[perl-Encode/f20] Correct license from (GPL+ or Artistic) to ((GPL+ or Artistic) and UCD)

[Petr Pisar]

commit f8acc901da5258c41fa0847550b04e51f19d32a0
Author: Petr Písař <ppisar at redhat.com>
Date:   Wed Mar 4 14:26:47 2015 +0100

    Correct license from (GPL+ or Artistic) to ((GPL+ or Artistic) and UCD)

 perl-Encode.spec | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/perl-Encode.spec b/perl-Encode.spec
index c0fa751..d12aeac 100644
--- a/perl-Encode.spec
+++ b/perl-Encode.spec
@@ -1,9 +1,11 @@
 Name:           perl-Encode
 Epoch:          1
 Version:        2.54
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Character encodings in Perl
-License:        GPL+ or Artistic
+# ucm:          UCD
+# other files:  GPL+ or Artistic
+License:        (GPL+ or Artistic) and UCD
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Encode/
 Source0:        http://www.cpan.org/authors/id/D/DA/DANKOGAI/Encode-%{version}.tar.gz
@@ -115,6 +117,9 @@ make test
 %{perl_vendorarch}/Encode/encode.h
 
 %changelog
+* Wed Mar 04 2015 Petr Pisar <ppisar at redhat.com> - 1:2.54-4
+- Correct license from (GPL+ or Artistic) to ((GPL+ or Artistic) and UCD)
+
 * Mon Oct 20 2014 Petr Pisar <ppisar at redhat.com> - 1:2.54-3
 - Fix perl stack handling after a subroutine call