Branch: master

81749df8 2014-11-02 15:25:05 François Andriot
RPM packaging: update packages
M redhat/dependencies/arts/arts-14.0.0.spec
M redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
M redhat/tdeadmin/tdeadmin-14.0.0.spec
M redhat/tdebase/tdebase-14.0.0.spec
M redhat/tdebindings/tdebindings-14.0.0.spec
M redhat/tdegraphics/tdegraphics-14.0.0.spec
M redhat/tdepim/tdepim-14.0.0.spec
M redhat/tdesdk/tdesdk-14.0.0.spec
diff --git a/redhat/dependencies/arts/arts-14.0.0.spec b/redhat/dependencies/arts/arts-14.0.0.spec
index ab84736..244c370 100644
--- a/redhat/dependencies/arts/arts-14.0.0.spec
+++ b/redhat/dependencies/arts/arts-14.0.0.spec
@@ -29,6 +29,7 @@
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_sbindir %{tde_prefix}/sbin
 %define tde_tdeappdir %{tde_datadir}/applications/tde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
index 95a4186..8b71f35 100755
--- a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
@@ -23,16 +23,6 @@
 %define tde_epoch 2
 %define tde_version 14.0.0
 %define tde_pkg tqtinterface
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
 %define cmake_modules_dir %{_datadir}/cmake/Modules
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
@@ -230,7 +220,7 @@
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
   \
-  -DQTDIR="%{tde_datadir}/tqt3" \
+  -DQTDIR="%{_datadir}/tqt3" \
   -DQT_INCLUDE_DIR="%{_includedir}/tqt3" \
   -DQT_LIBRARY_DIR="%{_libdir}" \
   \
diff --git a/redhat/tdeadmin/tdeadmin-14.0.0.spec b/redhat/tdeadmin/tdeadmin-14.0.0.spec
index 102aa23..0b1312a 100644
--- a/redhat/tdeadmin/tdeadmin-14.0.0.spec
+++ b/redhat/tdeadmin/tdeadmin-14.0.0.spec
@@ -209,7 +209,8 @@
 Group:		System/GUI/Other
 
 %description kfile-plugins
-File metainfo plugins for deb and rpm package files.
+This package contains the Trinity File metainfo plugins for deb and rpm
+package files.
 
 %files kfile-plugins
 %defattr(-,root,root,-)
diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec
index abaf6a2..0844117 100644
--- a/redhat/tdebase/tdebase-14.0.0.spec
+++ b/redhat/tdebase/tdebase-14.0.0.spec
@@ -263,6 +263,14 @@
 %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
 %endif
 
+# OpenSuse 13.2 Theme
+%if "%{?suse_version}" == "1320"
+Requires:	wallpaper-branding = 13.2
+%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
+Requires:	hicolor-icon-theme-branding = 13.2
+%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}
 
@@ -378,30 +386,16 @@
 %endif
 
 # XSCREENSAVER support
-#  Disabled on RHEL4, RHEL >= 7
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 7 || 0%{?suse_version} || 0%{?with_xscreensaver}
-%if 0%{?rhel} == 0 || 0%{?rhel} <= 6
+%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} || 0%{?with_xscreensaver}
 %define with_xscreensaver 1
-%if 0%{?rhel} == 5
-BuildRequires:	xorg-x11-proto-devel
-BuildRequires:	gnome-screensaver
+%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version}
+BuildRequires:	libXScrnSaver-devel
 %endif
 %if 0%{?mgaversion} || 0%{?mdkversion}
 %if 0%{?mgaversion} >= 4
 BuildRequires:	%{_lib}xscrnsaver-devel
 %else
 BuildRequires:	%{_lib}xscrnsaver%{?mgaversion:1}-devel
-%endif
-%endif
-%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} >= 1220
-BuildRequires:	xscreensaver
-BuildRequires:	libXScrnSaver-devel
-%if 0%{?suse_version}
-BuildRequires:	xscreensaver-data-extra
-%endif
-%endif
-%if 0%{?suse_version} == 1140
-BuildRequires:	xscreensaver
 %endif
 %endif
 %endif
@@ -3388,7 +3382,7 @@
 
 ##########
 
-%if 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
@@ -3713,7 +3707,6 @@
 
 # Updates applications categories for openSUSE
 %if 0%{?suse_version}
-# Other applications
 %suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/Help.desktop                       Documentation Viewer
 %suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/Home.desktop                       System FileManager core
 %suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kate.desktop                       TextEditor
diff --git a/redhat/tdebindings/tdebindings-14.0.0.spec b/redhat/tdebindings/tdebindings-14.0.0.spec
index a32f8d1..2d98f88 100644
--- a/redhat/tdebindings/tdebindings-14.0.0.spec
+++ b/redhat/tdebindings/tdebindings-14.0.0.spec
@@ -184,7 +184,7 @@
 %define perl_vendorarch %{expand:%%(eval `perl -V:installvendorarch`; echo $installvendorarch)}
 
 ## QScintilla
