[perl-AnyEvent-XMPP] 0.52 bump and some cleanup

[Petr Šabata]

commit 2af8ddcf3b463c269b52e750c55c0786458e63c8
Author: Petr Šabata <contyk at redhat.com>
Date:   Tue Jan 24 13:31:12 2012 +0100

    0.52 bump and some cleanup

 .gitignore              |    1 +
 perl-AnyEvent-XMPP.spec |   96 ++++++++++++++--------------------------------
 sources                 |    2 +-
 3 files changed, 31 insertions(+), 68 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 421db10..4646b83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 AnyEvent-XMPP-0.51.tar.gz
+/AnyEvent-XMPP-0.52.tar.gz
diff --git a/perl-AnyEvent-XMPP.spec b/perl-AnyEvent-XMPP.spec
index d924962..bf5c19c 100644
--- a/perl-AnyEvent-XMPP.spec
+++ b/perl-AnyEvent-XMPP.spec
@@ -1,110 +1,72 @@
 Name:           perl-AnyEvent-XMPP
-Version:        0.51
-Release:        7%{?dist}
+Version:        0.52
+Release:        1%{?dist}
 Summary:        Implementation of the XMPP Protocol
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/AnyEvent-XMPP/
 Source0:        http://www.cpan.org/authors/id/E/EL/ELMEX/AnyEvent-XMPP-%{version}.tar.gz
 Patch0:         AnyEvent-XMPP-0.51-timezone.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
+BuildRequires:  perl(base)
+BuildRequires:  perl(constant)
 BuildRequires:  perl(AnyEvent)
 BuildRequires:  perl(AnyEvent::Handle)
 BuildRequires:  perl(AnyEvent::Socket)
 BuildRequires:  perl(Authen::SASL)
+BuildRequires:  perl(Data::Dumper)
 BuildRequires:  perl(Digest::SHA1)
+BuildRequires:  perl(Encode)
 BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(IO::Handle)
+BuildRequires:  perl(MIME::Base64)
 BuildRequires:  perl(Net::LibIDN)
 BuildRequires:  perl(Object::Event)
+BuildRequires:  perl(Scalar::Util)
+BuildRequires:  perl(Test::More)
+BuildRequires:  perl(Time::Local)
 BuildRequires:  perl(XML::Parser::Expat)
 BuildRequires:  perl(XML::Writer)
-BuildRequires:  perl(Test::More)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+%{?perl_default_filter}
+
 %description
 AnyEvent::XMPP - An implementation of the XMPP Protocol.
 
-
 %prep
 %setup -q -n AnyEvent-XMPP-%{version}
 %patch0 -p1 -b .timezone
-
-# Filter requires
-cat << \EOF > %{name}-req
-#!/bin/sh
-%{__perl_requires} $* |\
-sed -e '/perl(AnyEvent::XMPP::Client)/d' |\
-sed -e '/perl(AnyEvent::XMPP::Connection)/d' |\
-sed -e '/perl(AnyEvent::XMPP::Error)/d' |\
-sed -e '/perl(AnyEvent::XMPP::Error::Exception)/d' |\
-sed -e '/perl(AnyEvent::XMPP::Error::IQ)/d' |\
-sed -e '/perl(AnyEvent::XMPP::Error::IQAuth)/d' |\
-sed -e '/perl(AnyEvent::XMPP::Error::MUC)/d' |\
-sed -e '/perl(AnyEvent::XMPP::Error::Message)/d' |\
-sed -e '/perl(AnyEvent::XMPP::Error::Parser)/d' |\
-sed -e '/perl(AnyEvent::XMPP::Error::Presence)/d' |\
-sed -e '/perl(AnyEvent::XMPP::Error::Register)/d' |\
-sed -e '/perl(AnyEvent::XMPP::Error::SASL)/d' |\
-sed -e '/perl(AnyEvent::XMPP::Error::Stanza)/d' |\
-sed -e '/perl(AnyEvent::XMPP::Error::Stream)/d' |\
-sed -e '/perl(AnyEvent::XMPP::Ext)/d' |\
-sed -e '/perl(AnyEvent::XMPP::Ext::DataForm)/d' |\
-sed -e '/perl(AnyEvent::XMPP::Ext::Disco::Info)/d' |\
-sed -e '/perl(AnyEvent::XMPP::Ext::Disco::Items)/d' |\
-sed -e '/perl(AnyEvent::XMPP::Ext::MUC::Message)/d' |\
-sed -e '/perl(AnyEvent::XMPP::Ext::MUC::Room)/d' |\
-sed -e '/perl(AnyEvent::XMPP::Ext::MUC::RoomInfo)/d' |\
-sed -e '/perl(AnyEvent::XMPP::Ext::MUC::User)/d' |\
-sed -e '/perl(AnyEvent::XMPP::Ext::OOB)/d' |\
-sed -e '/perl(AnyEvent::XMPP::Ext::RegisterForm)/d' |\
-sed -e '/perl(AnyEvent::XMPP::Extendable)/d' |\
-sed -e '/perl(AnyEvent::XMPP::IM::Account)/d' |\
-sed -e '/perl(AnyEvent::XMPP::IM::Connection)/d' |\
-sed -e '/perl(AnyEvent::XMPP::IM::Contact)/d' |\
-sed -e '/perl(AnyEvent::XMPP::IM::Delayed)/d' |\
-sed -e '/perl(AnyEvent::XMPP::IM::Message)/d' |\
-sed -e '/perl(AnyEvent::XMPP::IM::Presence)/d' |\
-sed -e '/perl(AnyEvent::XMPP::IM::Roster)/d' |\
-sed -e '/perl(AnyEvent::XMPP::Namespaces)/d' |\
-sed -e '/perl(AnyEvent::XMPP::Node)/d' |\
-sed -e '/perl(AnyEvent::XMPP::Parser)/d' |\
-sed -e '/perl(AnyEvent::XMPP::SimpleConnection)/d' |\
-sed -e '/perl(AnyEvent::XMPP::Util)/d' |\
-sed -e '/perl(AnyEvent::XMPP::Writer)/d'
-EOF
-
-%define __perl_requires %{_builddir}/AnyEvent-XMPP-%{version}/%{name}-req
-chmod +x %{__perl_requires}
-
+for file in samples/*; do
+    sed -i 's/#!.*perl/\/usr\/bin\/perl/' ${file}
+    chmod a-x ${file}
+done
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+perl Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
-make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
-
-%{_fixperms} $RPM_BUILD_ROOT/*
+make pure_install PERL_INSTALL_ROOT=%{buildroot}
+find %{buildroot} -type f -name .packlist -exec rm -f {} \;
+find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;
+%{_fixperms} %{buildroot}/*
 
 %check
 make test
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(-,root,root,-)
-%doc Changes CONTRIBUTORS README TODO
+%doc Changes CONTRIBUTORS README TODO samples
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
 %changelog
+* Tue Jan 24 2012 Petr Šabata <contyk at redhat.com> - 0.52-1
+- 0.52 bump
+- Spec cleanup, remove useless Requires filters
+- Adding samples to doc (and thus adding default_filter to avoid redundant
+  dependency generation, rpm #783442)
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.51-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 54cd60a..7e2669d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d867d4a756c034cd36933dbd61ec1ad0  AnyEvent-XMPP-0.51.tar.gz
+8eae83900004fc24aae01f651423c2a5  AnyEvent-XMPP-0.52.tar.gz