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
This commit is contained in:
Iain Arnell 2011-06-17 18:05:10 +02:00
parent c6f8ece657
commit d4671348bc
3 changed files with 25 additions and 15 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
Tk-804.028_503.tar.gz Tk-804.028_503.tar.gz
/Tk-804.029_500.tar.gz

View File

@ -2,10 +2,10 @@
%define perlver %(eval "`%{__perl} -V:version`"; echo $version) %define perlver %(eval "`%{__perl} -V:version`"; echo $version)
Name: perl-Tk Name: perl-Tk
# devel version fix for perl 5.12: # devel version fix for perl 5.14:
%define real_version 804.028_503 %define real_version 804.029_500
Version: 804.028 Version: 804.029
Release: 16%{?dist} Release: 1%{?dist}
Summary: Perl Graphical User Interface ToolKit Summary: Perl Graphical User Interface ToolKit
Group: Development/Libraries Group: Development/Libraries
@ -18,8 +18,6 @@ Patch1: perl-Tk-debian.patch.gz
# fix segfaults as in #235666 because of broken cashing code # fix segfaults as in #235666 because of broken cashing code
Patch2: perl-Tk-seg.patch Patch2: perl-Tk-seg.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Versions before this have Unicode issues # Versions before this have Unicode issues
BuildRequires: perl-devel >= 3:5.8.3 BuildRequires: perl-devel >= 3:5.8.3
BuildRequires: libjpeg-devel BuildRequires: libjpeg-devel
@ -32,6 +30,19 @@ Provides: perl(Tk::LabRadio) = 4.004
Provides: perl(Tk::TextReindex) Provides: perl(Tk::TextReindex)
Provides: perl(Tk) = %{version} 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 %description
This a re-port of a perl interface to Tk8.4. This a re-port of a perl interface to Tk8.4.
C code is derived from Tcl/Tk8.4.5. 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 # fix for widget as docs
%patch0 %patch0
%{__perl} -pi -e \ %{__perl} -pi -e \
's,\@demopath\@,%{_datadir}/doc/%{name}-%{version}/demos,g' \ 's,\@demopath\@,%{_datadir}/doc/%{name}-%{version}/demos,g' demos/widget
%{_builddir}/Tk-%{version}/demos/widget
# debian patch # debian patch
%patch1 -p1 %patch1 -p1
# patch to fix #235666 ... seems like caching code is broken # patch to fix #235666 ... seems like caching code is broken
@ -66,8 +76,6 @@ make %{?_smp_mflags}
# make test # make test
%install %install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; 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 cp -pR $RPM_BUILD_ROOT%{perl_vendorarch}/Tk/demos __demos
find __demos/ -type f -exec chmod -x {} \; find __demos/ -type f -exec chmod -x {} \;
%clean
rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root,-)
%doc Changes README README.linux ToDo pTk/*license* __demos/demos demos/widget %doc Changes README README.linux ToDo pTk/*license* __demos/demos demos/widget
%doc blib/man1/widget.1 %doc blib/man1/widget.1
%{_bindir}/p* %{_bindir}/p*
@ -97,6 +101,11 @@ rm -rf $RPM_BUILD_ROOT
%exclude %{perl_vendorarch}/Tk/demos %exclude %{perl_vendorarch}/Tk/demos
%changelog %changelog
* Fri Jun 17 2011 Iain Arnell <iarnell@gmail.com> 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@redhat.com> - 804.028-16 * Fri Jun 17 2011 Marcela Mašláňová <mmaslano@redhat.com> - 804.028-16
- Perl mass rebuild - Perl mass rebuild

View File

@ -1 +1 @@
8ec3e456ca0eadd685a574e943d3d9ce Tk-804.028_503.tar.gz f62eb795298300d892ab8c1e5696bfe5 Tk-804.029_500.tar.gz