rpms/perl/F-7 perl.spec,1.122,1.123

[Štěpán Kasal (kasal)]

Author: kasal

Update of /cvs/extras/rpms/perl/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9544

Modified Files:
	perl.spec 
Log Message:
- Fix the License: tags.


Index: perl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl/F-7/perl.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- perl.spec	17 Aug 2007 18:03:54 -0000	1.122
+++ perl.spec	18 Aug 2007 07:27:43 -0000	1.123
@@ -20,11 +20,15 @@
 
 Name:           perl
 Version:        %{perl_version}
-Release:        21%{?dist}
+Release:        22%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        The Perl programming language
 Group:          Development/Languages
-License:        Artistic or GPL
+# Modules Tie::File and Getopt::Long are licenced under "GPLv2+ or Artistic,"
+# we have to reflect that in the sub-package containing them.
+# FIXME: Digest::MD5 has a must-advertise-RSA license with an exception,
+# the tag does not reflect that (yet).
+License:        (GPL+ or Artistic) and (GPLv2+ or Artistic)
 Url:            http://www.perl.org/
 Source0:        http://www.cpan.org/authors/id/N/NW/NWCLARK/%{name}-%{perl_version}.tar.bz2
 Source11:       filter-depends.sh
@@ -204,6 +208,7 @@
 %package libs
 Summary:        The libraries for the perl runtime
 Group:          Development/Languages
+License:        (GPL+ or Artistic)
 Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
 
 %description libs
@@ -213,6 +218,7 @@
 %package devel
 Summary:        Header files for use in perl development
 Group:          Development/Languages
+License:        (GPL+ or Artistic)
 Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
 Requires:       perl(CPAN), perl(ExtUtils::Embed), perl(ExtUtils::MakeMaker)
 Requires:	perl(Test::Harness), perl(Test::Simple)
@@ -225,6 +231,7 @@
 %package suidperl
 Summary:        Suidperl, for use with setuid perl scripts
 Group:          Development/Languages
+License:        (GPL+ or Artistic)
 Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
 
 %description suidperl
@@ -234,6 +241,7 @@
 %package CPAN
 Summary:        Query, download and build perl modules from CPAN sites
 Group:          Development/Languages
+License:        (GPL+ or Artistic)
 Epoch:          0
 Version:        1.76_02
 Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
@@ -245,6 +253,7 @@
 %package ExtUtils-Embed
 Summary:        Utilities for embedding Perl in C/C++ applications
 Group:          Development/Languages
+License:        (GPL+ or Artistic)
 Epoch:          0
 Version:        1.26
 Requires:       perl-devel
@@ -256,6 +265,7 @@
 %package ExtUtils-MakeMaker
 Summary:        Create a module Makefile
 Group:          Development/Languages
+License:        (GPL+ or Artistic)
 Epoch:          0
 Version:        6.30
 Requires:       perl-devel
@@ -268,6 +278,7 @@
 %package Test-Harness
 Summary:        Run Perl standard test scripts with statistics
 Group:          Development/Languages
+License:        (GPL+ or Artistic)
 Epoch:          0
 Version:        2.56
 Requires:       perl-devel
@@ -279,6 +290,7 @@
 %package Test-Simple
 Summary:        Basic utilities for writing tests
 Group:          Development/Languages
+License:        (GPL+ or Artistic)
 Epoch:          0
 Version:        0.62
 Requires:       perl-devel
@@ -726,8 +738,11 @@
 %{_mandir}/man3/Test::Tutorial*
 
 %changelog
+* Sat Aug 18 2007 Stepan Kasal <skasal at redhat.com> - 4:5.8.8-22
+- Fix the License: tags.
+
 * Fri Aug 17 2007 Stepan Kasal <skasal at redhat.com> - 4:5.8.8-21
-- Appy patch to skip hostname tests, since hostname lookup isn't
+- Apply patch to skip hostname tests, since hostname lookup isn't
   available in Fedora buildroots by design.
 
 * Fri Aug 17 2007 Stepan Kasal <skasal at redhat.com> - 4:5.8.8-20