- fixed broken ac25x patch, cleanups/unifications, release 7

[packages/conflib.git] / conflib.spec

diff --git a/conflib.spec b/conflib.spec
index f926f8992f8350c0c43b44f30ae2aafdd681e297..22586cfdd7b770152991970f3c55b5290d9fc89f 100644 (file)
--- a/conflib.spec
+++ b/conflib.spec
@@ -3,13 +3,15 @@ Summary(pl):  Biblioteka plik
 Summary(de):   Library zum Lesen von Konfigurationsdateien
 Name:          conflib
 Version:       0.4.5
-Release:       5
+Release:       7
 License:       GPL
 Group:         Libraries
 Source0:       ftp://ftp.ohse.de/uwe/releases/%{name}-%{version}.tar.gz
+# Source0-md5: 301f140d0fbd0b5a225419c101c4c9d1
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-cl_build_stanza_array-fix.patch
 Patch2:                %{name}-ac25x.patch
+Patch3:                %{name}-locale.patch
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libtool
@@ -64,21 +66,25 @@ oraz warunkowe rozwijanie. Ten pakiet zawiera pliki statyczne.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
-rm -f missing
-libtoolize --copy --force
-aclocal
-autoconf
-automake -a -c -f
-%configure2_13
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
 
-gzip -9nf README NEWS ChangeLog
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT
+
+%clean
+rm -rf $RPM_BUILD_ROOT
 
 %post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -89,19 +95,16 @@ gzip -9nf README NEWS ChangeLog
 %postun devel
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(644,root,root,755)
+%doc AUTHORS ChangeLog NEWS README TODO
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
 
 %files devel
 %defattr(644,root,root,755)
-%doc README.gz NEWS.gz ChangeLog.gz
-%{_includedir}/*.h
 %attr(755,root,root) %{_libdir}/lib*.so
-%attr(755,root,root) %{_libdir}/lib*.la
+%{_libdir}/lib*.la
+%{_includedir}/*.h
 %{_infodir}/*info*
 
 %files static