rpms/inn/devel inn.spec,1.72,1.73

[Nikola Pajkovsky]

Author: npajkovs

Update of /cvs/extras/rpms/inn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21963

Modified Files:
	inn.spec 
Log Message:
change license and erase one rm -f


Index: inn.spec
===================================================================
RCS file: /cvs/extras/rpms/inn/devel/inn.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- inn.spec	11 Dec 2009 16:48:14 -0000	1.72
+++ inn.spec	16 Dec 2009 14:32:25 -0000	1.73
@@ -3,7 +3,7 @@ Name: inn
 Version: 2.5.1
 Release: 2%{?dist}
 #see LICENSE file for details
-License: GPL+ and BSD and MIT and Public Domain
+License: GPLv2+ and BSD and MIT and Public Domain
 Group: System Environment/Daemons
 URL: https://www.isc.org/software/INN/
 Source0: ftp://ftp.isc.org/isc/inn/inn-%{version}.tar.gz
@@ -53,6 +53,7 @@ newsgate or tin.
 Summary: The INN (InterNetNews) library
 Group: Development/Libraries
 Requires: inn = %{version}
+Requires: %{name}-libs = %{version}-%{release}
 
 %description devel
 The inn-devel package contains the INN (InterNetNews) library, which
@@ -179,12 +180,12 @@ PATH=\$PATH:%{_libexecdir}/news
 export PATH
 EOF
 
-# we get this from cleanfeed
-rm -f $RPM_BUILD_ROOT%{_libexecdir}/news/filter/filter_innd.pl
-
 #Fix perms in sample directory to avoid bogus dependencies
 find samples -name "*.in" -exec chmod a-x {} \;
 
+# we get this from cleanfeed
+rm -f $RPM_BUILD_ROOT%{_libexecdir}/news/filter/filter_innd.pl
+
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 ln -sf %{_libexecdir}/news/inews $RPM_BUILD_ROOT%{_bindir}/inews
 ln -sf %{_libexecdir}/news/rnews $RPM_BUILD_ROOT%{_bindir}/rnews
@@ -198,7 +199,6 @@ rm -rf $RPM_BUILD_ROOT/usr/doc/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
-rm -f files.list files.main files.devel files.inews
 
 %post
 /sbin/chkconfig --add innd