RPM: update spec files after building 14.0.10

12 files changed, 37 insertions, 14 deletions

diff --git a/redhat/Makefile b/redhat/Makefile
index 720f417e2..360583fa8 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -29,7 +29,6 @@ main:	tdelibs tdebase tdeaccessibility tdeadmin tdegames tdemultimedia tdepim td
 libraries:	kipi-plugins libkdcraw libkexiv2 libkipi libksquirrel libtdeldap libtqt-perl pytdeextensions python-trinity
 applications:	abakus amarok basket bibletime codeine digikam dolphin filelight gtk3-tqt-engine gtk-qt-engine gwenview k3b k9copy kaffeine kaffeine-mozilla kasablanca katapult kbarcode kbfx kbibtex kbiff kbookreader kchmviewer kcmautostart kcmldap kcmldapcontroller kcmldapmanager kcpuload kdbg kdbusnotification kdiff3 kdirstat keep kerberostray keximdb kftpgrabber kile kima kiosktool kkbswitch klamav klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knetworkmanager8 knights knmap knowit knutclient koffice kompose konversation kooldock kopete-otr kpicosim kpilot krecipes krename krusader kscope ksensors kshowmail kshutdown ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kvirc kvkbd kvpnc kxmleditor mathemagics mplayerthumbs piklab potracegui qalculate-tde qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tde-guidance tdeio-apt tdeio-ftps tastymenu tdedocker tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepacman tdepowersave tderadio tde-style-baghira tde-style-domino tde-style-ia-ora tde-style-lipstik tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal wlassistant yakuake
 i18n:	gwenview-i18n k3b-i18n koffice-i18n tde-i18n
-extras:	icons-crystalsvg-updated icons-kfaenza icons-nuvola icons-oxygen kdevmon kdissert klibido kmpose koverartist kpacman png2qrgb
 
 
 ### Trinity Dependencies
@@ -642,4 +641,4 @@ tarballs:
 
 # External packages
 external:
-	[ -d "${HOME}/rpmbuild/RPMS" ] && cp -rfv "${HOME}/rpmbuild/RPMS/"* "$(RPMDIR)"
+	if [ -d "${HOME}/rpmbuild/RPMS" ]; then cp -rfv "${HOME}/rpmbuild/RPMS/"* "$(RPMDIR)"; fi
diff --git a/redhat/applications/konversation/konversation.spec b/redhat/applications/konversation/konversation.spec
index f9f65a1cc..a7f587117 100644
--- a/redhat/applications/konversation/konversation.spec
+++ b/redhat/applications/konversation/konversation.spec
@@ -140,7 +140,9 @@ BuildRequires:	%{_lib}xscrnsaver%{?mgaversion:1}-devel
 %endif
 BuildRequires:	xscreensaver
 BuildRequires:	xscreensaver-base
+%if 0%{?pclinuxos} == 0
 BuildRequires:	xscreensaver-extrusion
+%endif
 BuildRequires:	xscreensaver-gl
 %endif
 %endif
diff --git a/redhat/applications/kstreamripper/scons-local-2.5.1.tar.gz b/redhat/applications/kstreamripper/scons-local-2.5.1.tar.gz
deleted file mode 100644
index ef63468b1..000000000
--- a/redhat/applications/kstreamripper/scons-local-2.5.1.tar.gz
+++ /dev/null
diff --git a/redhat/applications/tde-guidance/tde-guidance.spec b/redhat/applications/tde-guidance/tde-guidance.spec
index d16c96c28..fd72e9a6d 100644
--- a/redhat/applications/tde-guidance/tde-guidance.spec
+++ b/redhat/applications/tde-guidance/tde-guidance.spec
@@ -135,7 +135,9 @@ BuildRequires:	%{_lib}xscrnsaver%{?mgaversion:1}-devel
 %endif
 BuildRequires:	xscreensaver
 BuildRequires:	xscreensaver-base
+%if 0%{?pclinuxos} == 0
 BuildRequires:	xscreensaver-extrusion
+%endif
 BuildRequires:	xscreensaver-gl
 %endif
 %endif
