X-Git-Url: http://git.pld-linux.org/?p=packages%2Fconflib.git;a=blobdiff_plain;f=conflib.spec;h=9673f4efdae6c2b7ea84d36ce3eb77a585f5f14e;hp=a999e03340a01d2a76707e44142443d2307bbf12;hb=0a7a0260a8463e83c71845306792a2618101686f;hpb=1e255ff32b45150faa853d93250850c5e933498c

diff --git a/conflib.spec b/conflib.spec
index a999e03..9673f4e 100644
--- a/conflib.spec
+++ b/conflib.spec
@@ -2,12 +2,15 @@ Summary:	configuration file library
 Summary(de):	Library zum Lesen von Konfigurationsdateien
 Name:		conflib
 Version:	0.4.5
-Release:	2
-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.
@@ -19,39 +22,43 @@ Biblioteka C s
 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:		/usr/sbin/fix-info-dir
 
 %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.*.*
 
@@ -62,10 +69,10 @@ gzip -9nf $RPM_BUILD_ROOT%{_infodir}/*info* \
 %postun -p /sbin/ldconfig
 
 %post devel
-/usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
 %postun devel
-/usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
 %clean
 rm -rf $RPM_BUILD_ROOT