rpms/libgnomedb/devel libgnomedb-1.9.100-sharp.patch, 1.1, 1.2 libgnomedb.spec, 1.11, 1.12

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

Modified Files:
	libgnomedb-1.9.100-sharp.patch libgnomedb.spec 
Log Message:
* Mon Feb 13 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-5
- Bump release and rebuild for new gcc4.1 and glibc
- Attempt to properly install C-sharp/mono bindings
- Add %{?dist} for consistency with my other packages
- Remove static lib from -devel package
- Handle gconf2 files as described on the wiki scriptlets page


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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libgnomedb-1.9.100-sharp.patch	16 Jan 2006 22:42:29 -0000	1.1
+++ libgnomedb-1.9.100-sharp.patch	14 Feb 2006 21:29:02 -0000	1.2
@@ -32,3 +32,23 @@
 -  <dllmap dll="gnomedb-3" target="libgnomedb-2 at LIB_PREFIX@.1 at LIB_SUFFIX@"/>
 +  <dllmap dll="gnomedb-3" target="libgnomedb-3 at LIB_PREFIX@.4 at LIB_SUFFIX@"/>
  </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@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+-pkglibdir=${libdir}/libgnomedb
++pkglibdir=${prefix}/lib/mono/gnomedb-sharp-2.0
++gapidir=${prefix}/share/gapi-2.0
++
+ 
+ Name: gnomedb-sharp-2.0
+ Description: GnomeDB# - GNOMEDB .NET Binding
+ Requires: gda-sharp-2.0 gnome-sharp-2.0
+ Version: @VERSION@
+-Cflags: -I:${pkglibdir}/gnomedb-api.xml
++Cflags: -I:${gapidir}/gnomedb-api.xml
+ Libraries=${pkglibdir}/gnomedb-sharp.dll ${pkglibdir}/gnomedb-sharp.dll.config
+-Libs: -r:gnomedb-sharp.dll
++Libs: -r:${pkglibdir}/gnomedb-sharp.dll


Index: libgnomedb.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomedb/devel/libgnomedb.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libgnomedb.spec	17 Jan 2006 08:37:17 -0000	1.11
+++ libgnomedb.spec	14 Feb 2006 21:29:02 -0000	1.12
@@ -1,7 +1,7 @@
 Summary:         Library for writing gnome database programs
 Name:            libgnomedb
 Version:         1.9.100
-Release:         4
+Release:         5%{?dist}
 Epoch:           1
 Source:          %{name}-%{version}.tar.bz2
 URL:             http://www.gnome-db.org/
@@ -31,6 +31,9 @@
 Requires:        libgda-devel >= 1:1.9.99
 Requires:        gtk2-devel >= 1.3.6
 Requires:        libglade2-devel
+Requires(pre):   GConf2
+Requires(post):  GConf2 /sbin/ldconfig
+Requires(preun): GConf2
 
 %description devel
 This package contains the header files and libraries needed to write
@@ -67,25 +70,40 @@
   --vendor fedora --add-category X-Fedora --delete-original \
   %{buildroot}%{_datadir}/applications/database-properties.desktop
 
-# install gnomedb-api.xml
-install -m 644 gnomedb-sharp/gnomedb-api.xml \
-   %{buildroot}%{_libdir}/libgnomedb/gnomedb-api.xml
+#fixup mono / sharp related files install
+mkdir -p %{buildroot}/%{_datadir}/gapi-2.0
+install -m 644 gnomedb-sharp/gnomedb-api.xml %{buildroot}/%{_datadir}/gapi-2.0
+mkdir -p %{buildroot}/usr/lib/mono/gnomedb-sharp-2.0
+mv %{buildroot}/%{_libdir}/libgnomedb/gnomedb-sharp.dll* \
+  %{buildroot}/usr/lib/mono/gnomedb-sharp-2.0
 
 # remove unpackaged files
-rm -f %{buildroot}/%{_libdir}/*.la
-rm -f %{buildroot}/%{_libdir}/libgnomedb/plugins/*.a
-rm -f %{buildroot}/%{_libdir}/libgnomedb/plugins/*.la
-rm -f %{buildroot}/%{_libdir}/libglade/2.0/*.a
-rm -f %{buildroot}/%{_libdir}/libglade/2.0/*.la
+rm -f %{buildroot}/%{_libdir}/*.{a,la}
+rm -f %{buildroot}/%{_libdir}/libgnomedb/plugins/*.{a,la}
+rm -f %{buildroot}/%{_libdir}/libglade/2.0/*.{a,la}
+
+
+%pre
+if [ "$1" -gt 1 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/libgnomedb.schemas >/dev/null || :
+fi
 
 
 %post
 /sbin/ldconfig
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule \
+  %{_sysconfdir}/gconf/schemas/libgnomedb.schemas > /dev/null || :
 
-for SCHEMA in %{_sysconfdir}/gconf/schemas/libgnomedb.schemas; do
-/usr/bin/gconftool-2 --makefile-install-rule $SCHEMA > /dev/null 2>&1
-done
+
+%preun
+if [ "$1" -eq 0 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/libgnomedb.schemas > /dev/null || :
+fi
 
 
 %postun -p /sbin/ldconfig
@@ -121,7 +139,6 @@
 %files devel
 %defattr(-,root,root)
 %{_includedir}/libgnomedb-1.9
-%{_libdir}/*.a
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/libgnomedb-2.0.pc
 %{_datadir}/omf
@@ -130,12 +147,19 @@
 
 %files sharp
 %defattr(-,root,root)
-%{_libdir}/libgnomedb/gnomedb-api.xml
-%{_libdir}/libgnomedb/gnomedb-sharp.dll*
+%{_datadir}/gapi-2.0
+/usr/lib/mono/gnomedb-sharp-2.0
 %{_libdir}/pkgconfig/gnomedb-sharp-2.0.pc
 
 
 %changelog
+* Mon Feb 13 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-5
+- Bump release and rebuild for new gcc4.1 and glibc
+- Attempt to properly install C-sharp/mono bindings
+- Add %%{?dist} for consistency with my other packages
+- Remove static lib from -devel package
+- Handle gconf2 files as described on the wiki scriptlets page
+
 * Tue Jan 17 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-4
 - Put mono files only in sharp package and not in sharp and main package.
 - Make -sharp package Require the main package.