- rebuild for perl 5.20

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

diff --git a/perl-Tk.spec b/perl-Tk.spec
index 12c673fbd4d581efec9d9a44b906e7521e72f998..ee9d4e7bf3f350ab43d4e09d93e4d87c32887d17 100644 (file)
--- a/perl-Tk.spec
+++ b/perl-Tk.spec
@@ -8,15 +8,16 @@
 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.028
+Version:       804.031
 Release:       5
 # 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-module/Tk/%{pnam}-%{version}.tar.gz
-# Source0-md5: 7153c1c411b0dd005a0660179e5c5900
+Source0:       http://www.cpan.org/modules/by-authors/id/S/SR/SREZIC/%{pnam}-%{version}.tar.gz
+# Source0-md5: 57a8afd0563184c17a6470d1ee957f35
 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
@@ -27,7 +28,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,8 +59,12 @@ graficznego interfejsu użytkownika Tk.
 %setup -q -n %{pnam}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
+# sync with current Xlib
+ln -sf /usr/include/X11/Xlib.h pTk/Xlib.h
+
 %{__perl} Makefile.PL \
        XFT=1 \
        INSTALLDIRS=vendor \
@@ -82,15 +87,13 @@ install -d $RPM_BUILD_ROOT{%{perl_vendorlib}/Tk,%{_examplesdir}/%{name}-%{versio
 mv $RPM_BUILD_ROOT{%{perl_vendorarch}/Tk/demos,%{_examplesdir}/%{name}-%{version}}
 
 # perl-Tie-Watch packaged in system
-rm -f $RPM_BUILD_ROOT{%{_mandir}/man3/Tie::Watch.3pm,%{perl_vendorarch}/Tie/Watch.pm}
-
-# other arch
-rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/fix_4_os2.pl
+%{__rm} $RPM_BUILD_ROOT{%{_mandir}/man3/Tie::Watch.3pm,%{perl_vendorarch}/Tie/Watch.pm}
 
-rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/{{auto/Tk/.packlist,Tk/reindex.pl},Tk{,/*}.pod}
+%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/Tk{,/*}.pod
+%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Tk/.packlist
 
 # in %doc
-rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/Tk/{Credits,README.*,license.terms}
+%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/Tk/{Credits,README.*,license.terms}
 
 find $RPM_BUILD_ROOT -type f | xargs sed -i -e "s|/usr/local/bin/perl|%{_bindir}/perl|g"
 
@@ -114,6 +117,8 @@ 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
@@ -152,8 +157,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*