diff --git a/redhat/extras/fileshareset/fileshareset.spec b/redhat/extras/fileshareset/fileshareset.spec
index d48421788..3c7745b27 100644
--- a/redhat/extras/fileshareset/fileshareset.spec
+++ b/redhat/extras/fileshareset/fileshareset.spec
@@ -92,11 +92,21 @@ export LDFLAGS="$LDFLAGS -pie"
 mkdir -p "${RPM_BUILD_ROOT}%{_sysconfdir}/security/"
 echo "RESTRICT=yes" > "${RPM_BUILD_ROOT}%{_sysconfdir}/security/fileshare.conf"
 
+# Remove setuid bit on some binaries.
+chmod 0755 "%{?buildroot}%{_bindir}/fileshareset"
+
 
 %clean
 %__rm -rf $RPM_BUILD_ROOT
 
 
+%post
+%if 0%{?suse_version}
+# Sets permissions on setuid files (openSUSE specific)
+%set_permissions %{_bindir}/fileshareset
+%endif
+
+
 %files
 %defattr(-,root,root,-)
 %{_bindir}/filesharelist
diff --git a/redhat/extras/trinity-desktop/trinity-desktop.spec b/redhat/extras/trinity-desktop/trinity-desktop.spec
index 4a6e4d346..601648eb3 100644
--- a/redhat/extras/trinity-desktop/trinity-desktop.spec
+++ b/redhat/extras/trinity-desktop/trinity-desktop.spec
@@ -189,6 +189,10 @@ Requires: trinity-mplayerthumbs
 Requires: trinity-piklab
 Requires: trinity-potracegui
 #Requires: trinity-qalculate-tde
+# On RHEL, lilypond is not available, so no rosegarden :'-(
+%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora}
+Requires: trinity-rosegarden
+%endif
 Requires: trinity-smb4k
 Requires: trinity-smartcardauth
 Requires: trinity-soundkonverter
@@ -239,11 +243,6 @@ Obsoletes: trinity-tde-guidance-powermanager
 #Requires: trinity-gtk3-tqt-engine
 #Requires: trinity-qt4-tqt-theme-engine
 
-# On RHEL 5/7, lilypond is not available, so no rosegarden :'-(
-%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora}
-Requires: trinity-rosegarden
-%endif
-
 # Compiz-related stuff does not work (obsolete)
 #Requires: trinity-compizconfig-backend-kconfig
 #Requires: trinity-desktop-effects-kde
diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem.spec b/redhat/extras/trinity-filesystem/trinity-filesystem.spec
index 365092542..642f778d8 100644
--- a/redhat/extras/trinity-filesystem/trinity-filesystem.spec
+++ b/redhat/extras/trinity-filesystem/trinity-filesystem.spec
@@ -626,6 +626,11 @@ for b in kcheckpass kgrantpty kpac_dhcp_helper kppp start_tdeinit tdmtsak tdekbd
     echo "%{tde_bindir}/${b}          root:root       4711" >>/etc/permissions.local
   fi
 done
+for b in fileshareset ; do
+  if ! grep -q "^%{_bindir}/${b}" "/etc/permissions.local"; then
+    echo "%{_bindir}/${b}          root:root       4711" >>/etc/permissions.local
+  fi
+done
 %endif
 
 
diff --git a/redhat/main/tdeaddons/tdeaddons.spec b/redhat/main/tdeaddons/tdeaddons.spec
index d190c2ca6..f373b469d 100644
--- a/redhat/main/tdeaddons/tdeaddons.spec
+++ b/redhat/main/tdeaddons/tdeaddons.spec
@@ -138,9 +138,11 @@ BuildRequires:	db4-devel
 #%endif
 
 # PYTHON2 support
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 8
+%if 0%{?rhel} >= 7 || 0%{?fedora} >= 30 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 7
 %global python python2
 %global __python %__python2
+%else
+%global python python
 %endif
 
 Requires: trinity-atlantikdesigner = %{version}-%{release}
diff --git a/redhat/main/tdeartwork/tdeartwork.spec b/redhat/main/tdeartwork/tdeartwork.spec
index d0141f44b..9fbe494cf 100644
--- a/redhat/main/tdeartwork/tdeartwork.spec
+++ b/redhat/main/tdeartwork/tdeartwork.spec
@@ -134,7 +134,9 @@ BuildRequires:	%{_lib}xscrnsaver%{?mgaversion:1}-devel
 %endif
 BuildRequires:	xscreensaver
 BuildRequires:	xscreensaver-base
