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

Changed files:
    conflib-ac25x.patch -> 1.4
    conflib.spec -> 1.44

diff --git a/conflib-ac25x.patch b/conflib-ac25x.patch
index f114bf61dbd9203cc4e467d975f221f4aed6c9ed..072ca576b36fce4de6b3d70852866d715372b1cd 100644 (file)
--- a/conflib-ac25x.patch
+++ b/conflib-ac25x.patch
@@ -1,11 +1,10 @@
 --- conflib-0.4.5/configure.in~        2003-10-31 00:17:42.000000000 +0100
 +++ conflib-0.4.5/configure.in 2003-10-31 00:18:14.000000000 +0100
-@@ -85,7 +85,7 @@
+@@ -85,7 +85,6 @@
  AC_MSG_RESULT($fu_cv_sys_working_fnmatch)
  UO_FUNC_BROKEN_F_SETLK
  
 -AC_SUBST(LIBOBJS)
-+AC_SUBST(AC_LIBOBJ)
  AC_SUBST(ERSATZHEADER)
  
 -AC_OUTPUT(Makefile tests/Makefile doc/Makefile src/Makefile testsuite/Makefile)

diff --git a/conflib.spec b/conflib.spec
index b202cb5fd0bb04dc9c12413b65dbec9ad9f9615c..22586cfdd7b770152991970f3c55b5290d9fc89f 100644 (file)
--- a/conflib.spec
+++ b/conflib.spec
@@ -3,7 +3,7 @@ Summary(pl):    Biblioteka plik
 Summary(de):   Library zum Lesen von Konfigurationsdateien
 Name:          conflib
 Version:       0.4.5
-Release:       6
+Release:       7
 License:       GPL
 Group:         Libraries
 Source0:       ftp://ftp.ohse.de/uwe/releases/%{name}-%{version}.tar.gz
@@ -69,19 +69,23 @@ oraz warunkowe rozwijanie. Ten pakiet zawiera pliki statyczne.
 %patch3 -p1
 
 %build
-rm -f missing
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
-%configure2_13
+%configure
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+%clean
+rm -rf $RPM_BUILD_ROOT
+
 %post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
@@ -91,19 +95,16 @@ rm -rf $RPM_BUILD_ROOT
 %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 NEWS ChangeLog
-%{_includedir}/*.h
 %attr(755,root,root) %{_libdir}/lib*.so
 %{_libdir}/lib*.la
+%{_includedir}/*.h
 %{_infodir}/*info*
 
 %files static