From 4de2b173f59f28bdf39e51a147d88d474b2ae513 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Wed, 22 May 2013 10:57:52 +0200 Subject: [PATCH] Add BSD, ISC, and MIT to licenses --- perl-Net-DNS.spec | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/perl-Net-DNS.spec b/perl-Net-DNS.spec index 3e084b6..f6b13f4 100644 --- a/perl-Net-DNS.spec +++ b/perl-Net-DNS.spec @@ -1,15 +1,21 @@ Name: perl-Net-DNS Version: 0.72 -Release: 2%{?dist} +Release: 3%{?dist} Summary: DNS resolver modules for Perl -License: GPL+ or Artistic +# lib/Net/DNS/RR/OPT.pm: MIT +# netdns.c: ISC and MIT and BSD +# rest: GPL+ or Artistic +License: (GPL+ or Artistic) and BSD and ISC and MIT Group: Development/Libraries URL: http://www.net-dns.org/ Source0: http://search.cpan.org/CPAN/authors/id/N/NL/NLNETLABS/Net-DNS-%{version}.tar.gz BuildRequires: %{_bindir}/iconv +BuildRequires: perl +BuildRequires: perl(Config) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Getopt::Long) BuildRequires: perl(IO::Socket) +BuildRequires: perl(strict) # Run-time: BuildRequires: perl(base) BuildRequires: perl(Carp) @@ -21,8 +27,11 @@ BuildRequires: perl(Digest::BubbleBabble) %endif BuildRequires: perl(Digest::HMAC_MD5) >= 1 # Digest::SHA is not used +# DynaLoader not used BuildRequires: perl(Encode) BuildRequires: perl(Exporter) +BuildRequires: perl(FileHandle) +BuildRequires: perl(integer) BuildRequires: perl(IO::Select) BuildRequires: perl(IO::Socket::INET) # IO::Socket::INET6 is optional @@ -30,7 +39,9 @@ BuildRequires: perl(IO::Socket::INET6) BuildRequires: perl(MIME::Base64) >= 2.11 # Net::LibIDN is optional BuildRequires: perl(Net::LibIDN) +BuildRequires: perl(overload) BuildRequires: perl(Socket) +BuildRequires: perl(vars) # Win32::IPHelper is not needed # Win32::TieRegistry is not needed BuildRequires: perl(XSLoader) @@ -40,7 +51,7 @@ BuildRequires: perl(Test::Builder) BuildRequires: perl(Test::More) >= 0.18 # Optional tests: BuildRequires: perl(Test::Pod) >= 0.95 -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) Requires: perl(Digest::HMAC_MD5) >= 1 Requires: perl(Encode) Requires: perl(Exporter) @@ -74,6 +85,11 @@ Instances of the "Net::DNS::Nameserver" class represent DNS server objects. %setup -q -n Net-DNS-%{version} chmod -x demo/* sed -i -e '1 s,^#!/usr/local/bin/perl,#!%{__perl},' demo/* +for i in Changes; do + iconv -f iso8859-1 -t utf-8 "$i" > "${i}.conv" + touch -r "$i" "${i}.iconv" + mv -f "${i}.conv" "$i" +done %build export PERL_MM_USE_DEFAULT=yes @@ -85,9 +101,6 @@ make pure_install DESTDIR=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' chmod -R u+w %{buildroot}/* -for i in Changes; do - iconv -f iso8859-1 -t utf-8 $i > $i.conv && /bin/mv -f $i.conv $i -done %check make test @@ -110,6 +123,10 @@ make test %{_mandir}/man3/Net::DNS::Nameserver* %changelog +* Wed May 22 2013 Petr Pisar - 0.72-3 +- Add BSD, ISC, and MIT to licenses +- Specify all dependencies + * Thu Feb 14 2013 Fedora Release Engineering - 0.72-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild