rpms/enscript/devel enscript.spec,1.44,1.45

[Adam Tkac]

Author: atkac

Update of /cvs/pkgs/rpms/enscript/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14673

Modified Files:
	enscript.spec 
Log Message:
- merge review related fixes (#225729)



Index: enscript.spec
===================================================================
RCS file: /cvs/pkgs/rpms/enscript/devel/enscript.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- enscript.spec	30 Nov 2009 14:01:37 -0000	1.44
+++ enscript.spec	14 Dec 2009 13:01:28 -0000	1.45
@@ -1,30 +1,43 @@
 Summary: A plain ASCII to PostScript converter
 Name: enscript
 Version: 1.6.4
-Release: 15%{?dist}
-License: GPLv2
+Release: 16%{?dist}
+License: GPLv2+
 Group: Applications/Publishing
-Source0: http://www.iki.fi/mtr/genscript/enscript-%{version}.tar.gz
+URL: http://www.gnu.org/software/enscript
+# Tarball exists nowhere. You have to obtain it via:
+# $ git clone git://git.savannah.gnu.org/enscript.git
+# $ git archive --format=tar --prefix=enscript-1.6.4/ v1.6.4 |gzip > enscript-1.6.4.tar.gz
+Source0: enscript-%{version}.tar.gz
 Source1: enscript-ruby-1.6.4.tar.gz
 #http://neugierig.org/software/ruby/ruby-enscript.tar.gz
 Source2: enscript-php-1.6.4.st
 #http://home.raxnet.net/downloads/viewcvs/php.st
+
+# Make `make DESTDIR=dir install`  working
 Patch0: enscript-1.6.1-config.patch
+# RH #177336
 Patch1: enscript-1.6.4-hilight.patch
+# RH #61294
 Patch3: enscript-1.6.1-locale.patch
+# RH #132964
 Patch4: enscript-doublefree.patch
+
 Patch6: enscript-1.6.1-CAN-2004-1185.patch
 Patch7: enscript-1.6.1-CAN-2004-1186.patch
+
+# RH #224548
 Patch8: enscript-wrap_header.patch
+
 Patch9: enscript-1.6.4-rh457719.patch
 Patch10:enscript-1.6.4-rh457720.patch
 Patch11:enscript-CVE-2008-3863+CVE-2008-4306.patch
 Patch12:enscript-rh477382.patch
-URL: http://www.codento.com/people/mtr/genscript/
 Requires(preun): /sbin/install-info
 Requires(post): /sbin/install-info
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Obsoletes: nenscript
+Obsoletes: nenscript < 1.13++-13
+Provides: nenscript = 1.13++-13
 
 BuildRequires: autoconf, automake
 
@@ -76,7 +89,7 @@ rm -f %{buildroot}%{_datadir}/info/dir
   ln .%{_prefix}/bin/enscript .%{_prefix}/bin/nenscript
 )
 
-cat %{name}.lang >> share.list
+%find_lang %{name} %{name}.lang
 
 for all in README THANKS; do
 	iconv -f ISO88591 -t UTF8 < $all > $all.new
@@ -98,17 +111,19 @@ fi
 [ -f %{_infodir}/%{name}.info.gz ] && \
   /sbin/install-info %{_infodir}/%{name}.info.gz %{_infodir}/dir || :
 
-%files -f share.list
+%files -f %{name}.lang -f share.list
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog docs/FAQ.html NEWS README README.ESCAPES THANKS TODO 
+%doc AUTHORS ChangeLog COPYING docs/FAQ.html NEWS README README.ESCAPES THANKS TODO
 %{_bindir}/*
 %{_mandir}/man1/*
 %dir %{_datadir}/enscript
 %{_infodir}/%{name}*
 %config(noreplace) %{_sysconfdir}/enscript.cfg
 
-
 %changelog
+* Mon Dec 14 2009 Adam Tkac <atkac redhat com> - 1.6.4-16
+- merge review related fixes (#225729)
+
 * Mon Nov 30 2009 Adam Tkac <atkac redhat com> - 1.6.4-15
 - ship postscript files with .eps extension (#505775)
 - merge review fixes (#225729)