From 8f4a9803cd723ab0c5ff426c9b482f270a8fa3243d743fb20fa126b36f60f993 Mon Sep 17 00:00:00 2001 From: Pascal Bleser Date: Mon, 27 Dec 2010 10:27:17 +0000 Subject: [PATCH] fix OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-Alien-wxWidgets?expand=0&rev=4 --- perl-Alien-wxWidgets-do_not_build_wxgtk.patch | 11 +++ ...en-wxWidgets-ignore_cbuilder_version.patch | 11 +++ perl-Alien-wxWidgets.changes | 7 ++ perl-Alien-wxWidgets.spec | 80 +++++++++---------- 4 files changed, 68 insertions(+), 41 deletions(-) create mode 100644 perl-Alien-wxWidgets-do_not_build_wxgtk.patch create mode 100644 perl-Alien-wxWidgets-ignore_cbuilder_version.patch diff --git a/perl-Alien-wxWidgets-do_not_build_wxgtk.patch b/perl-Alien-wxWidgets-do_not_build_wxgtk.patch new file mode 100644 index 0000000..dd48a04 --- /dev/null +++ b/perl-Alien-wxWidgets-do_not_build_wxgtk.patch @@ -0,0 +1,11 @@ +--- Build.PL.orig 2010-12-27 01:18:00.000000000 +0100 ++++ Build.PL 2010-12-27 01:18:20.000000000 +0100 +@@ -123,7 +123,7 @@ + # if anything went wrong in the autodetection, revert to the correct + # default + if( !$ok ) { +- $build_wx_dflt = 'yes'; ++ die "not ok"; + } + + # detect wxWidgets using WXDIR/WXWIN environment variables on Win32 diff --git a/perl-Alien-wxWidgets-ignore_cbuilder_version.patch b/perl-Alien-wxWidgets-ignore_cbuilder_version.patch new file mode 100644 index 0000000..e77829a --- /dev/null +++ b/perl-Alien-wxWidgets-ignore_cbuilder_version.patch @@ -0,0 +1,11 @@ +--- Build.PL.orig 2010-12-27 11:20:05.000000000 +0100 ++++ Build.PL 2010-12-27 11:20:22.000000000 +0100 +@@ -44,7 +44,7 @@ + 'Module::Pluggable' => '2.6', + }, + build_requires => { 'Module::Build' => '0.28', +- 'ExtUtils::CBuilder' => '0.24', ++ 'ExtUtils::CBuilder' => 0, + 'File::Spec' => '1.50', + }, + configure_requires => { 'Module::Build' => '0.28', diff --git a/perl-Alien-wxWidgets.changes b/perl-Alien-wxWidgets.changes index 2082280..812b12c 100644 --- a/perl-Alien-wxWidgets.changes +++ b/perl-Alien-wxWidgets.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Dec 27 00:37:45 UTC 2010 - pascal.bleser@opensuse.org + +- spec file rewrite + +- added patch to prevent building wxGTK + ------------------------------------------------------------------- Wed Dec 1 13:30:35 UTC 2010 - coolo@novell.com diff --git a/perl-Alien-wxWidgets.spec b/perl-Alien-wxWidgets.spec index df90d7e..889eb20 100644 --- a/perl-Alien-wxWidgets.spec +++ b/perl-Alien-wxWidgets.spec @@ -1,63 +1,61 @@ -# -# spec file for package perl-Alien-wxWidgets (Version 0.51) -# -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - - -%define cpan_name Alien-wxWidgets +# vim: set sw=4 ts=4 et nu: Name: perl-Alien-wxWidgets Version: 0.51 -Release: 1 -License: GPL+ or Artistic +Release: 0 Summary: Building, finding and using wxWidgets binaries -Url: http://search.cpan.org/dist/Alien-wxWidgets/ +# http://search.cpan.org/CPAN/authors/id/M/MB/MBARBON/Alien-wxWidgets-%{version}.tar.gz +Source: Alien-wxWidgets-%{version}.tar.bz2 +Patch1: perl-Alien-wxWidgets-do_not_build_wxgtk.patch +Patch2: perl-Alien-wxWidgets-ignore_cbuilder_version.patch +URL: http://search.cpan.org/dist/Alien-wxWidgets Group: Development/Libraries/Perl -#Source: http://www.cpan.org/authors/id/M/MB/MBARBON/Alien-wxWidgets-%{version}.tar.gz -Source: %{cpan_name}-%{version}.tar.bz2 +License: Perl License +BuildRoot: %{_tmppath}/build-%{name}-%{version} +Requires: perl = %{perl_version} +BuildRequires: wxGTK-devel BuildRequires: perl -BuildRequires: perl(Module::Build) -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%{perl_requires} -BuildArch: noarch BuildRequires: perl-macros -BuildRequires: perl >= 5.006 BuildRequires: perl(File::Spec) >= 1.50 +BuildRequires: perl(Module::Build) >= 0.28 +BuildRequires: perl(ExtUtils::CBuilder) >= 0.24 +BuildRequires: perl(Module::Build) +BuildRequires: perl(Module::Pluggable) >= 2.6 +BuildRequires: gcc-c++ +Requires: perl(Module::Pluggable) >= 2.6 %description Please see Alien for the manifesto of the Alien namespace. +In short "Alien::wxWidgets" can be used to detect and get configuration +settings from an installed wxWidgets. %prep -%setup -q -n %{cpan_name}-%{version} +%setup -q -n "Alien-wxWidgets-%{version}" +%patch1 +%patch2 %build -%{__perl} Build.PL installdirs=vendor -./Build build flags=%{?_smp_mflags} +yes no | %__perl ./Build.PL +yes no | ./Build + +%install +./Build pure_install --destdir "%{buildroot}" --installdirs vendor +%perl_process_packlist %check ./Build test -%install -./Build install destdir=%{buildroot} create_packlist=0 -%perl_gen_filelist - %clean -%{__rm} -rf %{buildroot} +%{?buildroot:%__rm -rf "%{buildroot}"} -%files -f %{name}.files -%defattr(-,root,root,-) -%doc Changes patches README.txt script +%files +%defattr(-,root,root) +%doc Changes README.txt +%dir %{perl_vendorarch}/Alien +%{perl_vendorarch}/Alien/wxWidgets +%{perl_vendorarch}/Alien/wxWidgets.pm +%dir %{perl_vendorarch}/auto/Alien +%{perl_vendorarch}/auto/Alien/wxWidgets +%doc %{perl_man3dir}/Alien::wxWidgets.%{perl_man3ext}%{ext_man} +%doc %{perl_man3dir}/Alien::wxWidgets::*.%{perl_man3ext}%{ext_man} -%changelog