rpms/moblin-icon-theme/devel moblin-icon-theme.spec,1.1,1.2

[Peter Robinson]

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-icon-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13092

Modified Files:
	moblin-icon-theme.spec 
Log Message:
- Some more package optimisations


Index: moblin-icon-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-icon-theme/devel/moblin-icon-theme.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- moblin-icon-theme.spec	3 Aug 2009 10:37:20 -0000	1.1
+++ moblin-icon-theme.spec	3 Aug 2009 19:50:57 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           moblin-icon-theme
 Version:        0.7
-Release:        1%{?dist}
+Release:        2
 Summary:        Moblin icon theme
 
 Group:          User Interface/Desktops
@@ -31,9 +31,28 @@ cp -rp output/moblin/16x16 %{buildroot}/
 cp -rp output/moblin/24x24 %{buildroot}/%{_datadir}/icons/moblin
 cp -rp output/moblin/48x48 %{buildroot}/%{_datadir}/icons/moblin
 
+# create an empty cache file so its removed when the package is
+touch %{buildroot}/%{_datadir}/icons/moblin/icon-theme.cache
+
 #Remove Makefile.am files
 find %{buildroot} -name 'Makefile.am' -exec rm -f {} ';'
 
+# create symlinks for missing stock icons
+cd %{buildroot}/%{_datadir}/icons/moblin
+for size in 16x16 24x24 48x48; do
+  (
+  cd $size
+  for context in *; do
+    if [ -d $context ]; then
+      (
+      cd $context
+      INU_DATA_DIR=%{_builddir}/%{name}-%{version} /usr/bin/icon-name-mapping -c $context
+      )
+    fi
+  done
+  )
+done
+
 %clean
 rm -rf %{buildroot}
 
@@ -41,16 +60,14 @@ rm -rf %{buildroot}
 touch --no-create %{_datadir}/icons/moblin &>/dev/null || :
 
 %postun
-if [ $1 -eq 0 ] ; then
-  touch --no-create %{_datadir}/icons/moblin &>/dev/null || :
-  if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-      %{_bindir}/gtk-update-icon-cache -f -t --quiet %{_datadir}/icons/moblin || :
-  fi
+touch --no-create %{_datadir}/icons/moblin &>/dev/null || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+    %{_bindir}/gtk-update-icon-cache -f --quiet %{_datadir}/icons/moblin &>/dev/null || :
 fi
 
 %posttrans
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-    %{_bindir}/gtk-update-icon-cache -f --quiet %{_datadir}/icons/moblin || :
+    %{_bindir}/gtk-update-icon-cache -f --quiet %{_datadir}/icons/moblin &>/dev/null || :
 fi
 
 %files
@@ -59,6 +76,9 @@ fi
 %{_datadir}/icons/moblin
 
 %changelog
+* Mon Aug  3 2009 Peter Robinson <pbrobinson at gmail.com> 0.7-2
+- Some more package optimisations
+
 * Sat Aug  1 2009 Peter Robinson <pbrobinson at gmail.com> 0.7-1
 - New upstream 0.7 release