[perl-Tk-ToolBar] 0.12 bump

[Petr Šabata]

commit 36bfae2a3d5fe736beaa7eafd7b41cbb708f36ee
Author: Petr Šabata <contyk at redhat.com>
Date:   Mon Mar 23 13:34:02 2015 +0100

    0.12 bump
    
    - Update source URL
    - Modernize the spec and fix the dep list

 .gitignore                     |  1 +
 Tk-ToolBar-0.12-noarch.patch   | 16 ++++++++++++
 perl-Tk-ToolBar-no-demos.patch | 14 -----------
 perl-Tk-ToolBar.spec           | 55 +++++++++++++++++++++++-------------------
 sources                        |  2 +-
 5 files changed, 48 insertions(+), 40 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9fa83e9..eb50362 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /Tk-ToolBar-0.10.zip
+/Tk-ToolBar-0.12.tar.gz
diff --git a/Tk-ToolBar-0.12-noarch.patch b/Tk-ToolBar-0.12-noarch.patch
new file mode 100644
index 0000000..89d1a93
--- /dev/null
+++ b/Tk-ToolBar-0.12-noarch.patch
@@ -0,0 +1,16 @@
+diff --git a/Makefile.PL b/Makefile.PL
+index c270704..5d12468 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -30,11 +30,6 @@ WriteMakefile1(
+             TARFLAGS => '-c -C -f',
+         },
+     ) : (),
+-	PM               => {
+-		'lib/Tk/ToolBar.pm'       => '$(INST_LIB)/Tk/ToolBar.pm',
+-		'toolbar.pl'       => ($] >= 5.005 ? '$(INST_ARCHLIB)' : '$(INST_LIB)') . '/Tk/demos/widtrib/toolbar.pl',
+-		'ToolBar/tkIcons'  => '$(INST_LIB)/Tk/ToolBar/tkIcons',
+-	},
+ );
+ 
+ sub WriteMakefile1 {  #Written by Alexandr Ciornii, version 0.21. Added by eumm-upgrade.
diff --git a/perl-Tk-ToolBar.spec b/perl-Tk-ToolBar.spec
index 2a9f06d..974e458 100644
--- a/perl-Tk-ToolBar.spec
+++ b/perl-Tk-ToolBar.spec
@@ -1,32 +1,36 @@
 Name:           perl-Tk-ToolBar
-Version:        0.10
-Release:        10%{?dist}
+Version:        0.12
+Release:        1%{?dist}
 Summary:        Toolbar widget for Perl/Tk
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Tk-ToolBar/
-Source0:        http://www.cpan.org/authors/id/C/CH/CHORNY/Tk-ToolBar-%{version}.zip
-# don't install toolbar.pl demo - add to docs instead
-Patch0:         perl-Tk-ToolBar-no-demos.patch
+Source0:        http://search.cpan.org/CPAN/authors/id/A/AS/ASB/Tk-ToolBar-%{version}.tar.gz
+Patch0:         Tk-ToolBar-0.12-noarch.patch
 BuildArch:      noarch
-BuildRequires:  perl >= 0:5.005
+# Build
+BuildRequires:  perl
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.76
+# Runtime
 BuildRequires:  perl(base)
 BuildRequires:  perl(Carp)
-BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  perl(Test)
-BuildRequires:  perl(Test::More)
-BuildRequires:  perl(Test::Pod)
-BuildRequires:  perl(Tk)
+BuildRequires:  perl(POSIX)
+BuildRequires:  perl(strict)
 BuildRequires:  perl(Tk::Balloon)
-BuildRequires:  perl(Tk::CursorControl)
+BuildRequires:  perl(Tk::BrowseEntry)
+# Unused BuildRequires:  perl(Tk::CursorControl)
 BuildRequires:  perl(Tk::Frame)
-BuildRequires:  perl(Tk::LabEntry)
+# Unused BuildRequires:  perl(Tk::LabEntry)
 BuildRequires:  perl(Tk::widgets)
-Requires:       perl(Tk::CursorControl)
+BuildRequires:  perl(vars)
+# Tests only
+BuildRequires:  perl(Test)
+BuildRequires:  perl(Test::More)
+# Optional tests only
+BuildRequires:  perl(Test::Pod) >= 1.14
+Requires:       perl(:MODULE_COMPAT_%(eval "$(perl -V:version)"; echo $version))
+# Optional Requires:       perl(Tk::CursorControl)
 Requires:       perl(Tk::LabEntry)
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-
-%{?perl_default_filter}
 
 %description
 This module implements a dockable toolbar. It is in the same spirit as the
@@ -36,21 +40,17 @@ shortcut buttons).
 
 %prep
 %setup -q -n Tk-ToolBar-%{version}
-%patch0 -p1
-
-# strip CRLF
 find -type f -print0 | xargs -0 sed -i 's/\r$//'
+%patch0 -p1
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1
 make %{?_smp_mflags}
 
 %install
 make pure_install DESTDIR=%{buildroot}
-
-find %{buildroot} -type f -name .packlist -exec rm -f {} \;
-find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;
-
+# Package the demo script in doc instead
+rm -f %{buildroot}/%{perl_vendorlib}/Tk/toolbar.pl
 %{_fixperms} %{buildroot}/*
 
 %check
@@ -62,6 +62,11 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Mon Mar 23 2015 Petr Šabata <contyk at redhat.com> - 0.12-1
+- 0.12 bump
+- Update source URL
+- Modernize the spec and fix the dep list
+
 * Wed Aug 27 2014 Jitka Plesnikova <jplesnik at redhat.com> - 0.10-10
 - Perl 5.20 rebuild
 
diff --git a/sources b/sources
index dd3d6ba..e145094 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c21f0f0320651eac05c5c6071f87df35  Tk-ToolBar-0.10.zip
+a1827609ff99a9ec6795611da805fac4  Tk-ToolBar-0.12.tar.gz