+%if 0%{?pclinuxos} == 0
 BuildRequires:	xscreensaver-extrusion
+%endif
 BuildRequires:	xscreensaver-gl
 %endif
 
diff --git a/redhat/main/tdebase/tdebase.spec b/redhat/main/tdebase/tdebase.spec
index ef2d11e7f..1a9c51be0 100644
--- a/redhat/main/tdebase/tdebase.spec
+++ b/redhat/main/tdebase/tdebase.spec
@@ -628,7 +628,9 @@ BuildRequires:	%{_lib}xscrnsaver%{?mgaversion:1}-devel
 %endif
 BuildRequires:	xscreensaver
 BuildRequires:	xscreensaver-base
+%if 0%{?pclinuxos} == 0
 BuildRequires:	xscreensaver-extrusion
+%endif
 BuildRequires:	xscreensaver-gl
 %endif
 %endif
@@ -788,7 +790,7 @@ BuildRequires:		libr-devel >= 0.6.0
 %endif
 
 # RPC support
-%if 0%{?fedora} >= 28 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 8
+%if 0%{?fedora} >= 28 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 8 || 0%{?pclinuxos}
 BuildRequires:		libtirpc-devel
 BuildRequires:		rpcgen
 %if 0%{?fedora}
@@ -1499,9 +1501,7 @@ TDE applications, particularly those in the TDE base module.
 %{tde_libdir}/libtdeinit_kxkb.la
 %{tde_libdir}/libtdeinit_kxkb.so
 %{tde_libdir}/libkhotkeys_shared.so.*
-%if "%{?tde_version}" != "14.0.9"
 %{tde_tdeappdir}/kdcop.desktop
-%endif
 %{tde_tdeappdir}/keyboard.desktop
 %{tde_tdeappdir}/keyboard_layout.desktop
 %{tde_tdeappdir}/khotkeys.desktop
@@ -3707,9 +3707,7 @@ popd
 %suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/tdefontview.desktop                Graphics Viewer
 %{?with_tderandrtray:%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/tderandrtray.desktop               Applet X-TDE-settings-desktop}
 %suse_update_desktop_file    %{?buildroot}%{tde_datadir}/applnk/.hidden/konqfilemgr.desktop   System FileManager
-if [ -r %{?buildroot}%{tde_tdeappdir}/kdcop.desktop ]; then
 %suse_update_desktop_file -u %{?buildroot}%{tde_tdeappdir}/kdcop.desktop                      System Utility
-fi
 %endif
 
 # Icons from TDE Control Center should only be displayed in TDE
diff --git a/redhat/main/tdebindings/tdebindings.spec b/redhat/main/tdebindings/tdebindings.spec
index 947ee160d..b4d0d9c76 100644
--- a/redhat/main/tdebindings/tdebindings.spec
+++ b/redhat/main/tdebindings/tdebindings.spec
@@ -169,10 +169,12 @@ BuildRequires: Mesa-libGLU-devel
 %endif
 
 # PYTHON support
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 8
+%if 0%{?rhel} >= 7 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 7
 %global python python2
 %global __python %__python2
 %global python_sitearch %{python2_sitearch}
+%else
+%global python python
 %endif
 %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 BuildRequires:	%{python}
diff --git a/redhat/main/tdepim/tdepim.spec b/redhat/main/tdepim/tdepim.spec
index a1c3e7cbc..f32a3bda7 100644
--- a/redhat/main/tdepim/tdepim.spec
+++ b/redhat/main/tdepim/tdepim.spec
@@ -179,7 +179,9 @@ BuildRequires:	%{_lib}xscrnsaver%{?mgaversion:1}-devel
 %endif
 BuildRequires:	xscreensaver
 BuildRequires:	xscreensaver-base
+%if 0%{?pclinuxos} == 0
 BuildRequires:	xscreensaver-extrusion
+%endif
 BuildRequires:	xscreensaver-gl
 %endif
 %endif