[packages/rarian] - added am patch (fixes build with current autoconf/m4) - dropped libtool file - release 3

qboosh qboosh at pld-linux.org
Sat Dec 14 13:39:40 CET 2013


commit 144cc940adf613f2237ff3e458cae83f0c90cc3c
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Dec 14 13:41:20 2013 +0100

    - added am patch (fixes build with current autoconf/m4)
    - dropped libtool file
    - release 3

 rarian-am.patch | 11 +++++++++++
 rarian.spec     | 18 +++++++++++-------
 2 files changed, 22 insertions(+), 7 deletions(-)
---
diff --git a/rarian.spec b/rarian.spec
index 356dd85..021edf3 100644
--- a/rarian.spec
+++ b/rarian.spec
@@ -2,11 +2,12 @@ Summary:	Rarian - a documentation meta-data library
 Summary(pl.UTF-8):	Rarian - biblioteka metadanych dokumentacji
 Name:		rarian
 Version:	0.8.1
-Release:	2
-License:	LGPL v2.1+
+Release:	3
+License:	LGPL v2.1+ (library), GPL v2+ (utilities)
 Group:		Libraries
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/rarian/0.8/%{name}-%{version}.tar.bz2
 # Source0-md5:	75091185e13da67a0ff4279de1757b94
+Patch0:		%{name}-am.patch
 URL:		http://rarian.freedesktop.org/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
@@ -75,13 +76,14 @@ Statyczna biblioteka Rarian (librarian).
 
 %prep
 %setup -q
+%patch0 -p1
+
+%build
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-
-%build
 %configure \
 	--enable-omf-read \
 	--disable-skdb-update
@@ -95,6 +97,9 @@ install -d $RPM_BUILD_ROOT%{_datadir}/omf
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+# obsolted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/librarian.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -106,12 +111,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING ChangeLog NEWS README
+%doc COPYING ChangeLog NEWS README
 %attr(755,root,root) %{_bindir}/rarian-example
 %attr(755,root,root) %{_libdir}/librarian.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/librarian.so.0
 %{_datadir}/librarian
-%{_datadir}/help/*
+%{_datadir}/help/rarian.document
 
 %files compat
 %defattr(644,root,root,755)
@@ -122,7 +127,6 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/librarian.so
-%{_libdir}/librarian.la
 %{_includedir}/rarian
 %{_pkgconfigdir}/rarian.pc
 
diff --git a/rarian-am.patch b/rarian-am.patch
new file mode 100644
index 0000000..28c3b22
--- /dev/null
+++ b/rarian-am.patch
@@ -0,0 +1,11 @@
+--- rarian-0.8.1/configure.ac.orig	2008-09-01 20:44:05.000000000 +0200
++++ rarian-0.8.1/configure.ac	2013-12-14 13:12:50.080596608 +0100
+@@ -5,7 +5,7 @@
+ AC_INIT(rarian, 0.8.1)
+ AC_CONFIG_SRCDIR([util/rarian-example.c])
+ AC_CONFIG_HEADER([config.h])
+-AM_INIT_AUTOMAKE ([foreign dist-bzip2 dist-gzip])
++AM_INIT_AUTOMAKE([foreign dist-bzip2])
+ 
+ AM_MAINTAINER_MODE
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rarian.git/commitdiff/144cc940adf613f2237ff3e458cae83f0c90cc3c



More information about the pld-cvs-commit mailing list