rpms/linux-atm/devel linux-atm.spec,1.10,1.11

[fedora-cvs-commits at redhat.com]

Author: dwmw2

Update of /cvs/dist/rpms/linux-atm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv691

Modified Files:
	linux-atm.spec 
Log Message:
Cleanup (#172932)



Index: linux-atm.spec
===================================================================
RCS file: /cvs/dist/rpms/linux-atm/devel/linux-atm.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- linux-atm.spec	9 Dec 2005 22:41:47 -0000	1.10
+++ linux-atm.spec	21 Dec 2005 12:32:28 -0000	1.11
@@ -1,7 +1,7 @@
-Summary: Tools to support ATM networking under Linux.
+Summary: Tools to support ATM networking under Linux
 Name: linux-atm
 Version: 2.5.0
-Release: 0.20050118.2.1
+Release: 0.20050118.3
 License: BSD, GPL, LGPL
 URL: http://linux-atm.sourceforge.net/
 Group: System Environment/Daemons
@@ -43,42 +43,57 @@
 
 %build
 ./autotools
-%{configure}
+%configure
 make
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT _doc
 make DESTDIR=$RPM_BUILD_ROOT install
-rm $RPM_BUILD_ROOT/%{_libdir}/libatm.la
-install -c -m 644 src/config/hosts.atm $RPM_BUILD_ROOT/etc
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libatm.la
+install -m 0644 src/config/hosts.atm $RPM_BUILD_ROOT/etc/
+# Selectively sort what we want included in %%doc
+mkdir _doc
+cp -a doc/ src/config/init-redhat/ src/extra/ANS/ _doc/
+rm -f _doc/Makefile* _doc/*/Makefile* _doc/doc/*.sgml
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files libs
-%defattr(-, root, root)
-%{_libdir}/libatm.so.*
+%post libs -p /sbin/ldconfig
 
-%files libs-devel
-%defattr(-, root, root)
-%{_includedir}/*
-%{_libdir}/libatm.so
-%{_libdir}/libatm.a
+%postun libs -p /sbin/ldconfig
 
 %files 
-%defattr(-, root, root)
-%doc AUTHORS BUGS ChangeLog COPYING COPYING.GPL COPYING.LGPL
-%doc INSTALL NEWS README THANKS
-%doc doc/ src/config/init-redhat/ src/extra/ANS
+%defattr(-, root, root, 0755)
+%doc AUTHORS BUGS ChangeLog COPYING* NEWS README THANKS _doc/*
+%config(noreplace) /etc/atmsigd.conf
+%config /etc/hosts.atm
 %{_bindir}/*
 %{_sbindir}/*
-%config /etc/atmsigd.conf
 %{_mandir}/man4/*
-%{_mandir}/man8/*
 %{_mandir}/man7/*
-%config /etc/hosts.atm
+%{_mandir}/man8/*
+
+%files libs
+%defattr(-, root, root, 0755)
+%{_libdir}/libatm.so.*
+
+%files libs-devel
+%defattr(-, root, root, 0755)
+%{_includedir}/*
+%{_libdir}/libatm.a
+%{_libdir}/libatm.so
 
 %changelog
+* Wed Dec 21 2005 David Woodhouse <dwmw2 at redhat.com> 2.5.0-0.20050118.3
+- Package cleanups from Matthias Saou (#172932):
+-  Add missing /sbin/ldconfig calls for the libs package.
+-  Tag atmsigd.conf config file as noreplace.
+-  Remove INSTALL (dangling symlink) from %%doc.
+-  Don't include Makefile* file from doc/.
+-  Don't include both sgml and txt howto (only txt).
+-  Minor spec file cleanups.
+ 
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt