commit d4671348bcee1aba69f30a136b2fe5c0b3272fd4
Author: Iain Arnell <iarnell@xxxxxxxxx>
Date: Fri Jun 17 18:05:10 2011 +0200
update to 804.029_500 development version to fix FTBFS with perl 5.14
clean up spec for modern rpmbuild
use perl_default_filter and filter useless provides
.gitignore | 1 +
perl-Tk.spec | 37 +++++++++++++++++++++++--------------
sources | 2 +-
3 files changed, 25 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5cebbe4..562e0b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
Tk-804.028_503.tar.gz
+/Tk-804.029_500.tar.gz
diff --git a/perl-Tk.spec b/perl-Tk.spec
index 1e8eecd..dd15828 100644
--- a/perl-Tk.spec
+++ b/perl-Tk.spec
@@ -2,10 +2,10 @@
%define perlver %(eval "`%{__perl} -V:version`"; echo $version)
Name: perl-Tk
-# devel version fix for perl 5.12:
-%define real_version 804.028_503
-Version: 804.028
-Release: 16%{?dist}
+# devel version fix for perl 5.14:
+%define real_version 804.029_500
+Version: 804.029
+Release: 1%{?dist}
Summary: Perl Graphical User Interface ToolKit
Group: Development/Libraries
@@ -18,8 +18,6 @@ Patch1: perl-Tk-debian.patch.gz
# fix segfaults as in #235666 because of broken cashing code
Patch2: perl-Tk-seg.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
# Versions before this have Unicode issues
BuildRequires: perl-devel >= 3:5.8.3
BuildRequires: libjpeg-devel
@@ -32,6 +30,19 @@ Provides: perl(Tk::LabRadio) = 4.004
Provides: perl(Tk::TextReindex)
Provides: perl(Tk) = %{version}
+%{?perl_default_filter}
+%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}perl\\(Tk\\)
+%global __provides_exclude %__provides_exclude|perl\\(Tk::Clipboard\\)
+%global __provides_exclude %__provides_exclude|perl\\(Tk::Frame\\)
+%global __provides_exclude %__provides_exclude|perl\\(Tk::Listbox\\)
+%global __provides_exclude %__provides_exclude|perl\\(Tk::Scale\\)
+%global __provides_exclude %__provides_exclude|perl\\(Tk::Scrollbar\\)
+%global __provides_exclude %__provides_exclude|perl\\(Tk::Table\\)
+%global __provides_exclude %__provides_exclude|perl\\(Tk::Toplevel\\)
+%global __provides_exclude %__provides_exclude|perl\\(Tk::Widget\\)
+%global __provides_exclude %__provides_exclude|perl\\(Tk::Wm\\)
+
+
%description
This a re-port of a perl interface to Tk8.4.
C code is derived from Tcl/Tk8.4.5.
@@ -49,8 +60,7 @@ chmod -x pod/Popup.pod Tixish/lib/Tk/balArrow.xbm
# fix for widget as docs
%patch0
%{__perl} -pi -e \
-'s,\@demopath\@,%{_datadir}/doc/%{name}-%{version}/demos,g' \
-%{_builddir}/Tk-%{version}/demos/widget
+'s,\@demopath\@,%{_datadir}/doc/%{name}-%{version}/demos,g' demos/widget
# debian patch
%patch1 -p1
# patch to fix #235666 ... seems like caching code is broken
@@ -66,8 +76,6 @@ make %{?_smp_mflags}
# make test
%install
-rm -rf $RPM_BUILD_ROOT
-
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
@@ -79,11 +87,7 @@ mkdir __demos
cp -pR $RPM_BUILD_ROOT%{perl_vendorarch}/Tk/demos __demos
find __demos/ -type f -exec chmod -x {} \;
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
-%defattr(-,root,root,-)
%doc Changes README README.linux ToDo pTk/*license* __demos/demos demos/widget
%doc blib/man1/widget.1
%{_bindir}/p*
@@ -97,6 +101,11 @@ rm -rf $RPM_BUILD_ROOT
%exclude %{perl_vendorarch}/Tk/demos
%changelog
+* Fri Jun 17 2011 Iain Arnell <iarnell@xxxxxxxxx> 804.029-1
+- update to 804.029_500 development version to fix FTBFS with perl 5.14
+- clean up spec for modern rpmbuild
+- use perl_default_filter and filter useless provides
+
* Fri Jun 17 2011 Marcela Mašláňová <mmaslano@xxxxxxxxxx> - 804.028-16
- Perl mass rebuild
diff --git a/sources b/sources
index fd26459..c88ee22 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8ec3e456ca0eadd685a574e943d3d9ce Tk-804.028_503.tar.gz
+f62eb795298300d892ab8c1e5696bfe5 Tk-804.029_500.tar.gz
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
