- added bugfix patch

[packages/conflib.git] / conflib.spec

diff --git a/conflib.spec b/conflib.spec
index ccc2e32e76a3f6af6aa8bb4f59dceb9c6e925d17..9673f4efdae6c2b7ea84d36ce3eb77a585f5f14e 100644 (file)
--- a/conflib.spec
+++ b/conflib.spec
@@ -1,68 +1,94 @@
-Summary: configuration file library
-Name: conflib
-Version: 0.4.5
-Release: 0
-Copyright: GPL
-Group: Libraries
-Source: ftp://ftp.ohse.de/uwe/releases/conflib-0.4.5.tar.gz
-Buildroot: /tmp/conflib-buildroot
-Prereq: /sbin/install-info /sbin/ldconfig
-Summary(de): Library zum Lesen von Konfigurationsdateien
+Summary:       configuration file library
+Summary(de):   Library zum Lesen von Konfigurationsdateien
+Name:          conflib
+Version:       0.4.5
+Release:       4
+License:       GPL
+Group:         Libraries
+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
-Group: Development/Libraries
-Requires: conflib = %{PACKAGE_VERSION}
-Summary(de): Dateien zum Entwickeln von Programmen mit der conflib-Library
+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}
 
 %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.
 
 %prep
-%setup 
+%setup -q
+%patch0 -p1
+%patch1 -p1    
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr
-make
+LDFLAGS="-s"; export LDFLAGS
+%configure
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install prefix=$RPM_BUILD_ROOT/usr
-# Uh ... too ugly to describe? Do the people at redhat _really_
-# update the specs files manually? Every time?
-# ln -sf libconf.so.5.0.1 $RPM_BUILD_ROOT/usr/lib/libconf.so
-(cd $RPM_BUILD_ROOT/usr/lib/ ; ln -fs `echo libconf.*.*.*` libconf.so )
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
 
-gzip -nf9 $RPM_BUILD_ROOT/usr/info/*info*
+strip --strip-unneeded $RPM_BUILD_ROOT%{_libdir}/lib*.so.*.*
 
-%post
-/sbin/ldconfig
-/sbin/install-info /usr/info/conflib.info.gz /usr/info/dir --entry="* Conflib: (conflib.info).         Configuration File Handling."
+gzip -9nf $RPM_BUILD_ROOT%{_infodir}/*info* \
+       README NEWS ChangeLog
 
+%post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%preun
-if [ $1 = 0 ]; then
-   /sbin/install-info --delete /usr/info/history.info.gz /usr/info/dir --entry="* Conflib: (conflib.info).         Configuration File Handling."
-readline."
-fi
+%post devel
+[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+
+%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
-#/usr/man/*/*
-/usr/info/*info*
-/usr/lib/lib*.so.*
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/lib*.so.*.*
 
 %files devel
-%doc README NEWS ChangeLog
-/usr/include/*.h
-/usr/lib/lib*.a
-/usr/lib/lib*.so
+%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
+%{_infodir}/*info*
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/lib*.a