- added bugfix patch

[packages/conflib.git] / conflib.spec

diff --git a/conflib.spec b/conflib.spec
index d77dfb8bae8039b296b1a584739df16bb6b74ba2..9673f4efdae6c2b7ea84d36ce3eb77a585f5f14e 100644 (file)
--- a/conflib.spec
+++ b/conflib.spec
@@ -2,53 +2,63 @@ Summary:      configuration file library
 Summary(de):   Library zum Lesen von Konfigurationsdateien
 Name:          conflib
 Version:       0.4.5
-Release:       1
-Copyright:     GPL
+Release:       4
+License:       GPL
 Group:         Libraries
-Source:                ftp://ftp.ohse.de/uwe/releases/%{name}-%{version}.tar.gz
-Patch:         conflib-info.patch
-Buildroot:     /tmp/%{name}-%{version}-root
+Group(fr):     Librairies
+Group(pl):     Biblioteki
+Source0:       ftp://ftp.ohse.de/uwe/releases/%{name}-%{version}.tar.gz
+Patch0:                conflib-info.patch
+Patch1:                conflib-cl_build_stanza_array-fix.patch
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description 
 A C language library for reading configuration files.
 
+%description -l pl
+Biblioteka C s³u¿±ca do odczytywania plików konfiguracyjnych.
+
 %package devel
 Summary:       file for developing programs that use the conflib library
 Summary(de):   Dateien zum Entwickeln von Programmen mit der conflib-Library
 Group:         Development/Libraries
+Group(fr):     Development/Librairies
+Group(pl):     Programowanie/Biblioteki
 Requires:      %{name} = %{version}
-Prereq:                /sbin/install-info
 
 %description devel
-This library makes it relativly easy to read configuration files (one 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.
+This library makes it relativly easy to read configuration files (one
+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.
 
 %package static
 Summary:       file for developing programs that use the conflib library
 Summary(de):   Dateien zum Entwickeln von Programmen mit der conflib-Library
 Group:         Development/Libraries
+Group(fr):     Development/Librairies
+Group(pl):     Programowanie/Biblioteki
 Requires:      %{name}-devel = %{version}
 
 %description static
-This library makes it relativly easy to read configuration files (one 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.
+This library makes it relativly easy to read configuration files (one
+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.
 
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1
+%patch1 -p1    
 
 %build
 LDFLAGS="-s"; export LDFLAGS
 %configure
-make
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 strip --strip-unneeded $RPM_BUILD_ROOT%{_libdir}/lib*.so.*.*
 
@@ -59,13 +69,10 @@ gzip -9nf $RPM_BUILD_ROOT%{_infodir}/*info* \
 %postun -p /sbin/ldconfig
 
 %post devel
-/sbin/install-info %{_infodir}/conflib.info.gz /etc/info-dir
-
+[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
-%preun devel
-if [ "$1" = "0" ]; then
-       /sbin/install-info --delete %{_infodir}/conflib.info.gz /etc/info-dir
-fi
+%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