Branch: master

3c828227 2016-09-18 04:58:13 François Andriot
RPM packaging: remove useless kooldock postinstallation
M redhat/applications/kooldock/kooldock.spec
diff --git a/redhat/applications/kooldock/kooldock.spec b/redhat/applications/kooldock/kooldock.spec
index caf1f55..1b99671 100644
--- a/redhat/applications/kooldock/kooldock.spec
+++ b/redhat/applications/kooldock/kooldock.spec
@@ -145,23 +145,6 @@
 %__rm -rf %{buildroot}
 
 
-%post
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig
-update-desktop-database %{tde_tdeappdir} -q &> /dev/null
-
-%postun
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig
-update-desktop-database %{tde_tdeappdir} -q &> /dev/null
-
-
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
abfac4fc 2016-09-18 04:58:34 François Andriot
RPM packaging: minor fix to build script
M redhat/build/get_rpm_package_name.sh
diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh
index 8d12a91..e84d99d 100755
--- a/redhat/build/get_rpm_package_name.sh
+++ b/redhat/build/get_rpm_package_name.sh
@@ -83,7 +83,7 @@
   
   # Some other packags NOT having development package
   case "${PKGNAME}" in
-    "hal-info"|"lilypond"|"mftrace"|"pcsc-perl"|"torsocks") exit 0;;
+    "cmake"|"hal-info"|"lilypond"|"mftrace"|"pcsc-perl"|"torsocks") exit 0;;
     "tqca-tls"|"tdeadmin"|"tdetoys"|"tde-i18n"*|"tdeaddons"|"tdeartwork"|"libtqt-perl") exit 0;;
   esac
 
46639a3a 2016-09-18 04:58:57 François Andriot
RPM packaging: add opensuse 42.2 theme in tdebase
M redhat/main/tdebase/tdebase-14.0.0.spec
diff --git a/redhat/main/tdebase/tdebase-14.0.0.spec b/redhat/main/tdebase/tdebase-14.0.0.spec
index 528fc7b..539b29d 100644
--- a/redhat/main/tdebase/tdebase-14.0.0.spec
+++ b/redhat/main/tdebase/tdebase-14.0.0.spec
@@ -316,6 +316,14 @@
 %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
 %endif
 
+# OpenSuse 42.2 Theme
+%if "%{?suse_version}" == "4220"
+Requires:	wallpaper-branding = 42.2
+%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
+Requires:	hicolor-icon-theme-branding
+%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
+%endif
+
 BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}