- should be ready for perl-5.8.0; release++

Changed files:
    perl-Tk.spec -> 1.40

diff --git a/perl-Tk.spec b/perl-Tk.spec
index 9271fffe6782f7813a8b3f9b80b633c4680e5a70..94ae23e80996ab27f2c47f78ad9557d7c0cabb45 100644 (file)
--- a/perl-Tk.spec
+++ b/perl-Tk.spec
@@ -1,6 +1,12 @@
+# 
+# TODO:
+# - move *license* files to %%docdir
+# - better summaries / descriptions
+# - do something with the demos (AAArgh!)
+#
 %include       /usr/lib/rpm/macros.perl
-%define                pdir    Tk
-%define                pnam    Tk
+%define        pdir    Tk
+%define        pnam    Tk
 Summary:       Tk Perl module
 Summary(cs):   Modul Tk pro Perl
 Summary(da):   Perlmodul Tk
@@ -20,7 +26,7 @@ Summary(uk):  
 Summary(zh_CN):        Tk Perl Ä£¿é
 Name:          perl-Tk
 Version:       800.024
-Release:       1
+Release:       2
 License:       GPL
 Group:         Development/Languages/Perl
 Source0:       http://www.cpan.org/modules/by-module/%{pdir}/%{pnam}-%{version}.tar.gz
@@ -30,10 +36,12 @@ Patch2:             %{name}-man_section.patch
 BuildRequires: XFree86-devel
 BuildRequires: perl-Tie-Watch
 BuildRequires: perl-devel >= 5.6.1
-BuildRequires: rpm-perlprov >= 3.0.3-16
+BuildRequires: rpm-perlprov >= 4.1-13
 Provides:      perl(Tk::LabRadio)
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                _noautoreq      'perl(Plot)'
+
 %description
 This package gives you the ability to develop perl applications using
 the Tk GUI.
@@ -49,19 +57,20 @@ wykorzystaniem GUI Tk.
 %patch2 -p1
 
 %build
-%{__perl} Makefile.PL
+%{__perl} Makefile.PL \
+       INSTALLDIRS=vendor 
 %{__perl} -pi -e 's/<default.h>/"default.h"/g' pTk/tixDef.h
 %{__make} OPTIMIZE="%{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{perl_sitelib}/Tk
+install -d $RPM_BUILD_ROOT%{perl_vendorlib}/Tk
 
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{perl_sitearch}/{auto/Tk/.packlist,Tk/reindex.pl} \
+rm -f  $RPM_BUILD_ROOT%{perl_vendorarch}/{auto/Tk/.packlist,Tk/reindex.pl} \
        $RPM_BUILD_ROOT%{_mandir}/man3/Tie::Watch.3pm \
-       $RPM_BUILD_ROOT%{perl_sitearch}/Tk/*.pod
+       $RPM_BUILD_ROOT%{perl_vendorarch}/Tk/*.pod
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -70,27 +79,27 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc Changes README README.linux ToDo Funcs.doc
 %attr(755,root,root) %{_bindir}/*
-%dir %{perl_sitelib}/Tk
-%{perl_sitearch}/Tk.pm
-%{perl_sitearch}/Tk
-%dir %{perl_sitearch}/auto/Tk
-%{perl_sitearch}/auto/Tk/Tk.bs
-%attr(755,root,root) %{perl_sitearch}/auto/Tk/Tk.so
-%{perl_sitearch}/auto/Tk/autosplit.ix
-%{perl_sitearch}/auto/Tk/*.al
-%dir %{perl_sitearch}/auto/Tk/[BHLMNPWXp]*
-%dir %{perl_sitearch}/auto/Tk/Canvas
-%dir %{perl_sitearch}/auto/Tk/C[lo]*
-%dir %{perl_sitearch}/auto/Tk/Entry
-%dir %{perl_sitearch}/auto/Tk/Event
-%dir %{perl_sitearch}/auto/Tk/Frame
-%dir %{perl_sitearch}/auto/Tk/IO
-%dir %{perl_sitearch}/auto/Tk/InputO
-%dir %{perl_sitearch}/auto/Tk/Sc*
-%dir %{perl_sitearch}/auto/Tk/T[Laeio]*
-%{perl_sitearch}/auto/Tk/*/autosplit.ix
-%{perl_sitearch}/auto/Tk/*/*.al
-%{perl_sitearch}/auto/Tk/*/*.bs
-%{perl_sitearch}/auto/Tk/*/*.ld
-%attr(755,root,root) %{perl_sitearch}/auto/Tk/*/*.so
+%dir %{perl_vendorlib}/Tk
+%{perl_vendorarch}/Tk.pm
+%{perl_vendorarch}/Tk
+%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
+%dir %{perl_vendorarch}/auto/Tk/[BHLMNPWXp]*
+%dir %{perl_vendorarch}/auto/Tk/Canvas
+%dir %{perl_vendorarch}/auto/Tk/C[lo]*
+%dir %{perl_vendorarch}/auto/Tk/Entry
+%dir %{perl_vendorarch}/auto/Tk/Event
+%dir %{perl_vendorarch}/auto/Tk/Frame
+%dir %{perl_vendorarch}/auto/Tk/IO
+%dir %{perl_vendorarch}/auto/Tk/InputO
+%dir %{perl_vendorarch}/auto/Tk/Sc*
+%dir %{perl_vendorarch}/auto/Tk/T[Laeio]*
+%{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}/man[13]/*