rpms/libgnomedb/devel libgnomedb-1.9.100-sharp.patch, NONE, 1.1 libgnomedb.spec, 1.9, 1.10

Hans de Goede (jwrdegoede) fedora-extras-commits at redhat.com
Mon Jan 16 22:42:29 UTC 2006


Author: jwrdegoede

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

Modified Files:
	libgnomedb.spec 
Added Files:
	libgnomedb-1.9.100-sharp.patch 
Log Message:
* Mon Jan 16 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-3
- Remove unneeded requires (.so reqs are automaticly picked up by rpm).
- Add BuildRequires for building libgda-sharp


libgnomedb-1.9.100-sharp.patch:

--- NEW FILE libgnomedb-1.9.100-sharp.patch ---
--- libgnomedb-1.9.100/Makefile.am.sharp	2006-01-16 23:33:46.000000000 +0100
+++ libgnomedb-1.9.100/Makefile.am	2006-01-16 23:35:47.000000000 +0100
@@ -13,9 +13,9 @@
 endif
 
 if BUILD_GNOMEDB_SHARP
-GNOME_DIRECTORY=gnomedb-sharp
+GNOMEDB_SHARP_DIRECTORY=gnomedb-sharp
 else
-GNOME_DIRECTORY=
+GNOMEDB_SHARP_DIRECTORY=
 endif
 
 if ENABLE_GTK_DOC
--- libgnomedb-1.9.100/Makefile.in.sharp	2006-01-16 23:33:41.000000000 +0100
+++ libgnomedb-1.9.100/Makefile.in	2006-01-16 23:36:40.000000000 +0100
@@ -286,8 +286,8 @@
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 @HAVE_LIBGLADE_FALSE at LIBGLADE_DIRECTORY = 
 @HAVE_LIBGLADE_TRUE at LIBGLADE_DIRECTORY = glade
- at BUILD_GNOMEDB_SHARP_FALSE@GNOME_DIRECTORY = 
- at BUILD_GNOMEDB_SHARP_TRUE@GNOME_DIRECTORY = gnomedb-sharp
+ at BUILD_GNOMEDB_SHARP_FALSE@GNOMEDB_SHARP_DIRECTORY = 
+ at BUILD_GNOMEDB_SHARP_TRUE@GNOMEDB_SHARP_DIRECTORY = gnomedb-sharp
 @BUILD_WITH_GNOME_FALSE at GNOME_DIRECTORY = 
 @BUILD_WITH_GNOME_TRUE at GNOME_DIRECTORY = control-center
 @ENABLE_GTK_DOC_FALSE at DOC_DIRECTORY = 
--- libgnomedb-1.9.100/gnomedb-sharp/gnomedb-sharp.dll.config.in.sharp	2006-01-16 23:34:13.000000000 +0100
+++ libgnomedb-1.9.100/gnomedb-sharp/gnomedb-sharp.dll.config.in	2006-01-16 23:35:04.000000000 +0100
@@ -1,3 +1,3 @@
 <configuration>
-  <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>


Index: libgnomedb.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomedb/devel/libgnomedb.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libgnomedb.spec	30 Nov 2005 18:03:37 -0000	1.9
+++ libgnomedb.spec	16 Jan 2006 22:42:29 -0000	1.10
@@ -1,22 +1,22 @@
 Summary:         Library for writing gnome database programs
 Name:            libgnomedb
 Version:         1.9.100
-Release:         2
+Release:         3
 Epoch:           1
 Source:          %{name}-%{version}.tar.bz2
 URL:             http://www.gnome-db.org/
 Group:           System Environment/Libraries
 License:         LGPL
 BuildRoot:       %{_tmppath}/%{name}-%{version}-root
-Requires:        gtk2 >= 1.3.6, libglade2, libgnomeui >= 1.103.0
-PreReq:          desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires:   pkgconfig >= 0.8, libgnomeui-devel >= 1.103.0
 BuildRequires:   gtk2-devel >= 1.3.6, libglade2-devel, scrollkeeper
 BuildRequires:   desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires:   libgda-devel >= 1:1.9.99
 BuildRequires:   gtk-doc, openssl-devel, gtksourceview-devel
+BuildRequires:   mono-devel gtk-sharp2 gtk-sharp2-gapi libgda-sharp
 
 Patch0: libgnomedb-1.2.0-desktop.patch
+Patch1: libgnomedb-1.9.100-sharp.patch
 
 %description
 libgnomedb is a library that eases the task of writing
@@ -36,14 +36,27 @@
 This package contains the header files and libraries needed to write
 or compile programs that use libgda.
 
+
+%package sharp
+Summary:          Mono bindings for libgnomedb
+Group:            System Environment/Libraries
+
+%description sharp
+This package contains the dll files needed to run (and compile) Mono
+applications which use libgnomedb.
+
+
 %prep
 %setup -q
 %patch0 -p1 -b .desktop.patch
+%patch1 -p1 -b .sharp
+
 
 %build
 %configure
 make %{?_smp_mflags}
 
+
 %install
 rm -rf %{buildroot}
 %makeinstall LIBGNOMEDB_DTDDIR=%{buildroot}%{_datadir}/libgnomedb/dtd
@@ -53,6 +66,10 @@
   --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
+
 # remove unpackaged files
 rm -f %{buildroot}/%{_libdir}/*.la
 rm -f %{buildroot}/%{_libdir}/libgnomedb/plugins/*.a
@@ -60,6 +77,7 @@
 rm -f %{buildroot}/%{_libdir}/libglade/2.0/*.a
 rm -f %{buildroot}/%{_libdir}/libglade/2.0/*.la
 
+
 %post
 /sbin/ldconfig
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -68,17 +86,22 @@
 /usr/bin/gconftool-2 --makefile-install-rule $SCHEMA > /dev/null 2>&1
 done
 
+
 %postun -p /sbin/ldconfig
 
+
 %post devel
 if which scrollkeeper-update >/dev/null 2>&1; then scrollkeeper-update; fi
 
+
 %postun devel
 if which scrollkeeper-update >/dev/null 2>&1; then scrollkeeper-update; fi
 
+
 %clean
 rm -rf %{buildroot}
 
+
 %files -f libgnomedb-3.lang
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog README NEWS
@@ -92,17 +115,29 @@
 %{_libdir}/libglade/2.0/*
 %config(noreplace) %{_sysconfdir}/gconf/schemas/*
 
+
 %files devel
 %defattr(-,root,root)
 %{_includedir}/libgnomedb-1.9
 %{_libdir}/*.a
 %{_libdir}/*.so
-%{_libdir}/pkgconfig/*
+%{_libdir}/pkgconfig/libgnomedb-2.0.pc
 %{_datadir}/omf
 %{_datadir}/gtk-doc/html/libgnomedb
 
 
+%files sharp
+%defattr(-,root,root)
+%{_libdir}/libgnomedb/gnomedb-api.xml
+%{_libdir}/libgnomedb/gnomedb-sharp.dll*
+%{_libdir}/pkgconfig/gnomedb-sharp-2.0.pc
+
+
 %changelog
+* Mon Jan 16 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-3
+- Remove unneeded requires (.so reqs are automaticly picked up by rpm).
+- Add BuildRequires for building libgda-sharp
+
 * Wed Nov 30 2005 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-2
 - Add BuildRequires for optional gtksourceview, unfortunatly the
   evolution-data-server in Fedora is too new for the evolution provider.




More information about the scm-commits mailing list