- perl req/prov fix

[packages/perl-Tk.git] / perl-Tk.spec

diff --git a/perl-Tk.spec b/perl-Tk.spec
index e07e1866069e23ca5d97da2e39ce9e7dcc8676c8..5f7818c978832279a7da80cc3cc3a9f7f0997b35 100644 (file)
--- a/perl-Tk.spec
+++ b/perl-Tk.spec
@@ -8,18 +8,23 @@
 Summary:       Tk - a graphical user interface toolkit for Perl
 Summary(pl.UTF-8):     Tk - toolkit graficznego interfejsu użytkownika dla Perla
 Name:          perl-Tk
-Version:       804.030
-Release:       3
+Version:       804.033
+Release:       4
 # same as perl (except pTk dir - BSD-like)
 License:       GPL v1+ or Artistic, parts BSD-like
 Group:         Development/Languages/Perl
 Source0:       http://www.cpan.org/modules/by-authors/id/S/SR/SREZIC/%{pnam}-%{version}.tar.gz
-# Source0-md5: 13275e85f99ee467a86d9598a437abff
+# Source0-md5: 4c6d281ca9c6c2349e5cf84394e638fa
 Patch0:                %{name}-misc.patch
 Patch1:                %{name}-man_section.patch
+Patch2:                %{name}-link.patch
 URL:           http://search.cpan.org/dist/Tk/
 BuildRequires: perl-Tie-Watch
 BuildRequires: perl-devel >= 1:5.8.0
+%if %{with tests}
+BuildRequires: perl-Encode
+BuildRequires: perl-Test-Simple
+%endif
 BuildRequires: rpm-perlprov >= 4.1-13
 BuildRequires: sed >= 4.0
 BuildRequires: xorg-lib-libXft-devel
@@ -27,7 +32,7 @@ Obsoletes:    perl-Tk-JPEG
 Obsoletes:     perl-Tk-PNG
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _noautoreq  'perl(WidgetDemo)'
+%define                _noautoreq_perl WidgetDemo
 
 %description
 Perl Tk extension aims to provide a complete interface to the latest
@@ -58,6 +63,7 @@ graficznego interfejsu użytkownika Tk.
 %setup -q -n %{pnam}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 # sync with current Xlib
@@ -82,7 +88,7 @@ install -d $RPM_BUILD_ROOT{%{perl_vendorlib}/Tk,%{_examplesdir}/%{name}-%{versio
        DESTDIR=$RPM_BUILD_ROOT
 
 # put demos to examples dir. do they work? don't know. didn't test
-mv $RPM_BUILD_ROOT{%{perl_vendorarch}/Tk/demos,%{_examplesdir}/%{name}-%{version}}
+%{__mv} $RPM_BUILD_ROOT{%{perl_vendorarch}/Tk/demos,%{_examplesdir}/%{name}-%{version}}
 
 # perl-Tie-Watch packaged in system
 %{__rm} $RPM_BUILD_ROOT{%{_mandir}/man3/Tie::Watch.3pm,%{perl_vendorarch}/Tie/Watch.pm}
@@ -115,8 +121,9 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_vendorarch}/Tk/[N-Z]*.pm
 %{perl_vendorarch}/Tk/M[a-z]*.pm
 %{perl_vendorarch}/Tk/widgets.pm
+# most of the bitmaps are used by demos
+%{perl_vendorarch}/Tk/*.x[bp]m
 %dir %{perl_vendorarch}/auto/Tk
-%{perl_vendorarch}/auto/Tk/Tk.bs
 %attr(755,root,root) %{perl_vendorarch}/auto/Tk/Tk.so
 %{perl_vendorarch}/auto/Tk/autosplit.ix
 %{perl_vendorarch}/auto/Tk/*.al
@@ -133,7 +140,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{perl_vendorarch}/auto/Tk/JPEG
 %{perl_vendorarch}/auto/Tk/*/autosplit.ix
 %{perl_vendorarch}/auto/Tk/*/*.al
-%{perl_vendorarch}/auto/Tk/*/*.bs
 %{perl_vendorarch}/auto/Tk/*/*.ld
 %attr(755,root,root) %{perl_vendorarch}/auto/Tk/*/*.so
 %{_mandir}/man1/tkjpeg.1p*
@@ -153,8 +159,6 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_vendorarch}/Tk/TkXSUB.def
 %{perl_vendorarch}/Tk/install.pm
 %{perl_vendorarch}/Tk/pTk
-# most of the bitmaps are used by demos
-%{perl_vendorarch}/Tk/*.x[bp]m
 %{perl_vendorarch}/Tk/*.gif
 %{_mandir}/man1/ptked.1p*
 %{_mandir}/man1/ptksh.1p*