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

[packages/conflib.git] / conflib.spec

diff --git a/conflib.spec b/conflib.spec
index 482140427e72c0e6c700a6715e50e74138b277aa..22586cfdd7b770152991970f3c55b5290d9fc89f 100644 (file)
--- a/conflib.spec
+++ b/conflib.spec
@@ -3,23 +3,21 @@ 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
-Group(de):     Libraries
-Group(es):     Bibliotecas
-Group(fr):     Librairies
-Group(pl):     Biblioteki
-Group(pt_BR):  Bibliotecas
-Group(ru):     âÉÂÌÉÏÔÅËÉ
-Group(uk):     â¦Â̦ÏÔÅËÉ
 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
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%description 
+%description
 A C language library for reading configuration files.
 
 %description -l pl
@@ -30,13 +28,6 @@ Summary:     Files for developing programs that use the conflib library
 Summary(pl):   Pliki do tworzenia programów wykorzystuj±cych bibliotekê conflib
 Summary(de):   Dateien zum Entwickeln von Programmen mit der conflib-Library
 Group:         Development/Libraries
-Group(de):     Entwicklung/Libraries
-Group(es):     Desarrollo/Bibliotecas
-Group(fr):     Development/Librairies
-Group(pl):     Programowanie/Biblioteki
-Group(pt_BR):  Desenvolvimento/Bibliotecas
-Group(ru):     òÁÚÒÁÂÏÔËÁ/âÉÂÌÉÏÔÅËÉ
-Group(uk):     òÏÚÒÏÂËÁ/â¦Â̦ÏÔÅËÉ
 Requires:      %{name} = %{version}
 
 %description devel
@@ -45,7 +36,7 @@ or more), or parts of them. It supports a lot of different data types
 and some types of text interpretations, including \-escapes, ~user,
 $HOME and conditional expansions.
 
-%description -l pl devel
+%description devel -l pl
 Ta biblioteka pozwala na stosunkowo proste czytanie plików
 konfiguracyjnych lub ich czê¶ci. Wspiera wiele ró¿nych typów danych
 oraz niektóre typy interpretacji tekstu, np. \-escapes, ~user, $HOME
@@ -56,13 +47,6 @@ Summary:     Files for developing programs that use the conflib library
 Summary(pl):   Statyczne pliki do tworzenia programów wykorzystuj±cych bibliotekê conflib
 Summary(de):   Dateien zum Entwickeln von Programmen mit der conflib-Library
 Group:         Development/Libraries
-Group(de):     Entwicklung/Libraries
-Group(es):     Desarrollo/Bibliotecas
-Group(fr):     Development/Librairies
-Group(pl):     Programowanie/Biblioteki
-Group(pt_BR):  Desenvolvimento/Bibliotecas
-Group(ru):     òÁÚÒÁÂÏÔËÁ/âÉÂÌÉÏÔÅËÉ
-Group(uk):     òÏÚÒÏÂËÁ/â¦Â̦ÏÔÅËÉ
 Requires:      %{name}-devel = %{version}
 
 %description static
@@ -71,7 +55,7 @@ or more), or parts of them. It supports a lot of different data types
 and some types of text interpretations, including \-escapes, ~user,
 $HOME and conditional expansions.
 
-%description -l pl static
+%description static -l pl
 Ta biblioteka pozwala na stosunkowo proste czytanie plików
 konfiguracyjnych lub ich czê¶ci. Wspiera wiele ró¿nych typów danych
 oraz niektóre typy interpretacji tekstu, np. \-escapes, ~user, $HOME
@@ -80,23 +64,27 @@ oraz warunkowe rozwijanie. Ten pakiet zawiera pliki statyczne.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1    
-%patch2 -p1    
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
-rm -f missing
-libtoolize --copy --force
-aclocal
-autoconf
-automake -a -c
-%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
@@ -107,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