rpms/libgnomedb/devel libgnomedb-1.9.100-sharp.patch, 1.2, 1.3 libgnomedb.spec, 1.21, 1.22

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

Modified Files:
	libgnomedb-1.9.100-sharp.patch libgnomedb.spec 
Log Message:
* Tue Mar 27 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-13
- Fix categories in fedora-database-properties.desktop file (bz 234164)
- Fixup packaging of sharp bindings to match the mono packaging guidelines


libgnomedb-1.9.100-sharp.patch:

Index: libgnomedb-1.9.100-sharp.patch
===================================================================
RCS file: /cvs/extras/rpms/libgnomedb/devel/libgnomedb-1.9.100-sharp.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libgnomedb-1.9.100-sharp.patch	14 Feb 2006 21:29:02 -0000	1.2
+++ libgnomedb-1.9.100-sharp.patch	27 Mar 2007 19:58:51 -0000	1.3
@@ -34,14 +34,11 @@
  </configuration>
 --- libgnomedb-1.9.100/gnomedb-sharp/gnomedb-sharp-2.0.pc.in~	2006-02-14 20:57:23.000000000 +0100
 +++ libgnomedb-1.9.100/gnomedb-sharp/gnomedb-sharp-2.0.pc.in	2006-02-14 20:57:23.000000000 +0100
-@@ -1,12 +1,14 @@
- prefix=@prefix@
+@@ -2,11 +2,12 @@
  exec_prefix=@exec_prefix@
  libdir=@libdir@
--pkglibdir=${libdir}/libgnomedb
-+pkglibdir=${prefix}/lib/mono/gnomedb-sharp-2.0
+ pkglibdir=${libdir}/libgnomedb
 +gapidir=${prefix}/share/gapi-2.0
-+
  
  Name: gnomedb-sharp-2.0
  Description: GnomeDB# - GNOMEDB .NET Binding


Index: libgnomedb.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomedb/devel/libgnomedb.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libgnomedb.spec	11 Jan 2007 15:56:08 -0000	1.21
+++ libgnomedb.spec	27 Mar 2007 19:58:51 -0000	1.22
@@ -1,7 +1,7 @@
 Name:            libgnomedb
 Epoch:           1
 Version:         1.9.100
-Release:         12%{?dist}
+Release:         13%{?dist}
 Summary:         Library for writing gnome database programs
 Group:           System Environment/Libraries
 License:         LGPL
@@ -28,7 +28,7 @@
 
 
 %package devel
-Summary:         Development libraries and header files for libgnomedb.
+Summary:         Development libraries and header files for libgnomedb
 Group:           Development/Libraries
 Requires:        %{name} = %{epoch}:%{version}-%{release}
 Requires:        pkgconfig libgnomeui-devel libgda-devel
@@ -50,6 +50,16 @@
 applications which use libgnomedb.
 
 
+%package sharp-devel
+Summary:         Development files for the Mono bindings for libgnomedb
+Group:           Development/Libraries
+Requires:        %{name}-sharp = %{epoch}:%{version}-%{release}
+Requires:        pkgconfig
+
+%description sharp-devel
+Development files for the Mono bindings for libgnomedb
+
+
 %prep
 %setup -q
 %patch0 -p1 -b .desktop.patch
@@ -71,7 +81,8 @@
 
 # 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 \
+  --vendor fedora --remove-category AdvancedSettings --delete-original \
+  --add-category X-GNOME-SystemSettings \
   $RPM_BUILD_ROOT%{_datadir}/applications/database-properties.desktop
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
@@ -81,9 +92,6 @@
 # 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
-mkdir -p $RPM_BUILD_ROOT/usr/lib/mono/gnomedb-sharp-2.0
-mv $RPM_BUILD_ROOT/%{_libdir}/libgnomedb/gnomedb-sharp.dll* \
-  $RPM_BUILD_ROOT/usr/lib/mono/gnomedb-sharp-2.0
 
 # remove unpackaged files
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.{a,la}
@@ -105,9 +113,7 @@
 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
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 
 %preun
@@ -121,9 +127,7 @@
 %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
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 
 %post devel
@@ -139,12 +143,12 @@
 
 
 %files -f libgnomedb-3.lang
-%defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog README NEWS
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING ChangeLog NEWS
 %{_bindir}/*
 %{_datadir}/mime-info/*
 %{_datadir}/pixmaps/libgnomedb
-%{_datadir}/applications/*.desktop
+%{_datadir}/applications/fedora-database-properties.desktop
 %{_datadir}/icons/hicolor/48x48/apps/gnome-db.png
 %{_datadir}/libgnomedb
 %{_libdir}/*.so.*
@@ -154,7 +158,7 @@
 %config(noreplace) %{_sysconfdir}/gconf/schemas/*
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_includedir}/libgnomedb-1.9
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/libgnomedb-2.0.pc
@@ -162,13 +166,20 @@
 %{_datadir}/gtk-doc/html/libgnomedb
 
 %files sharp
-%defattr(-,root,root)
+%defattr(-,root,root,-)
+%{_libdir}/libgnomedb/gnomedb-sharp.dll*
+
+%files sharp-devel
+%defattr(-,root,root,-)
 %{_datadir}/gapi-2.0
-/usr/lib/mono/gnomedb-sharp-2.0
 %{_libdir}/pkgconfig/gnomedb-sharp-2.0.pc
 
 
 %changelog
+* Tue Mar 27 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-13
+- Fix categories in fedora-database-properties.desktop file (bz 234164)
+- Fixup packaging of sharp bindings to match the mono packaging guidelines
+
 * 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)