RPM Packaging: update packages for 3.5.13.2 under Fedora 19

1 files changed, 33 insertions, 31 deletions

diff --git a/redhat/applications/tde-systemsettings/tde-systemsettings-3.5.13.2.spec b/redhat/applications/tde-systemsettings/tde-systemsettings-3.5.13.2.spec
index bf6bddbd6..cf9b3a815 100644
--- a/redhat/applications/tde-systemsettings/tde-systemsettings-3.5.13.2.spec
+++ b/redhat/applications/tde-systemsettings/tde-systemsettings-3.5.13.2.spec
@@ -1,5 +1,6 @@
 # Default version for this component
-%define tdecomp tde-systemsettings
+%define tde_pkg tde-systemsettings
+%define tde_version 3.5.13.2
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?tde_prefix}" != "/usr"
@@ -8,7 +9,7 @@
 %define tde_sysconfdir %{tde_prefix}/etc
 %endif
 
-# TDE 3.5.13 specific building variables
+# TDE specific building variables
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
@@ -25,22 +26,22 @@
 %define _docdir %{tde_docdir}
 
 
-Name:		trinity-tde-systemsettings
-Summary:	easy to use control centre for TDE
-Version:	0.0svn20070312
-Release:	7%{?dist}%{?_variant}
+Name:			trinity-tde-systemsettings
+Summary:		easy to use control centre for TDE
+Version:		0.0svn20070312
+Release:		%{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
 
-License:	GPLv2+
-Group:		Applications/Utilities
+License:		GPLv2+
+Group:			Applications/Utilities
 
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org
+Vendor:			Trinity Project
+Packager:		Francois Andriot <francois.andriot@free.fr>
+URL:			http://www.trinitydesktop.org
 
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix:			%{tde_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:	trinity-%{tdecomp}-3.5.13.2.tar.gz
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 Source1:	kde-settings-laptops.directory
 
 Provides:	trinity-kde-systemsettings = %{version}-%{release}
@@ -48,12 +49,13 @@ Obsoletes:	trinity-kde-systemsettings < %{version}-%{release}
 Provides:	trinity-systemsettings = %{version}-%{release}
 Obsoletes:	trinity-systemsettings < %{version}-%{release}
 
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.2
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.2
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.2
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires:	trinity-arts-devel >= 1:1.5.10
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-Requires:	trinity-guidance
+Requires:		trinity-guidance
 
 %description
 System preferences is a replacement for the TDE
@@ -66,13 +68,7 @@ Control Centre with an improved user interface.
 
 
 %prep
-%setup -q -n trinity-%{tdecomp}-3.5.13.2
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@@ -82,7 +78,6 @@ Control Centre with an improved user interface.
 %build
 unset QTDIR; . /etc/profile.d/qt3.sh
 export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 export KDEDIR="%{tde_prefix}"
 
 %configure \
@@ -92,9 +87,13 @@ export KDEDIR="%{tde_prefix}"
   --datadir=%{tde_datadir} \
   --includedir=%{tde_tdeincludedir} \
   --sysconfdir=%{tde_sysconfdir} \
-  --disable-rpath \
-  --with-extra-includes=%{tde_includedir}/tqt \
-  --enable-closure
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
+  --enable-final \
+  --enable-new-ldflags \
+  --enable-closure \
+  --enable-rpath
 
 %__make %{?_smp_mflags}
 
@@ -118,12 +117,12 @@ export PATH="%{tde_bindir}:${PATH}"
 %post
 touch --no-create %{tde_datadir}/icons/crystalsvg || :
 gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-xdg-user-dirs-update
+update-desktop-database %{tde_tdeappdir} -q &> /dev/null
 
 %postun
 touch --no-create %{tde_datadir}/icons/crystalsvg || :
 gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-xdg-user-dirs-update
+update-desktop-database %{tde_tdeappdir} -q &> /dev/null
 
 %files
 %defattr(-,root,root,-)
@@ -145,6 +144,9 @@ xdg-user-dirs-update
 
 
 %changelog
+* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-8
+- Build for Fedora 19
+
 * Sat Jun 29 2013 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-7
 - Rebuild