- more rpm macroc,

- added info patch,
- info pages moved to devel,
- added lib*.la files to devel,
- permission changed to 755 on lib*.so,
- standarized {un}registering info pages.

Changed files:
    conflib.spec -> 1.7

diff --git a/conflib.spec b/conflib.spec
index ca656188b70f2836b155b675b8bb339b845e6cbc..ebcc7c43142a0d1dc69ef9b6ac2cbf4f49b87fbe 100644 (file)
--- a/conflib.spec
+++ b/conflib.spec
@@ -5,9 +5,10 @@ Version:       0.4.5
 Release:       1
 Copyright:     GPL
 Group:         Libraries
 Release:       1
 Copyright:     GPL
 Group:         Libraries

-Source:                ftp://ftp.ohse.de/uwe/releases/conflib-0.4.5.tar.gz
+Source:                ftp://ftp.ohse.de/uwe/releases/%{name}-%{version}.tar.gz
+Patch:         conflib-info.patch
+Prereq:                /sbin/install-info

 Buildroot:     /tmp/%{name}-%{version}-root
 Buildroot:     /tmp/%{name}-%{version}-root

-Prereq:                /sbin/install-info /sbin/ldconfig

 
 %description 
 A C language library for reading configuration files.
 
 %description 
 A C language library for reading configuration files.


@@ -38,30 +39,31 @@ and conditional expansions.
 
 %prep
 %setup -q
 
 %prep
 %setup -q

+%patch -p1

 
 %build
 
 %build

-%GNUconfigure
+LDFLAGS="-s"; export LDFLAGS
+%configure

 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 

+strip --strip-unneeded $RPM_BUILD_ROOT%{_libdir}/lib*.so.*.*
+

 gzip -9nf $RPM_BUILD_ROOT%{_infodir}/*info* \
        README NEWS ChangeLog
 
 gzip -9nf $RPM_BUILD_ROOT%{_infodir}/*info* \
        README NEWS ChangeLog
 

-#      $RPM_BUILD_ROOT%{_mandir}/man*/* \
-

 %post
 /sbin/ldconfig
 %post
 /sbin/ldconfig

-/sbin/install-info %{_infodir}/conflib.info.gz %{_infodir}/dir --entry="* Conflib: (conflib.info).         Configuration File Handling."
+/sbin/install-info %{_infodir}/conflib.info.gz /etc/info-dir

 
 %postun -p /sbin/ldconfig
 
 %preun
 
 %postun -p /sbin/ldconfig
 
 %preun

-if [ $1 = 0 ]; then
-   /sbin/install-info --delete %{_infodir}/history.info.gz %{_infodir}/dir --entry="* Conflib: (conflib.info).         Configuration File Handling."
-readline."
+if [ "$1" = "0" ]; then
+       /sbin/install-info --delete %{_infodir}/conflib.info.gz /etc/info-dir

 fi
 
 %clean
 fi
 
 %clean


@@ -69,15 +71,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
 
 %files
 %defattr(644,root,root,755)

-#%{_mandir}/*/*
-%{_infodir}/*info*
-%attr(755,root,root) %{_libdir}/lib*.so.*
+%attr(755,root,root) %{_libdir}/lib*.so.*.*

 
 %files devel
 %defattr(644,root,root,755)
 %doc README.gz NEWS.gz ChangeLog.gz
 %{_includedir}/*.h
 
 %files devel
 %defattr(644,root,root,755)
 %doc README.gz NEWS.gz ChangeLog.gz
 %{_includedir}/*.h

-%{_libdir}/lib*.so
+%attr(755,root,root) %{_libdir}/lib*.so
+%attr(755,root,root) %{_libdir}/lib*.la
+%{_infodir}/*info*

 
 %files static
 %defattr(644,root,root,755)
 
 %files static
 %defattr(644,root,root,755)