-BuildRequires:	trinity-tqscintilla-devel
+BuildRequires:	libtqscintilla-devel >= %{?tde_epoch:%{tde_epoch}:}1.7.1
 %define _enable_qscintilla --enable-qscintilla
 
 Obsoletes:	trinity-kdebindings < %{version}-%{release}
diff --git a/redhat/tdegraphics/tdegraphics-14.0.0.spec b/redhat/tdegraphics/tdegraphics-14.0.0.spec
index 1aee2ca..c63d352 100644
--- a/redhat/tdegraphics/tdegraphics-14.0.0.spec
+++ b/redhat/tdegraphics/tdegraphics-14.0.0.spec
@@ -179,6 +179,9 @@
 BuildRequires: Mesa-libGL-devel
 BuildRequires: Mesa-libGLU-devel
 %endif
+%if 0%{?rhel} == 4
+BuildRequires:	xorg-x11-Mesa-libGLU
+%endif
 
 # DRM support
 %if 0%{?rhel} == 4
diff --git a/redhat/tdepim/tdepim-14.0.0.spec b/redhat/tdepim/tdepim-14.0.0.spec
index 6f27a41..4456ec3 100644
--- a/redhat/tdepim/tdepim-14.0.0.spec
+++ b/redhat/tdepim/tdepim-14.0.0.spec
@@ -945,12 +945,27 @@
 %{tde_tdeappdir}/kleopatra.desktop
 %{tde_tdedocdir}/HTML/en/kleopatra/
 %{tde_tdedocdir}/HTML/en/kwatchgnupg/
+%{tde_datadir}/icons/hicolor/128x128/apps/kleopatra.png
+%{tde_datadir}/icons/hicolor/16x16/apps/kleopatra.png
+%{tde_datadir}/icons/hicolor/22x22/apps/kleopatra.png
+%{tde_datadir}/icons/hicolor/32x32/apps/kleopatra.png
+%{tde_datadir}/icons/hicolor/48x48/apps/kleopatra.png
+%{tde_datadir}/icons/hicolor/64x64/apps/kleopatra.png
+%{tde_datadir}/icons/hicolor/scalable/apps/kleopatra.svgz
 
 %post -n trinity-kleopatra
 update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
+for f in hicolor ; do
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
+done
 
 %postun -n trinity-kleopatra
 update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
+for f in hicolor ; do
+  touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
+done
 
 ##########
 
@@ -2325,7 +2340,7 @@
 %suse_update_desktop_file -r    %{?buildroot}%{tde_tdeappdir}/kalarm.desktop          Utility  TimeUtility X-TDE-Utilities-PIM
 %suse_update_desktop_file -r    %{?buildroot}%{tde_tdeappdir}/kandy.desktop           Utility  Telephony X-TDE-Utilities-Peripherals
 %suse_update_desktop_file -r    %{?buildroot}%{tde_tdeappdir}/karm.desktop            Utility  TimeUtility X-TDE-Utilities-PIM
-%suse_update_desktop_file       %{?buildroot}%{tde_tdeappdir}/kleopatra.desktop       Utility
+%suse_update_desktop_file       %{?buildroot}%{tde_tdeappdir}/kleopatra.desktop       X-TDE-Utilities-PIM
 %suse_update_desktop_file       %{?buildroot}%{tde_tdeappdir}/KNode.desktop
 %suse_update_desktop_file -r    %{?buildroot}%{tde_tdeappdir}/knotes.desktop          Utility  DesktopUtility X-TDE-Utilities-Desktop
 %suse_update_desktop_file       %{?buildroot}%{tde_tdeappdir}/KMail.desktop
diff --git a/redhat/tdesdk/tdesdk-14.0.0.spec b/redhat/tdesdk/tdesdk-14.0.0.spec
index b9167bb..8e97c70 100644
--- a/redhat/tdesdk/tdesdk-14.0.0.spec
+++ b/redhat/tdesdk/tdesdk-14.0.0.spec
@@ -1074,7 +1074,7 @@
 
 ##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
a178b65f 2014-11-02 15:34:45 François Andriot
RPM packaging: update tdeartwork
M redhat/tdeartwork/tdeartwork-14.0.0.spec
diff --git a/redhat/tdeartwork/tdeartwork-14.0.0.spec b/redhat/tdeartwork/tdeartwork-14.0.0.spec
index 776b4f4..be61af2 100644
--- a/redhat/tdeartwork/tdeartwork-14.0.0.spec
+++ b/redhat/tdeartwork/tdeartwork-14.0.0.spec
@@ -97,7 +97,8 @@
 # XSCREENSAVER support
 #  RHEL 4: disabled
 #  RHEL 6: available in EPEL
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{rhel} == 7 || 0%{?suse_version} || 0%{?with_xscreensaver}
+#  RHEL 7: available in NUX
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?suse_version} || 0%{?with_xscreensaver}
 %define with_xscreensaver 1
 
 %if 0%{?fedora} || 0%{?rhel} >= 5