- created -devel

- enabled XFT

Changed files:
    perl-Tk.spec -> 1.59

diff --git a/perl-Tk.spec b/perl-Tk.spec
index 58f0bee530fc853ea9921953658a7adf6fd9e4c4..476335a96759744836bd8cdba9f99ec723ba5e80 100644 (file)
--- a/perl-Tk.spec
+++ b/perl-Tk.spec
@@ -1,12 +1,8 @@
 # TODO:
-# - move *license* files to %%docdir
 # - better summaries / descriptions
-# - do something with the demos (AAArgh!)
-# - perl-devel-5.8.7-4 marks perl-Tk-800.025-3 (req perl(ExtUtils::MakeMaker))
 #
 # Conditional build:
-%bcond_with    tests   # perform "make test"
-                       # require valid DISPLAY
+%bcond_with    tests   # perform "make test" (requires valid $DISPLAY)
 #
 %include       /usr/lib/rpm/macros.perl
 %define                pdir    Tk
@@ -15,7 +11,7 @@ Summary:      Tk - a graphical user interface toolkit for Perl
 Summary(pl):   Tk - toolkit graficznego interfejsu u¿ytkownika dla Perla
 Name:          perl-Tk
 Version:       804.027
-Release:       0.1
+Release:       0.9
 # same as perl (except pTk dir - BSD-like)
 License:       GPL v1+ or Artistic, parts BSD-like
 Group:         Development/Languages/Perl
@@ -28,21 +24,28 @@ BuildRequires:      XFree86-devel
 BuildRequires: perl-Tie-Watch
 BuildRequires: perl-devel >= 1:5.8.0
 BuildRequires: rpm-perlprov >= 4.1-13
-Provides:      perl(Tk::LabRadio)
+BuildRequires: sed >= 4.0
 Obsoletes:     perl-Tk-JPEG
 Obsoletes:     perl-Tk-PNG
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _noautoreq      'perl(Plot)' 'perl(WidgetDemo)'
-
 %description
-This package gives you the ability to develop perl applications using
-the Tk GUI.
+This package gives you the ability to run Perl applications using the
+Tk GUI.
 
 %description -l pl
 Ten pakiet daje Ci mo¿liwo¶æ tworzenia aplikacji Perla z
 wykorzystaniem GUI Tk.
 
+%package devel
+Summary:       Perl Tk - development files
+Group:         Development/Languages/Perl
+Requires:      %{name} = %{version}-%{release}
+
+%description devel
+This package gives you the ability to develop Perl applications using
+the Tk GUI.
+
 %prep
 %setup -q -n %{pnam}-%{version}
 %patch0 -p1
@@ -51,9 +54,10 @@ wykorzystaniem GUI Tk.
 
 %build
 %{__perl} Makefile.PL \
+       XFT=1 \
        INSTALLDIRS=vendor \
        X11LIB=/usr/X11R6/%{_lib}
-%{__perl} -pi -e 's/<default.h>/"default.h"/g' pTk/tixDef.h
+%{__sed} -i -e 's/<default.h>/"default.h"/g' pTk/tixDef.h
 %{__make} \
        OPTIMIZE="%{rpmcflags}"
 
@@ -61,13 +65,24 @@ wykorzystaniem GUI Tk.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{perl_vendorlib}/Tk
+install -d $RPM_BUILD_ROOT{%{perl_vendorlib}/Tk,%{_examplesdir}/%{name}-%{version}}
 
-%{__make} install \
+%{__make} pure_install \
        DESTDIR=$RPM_BUILD_ROOT
-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_vendorarch}/Tk/*.pod
+
+# 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}}
+
+# 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 -f $RPM_BUILD_ROOT%{perl_vendorarch}/{{auto/Tk/.packlist,Tk/reindex.pl},Tk{,/*}.pod}
+
+# in %doc
+rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/Tk/{Credits,README.*,license.terms}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -75,10 +90,21 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc Changes README README.linux ToDo Funcs.doc
-%attr(755,root,root) %{_bindir}/*
+%doc Tk/Credits Tk/license.terms Tk/README.Adjust
+%attr(755,root,root) %{_bindir}/gedi
+%attr(755,root,root) %{_bindir}/tkjpeg
 %dir %{perl_vendorlib}/Tk
 %{perl_vendorarch}/Tk.pm
-%{perl_vendorarch}/Tk
+%dir %{perl_vendorarch}/Tk
+%{perl_vendorarch}/Tk/DragDrop
+%{perl_vendorarch}/Tk/Event
+%{perl_vendorarch}/Tk/Menu
+%{perl_vendorarch}/Tk/Text
+%{perl_vendorarch}/Tk/[A-L]*.pm
+%{perl_vendorarch}/Tk/[N-Z]*.pm
+%{perl_vendorarch}/Tk/M[a-z]*.pm
+%{perl_vendorarch}/Tk/widgets.pm
+
 %dir %{perl_vendorarch}/auto/Tk
 %{perl_vendorarch}/auto/Tk/Tk.bs
 %attr(755,root,root) %{perl_vendorarch}/auto/Tk/Tk.so
@@ -100,3 +126,22 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_vendorarch}/auto/Tk/*/*.ld
 %attr(755,root,root) %{perl_vendorarch}/auto/Tk/*/*.so
 %{_mandir}/man[13]/*
+
+%files devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/ptked
+%attr(755,root,root) %{_bindir}/ptksh
+%attr(755,root,root) %{_bindir}/widget
+%{perl_vendorarch}/Tk/MMtry.pm
+%{perl_vendorarch}/Tk/MMutil.pm
+%{perl_vendorarch}/Tk/prolog.ps
+%{perl_vendorarch}/Tk/typemap
+%{perl_vendorarch}/Tk/tkGlue*
+%{perl_vendorarch}/Tk/vtab.def
+%{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
+%{_examplesdir}/*