rpms/libgnomedb/devel libgnomedb-3.0.0-64bit.patch, NONE, 1.1 libgnomedb.spec, 1.24, 1.25 libgnomedb-1.2.0-desktop.patch, 1.2, NONE libgnomedb-1.9.100-64bit.patch, 1.1, NONE libgnomedb-1.9.100-about.patch, 1.1, NONE libgnomedb-1.9.100-sharp.patch, 1.3, NONE libgnomedb-1.9.100-unknown-datatype-fix.patch, 1.2, NONE

Hans de Goede (jwrdegoede) fedora-extras-commits at redhat.com
Mon May 28 06:57:11 UTC 2007 

Author: jwrdegoede

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

Modified Files:
	libgnomedb.spec 
Added Files:
	libgnomedb-3.0.0-64bit.patch 
Removed Files:
	libgnomedb-1.2.0-desktop.patch libgnomedb-1.9.100-64bit.patch 
	libgnomedb-1.9.100-about.patch libgnomedb-1.9.100-sharp.patch 
	libgnomedb-1.9.100-unknown-datatype-fix.patch 
Log Message:
* Sun May 27 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:3.0.0-1
- New upstream release 3.0.0
- Remove mono bindings sub-package as upstream no longer includes them


libgnomedb-3.0.0-64bit.patch:

--- NEW FILE libgnomedb-3.0.0-64bit.patch ---
--- libgnomedb-3.0.0/extra/demos/console.c~	2007-05-27 21:37:35.000000000 +0200
+++ libgnomedb-3.0.0/extra/demos/console.c	2007-05-27 21:37:35.000000000 +0200
@@ -4,6 +4,7 @@
  */
 
 #include <libgnomedb/libgnomedb.h>
+#include <libgnomedb-extra/gnome-db-sql-console.h>
 
 extern GdaDict *demo_dict;
 static GtkWidget *window = NULL;
--- libgnomedb-3.0.0/libgnomedb/gnome-db-data-source-selector.c~	2007-05-27 21:36:12.000000000 +0200
+++ libgnomedb-3.0.0/libgnomedb/gnome-db-data-source-selector.c	2007-05-27 21:36:12.000000000 +0200
@@ -28,6 +28,7 @@
 #include <libgnomedb/gnome-db-util.h>
 #include <gtk/gtkcelllayout.h>
 #include <gtk/gtkcellrenderer.h>
+#include <gtk/gtkcellrenderertext.h>
 
 #define PARENT_TYPE GTK_TYPE_COMBO_BOX
 


Index: libgnomedb.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomedb/devel/libgnomedb.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- libgnomedb.spec	11 May 2007 18:58:16 -0000	1.24
+++ libgnomedb.spec	28 May 2007 06:56:33 -0000	1.25
@@ -1,30 +1,25 @@
 Name:            libgnomedb
 Epoch:           1
-Version:         1.9.100
-Release:         15%{?dist}
+Version:         3.0.0
+Release:         1%{?dist}
 Summary:         Library for writing gnome database programs
 Group:           System Environment/Libraries
 License:         LGPL
 URL:             http://www.gnome-db.org/
-Source:          http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.9/%{name}-%{version}.tar.bz2
-Patch0:          libgnomedb-1.2.0-desktop.patch
-Patch1:          libgnomedb-1.9.100-sharp.patch
-Patch2:          libgnomedb-1.9.100-unknown-datatype-fix.patch
-Patch3:          libgnomedb-1.9.100-64bit.patch
-Patch4:          libgnomedb-1.9.100-about.patch
+Source:          http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.0/%{name}-%{version}.tar.bz2
+Patch0:          libgnomedb-3.0.0-64bit.patch
 BuildRoot:       %{_tmppath}/%{name}-%{version}-root
 BuildRequires:   libgnomeui-devel libgda-devel openssl-devel
 BuildRequires:   gtksourceview-devel gtk-doc
 BuildRequires:   gettext scrollkeeper perl(XML::Parser) desktop-file-utils
-%ifnarch ppc64
-BuildRequires:   mono-devel gnome-sharp-devel libgda-sharp-devel
-BuildRequires:   gtk-sharp2-devel gtk-sharp2-gapi
-%endif
 Requires:        scrollkeeper hicolor-icon-theme
 Requires(pre):   GConf2
 Requires(post):  GConf2 /sbin/ldconfig
 Requires(preun): GConf2
 Requires(postun): /sbin/ldconfig
+# note we do not provide these, they no longer exist
+Obsoletes:       %{name}-sharp < %{epoch}:%{version}-%{release}
+Obsoletes:       %{name}-sharp-devel < %{epoch}:%{version}-%{release}
 
 %description
 libgnomedb is a library that eases the task of writing
@@ -44,41 +39,18 @@
 or compile programs that use libgda.
 
 
-%ifnarch ppc64
-
-%package sharp
-Summary:         Mono bindings for libgnomedb
-Group:           System Environment/Libraries
-Requires:        %{name} = %{epoch}:%{version}-%{release}
-
-%description sharp
-This package contains the dll files needed to run (and compile) Mono
-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
-
-%endif
-
-
 %prep
 %setup -q
