[packages/libxode] - added system-expat patch (use system expat) - added ac patch to allow full ac/am regeneration

[qboosh]

commit b4e4f284018ccc896c1185cf17759b36b446b865
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Jan 19 08:47:25 2014 +0100

    - added system-expat patch (use system expat)
    - added ac patch to allow full ac/am regeneration

 libxode-ac.patch           | 11 +++++++++++
 libxode-system-expat.patch | 18 ++++++++++++++++++
 libxode.spec               | 25 +++++++++++++++++--------
 3 files changed, 46 insertions(+), 8 deletions(-)
---
diff --git a/libxode.spec b/libxode.spec
index 18dd6ab..e217bb7 100644
--- a/libxode.spec
+++ b/libxode.spec
@@ -7,9 +7,12 @@ License:	GPL v2
 Group:		Libraries
 Source0:	http://downloads.sourceforge.net/libxode/%{name}-%{version}.tar.gz
 # Source0-md5:	2314649f82d11eec6ba22f88d2e4ca9b
+Patch0:		%{name}-system-expat.patch
+Patch1:		%{name}-ac.patch
 URL:		http://libxode.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
+BuildRequires:	expat-devel >= 1.95
 BuildRequires:	libtool
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -26,6 +29,7 @@ Summary:	Header files and development documentation for libxode
 Summary(pl.UTF-8):	Pliki nagłówkowe i dokumentacja do libxode
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	expat-devel >= 1.95
 
 %description devel
 Header files and development documentation for libxode.
@@ -47,10 +51,15 @@ Statyczna wersja libxode.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
-cp -f /usr/share/automake/config.sub .
+%{__libtoolize}
+%{__aclocal}
 %{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure
 %{__make}
 
@@ -69,16 +78,16 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/lib*.so.1
+%attr(755,root,root) %{_libdir}/libxode.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libxode.so.1
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
-%{_includedir}/%{name}*
+%attr(755,root,root) %{_bindir}/libxode-config
+%attr(755,root,root) %{_libdir}/libxode.so
+%{_libdir}/libxode.la
+%{_includedir}/libxode.h
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libxode.a
diff --git a/libxode-ac.patch b/libxode-ac.patch
new file mode 100644
index 0000000..3f62c2f
--- /dev/null
+++ b/libxode-ac.patch
@@ -0,0 +1,11 @@
+--- libxode-0.71/configure.in.orig	2001-04-24 19:10:11.000000000 +0200
++++ libxode-0.71/configure.in	2014-01-19 08:39:47.795040959 +0100
+@@ -8,7 +8,7 @@
+ AC_STDC_HEADERS
+ AC_C_BIGENDIAN
+ 
+-AC_CHECK_FUNC(snprintf,AC_DEFINE(HAVE_SNPRINTF))
++AC_CHECK_FUNC(snprintf, [AC_DEFINE(HAVE_SNPRINTF, , [have snprintf function])])
+ 
+ AC_CHECK_SIZEOF(int)
+ AC_CHECK_SIZEOF(short)
diff --git a/libxode-system-expat.patch b/libxode-system-expat.patch
new file mode 100644
index 0000000..cd8e676
--- /dev/null
+++ b/libxode-system-expat.patch
@@ -0,0 +1,18 @@
+--- libxode-0.71/src/Makefile.am.orig	2001-03-27 01:10:20.000000000 +0200
++++ libxode-0.71/src/Makefile.am	2014-01-19 08:30:02.955065503 +0100
+@@ -1,5 +1,4 @@
+-INCLUDES = -I$(top_builddir)/include -Iexpat/lib -Iexpat
+-SUBDIRS = expat
++INCLUDES = -I$(top_builddir)/include
+ 
+ lib_LTLIBRARIES = libxode.la
+ 
+@@ -11,7 +10,7 @@
+ 	xstream.c \
+ 	xode_from.c
+ 
+-libxode_la_LIBADD = expat/xmlparse.lo  expat/xmlrole.lo  expat/xmltok.lo
++libxode_la_LIBADD = -lexpat
+ 
+ CFLAGS = -Wall -g
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libxode.git/commitdiff/b4e4f284018ccc896c1185cf17759b36b446b865