- removed obsolete patches

Changed files:
    perl-Template-Toolkit-extras.patch -> 1.2
    perl-Template-Toolkit-paths.patch -> 1.5
    perl-Template-Toolkit.spec -> 1.64

diff --git a/perl-Template-Toolkit-extras.patch b/perl-Template-Toolkit-extras.patch
deleted file mode 100644 (file)
index 87e538e..0000000
--- a/perl-Template-Toolkit-extras.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- Template-Toolkit-2.20/Makefile.PL~ 2008-12-11 14:05:20.000000000 +0100
-+++ Template-Toolkit-2.20/Makefile.PL  2008-12-11 14:11:35.126277920 +0100
-@@ -160,11 +160,11 @@
- version_check();
- mandatory_modules();
- optional_stash_xs();
--#optional_extras();
--#splash_images();
--#html_docs();
--#html_docstyle();
--#html_examples();
-+optional_extras();
-+splash_images();
-+html_docs();
-+html_docstyle();
-+html_examples();
- write_defaults();
- 
- print "\n";

diff --git a/perl-Template-Toolkit-paths.patch b/perl-Template-Toolkit-paths.patch
deleted file mode 100644 (file)
index 9317d3a..0000000
--- a/perl-Template-Toolkit-paths.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -durN Template-Toolkit-2.07.orig/Makefile.PL Template-Toolkit-2.07/Makefile.PL
---- Template-Toolkit-2.07.orig/Makefile.PL     Thu Jan 17 10:33:14 2002
-+++ Template-Toolkit-2.07/Makefile.PL  Thu Jul 11 08:39:42 2002
-@@ -189,20 +189,20 @@
-     return '' unless $main::TT_PREFIX;
-     my $amble =<<'EOF';
- tt2_install ::
--      @$(PERL) bin/tt2inst -v "$(TT_PREFIX)"
-+      @$(PERL) -Mblib bin/tt2inst -v "$(DESTDIR)$(TT_PREFIX)"
- 
- tt2_splash ::
--      @$(PERL) -I$(INST_LIB) -I$(INST_ARCHLIB) bin/gifsplash -v -i "$(TT_PREFIX)"
-+      @$(PERL) -Mblib -I$(INST_LIB) -I$(INST_ARCHLIB) bin/gifsplash -v -i "$(DESTDIR)$(TT_PREFIX)"
- 
- EOF
-     $amble .=<<EOF if $main::TT_BUILD_DOCS;
- tt2_html_docs ::
--      \@\$(PERL) -I\$(INST_LIB) -I\$(INST_ARCHLIB) bin/ttree -v -f "\$(TT_PREFIX)/$TT_DOCS_CFG"
-+      \@\$(PERL) -Mblib -I\$(INST_LIB) -I\$(INST_ARCHLIB) bin/ttree -v -f "\$(DESTDIR)\$(TT_PREFIX)/$TT_DOCS_CFG"
- 
- EOF
-     $amble .=<<EOF if $main::TT_EXAMPLES;
- tt2_examples ::
--      \@\$(PERL) -I\$(INST_LIB) -I\$(INST_ARCHLIB) bin/ttree -v -f "\$(TT_PREFIX)/$TT_EXAMPLE_CFG"
-+      \@\$(PERL) -Mblib -I\$(INST_LIB) -I\$(INST_ARCHLIB) bin/ttree -v -f "\$(DESTDIR)\$(TT_PREFIX)/$TT_EXAMPLE_CFG"
- 
- EOF
-     return $amble;

diff --git a/perl-Template-Toolkit.spec b/perl-Template-Toolkit.spec
index 3a8aec7261a1495f0565e2c527d156a470fba0a1..39e777f00f9360354fb095e91b6f865082d59614 100644 (file)
--- a/perl-Template-Toolkit.spec
+++ b/perl-Template-Toolkit.spec
@@ -16,9 +16,6 @@ License:      GPL v1+ or or Artistic
 Group:         Development/Languages/Perl
 Source0:       http://www.cpan.org/modules/by-module/Template/%{pdir}-%{pnam}-%{version}.tar.gz
 # Source0-md5: d98277f6420e5da6b93d99a8db2b3934
-# seems obsolete
-Patch0:                %{name}-paths.patch
-Patch1:                %{name}-extras.patch
 URL:           http://www.template-toolkit.org/
 BuildRequires: perl(File::Spec) >= 0.6
 BuildRequires: perl-AppConfig >= 1.52
@@ -65,7 +62,6 @@ Summary:      Date plugin for Template Toolkit - date formatting
 Summary(pl.UTF-8):     Wtyczka Date dla pakietu Template Toolkit - formatowanie daty
 Group:         Development/Languages/Perl
 Requires:      %{name} = %{version}-%{release}
-#Requires:     perl-Date-Calc
 Requires:      perl-Date-Manip
 
 %description Plugin-Date
@@ -122,8 +118,6 @@ prosty obiektowy model.
 
 %prep
 %setup -q -n %{pdir}-%{pnam}-%{version}
-#%patch0 -p1
-#%patch1 -p1
 
 %build
 %{__perl} Makefile.PL \
@@ -161,7 +155,8 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc Changes HACKING README TODO
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/tpage
+%attr(755,root,root) %{_bindir}/ttree
 %{perl_vendorarch}/Template.pm
 %{perl_vendorarch}/Template/*.pm
 %{perl_vendorarch}/Template/Stash
@@ -191,7 +186,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{perl_vendorarch}/auto/Template/Stash/XS
 %{perl_vendorarch}/auto/Template/Stash/XS/*.bs
 %attr(755,root,root) %{perl_vendorarch}/auto/Template/Stash/XS/*.so
-%{_mandir}/man1/*
+%{_mandir}/man1/tpage.1*
+%{_mandir}/man1/ttree.1*
 %{_mandir}/man3/Template.*
 %{_mandir}/man3/Template::[!P]*
 %{_mandir}/man3/Template::P[!l]*