-%patch0 -p1 -b .desktop.patch
-%patch1 -p1 -b .sharp
-%patch2 -p1 -b .unknown
-%patch3 -p1 -b .64bit
-%patch4 -p1 -b .about
+%patch0 -p1 -z .64bit
 
 
 %build
-%configure
+%configure --disable-static --disable-dependency-tracking
+# Don't use rpath!
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+# dirty hack to make building the gtkdocs work despite us disabling rpath
+export LD_LIBRARY_PATH=`pwd`/libgnomedb/.libs:`pwd`/libgnomedb/plugins/.libs:`pwd`/libgnomedb-extra/.libs:`pwd`/libgnomedb-graph/.libs
 make %{?_smp_mflags}
 
 
@@ -86,35 +58,33 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT \
   LIBGNOMEDB_DTDDIR=%{_datadir}/libgnomedb/dtd
-%find_lang libgnomedb-3
+%find_lang libgnomedb-3.0
 
 # below is the desktop file and icon stuff.
 desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --vendor fedora --remove-category AdvancedSettings --delete-original \
+  --vendor fedora --remove-category Application \
+  --remove-category AdvancedSettings --delete-original \
   --add-category X-GNOME-SystemSettings \
-  $RPM_BUILD_ROOT%{_datadir}/applications/database-properties.desktop
+  $RPM_BUILD_ROOT%{_datadir}/applications/database-properties-3.0.desktop
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/libgnomedb/gnome-db.png \
+mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/gnome-db.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
 
-%ifnarch ppc64
-# 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
-%endif
-
 # remove unpackaged files
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.{a,la}
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libgnomedb/plugins/*.{a,la}
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libglade/2.0/*.{a,la}
+rm $RPM_BUILD_ROOT/%{_libdir}/*.la
+rm $RPM_BUILD_ROOT/%{_libdir}/libgnomedb/plugins/*.la
+rm $RPM_BUILD_ROOT/%{_libdir}/libglade/2.0/*.la
+
+# put the demo in -devel %%doc
+mv $RPM_BUILD_ROOT/%{_datadir}/gnome-db/demo .
 
 
 %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 || :
+      %{_sysconfdir}/gconf/schemas/libgnomedb-3.0.schemas >/dev/null || :
 fi
 
 
@@ -122,7 +92,7 @@
 /sbin/ldconfig
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
-  %{_sysconfdir}/gconf/schemas/libgnomedb.schemas > /dev/null || :
+  %{_sysconfdir}/gconf/schemas/libgnomedb-3.0.schemas > /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
@@ -131,7 +101,7 @@
 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 || :
+      %{_sysconfdir}/gconf/schemas/libgnomedb-3.0.schemas > /dev/null || :
 fi
 
 
@@ -153,15 +123,14 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%files -f libgnomedb-3.lang
+%files -f libgnomedb-3.0.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS
 %{_bindir}/*
-%{_datadir}/mime-info/*
-%{_datadir}/pixmaps/libgnomedb
-%{_datadir}/applications/fedora-database-properties.desktop
+%{_datadir}/pixmaps/libgnomedb-3.0
+%{_datadir}/applications/fedora-database-properties-3.0.desktop
 %{_datadir}/icons/hicolor/48x48/apps/gnome-db.png
-%{_datadir}/libgnomedb
+%{_datadir}/gnome-db
 %{_libdir}/*.so.*
 %dir %{_libdir}/libgnomedb
 %{_libdir}/libgnomedb/plugins
@@ -170,27 +139,21 @@
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/libgnomedb-1.9
+%doc demo
+%{_includedir}/libgnomedb-3.0
 %{_libdir}/*.so
-%{_libdir}/pkgconfig/libgnomedb-2.0.pc
+%{_libdir}/pkgconfig/libgnomedb-3.0.pc
+%{_libdir}/pkgconfig/libgnomedb-extra-3.0.pc
+%{_libdir}/pkgconfig/libgnomedb-graph-3.0.pc
 %{_datadir}/omf/%{name}
-%{_datadir}/gtk-doc/html/libgnomedb
-
-%ifnarch ppc64
-
-%files sharp
-%defattr(-,root,root,-)
-%{_libdir}/libgnomedb/gnomedb-sharp.dll*
-
-%files sharp-devel
-%defattr(-,root,root,-)
-%{_datadir}/gapi-2.0
-%{_libdir}/pkgconfig/gnomedb-sharp-2.0.pc
-
-%endif
+%{_datadir}/gtk-doc/html/libgnomedb-3.0
 
 
 %changelog
+* Sun May 27 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:3.0.0-1
+- New upstream release 3.0.0
+- Remove mono bindings sub-package as upstream no longer includes them
+
 * Thu May 10 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-15
 - Don't build mono/sharp bits on ppc64
 


--- libgnomedb-1.2.0-desktop.patch DELETED ---


--- libgnomedb-1.9.100-64bit.patch DELETED ---


--- libgnomedb-1.9.100-about.patch DELETED ---


--- libgnomedb-1.9.100-sharp.patch DELETED ---


--- libgnomedb-1.9.100-unknown-datatype-fix.patch DELETED ---

More information about the fedora-extras-commits mailing list