[packages/libgda] - added xml patch (fixes build with current libxml2) - rename sr at Latn locale to sr at latin - release 1

qboosh qboosh at pld-linux.org
Sat Jan 5 20:18:46 CET 2013


commit 142780d3c117c5b5616411605abccfe89bffaecb
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Jan 5 20:18:46 2013 +0100

    - added xml patch (fixes build with current libxml2)
    - rename sr at Latn locale to sr at latin
    - release 19

 libgda-xml.patch | 11 +++++++++++
 libgda.spec      | 10 +++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)
---
diff --git a/libgda.spec b/libgda.spec
index 2494df0..4f6097d 100644
--- a/libgda.spec
+++ b/libgda.spec
@@ -19,7 +19,7 @@ Summary:	GNU Data Access library
 Summary(pl.UTF-8):	Biblioteka GNU Data Access
 Name:		libgda
 Version:	1.2.4
-Release:	18
+Release:	19
 Epoch:		1
 License:	LGPL v2/GPL v2
 Group:		Applications/Databases
@@ -35,6 +35,7 @@ Patch6:		%{name}-gtk-doc.patch
 Patch7:		%{name}-sybase.patch
 Patch8:		%{name}-firebird.patch
 Patch9:		glib.patch
+Patch10:	%{name}-xml.patch
 URL:		http://www.gnome-db.org/
 %{?with_firebird:BuildRequires:	Firebird-devel}
 BuildRequires:	autoconf >= 2.59
@@ -288,6 +289,7 @@ Pakiet dostarczający dane z xBase (dBase, Clippera, FoxPro) dla GDA.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 %build
 CXXFLAGS="%{rpmcxxflags} -fno-rtti -fno-exceptions"
@@ -319,7 +321,9 @@ rm -rf $RPM_BUILD_ROOT
 	DESTDIR=$RPM_BUILD_ROOT
 
 # modules dlopened by *.so through libgmodule
-rm -f $RPM_BUILD_ROOT%{_libdir}/libgda/providers/*.{a,la}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libgda/providers/*.{a,la}
+
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/locale/{sr at Latn,sr at latin}
 
 %find_lang %{name} --with-gnome --all-name
 
@@ -352,7 +356,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_sysconfdir}/libgda
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libgda/config
 %{_mandir}/man1/gda-config-tool.1*
-%{_mandir}/man5/*
+%{_mandir}/man5/gda-config.5*
 
 %files devel
 %defattr(644,root,root,755)
diff --git a/libgda-xml.patch b/libgda-xml.patch
new file mode 100644
index 0000000..4bdfe04
--- /dev/null
+++ b/libgda-xml.patch
@@ -0,0 +1,11 @@
+--- libgda-1.2.4/libgda/gda-xql-utils.c.orig	2007-01-09 13:50:51.000000000 +0100
++++ libgda-1.2.4/libgda/gda-xql-utils.c	2013-01-05 20:01:24.392711485 +0100
+@@ -94,7 +94,7 @@
+ 	if (freedoc)
+ 		xmlFreeDoc (doc);
+ 
+-	buffer = g_strdup (outbuf->buffer->content);
++	buffer = g_strdup (xmlBufContent(outbuf->buffer));
+ 	xmlOutputBufferClose (outbuf);
+ 
+ 	return buffer;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libgda.git/commitdiff/142780d3c117c5b5616411605abccfe89bffaecb



More information about the pld-cvs-commit mailing list