RHEL/Fedora: fix lots of application building

1 files changed, 10 insertions, 13 deletions

diff --git a/redhat/applications/kde-style-qtcurve/trinity-kde-style-qtcurve.spec b/redhat/applications/kde-style-qtcurve/trinity-kde-style-qtcurve.spec
index 4995202a2..b52e16305 100644
--- a/redhat/applications/kde-style-qtcurve/trinity-kde-style-qtcurve.spec
+++ b/redhat/applications/kde-style-qtcurve/trinity-kde-style-qtcurve.spec
@@ -1,7 +1,7 @@
 # Default version for this component
 %define kdecomp kde-style-qtcurve
 %define version 0.55.2
-%define release 1
+%define release 2
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -16,7 +16,7 @@ BuildRequires: autoconf automake libtool m4
 %define tde_libdir %{_libdir}/trinity
 
 
-Name:		trinity-%{kdecomp}
+Name:		trinity-style-qtcurve
 Summary:	This is a set of widget styles for Trinity based apps
 Version:	%{?version}
 Release:	%{?release}%{?dist}%{?_variant}
@@ -41,10 +41,11 @@ BuildRequires:	trinity-kdebase-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
+Obsoletes:		trinity-kde-style-qtcurve
 
 %description
 This package together with gtk2-engines-qtcurve aim to provide a unified look
-and feel on the desktop when using KDE and Gnome applications.
+and feel on the desktop when using TDE and Gnome applications.
 
 This package is most useful when installed together with 
 gtk2-engines-qtcurve.
@@ -56,8 +57,8 @@ gtk2-engines-qtcurve.
 
 # Ugly hack to modify TQT include directory inside autoconf files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-sed -i CMakeLists.txt \
-  -e "s,/usr/include/tqt,%{_includedir}/tqt,g"
+%__sed -i CMakeLists.txt \
+  -e "s|/usr/include/tqt|%{_includedir}/tqt|g"
 
 
 %build
@@ -85,14 +86,6 @@ export PATH="%{_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 
 
-%post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-
 
 %files
 %defattr(-,root,root,-)
@@ -114,5 +107,9 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 
 %Changelog
+* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.55.2-2
+- Rebuilt for Fedora 17
+- Removes post and postun
+
 * Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.55.2-1
 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16