From 327d234437bf8d1580686916e5e86ee62cb69048bd401c8733ccc4d282d51698 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 11 Mar 2016 21:14:10 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-ExtUtils-MakeMaker?expand=0&rev=34 --- Do_not_set_RPATH_by_default.patch | 28 ++++++++++++++-------------- cpanspec.yml | 27 +++++++++++++++++++++++++++ perl-ExtUtils-MakeMaker.spec | 5 +++-- 3 files changed, 44 insertions(+), 16 deletions(-) create mode 100644 cpanspec.yml diff --git a/Do_not_set_RPATH_by_default.patch b/Do_not_set_RPATH_by_default.patch index 1810f17..3322727 100644 --- a/Do_not_set_RPATH_by_default.patch +++ b/Do_not_set_RPATH_by_default.patch @@ -12,10 +12,10 @@ See . [ddiss@suse.de: also handle LD_RUN_PATH set in MM_Any.pm] --- -Index: ExtUtils-MakeMaker-7.04/lib/ExtUtils/Liblist.pm +Index: ExtUtils-MakeMaker-7.10/lib/ExtUtils/Liblist.pm =================================================================== ---- ExtUtils-MakeMaker-7.04.orig/lib/ExtUtils/Liblist.pm -+++ ExtUtils-MakeMaker-7.04/lib/ExtUtils/Liblist.pm +--- ExtUtils-MakeMaker-7.10.orig/lib/ExtUtils/Liblist.pm ++++ ExtUtils-MakeMaker-7.10/lib/ExtUtils/Liblist.pm @@ -88,6 +88,11 @@ libraries. LD_RUN_PATH is a colon separ in LDLOADLIBS. It is passed as an environment variable to the process that links the shared library. @@ -28,10 +28,10 @@ Index: ExtUtils-MakeMaker-7.04/lib/ExtUtils/Liblist.pm =head2 BSLOADLIBS List of those libraries that are needed but can be linked in -Index: ExtUtils-MakeMaker-7.04/lib/ExtUtils/MM_Unix.pm +Index: ExtUtils-MakeMaker-7.10/lib/ExtUtils/MM_Unix.pm =================================================================== ---- ExtUtils-MakeMaker-7.04.orig/lib/ExtUtils/MM_Unix.pm -+++ ExtUtils-MakeMaker-7.04/lib/ExtUtils/MM_Unix.pm +--- ExtUtils-MakeMaker-7.10.orig/lib/ExtUtils/MM_Unix.pm ++++ ExtUtils-MakeMaker-7.10/lib/ExtUtils/MM_Unix.pm @@ -972,7 +972,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $ } @@ -41,10 +41,10 @@ Index: ExtUtils-MakeMaker-7.04/lib/ExtUtils/MM_Unix.pm $ld_run_path_shell = 'LD_RUN_PATH="$(LD_RUN_PATH)" '; } -Index: ExtUtils-MakeMaker-7.04/lib/ExtUtils/MakeMaker.pm +Index: ExtUtils-MakeMaker-7.10/lib/ExtUtils/MakeMaker.pm =================================================================== ---- ExtUtils-MakeMaker-7.04.orig/lib/ExtUtils/MakeMaker.pm -+++ ExtUtils-MakeMaker-7.04/lib/ExtUtils/MakeMaker.pm +--- ExtUtils-MakeMaker-7.10.orig/lib/ExtUtils/MakeMaker.pm ++++ ExtUtils-MakeMaker-7.10/lib/ExtUtils/MakeMaker.pm @@ -301,7 +301,8 @@ sub full_setup { PERM_DIR PERM_RW PERM_RWX MAGICXS PL_FILES PM PM_FILTER PMLIBDIRS PMLIBPARENTDIRS POLLUTE @@ -83,8 +83,8 @@ Index: ExtUtils-MakeMaker-7.04/lib/ExtUtils/MakeMaker.pm + }; print "MakeMaker (v$VERSION)\n" if $Verbose; - if (-f "MANIFEST" && ! -f "Makefile" && ! $ENV{PERL_CORE}){ -@@ -2714,6 +2735,40 @@ precedence. A typemap in the current di + if (-f "MANIFEST" && ! -f "Makefile" && ! $UNDER_CORE){ +@@ -2711,6 +2732,40 @@ precedence. A typemap in the current di precedence, even if it isn't listed in TYPEMAPS. The default system typemap has lowest precedence. @@ -125,10 +125,10 @@ Index: ExtUtils-MakeMaker-7.04/lib/ExtUtils/MakeMaker.pm =item VENDORPREFIX Like PERLPREFIX, but only for the vendor install locations. -Index: ExtUtils-MakeMaker-7.04/lib/ExtUtils/MM_Any.pm +Index: ExtUtils-MakeMaker-7.10/lib/ExtUtils/MM_Any.pm =================================================================== ---- ExtUtils-MakeMaker-7.04.orig/lib/ExtUtils/MM_Any.pm -+++ ExtUtils-MakeMaker-7.04/lib/ExtUtils/MM_Any.pm +--- ExtUtils-MakeMaker-7.10.orig/lib/ExtUtils/MM_Any.pm ++++ ExtUtils-MakeMaker-7.10/lib/ExtUtils/MM_Any.pm @@ -2275,6 +2275,7 @@ sub init_others { # LD_RUN_PATH now computed by ExtUtils::Liblist ($self->{EXTRALIBS}, $self->{BSLOADLIBS}, diff --git a/cpanspec.yml b/cpanspec.yml new file mode 100644 index 0000000..28e16fa --- /dev/null +++ b/cpanspec.yml @@ -0,0 +1,27 @@ +--- +#description_paragraphs: 3 +#description: |- +# override description from CPAN +#summary: override summary from CPAN +#no_testing: broken upstream +#sources: +# - source1 +# - source2 +patches: + Do_not_set_RPATH_by_default.patch: -p1 +#preamble: |- +# BuildRequires: gcc-c++ +#post_prep: |- +# hunspell=`pkg-config --libs hunspell | sed -e 's,-l,,; s, *,,g'` +# sed -i -e "s,hunspell-X,$hunspell," t/00-prereq.t Makefile.PL +#post_build: |- +# rm unused.files +#post_install: |- +# sed on %{name}.files +#license: SUSE-NonFree +#skip_noarch: 1 +#custom_build: |- +#./Build build flags=%{?_smp_mflags} --myflag +#custom_test: |- +#startserver && make test +#ignore_requires: Bizarre::Module diff --git a/perl-ExtUtils-MakeMaker.spec b/perl-ExtUtils-MakeMaker.spec index 2f67789..c6b0a27 100644 --- a/perl-ExtUtils-MakeMaker.spec +++ b/perl-ExtUtils-MakeMaker.spec @@ -19,12 +19,13 @@ Name: perl-ExtUtils-MakeMaker Version: 7.10 Release: 0 -%define cpan_name ExtUtils-MakeMaker +%define cpan_name ExtUtils-MakeMaker Summary: Create a module Makefile License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/ExtUtils-MakeMaker/ -Source: http://www.cpan.org/authors/id/B/BI/BINGOS/%{cpan_name}-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/B/BI/BINGOS/%{cpan_name}-%{version}.tar.gz +Source1: cpanspec.yml BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl