[linux-atm] - fix few rpmlint warnings 226097

[Marcela Mašláňová]

commit 91c61136c5d9b2cf3e0accc5459290e557569ba8
Author: Marcela Mašláňová <mmaslano at redhat.com>
Date:   Wed Oct 13 14:28:39 2010 +0200

    - fix few rpmlint warnings 226097

 linux-atm.spec  |   31 ++++++++++++++++++++++++-------
 man-pages.patch |   45 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+), 7 deletions(-)
---
diff --git a/linux-atm.spec b/linux-atm.spec
index 3ee89c7..81fba1b 100644
--- a/linux-atm.spec
+++ b/linux-atm.spec
@@ -1,7 +1,7 @@
 Summary: Tools to support ATM networking under Linux
 Name: linux-atm
 Version: 2.5.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 # The licensing here is a mess. This is as close to accurate as possible.
 License: BSD and GPLv2 and GPLv2+ and LGPLv2+ and MIT
 URL: http://linux-atm.sourceforge.net/
@@ -9,12 +9,13 @@ Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 # Older kernel headers had broken ATM includes
 BuildRequires: glibc-kernheaders >= 2.4-9.1.88
-BuildRequires: byacc automake libtool flex
+BuildRequires: byacc automake libtool flex flex-static
 Source0: http://downloads.sf.net/%{name}/%{name}-%{version}.tgz
 # Patch from Debian to sanify syslogging
 Patch2: linux-atm-2.5.0-open-macro.patch
 Patch3: linux-atm-2.5.0-disable-ilmidiag.patch
 Patch4: linux-atm-gcc43.patch
+Patch5: man-pages.patch
 
 %description
 Tools to support ATM networking under Linux.
@@ -24,7 +25,7 @@ Summary: Linux ATM API library
 Group: System Environment/Libraries
 
 %description libs
-This package contains the ATM library required for userspace ATM tools.
+This package contains the ATM library required for user space ATM tools.
 
 %package libs-devel
 Summary: Development files for Linux ATM API library
@@ -41,20 +42,33 @@ Linux ATM API.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+
+iconv -f iso8859-1 -t utf8 < src/extra/ANS/e164_cc > src/extra/ANS/e164_cc.1
+mv src/extra/ANS/e164_cc.1 src/extra/ANS/e164_cc
+iconv -f iso8859-1 -t utf8 < doc/atm-linux-howto.txt > doc/atm-linux-howto.txt.1
+mv doc/atm-linux-howto.txt.1 doc/atm-linux-howto.txt
 
 %build
 %configure --disable-static
 make
 
 %install
-rm -rf $RPM_BUILD_ROOT _doc
+#rm -rf $RPM_BUILD_ROOT _doc CVS ANS doc/{\.cvsignore,CVS} init-redhat/{CVS,\.cvsignore} 
 make DESTDIR=$RPM_BUILD_ROOT install
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libatm.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libatm.{a,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
+chmod 0644 src/extra/ANS/{atm,pdf2e164_cc.pl,hosts2ans.pl}
+chmod 0644 _doc/{ANS/pdf2e164_cc.pl,ANS/hosts2ans.pl,init-redhat/atm,doc/atm-linux-howto.txt}
+
+# remove CVS files from installation
+rm -rf _doc/ANS 
+rm -rf _doc/doc/{.cvsignore,CVS} 
+rm -rf _doc/init-redhat/{CVS,.cvsignore}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -64,10 +78,10 @@ rm -rf $RPM_BUILD_ROOT
 %postun libs -p /sbin/ldconfig
 
 %files 
-%defattr(-, root, root, 0755)
+%defattr(-, root, root, -)
 %doc AUTHORS BUGS ChangeLog COPYING* NEWS README THANKS _doc/*
 %config(noreplace) /etc/atmsigd.conf
-%config /etc/hosts.atm
+%config(noreplace) /etc/hosts.atm
 %{_bindir}/*
 %{_sbindir}/*
 %{_mandir}/man4/*
@@ -84,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libatm.so
 
 %changelog
+* Wed Oct 13 2010 Marcela Mašláňová <mmaslano at redhat.com> - 2.5.1-2
+- fix few rpmlint warnings 226097
+
 * Fri May 28 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 2.5.1-1
 - update to 2.5.1
 - disable static libs
diff --git a/man-pages.patch b/man-pages.patch
new file mode 100644
index 0000000..c504cfe
--- /dev/null
+++ b/man-pages.patch
@@ -0,0 +1,45 @@
+diff -up linux-atm-2.5.1/src/led/zeppelin.8.fixman linux-atm-2.5.1/src/led/zeppelin.8
+--- linux-atm-2.5.1/src/led/zeppelin.8.fixman	2003-05-02 19:35:04.000000000 +0200
++++ linux-atm-2.5.1/src/led/zeppelin.8	2010-10-13 12:58:18.000000000 +0200
+@@ -99,7 +99,7 @@ Ring and ATM parts of the ELAN, so using
+ recommended. Token Ring support has received less testing than its
+ Ethernet counterpart.
+ .SH FILES
+-.IP \fI/var/run/lec[interface number].pid\fP
++\fI/var/run/lec[interface number].pid\fP
+ The file containing the process id of zeppelin.
+ .SH BUGS
+ John Bonham died 1980 and Led Zeppelin broke.
+diff -up linux-atm-2.5.1/src/mpoad/mpcd.8.fixman linux-atm-2.5.1/src/mpoad/mpcd.8
+--- linux-atm-2.5.1/src/mpoad/mpcd.8.fixman	2001-10-10 00:33:07.000000000 +0200
++++ linux-atm-2.5.1/src/mpoad/mpcd.8	2010-10-13 12:59:14.000000000 +0200
+@@ -28,7 +28,7 @@ mpcd \- ATM MPOA (Multi\-Protocol Over A
+ .B ]]
+ .SH DESCRIPTION
+ MPOA client
+-.SM(MPC) is responsible for creating and receiving
++.SM (MPC) is responsible for creating and receiving
+ internetwork layer shortcuts. Using these shortcuts MPCs forward
+ unicast internetwork layer packets effectively over ATM without need
+ for routing protocols.
+@@ -43,7 +43,7 @@ accepts shortcuts and packets arriving o
+ shortcuts is done with the help of
+ .SM MPOA
+ server
+-.SM(MPS).
++.SM (MPS).
+ .PP
+ Just as the Linux
+ .SM LAN
+diff -up linux-atm-2.5.1/src/sigd/atmsigd.conf.4.fixman linux-atm-2.5.1/src/sigd/atmsigd.conf.4
+--- linux-atm-2.5.1/src/sigd/atmsigd.conf.4.fixman	2001-10-10 00:33:07.000000000 +0200
++++ linux-atm-2.5.1/src/sigd/atmsigd.conf.4	2010-10-13 12:58:49.000000000 +0200
+@@ -125,7 +125,7 @@ a comment. The `#' character cannot be e
+ .P
+ If an option is specified in \fBatmsigd.conf\fP and on the command
+ line, the command line has priority.
+-.COMPATIBILITY
++.SH COMPATIBILITY
+ Certain options used by past versions of \fBatmsigd\fP but no longer documented
+ on the man page are still recognized and supported, but they also yield a
+ warning message. Future versions of \fBatmsigd\fP will not recognize those