[packages/libgnomedb] - added glib patch (fixes build with glib 2.34) - rename sr at Latn locale to sr at latin - ghost soname s

qboosh qboosh at pld-linux.org
Sun Jan 6 10:45:18 CET 2013


commit aa458aad338f9e699d923e57cdb4f9cf06cb14f0
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Jan 6 10:45:20 2013 +0100

    - added glib patch (fixes build with glib 2.34)
    - rename sr at Latn locale to sr at latin
    - ghost soname symlink
    - release 13

 libgnomedb-glib.patch | 11 +++++++++++
 libgnomedb.spec       | 13 ++++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)
---
diff --git a/libgnomedb.spec b/libgnomedb.spec
index c72ffc3..6033537 100644
--- a/libgnomedb.spec
+++ b/libgnomedb.spec
@@ -2,7 +2,7 @@ Summary:	GNOME-DB widget library
 Summary(pl.UTF-8):	Biblioteka widgetów GNOME-DB
 Name:		libgnomedb
 Version:	1.2.2
-Release:	12
+Release:	13
 Epoch:		1
 License:	LGPL v2+
 Group:		X11/Libraries
@@ -10,6 +10,7 @@ Source0:	http://ftp.gnome.org/pub/gnome/sources/libgnomedb/1.2/%{name}-%{version
 # Source0-md5:	cf8b1eb3aa3e7b18f46bc9bc9335dca7
 Patch0:		%{name}-desktop.patch
 Patch1:		%{name}-gtk-doc.patch
+Patch2:		%{name}-glib.patch
 URL:		http://www.gnome-db.org/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake >= 1:1.8
@@ -95,12 +96,13 @@ Requires:	%{name} = %{epoch}:%{version}-%{release}
 Allows to configure database access properties in GNOME.
 
 %description -n gnome-database-access-properties -l pl.UTF-8
-Pozwala na konfigurację dostępu do baz danych w GNOME.
+Narzędzie pozwalające na konfigurację dostępu do baz danych w GNOME.
 
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__intltoolize}
@@ -130,9 +132,13 @@ rm -rf $RPM_BUILD_ROOT
 ln -sf %{_pixmapsdir}/libgnomedb/gnome-db.png \
 	$RPM_BUILD_ROOT%{_pixmapsdir}/gnome-db.png
 
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/no
+# obsolete(?)
 %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/mime-info
 
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/locale/{sr at Latn,sr at latin}
+# duplicate of nb with obsolete name
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/no
+
 %find_lang %{name} --with-gnome --all-name
 
 %clean
@@ -157,6 +163,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS
 %attr(755,root,root) %{_libdir}/libgnomedb-2.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgnomedb-2.so.4
 # libglade2 module (include it here as lib requires libglade2 anyway)
 %attr(755,root,root) %{_libdir}/libglade/2.0/libgnomedb.so
 # for libgnomedb
diff --git a/libgnomedb-glib.patch b/libgnomedb-glib.patch
new file mode 100644
index 0000000..fe9fae4
--- /dev/null
+++ b/libgnomedb-glib.patch
@@ -0,0 +1,11 @@
+--- libgnomedb-1.2.2/libgnomedb/gnome-db-grid.c.orig	2004-10-09 19:11:03.000000000 +0200
++++ libgnomedb-1.2.2/libgnomedb/gnome-db-grid.c	2013-01-06 09:51:23.778940919 +0100
+@@ -21,7 +21,7 @@
+  */
+ 
+ #include <string.h>
+-#include <glib/gfileutils.h>
++#include <glib.h>
+ #include <libgda/gda-util.h>
+ #include <gtk/gtkcheckmenuitem.h>
+ #include <gtk/gtkdialog.h>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libgnomedb.git/commitdiff/aa458aad338f9e699d923e57cdb4f9cf06cb14f0



More information about the pld-cvs-commit mailing list