rpms/kmymoney2/EL-5 kmymoney2.spec,1.32,1.33

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kmymoney2/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv26574

Modified Files:
	kmymoney2.spec 
Log Message:
revert to old stuff, rhel5's rpm seems too buggy/old for fancy-schmancy



Index: kmymoney2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/EL-5/kmymoney2.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- kmymoney2.spec	14 Jul 2010 15:12:43 -0000	1.32
+++ kmymoney2.spec	14 Jul 2010 15:29:29 -0000	1.33
@@ -104,14 +104,29 @@ rm -rf %{buildroot}
 
 make install DESTDIR=%{buildroot}
 
-%if 0%{?rhel}
 desktop-file-install --vendor="" \
-  --dir=%{buildroot}%{_datadir}/applications/kde \
+  --dir=%{buildroot}%{_datadir}/applications/kde/ \
   %{buildroot}%{_datadir}/applications/kde/kmymoney2.desktop
-%endif
 
+## File lists
 # locale's
-%find_lang %{name} --with-kde
+%find_lang %{name}
+# HTML (1.0)
+HTML_DIR=$(kde-config --expandvars --install html)
+if [ -d %{buildroot}$HTML_DIR ]; then
+for lang_dir in %{buildroot}$HTML_DIR/* ; do
+  if [ -d $lang_dir ]; then
+    lang=$(basename $lang_dir)
+    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
+    # replace absolute symlinks with relative ones
+    pushd $lang_dir
+      for i in *; do
+        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
+      done
+    popd
+  fi
+done
+fi
 
 # Unpackaged files
 rm -f %{buildroot}%{_libdir}/lib*.la
@@ -121,7 +136,6 @@ rm -rf %{buildroot}%{_datadir}/icons/*/s
 %check 
 # Currently broken w/--enable-final: http://bugs.kde.org/115863
 %{?_with_check:make check }
-desktop-file-validate %{buildroot}%{_datadir}/applications/kde/kmymoney2.desktop
 
 
 %post libs -p /sbin/ldconfig
@@ -136,6 +150,7 @@ touch --no-create %{_datadir}/icons/Tang
 
 %postun
 if [ $1 -eq 0 ] ; then
+  update-desktop-database -q &> /dev/null
   touch --no-create %{_datadir}/icons/hicolor &> /dev/null 
   touch --no-create %{_datadir}/icons/locolor &> /dev/null
   touch --no-create %{_datadir}/icons/oxygen &> /dev/null
@@ -144,15 +159,14 @@ if [ $1 -eq 0 ] ; then
   gtk-update-icon-cache %{_datadir}/icons/locolor &> /dev/null || :
   gtk-update-icon-cache %{_datadir}/icons/oxygen &> /dev/null || :
   gtk-update-icon-cache %{_datadir}/icons/Tango &> /dev/null || :
-  update-desktop-database -q &> /dev/null
 fi
 
 %posttrans
+update-desktop-database -q &> /dev/null
 gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 gtk-update-icon-cache %{_datadir}/icons/locolor &> /dev/null || :
 gtk-update-icon-cache %{_datadir}/icons/oxygen &> /dev/null || :
 gtk-update-icon-cache %{_datadir}/icons/Tango &> /dev/null || :
-update-desktop-database -q &> /dev/null
 
 
 %files -f %{name}.lang
@@ -198,7 +212,6 @@ rm -rf %{buildroot}
 %changelog
 * Wed Jul 14 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.0.5-1
 - kmymoney2-1.0.5
-- use %%find_lang --with-kde
 
 * Wed Mar 31 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.0.4-1
 - kmymoney2-1.0.4