RHEL/Fedora: fix lots of application building

1 files changed, 13 insertions, 13 deletions

diff --git a/redhat/applications/kde-style-lipstik/trinity-kde-style-lipstik-3.5.13.spec b/redhat/applications/kde-style-lipstik/trinity-kde-style-lipstik-3.5.13.spec
index 6a6dcd028..5883a3d92 100644
--- a/redhat/applications/kde-style-lipstik/trinity-kde-style-lipstik-3.5.13.spec
+++ b/redhat/applications/kde-style-lipstik/trinity-kde-style-lipstik-3.5.13.spec
@@ -1,7 +1,7 @@
 # Default version for this component
 %define kdecomp kde-style-lipstik
 %define version 2.2.3
-%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-lipstik
 Summary:	Lipstik style for TDE
 Version:	%{?version}
 Release:	%{?release}%{?dist}%{?_variant}
@@ -33,6 +33,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
 
+Obsoletes:	trinity-kde-style-lipstik
+
 BuildRequires:	tqtinterface-devel
 BuildRequires:	trinity-kdelibs-devel
 BuildRequires:	trinity-kdebase-devel
@@ -52,11 +54,12 @@ Lipstik also provides Lipstik-color-schemes
 
 # 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,%{_includedir}/tqt,g"
+%__sed -i admin/acinclude.m4.in \
+  -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \
+  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
 
 %__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/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
@@ -81,14 +84,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,-)
@@ -104,5 +99,10 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 
 %Changelog
+* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 2.2.3-2
+- Rebuilt for Fedora 17
+- Fix HTML directory location
+- Removes post and postun
+
 * Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 2.2.3-1
 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16