From 3f18efad8f458348d3ca7feaf0cb24fff0fa4985 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Wed, 16 Mar 2016 07:05:57 +0100 Subject: RPM Packaging: update for pclinuxos2016 --- redhat/Makefile.r14 | 4 ++-- redhat/applications/basket/basket-14.0.0.spec | 3 +-- redhat/applications/k9copy/k9copy-14.0.0.spec | 9 ++++++++- redhat/applications/koffice/koffice-14.0.0.spec | 1 + redhat/applications/ksensors/ksensors-14.0.0.spec | 5 ----- redhat/applications/ksquirrel/ksquirrel-14.0.0.spec | 7 ++++--- redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2016 | 5 +++++ redhat/main/tdebase/pamd.kdm-trinity-np.pclos2016 | 7 +++++++ redhat/main/tdebase/pamd.kdm-trinity.pclos2016 | 8 ++++++++ redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2016 | 5 +++++ redhat/main/tdeedu/tdeedu-14.0.0.spec | 4 ++-- redhat/main/tdegames/tdegames-14.0.0.spec | 3 +-- redhat/main/tdenetwork/tdenetwork-14.0.0.spec | 3 +-- redhat/main/tdevelop/tdevelop-14.0.0.spec | 1 - 14 files changed, 45 insertions(+), 20 deletions(-) create mode 100644 redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2016 create mode 100644 redhat/main/tdebase/pamd.kdm-trinity-np.pclos2016 create mode 100644 redhat/main/tdebase/pamd.kdm-trinity.pclos2016 create mode 100644 redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2016 (limited to 'redhat') diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14 index b179230d0..1ad7a4480 100644 --- a/redhat/Makefile.r14 +++ b/redhat/Makefile.r14 @@ -246,8 +246,8 @@ ifneq ($(wildcard /boot/vmlinuz*.el5*),) endif torsocks: -# Do NOT build on RHEL 6, RHEL 7 -ifeq ($(wildcard /boot/vmlinuz*.el6* /boot/vmlinuz*.el7*),) +# Do NOT build on RHEL 6, RHEL 7, Fedora > 20 +ifeq ($(wildcard /boot/vmlinuz*.el6* /boot/vmlinuz*.el7* /boot/vmlinuz*.fc2*),) $(call buildpkg,3rdparty/torsocks) endif diff --git a/redhat/applications/basket/basket-14.0.0.spec b/redhat/applications/basket/basket-14.0.0.spec index 4b5ce7a67..03be3e89d 100644 --- a/redhat/applications/basket/basket-14.0.0.spec +++ b/redhat/applications/basket/basket-14.0.0.spec @@ -201,8 +201,7 @@ update-desktop-database %{tde_tdeappdir} -q &> /dev/null %{tde_datadir}/services/kontact/basket.desktop %{tde_datadir}/services/kontact/basket_v4.desktop %{tde_tdedocdir}/HTML/en/basket/ +%{tde_confdir}/magic/basket.magic.mgc %changelog -* Mon Jul 29 2013 Francois Andriot - 2:1.0.3.1-1 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/k9copy/k9copy-14.0.0.spec b/redhat/applications/k9copy/k9copy-14.0.0.spec index f67b2b12f..a88fe8581 100644 --- a/redhat/applications/k9copy/k9copy-14.0.0.spec +++ b/redhat/applications/k9copy/k9copy-14.0.0.spec @@ -100,8 +100,14 @@ This is the Trinity version. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +%if 0%{?suse_version} == 1315 +%__sed -i "k9author/k9avidecode.cpp" \ + -e "/pkt->destruct/ s|^|//|" \ + -e "s|PIX_FMT_RGB24|AV_PIX_FMT_RGB24|g" +%endif + # Removes internal dvdread headers -%__rm -rf dvdread +%__rm -rf "dvdread" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -155,6 +161,7 @@ touch --no-create %{tde_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : update-desktop-database %{tde_appdir} &> /dev/null + %postun touch --no-create %{tde_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : diff --git a/redhat/applications/koffice/koffice-14.0.0.spec b/redhat/applications/koffice/koffice-14.0.0.spec index 92044819f..1b92fe85b 100644 --- a/redhat/applications/koffice/koffice-14.0.0.spec +++ b/redhat/applications/koffice/koffice-14.0.0.spec @@ -681,6 +681,7 @@ update-desktop-database -q &> /dev/null ||: %{tde_tdelibdir}/krosskexiapp.* %{tde_tdelibdir}/krosskexidb.* %endif +%{tde_confdir}/magic/kexi.magic.mgc ########## diff --git a/redhat/applications/ksensors/ksensors-14.0.0.spec b/redhat/applications/ksensors/ksensors-14.0.0.spec index 3e75387d6..55dc1d05f 100644 --- a/redhat/applications/ksensors/ksensors-14.0.0.spec +++ b/redhat/applications/ksensors/ksensors-14.0.0.spec @@ -141,11 +141,6 @@ export PATH="%{tde_bindir}:${PATH}" %__mkdir_p "%{?buildroot}%{tde_tdeappdir}" %__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}" -# Creates autostart shortcut -%__install -dm 755 $RPM_BUILD_ROOT%{tde_datadir}/autostart -%__ln_s "%{tde_tdeappdir}/ksensors.desktop" \ - "$RPM_BUILD_ROOT%{tde_datadir}/autostart" - %find_lang %{tde_pkg} # Updates applications categories for openSUSE diff --git a/redhat/applications/ksquirrel/ksquirrel-14.0.0.spec b/redhat/applications/ksquirrel/ksquirrel-14.0.0.spec index 5f378f97b..6de711efc 100644 --- a/redhat/applications/ksquirrel/ksquirrel-14.0.0.spec +++ b/redhat/applications/ksquirrel/ksquirrel-14.0.0.spec @@ -197,9 +197,10 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %{tde_datadir}/icons/hicolor/*/apps/ksquirrel.png %{tde_datadir}/mimelnk/image/*.desktop %{tde_datadir}/services/ksquirrelpart.desktop -%{tde_datadir}/locale/*/LC_MESSAGES/ksquirrel.mo %{tde_mandir}/man1/ksquirrel.1 +%{tde_confdir}/magic/x-ras.magic.mgc +%{tde_confdir}/magic/x-sun.magic.mgc +%{tde_confdir}/magic/x-utah.magic.mgc + %changelog -* Fri Jul 05 2013 Francois Andriot - 2:0.8.0-1 -- Initial release for TDE 14.0.0 diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2016 b/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2016 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2016 @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth include system-auth +account include system-auth +password include system-auth +session include system-auth diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2016 b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2016 new file mode 100644 index 000000000..690b4df08 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2016 @@ -0,0 +1,7 @@ +#%PAM-1.0 +auth required pam_env.so +auth required pam_permit.so +account include system-auth +password include system-auth +session include system-auth +session optional pam_console.so diff --git a/redhat/main/tdebase/pamd.kdm-trinity.pclos2016 b/redhat/main/tdebase/pamd.kdm-trinity.pclos2016 new file mode 100644 index 000000000..87d080f58 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity.pclos2016 @@ -0,0 +1,8 @@ +#%PAM-1.0 +auth include system-auth +auth required pam_nologin.so +account include system-auth +password include system-auth +session include system-auth +session optional pam_console.so +session required pam_namespace.so diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2016 b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2016 new file mode 100644 index 000000000..0a37e6e13 --- /dev/null +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2016 @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth include system-auth +account include system-auth +password include system-auth +session include system-auth diff --git a/redhat/main/tdeedu/tdeedu-14.0.0.spec b/redhat/main/tdeedu/tdeedu-14.0.0.spec index 8eacfe4f7..41785bb3e 100644 --- a/redhat/main/tdeedu/tdeedu-14.0.0.spec +++ b/redhat/main/tdeedu/tdeedu-14.0.0.spec @@ -585,6 +585,8 @@ This package is part of Trinity, as a component of the TDE education module. %{tde_datadir}/services/tdefile_kig.desktop %{tde_datadir}/services/kig_part.desktop %{tde_tdedocdir}/HTML/en/kig/ +%{tde_confdir}/magic/cabri.magic.mgc +%{tde_confdir}/magic/drgeo.magic.mgc %post -n trinity-kig for i in crystalsvg hicolor ; do @@ -1454,5 +1456,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Jul 05 2013 Francois Andriot - 14.0.0-1 -- Initial release for TDE R14.0.0 diff --git a/redhat/main/tdegames/tdegames-14.0.0.spec b/redhat/main/tdegames/tdegames-14.0.0.spec index 9c52a7956..b8e352099 100644 --- a/redhat/main/tdegames/tdegames-14.0.0.spec +++ b/redhat/main/tdegames/tdegames-14.0.0.spec @@ -918,6 +918,7 @@ This package is part of Trinity, and a component of the TDE games module. %{tde_libdir}/libkolf.so.1 %{tde_libdir}/libkolf.so.1.2.0 %{tde_tdedocdir}/HTML/en/kolf/ +%{tde_confdir}/magic/kolf.magic.mgc %post -n trinity-kolf /sbin/ldconfig || : @@ -1651,5 +1652,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Jul 05 2013 Francois Andriot - 14.0.0-1 -- Initial release for TDE R14.0.0 diff --git a/redhat/main/tdenetwork/tdenetwork-14.0.0.spec b/redhat/main/tdenetwork/tdenetwork-14.0.0.spec index ab72ef950..bcacfc188 100644 --- a/redhat/main/tdenetwork/tdenetwork-14.0.0.spec +++ b/redhat/main/tdenetwork/tdenetwork-14.0.0.spec @@ -867,6 +867,7 @@ track of the time spent online for you. %{tde_datadir}/apps/kppp/ %{tde_datadir}/icons/hicolor/*/apps/kppp.png %{tde_tdedocdir}/HTML/en/kppp/ +%{_sysconfdir}/ppp/peers/kppp-options %if 0%{?with_consolehelper} %config(noreplace) /etc/security/console.apps/kppp3 @@ -1352,5 +1353,3 @@ done %changelog -* Fri Jul 05 2013 Francois Andriot - 14.0.0-1 -- Initial release for TDE 14.0.0 diff --git a/redhat/main/tdevelop/tdevelop-14.0.0.spec b/redhat/main/tdevelop/tdevelop-14.0.0.spec index b57cc824b..179050a47 100644 --- a/redhat/main/tdevelop/tdevelop-14.0.0.spec +++ b/redhat/main/tdevelop/tdevelop-14.0.0.spec @@ -458,7 +458,6 @@ individual needs. %{tde_datadir}/apps/kdevdebugger/ %{tde_datadir}/apps/kdevdesigner/ %{tde_datadir}/apps/kdevdesignerpart/ -%{tde_datadir}/apps/kdevdesignerpart/ %{tde_datadir}/apps/kdevdiff/ %{tde_datadir}/apps/kdevdistpart/ %{tde_datadir}/apps/kdevdocumentation/ -- cgit v1.2.1