rpms/libgnomedb/devel libgnomedb-1.2.0-desktop.patch, 1.1, 1.2 libgnomedb.spec, 1.20, 1.21

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/libgnomedb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15133

Modified Files:
	libgnomedb-1.2.0-desktop.patch libgnomedb.spec 
Log Message:
* Thu Jan 11 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-12
- Install icon under /usr/share/icons and don't reference it with an
  absolute path (bz 221101)


libgnomedb-1.2.0-desktop.patch:

Index: libgnomedb-1.2.0-desktop.patch
===================================================================
RCS file: /cvs/extras/rpms/libgnomedb/devel/libgnomedb-1.2.0-desktop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libgnomedb-1.2.0-desktop.patch	15 Mar 2005 08:14:35 -0000	1.1
+++ libgnomedb-1.2.0-desktop.patch	11 Jan 2007 15:56:08 -0000	1.2
@@ -5,7 +5,7 @@
  _Name=Database Access Properties 
  _Comment=Configure your database environment
 -Icon=libgnomedb/gnome-db.png
-+Icon=/usr/share/pixmaps/libgnomedb/gnome-db.png
++Icon=gnome-db.png
  Exec=gnome-database-properties
  Terminal=0
  Type=Application


Index: libgnomedb.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomedb/devel/libgnomedb.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libgnomedb.spec	10 Sep 2006 05:27:51 -0000	1.20
+++ libgnomedb.spec	11 Jan 2007 15:56:08 -0000	1.21
@@ -1,7 +1,7 @@
 Name:            libgnomedb
 Epoch:           1
 Version:         1.9.100
-Release:         11%{?dist}
+Release:         12%{?dist}
 Summary:         Library for writing gnome database programs
 Group:           System Environment/Libraries
 License:         LGPL
@@ -16,10 +16,11 @@
 BuildRequires:   gtksourceview-devel mono-devel gtk-sharp2-devel
 BuildRequires:   gnome-sharp-devel gtk-sharp2-gapi libgda-sharp gtk-doc
 BuildRequires:   gettext scrollkeeper perl(XML::Parser) desktop-file-utils
-Requires:        scrollkeeper
+Requires:        scrollkeeper hicolor-icon-theme
 Requires(pre):   GConf2
 Requires(post):  GConf2 /sbin/ldconfig
 Requires(preun): GConf2
+Requires(postun): /sbin/ldconfig
 
 %description
 libgnomedb is a library that eases the task of writing
@@ -68,10 +69,15 @@
   LIBGNOMEDB_DTDDIR=%{_datadir}/libgnomedb/dtd
 %find_lang libgnomedb-3
 
+# below is the desktop file and icon stuff.
 desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --vendor fedora --add-category X-Fedora --delete-original \
   $RPM_BUILD_ROOT%{_datadir}/applications/database-properties.desktop
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
+mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/libgnomedb/gnome-db.png \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
+
 # fixup mono / sharp related files install
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/gapi-2.0
 install -m 644 gnomedb-sharp/gnomedb-api.xml $RPM_BUILD_ROOT/%{_datadir}/gapi-2.0
@@ -98,6 +104,10 @@
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
   %{_sysconfdir}/gconf/schemas/libgnomedb.schemas > /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 
 %preun
@@ -108,7 +118,12 @@
 fi
 
 
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 
 %post devel
@@ -130,6 +145,7 @@
 %{_datadir}/mime-info/*
 %{_datadir}/pixmaps/libgnomedb
 %{_datadir}/applications/*.desktop
+%{_datadir}/icons/hicolor/48x48/apps/gnome-db.png
 %{_datadir}/libgnomedb
 %{_libdir}/*.so.*
 %dir %{_libdir}/libgnomedb
@@ -153,6 +169,10 @@
 
 
 %changelog
+* Thu Jan 11 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-12
+- Install icon under /usr/share/icons and don't reference it with an
+  absolute path (bz 221101)
+
 * Sun Sep 10 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-11
 - Don't own /usr/share/omf (bug 205669)