Update to 3.0.3

This commit is contained in:
Sergey Zhemoitel 2017-01-20 13:49:00 +03:00
parent eaced4b70e
commit 80e41b8971
2 changed files with 46 additions and 20 deletions

View file

@ -1,4 +1,5 @@
removed_sources: removed_sources:
italc-3.0.0.tar.gz: 936fd8bdaf30c34b6ed5e63ab11aa8775de39b27 italc-3.0.0.tar.gz: 936fd8bdaf30c34b6ed5e63ab11aa8775de39b27
sources:
italc-3.0.1.tar.gz: de04ae9ed46d7c8105a4a72530f51308b0f1fabc italc-3.0.1.tar.gz: de04ae9ed46d7c8105a4a72530f51308b0f1fabc
sources:
italc-3.0.3.tar.gz: 2f61880a65c08fa4f8ab7cd6c17fd7e3ad19cdba

View file

@ -1,11 +1,17 @@
%define debug_package %{nil} %define debug_package %{nil}
%define libname %mklibname italc
%define italcgrp italc
%define oname italc %define oname italc
%define ver 3
%define libname %mklibname %{oname} %{ver}
%define devname %mklibname %{oname} %{ver} -d
%define italcgrp %{oname}
%define build_dev 0
%{?_without_dev: %global build_dev 0}
%{?_with_dev: %global build_dev 1}
Name: italc3 Name: italc3
Summary: Intelligent Teaching And Learning with Computers - software for teachers Summary: Intelligent Teaching And Learning with Computers - software for teachers
Version: 3.0.1 Version: 3.0.3
Release: 1 Release: 1
License: GPLv2+ License: GPLv2+
Group: Networking/Remote access Group: Networking/Remote access
@ -19,8 +25,7 @@ Source10: %{name}.rpmlintrc
BuildRequires: cmake BuildRequires: cmake
BuildRequires: qt5-linguist BuildRequires: qt5-linguist
BuildRequires: pam-devel BuildRequires: pam-devel
#BuildRequires: pkgconfig(libopenjpeg1) BuildRequires: pkgconfig(libopenjpeg1)
BuildRequires: jpeg-devel
BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5Widgets)
@ -30,9 +35,6 @@ BuildRequires: pkgconfig(libopenjpeg1)
BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(xtst) BuildRequires: pkgconfig(xtst)
BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(zlib)
BuildRequires: pkgconfig(xinerama)
BuildRequires: pkgconfig(xrandr)
BuildRequires: java-devel
%description %description
iTALC is a use- and powerful didactical tool for teachers. It lets you view iTALC is a use- and powerful didactical tool for teachers. It lets you view
@ -58,34 +60,34 @@ Furthermore iTALC is optimized for usage on multi-core systems (by making
heavy use of threads). No matter how many cores you have, iTALC can make use heavy use of threads). No matter how many cores you have, iTALC can make use
of all of them. of all of them.
%package client %package client
Summary: Software for iTALC-clients Summary: Software for iTALC-clients
Group: Networking/Remote access Group: Networking/Remote access
%description client %description client
This package contains the software, needed by iTALC-clients. This package contains the software, needed by iTALC-clients.
See /usr/share/italc/doc/INSTALL for details on how to install and setup iTALC See /usr/share/italc/doc/INSTALL for details on how to install and setup iTALC
in your network. in your network.
%package master %package master
Summary: iTALC master software Summary: iTALC master software
Group: Networking/Remote access Group: Networking/Remote access
Requires: %{libname} = %{EVRD} Requires: %{libname} = %{EVRD}
Requires: %{name}-client = %{EVRD} Requires: %{name}-client = %{EVRD}
Requires(post): %{name}-client = %{EVRD} Requires(post): %{name}-client = %{EVRD}
%description master %description master
This package contains the actual master-software for accessing clients. This package contains the actual master-software for accessing clients.
See /usr/share/italc/doc/INSTALL for details on how to install and setup iTALC See /usr/share/italc/doc/INSTALL for details on how to install and setup iTALC
in your network. in your network.
%package -n %{libname} %package -n %{libname}
Summary: Library used by ITALC Summary: Library used by ITALC
Group: Networking/Remote access Group: Networking/Remote access
%description -n %{libname} %description -n %{libname}
iTALC is a use- and powerful didactical tool for teachers. It lets you iTALC is a use- and powerful didactical tool for teachers. It lets you
view and control other computers in your network in several ways. It view and control other computers in your network in several ways. It
supports Linux and Windows 2000/XP/Vista and it even can be used supports Linux and Windows 2000/XP/Vista and it even can be used
@ -93,6 +95,20 @@ transparently in mixed environments!
This is a library used by %{name}-master and %{name}-client. This is a library used by %{name}-master and %{name}-client.
%if %{build_dev}
%package -n %{devname}
Summary: Library used by ITALC
Group: Networking/Remote access
%description -n %{devname}
iTALC is a use- and powerful didactical tool for teachers. It lets you
view and control other computers in your network in several ways. It
supports Linux and Windows 2000/XP/Vista and it even can be used
transparently in mixed environments!
This is a library used by %{name}-master and %{name}-client.
%endif
%pre client %pre client
%{_sbindir}/groupadd -r -f %{italcgrp} 2>/dev/null ||: %{_sbindir}/groupadd -r -f %{italcgrp} 2>/dev/null ||:
@ -105,6 +121,9 @@ else
groupadd -r %{italcgrp} 2>/dev/null || : groupadd -r %{italcgrp} 2>/dev/null || :
fi fi
%post -n %{libname} -p /sbin/ldconfig
%postun -n %{libname} -p /sbin/ldconfig
%post master %post master
if if
@ -170,7 +189,7 @@ install -Dm644 ima/data/italc.png %{buildroot}/%{_datadir}/pixmaps/italc.png
install -D -m644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig/ica install -D -m644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig/ica
%files client %files client
%{_bindir}/ica %{_bindir}/ica
%{_bindir}/start-ica %{_bindir}/start-ica
%{_bindir}/italc_auth_helper %{_bindir}/italc_auth_helper
@ -193,13 +212,19 @@ install -D -m644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig/ica
%ghost %attr(0444,root,%{italcgrp}) %config(noreplace) %{_sysconfdir}/italc/keys/public/supporter/key %ghost %attr(0444,root,%{italcgrp}) %config(noreplace) %{_sysconfdir}/italc/keys/public/supporter/key
%files -n %{libname} %files -n %{libname}
%doc AUTHORS COPYING ChangeLog INSTALL README.md README.LZO %doc AUTHORS COPYING INSTALL README.md README.LZO
%{_libdir}/* %{_libdir}/*
%if %{build_dev}
%files -n %{devname}
%doc AUTHORS COPYING INSTALL README.md README.LZO
%{_libdir}/*.so
%{_includedir}/%{oname}
%endif
%files master %files master
%doc AUTHORS COPYING ChangeLog INSTALL README.md README.LZO %doc AUTHORS COPYING INSTALL README.md README.LZO
%{_bindir}/italc %{_bindir}/italc
%{_bindir}/italc-launcher %{_bindir}/italc-launcher
%{_bindir}/imc %{_bindir}/imc