- updated to 0.64,

- added package icon,
- Group in devel changed to Development/Libraries,
- removed "-m <perm>" from install parameters in %install,
- more rpm macros and some cosmetics.

Changed files:
    atm.spec -> 1.8

diff --git a/atm.spec b/atm.spec
index e59fc3546aadb784e47e8380bd13dab259098b80..46382e2192610a4930593d81f97b8d5938b8d357 100644 (file)
--- a/atm.spec
+++ b/atm.spec
@@ -1,15 +1,17 @@
-# $Revision: 1.7 $ $Date: 2000-01-07 21:13:23 $
+# $Revision: 1.8 $ $Date: 2000-01-12 00:26:58 $
 Summary:       ATM on Linux
 Summary(pl):   Obs³uga sieci ATM w Linuxie
-Name:          ATM
-Version:       0.62
-Release:       3
+Name:          atm
+Version:       0.64
+Release:       1
 Copyright:     GPL
 Group:         Networking
 Group(pl):     Sieciowe
-Source0                ftp://lrcftp.epfl.ch/pub/linux/atm/dist/atm-%{version}.tar.gz
-Source1:       ATM-pldrc.tar.gz
-Patch:         ATM-opt.patch
+Source0:       ftp://lrcftp.epfl.ch/pub/linux/atm/dist/atm-%{version}.tar.gz
+Source1:       atm-pldrc.tar.gz
+Patch:         atm-opt.patch
+Icon:          atm-logo.gif
+URL:           http://ica1www.epfl.ch/linux-atm/
 Buildroot:     /tmp/%{name}-%{version}-root
  
 %description
@@ -35,8 +37,8 @@ Multiprotocol Over ATM (MPOA) i inne rozmaito
 %package devel
 Summary:       ATM on Linux - developer's package
 Summary(pl):   Obs³uga sieci ATM w Linuxie - biblioteki i pliki nag³ówkowe
-Group:         Development
-Group(pl):     Programowanie
+Group:         Development/Libraries
+Group(pl):     Programowanie/Biblioteki
 Requires:      %{name} = %{version}
 
 %description devel
@@ -56,53 +58,46 @@ make
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT/etc/{atm,sysconfig/{interfaces,network-scripts},rc.d/init.d} \
+       $RPM_BUILD_ROOT/var/log/atm
 
-make \
-    INSTROOT=$RPM_BUILD_ROOT \
-    INSTPREFIX=$RPM_BUILD_ROOT%{_prefix} \
-    INSTMAN=$RPM_BUILD_ROOT%{_mandir} \
-    install
+make install \
+       INSTROOT=$RPM_BUILD_ROOT \
+       INSTPREFIX=$RPM_BUILD_ROOT%{_prefix} \
+       INSTMAN=$RPM_BUILD_ROOT%{_mandir}
 
 strip --strip-unneeded $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/*
 
-gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man*/* 
-gzip -9nf doc/usage.txt BUGS CREDITS CHANGES README config/pld/README.PLD
+install config/common/hosts.atm $RPM_BUILD_ROOT/etc
+install config/common/e164_cc $RPM_BUILD_ROOT/etc
 
-install -d -m 0755 $RPM_BUILD_ROOT/etc 
-install -c -m 0644 config/common/hosts.atm $RPM_BUILD_ROOT/etc
-install -c -m 0644 config/common/e164_cc $RPM_BUILD_ROOT/etc
-
-install -d -m 0755 $RPM_BUILD_ROOT/etc/atm
-install -d -m 0755 $RPM_BUILD_ROOT/etc/sysconfig
-install -d -m 0755 $RPM_BUILD_ROOT/etc/sysconfig/network-scripts
-install -d -m 0755 $RPM_BUILD_ROOT/etc/sysconfig/interfaces
-install -d -m 0755 $RPM_BUILD_ROOT/etc/rc.d/init.d
-install -c -m 0644 config/pld/atm/* $RPM_BUILD_ROOT/etc/atm/
-install -c -m 0755 config/pld/init.d/atm $RPM_BUILD_ROOT/etc/rc.d/init.d/
-install -c -m 0644 config/pld/sysconfig/atm $RPM_BUILD_ROOT/etc/sysconfig/
-install -c -m 0755 config/pld/network-scripts/{ifup-atm,ifup-lec,ifdown-atm,ifdown-lec} \
+install config/pld/atm/* $RPM_BUILD_ROOT/etc/atm/
+install config/pld/init.d/atm $RPM_BUILD_ROOT/etc/rc.d/init.d/
+install config/pld/sysconfig/atm $RPM_BUILD_ROOT/etc/sysconfig/
+install config/pld/network-scripts/{ifup-atm,ifup-lec,ifdown-atm,ifdown-lec} \
        $RPM_BUILD_ROOT/etc/sysconfig/network-scripts
-install -c -m 0644 config/pld/interfaces/{ifcfg-atm0,ifcfg-lec0} \
+install config/pld/interfaces/{ifcfg-atm0,ifcfg-lec0} \
        $RPM_BUILD_ROOT/etc/sysconfig/interfaces 
-install -d $RPM_BUILD_ROOT/var/log/atm
  
+gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man*/* \
+       doc/usage.txt BUGS CREDITS CHANGES README config/pld/README.PLD
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755) 
 %doc doc/usage.txt.gz *.gz config/pld/README.PLD.gz
-%{_mandir}/man*/*
+%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_sbindir}/*
 %config /etc/e164_cc
 %config(noreplace) /etc/hosts.atm
 %attr(755,root,root) %config /etc/sysconfig/network-scripts/*
-%attr(755,root,root) %config /etc/rc.d/init.d/atm
-%config /etc/sysconfig/atm
+%attr(754,root,root) %config /etc/rc.d/init.d/atm
+%attr(640,root,root) %config /etc/sysconfig/atm
 %config /etc/atm/*
 %config(noreplace) /etc/sysconfig/interfaces/*
-%attr(755,root,root) /var/log/atm
-%attr(755,root,root) /usr/bin/*
-%attr(755,root,root) /usr/sbin/*
+%dir /var/log/atm
+%{_mandir}/man*/*
 
 %files devel
 %defattr(644,root,root,755)