[packages/libmxml] - cleanup and spec updates - added ac patch - continuation note

qboosh qboosh at pld-linux.org
Sat Apr 19 09:26:12 CEST 2014


commit 1e8070b2ef898c0449a17718aa70726fc980bf63
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Apr 19 09:02:56 2014 +0200

    - cleanup and spec updates
    - added ac patch
    - continuation note

 libmxml-ac.patch | 26 ++++++++++++++++++++++++++
 libmxml.spec     | 33 ++++++++++++++++++++-------------
 2 files changed, 46 insertions(+), 13 deletions(-)
---
diff --git a/libmxml.spec b/libmxml.spec
index 83f9570..b368219 100644
--- a/libmxml.spec
+++ b/libmxml.spec
@@ -1,12 +1,16 @@
+# NOTE:
+# - for C++ continuation of _this_ libmxml, see libmxmlplus.spec
+# - for another libmxml (mxml pkgconfig package), see mxml.spec
 Summary:	Minimal XML library
 Summary(pl.UTF-8):	Minimalna biblioteka XML
 Name:		libmxml
 Version:	0.9.1
 Release:	1
-License:	GPL
+License:	LGPL v2.1
 Group:		Libraries
-Source0:	http://dl.sourceforge.net/mxml/%{name}-%{version}.tar.gz
+Source0:	http://downloads.sourceforge.net/mxml/%{name}-%{version}.tar.gz
 # Source0-md5:	1e166b6cec4b0843eeaf19b86a23d9d1
+Patch0:		%{name}-ac.patch
 URL:		http://mxml.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -47,21 +51,18 @@ Statyczna biblioteka libmxml.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-sed -i -e "s:\"-O2\":\$OPTFLAGS:" configure.in
-
 %{__libtoolize}
 %{__aclocal}
+%{__autoconf}
 %{__autoheader}
 %{__automake}
-%{__autoconf}
 %configure \
-	--enable-docs \
 	--enable-shared
 
-%{__make} \
-	OPTFLAGS="%{rpmcflags}"
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -72,17 +73,23 @@ rm -rf $RPM_BUILD_ROOT
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS
+%doc AUTHORS ChangeLog NEWS TODO
 %attr(755,root,root) %{_libdir}/libmxml.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmxml.so.1
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/*.so
-%{_libdir}/*.la
-%{_includedir}/*
+%attr(755,root,root) %{_libdir}/libmxml.so
+%{_libdir}/libmxml.la
+%{_includedir}/mxml.h
+%{_includedir}/mxml_defs.h
+%{_includedir}/mxml_file.h
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/*.a
+%{_libdir}/libmxml.a
diff --git a/libmxml-ac.patch b/libmxml-ac.patch
new file mode 100644
index 0000000..c162053
--- /dev/null
+++ b/libmxml-ac.patch
@@ -0,0 +1,26 @@
+--- libmxml-0.9.1/configure.in.orig	2014-04-19 08:39:31.962971110 +0200
++++ libmxml-0.9.1/configure.in	2014-04-19 08:47:21.506294656 +0200
+@@ -9,7 +9,7 @@
+ dnl Begin of script
+ dnl
+ 
+-AC_INIT( src )
++AC_INIT([src])
+ 
+ AC_REVISION($Revision: 1.3 $)
+ AC_CANONICAL_HOST
+--- libmxml-0.9.1/configure.in.orig	2003-08-09 18:57:24.000000000 +0200
++++ libmxml-0.9.1/configure.in	2014-04-19 08:52:21.709621734 +0200
+@@ -97,12 +97,6 @@
+ SUBDIRS="lib ltlib test doc"
+ RANLIB=ranlib
+ 
+-if test x$enable_debug = xyes; then
+-   CFLAGS="-g -DDEBUG"
+-else
+-   CFLAGS="-O2"
+-fi
+-
+ dnl--------------------------------
+ dnl settings for makefiles
+ dnl
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libmxml.git/commitdiff/1e8070b2ef898c0449a17718aa70726fc980bf63



More information about the pld-cvs-commit mailing list