RHEL/Fedora: more application fixes ...

1 files changed, 9 insertions, 15 deletions

diff --git a/redhat/applications/kdmtheme/trinity-kdmtheme.spec b/redhat/applications/kdmtheme/trinity-kdmtheme.spec
index 05f4b43a5..e2bd41958 100644
--- a/redhat/applications/kdmtheme/trinity-kdmtheme.spec
+++ b/redhat/applications/kdmtheme/trinity-kdmtheme.spec
@@ -1,7 +1,7 @@
 # Default version for this component
 %define kdecomp kdmtheme
 %define version 1.2.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"
@@ -32,7 +32,6 @@ Prefix:    %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
-Source1:	kdmtheme.lintian-overrides
 
 BuildRequires:	tqtinterface-devel
 BuildRequires:	trinity-kdelibs-devel
@@ -53,11 +52,11 @@ that allows you to easily install, remove and change your KDM themes.
 # 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" \
-  -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g"
+  -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"
 
 
@@ -77,20 +76,11 @@ export PATH="%{_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
-%__install -D -p -m644 %{SOURCE1} %{buildroot}%{_datadir}/lintian/overrides/kdmtheme-trinity
 
 %clean
 %__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,-)
@@ -100,9 +90,13 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %{tde_docdir}/HTML/en/kdmtheme/common
 %{tde_docdir}/HTML/en/kdmtheme/index.cache.bz2
 %{tde_docdir}/HTML/en/kdmtheme/index.docbook
-%{_datadir}/lintian/overrides/kdmtheme-trinity
 
 
 %Changelog
+* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.2.2-2
+- Rebuilt for Fedora 17
+- Removes post and postun
+- Removes the 'lintian' stuff from Debian
+
 * Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 1.2.2-1
 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16