[perl-Net-Jabber] Spec cleanup, build fix

Petr Šabata psabata at fedoraproject.org
Mon Jan 16 10:18:05 UTC 2012


commit aef25bb0aa077f8c5130183ff209482ef508fa7e
Author: Petr Šabata <contyk at redhat.com>
Date:   Mon Jan 16 11:14:54 2012 +0100

    Spec cleanup, build fix

 perl-Net-Jabber.spec |   42 +++++++++++++++++++-----------------------
 1 files changed, 19 insertions(+), 23 deletions(-)
---
diff --git a/perl-Net-Jabber.spec b/perl-Net-Jabber.spec
index d81cbe1..65a527d 100644
--- a/perl-Net-Jabber.spec
+++ b/perl-Net-Jabber.spec
@@ -1,23 +1,32 @@
-# $Id: perl-Net-Jabber.spec,v 1.10 2010/05/04 10:47:39 mmaslano Exp $
-
 Name:           perl-Net-Jabber
 Version:        2.0 
 Release:        17%{?dist}
 Summary:        Net::Jabber - Jabber Perl Library
-
 Group:          Development/Libraries
 License:        (GPL+ or Artistic) or LGPLv2+
 URL:            http://search.cpan.org/dist/Net-Jabber/
 Source0: http://search.cpan.org/CPAN/authors/id/R/RE/REATMON/Net-Jabber-%{version}.tar.gz 
 Source1:        LICENSING.correspondance
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:      noarch
-BuildRequires:  perl, perl(Net::XMPP), perl(Time::Timezone)
+BuildRequires:  perl(base)
+BuildRequires:  perl(Carp)
 BuildRequires:  perl(ExtUtils::MakeMaker)
-
-Requires:  perl(Time::Timezone)
+BuildRequires:  perl(Net::XMPP) >= 1.0
+BuildRequires:  perl(Net::XMPP::Client)
+BuildRequires:  perl(Net::XMPP::Connection)
+BuildRequires:  perl(Net::XMPP::Debug)
+BuildRequires:  perl(Net::XMPP::IQ)
+BuildRequires:  perl(Net::XMPP::JID)
+BuildRequires:  perl(Net::XMPP::Message)
+BuildRequires:  perl(Net::XMPP::Namespaces)
+BuildRequires:  perl(Net::XMPP::Presence)
+BuildRequires:  perl(Net::XMPP::Stanza)
+BuildRequires:  perl(Test::More)
+BuildRequires:  perl(Time::Timezone)
+# file requires for prep
+BuildRequires:  %{_bindir}/perldoc
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:  perl(Time::Timezone)
 
 %description
 Net::Jabber provides a Perl user with access to the Jabber Instant
@@ -29,13 +38,10 @@ For more information about Jabber visit:
 
 %prep
 %setup -q -n Net-Jabber-%{version}
-
 cp %{SOURCE1} .
-
 # generate our other two licenses...
 perldoc perlgpl > LICENSE.GPL
 perldoc perlartistic > LICENSE.Artistic
-
 # we really don't want executable examples...
 chmod -x examples/*
 
@@ -43,15 +49,12 @@ chmod -x examples/*
 %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
 make %{?_smp_mflags}
 
-
 %install
-rm -rf %{buildroot}
 make pure_install PERL_INSTALL_ROOT=%{buildroot}
 find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
 find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
 find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w %{buildroot}/*
-
 # fix wonky execute permissions
 find %{buildroot} -type f -exec chmod -x '{}' ';'
 
@@ -60,24 +63,17 @@ find %{buildroot} -type f -exec chmod -x '{}' ';'
 rm t/protocol_definenamespace.t
 rm t/protocol_muc.t
 rm t/protocol_rpc.t
-
 make test
 
-
-%clean
-rm -rf %{buildroot}
-
-
 %files
-%defattr(-,root,root,-)
 %doc CHANGES README examples LICENSE.* LICENSING.*
 %{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 
-
 %changelog
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-17
+* Mon Jan 16 2012 Petr Šabata <psabata at redhat.com> - 2.0-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+- Spec cleanup, build fix
 
 * Tue Jul 19 2011 Petr Sabata <contyk at redhat.com> - 2.0-16
 - Perl mass rebuild



More information about the perl-devel mailing list