From ed93e1700369ae3bc04b7e02edd21a3d4ee004bdde0926eb1ac0c1f8aecd39cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Schr=C3=B6der?= <mls@suse.com>
Date: Fri, 13 Jan 2012 13:51:12 +0000
Subject: [PATCH] bring back NDBM_File [bnc#732929]

OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl?expand=0&rev=71
---
 perl-5.14.2.dif | 10 ----------
 perl.changes    |  5 +++++
 perl.spec       | 24 +++++++++++-------------
 3 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/perl-5.14.2.dif b/perl-5.14.2.dif
index 4386f36..cf02635 100644
--- a/perl-5.14.2.dif
+++ b/perl-5.14.2.dif
@@ -372,16 +372,6 @@
 +# module, so add cccdlflags if we're going for a shared libperl
 +$self->{CCFLAGS} = ($self->{CCFLAGS} || $Config{ccflags}) . " $Config{cccdlflags}" if $Config{'useshrplib'} eq 'true';
  1;
---- ./ext/NDBM_File/Makefile.PL.orig	2011-04-13 11:36:34.000000000 +0000
-+++ ./ext/NDBM_File/Makefile.PL	2011-06-17 09:05:57.000000000 +0000
-@@ -2,6 +2,7 @@ use ExtUtils::MakeMaker;
- WriteMakefile(
-     NAME	=> 'NDBM_File',
-     LIBS => ["-L/usr/local/lib -lndbm", "-ldbm -lucb"],
-+    CCFLAGS => '-I/usr/include/db1 -Dbool=char -DHAS_BOOL',
-     XSPROTOARG => '-noprototypes', 		# XXX remove later?
-     VERSION_FROM => 'NDBM_File.pm',
-     INC => ($^O eq "MacOS" ? "-i ::::db:include" : "")
 --- ./ext/ODBM_File/Makefile.PL.orig	2011-04-13 11:36:34.000000000 +0000
 +++ ./ext/ODBM_File/Makefile.PL	2011-06-17 09:05:57.000000000 +0000
 @@ -1,7 +1,7 @@
diff --git a/perl.changes b/perl.changes
index 2ee5c88..b5032ef 100644
--- a/perl.changes
+++ b/perl.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jan 13 14:50:25 CET 2012 - mls@suse.de
+
+- bring back NDBM_File [bnc#732929]
+
 -------------------------------------------------------------------
 Tue Oct 25 15:20:26 CEST 2011 - mls@suse.de
 
diff --git a/perl.spec b/perl.spec
index 33db68e..d498f15 100644
--- a/perl.spec
+++ b/perl.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package perl
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 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
@@ -14,18 +14,16 @@
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
-
 # icecream 0
 
 
 Name:           perl
 Summary:        The Perl interpreter
-Version:        5.14.2
-Release:        1
-%define pversion 5.14.2
 License:        Artistic-1.0 ; GPL-2.0+
 Group:          Development/Languages/Perl
-AutoReqProv:    on
+Version:        5.14.2
+Release:        0
+%define pversion 5.14.2
 Url:            http://www.perl.org/
 Source:         perl-5.14.2.tar.bz2
 Source1:        %name-rpmlintrc
@@ -43,7 +41,11 @@ Patch7:         perl-cbuilder-ccflags.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         perl-base = %version
 #PreReq:         %fillup_prereq
-BuildRequires:  db-devel gdbm-devel libbz2-devel ncurses-devel zlib-devel
+BuildRequires:  db-devel
+BuildRequires:  gdbm-devel
+BuildRequires:  libbz2-devel
+BuildRequires:  ncurses-devel
+BuildRequires:  zlib-devel
 #Requires:       gzip	# needed in SuSEconfig.perl
 Suggests:       perl-doc = %version
 #
@@ -86,8 +88,6 @@ Some of the modules available on CPAN can be found in the "perl"
 series.
 
 %package base
-License:        Artistic-1.0 ; GPL-2.0+
-Group:          Development/Languages/Perl
 Summary:        The Perl interpreter
 Provides:       perl-Digest perl-Digest-MD5
 %if "%version" != "%pversion"
@@ -113,8 +113,6 @@ This package contains only some basic modules and the perl binary
 itself.
 
 %package doc
-License:        Artistic-1.0 ; GPL-2.0+
-Group:          Development/Languages/Perl
 Summary:        Perl Documentation
 Requires:       perl = %{version}
 Provides:       perl:/usr/share/man/man3/CORE.3pm.gz
@@ -155,7 +153,7 @@ options="$options -Duse64bitint"
 options="$options -Accflags='-DPERL_USE_SAFE_PUTENV'"
 options="$options -Dotherlibdirs=/usr/lib/perl5/site_perl"
 chmod 755 ./configure.gnu
-./configure.gnu --prefix=/usr -Dvendorprefix=/usr -Dinstallusrbinperl -Dusethreads -Di_db -Di_dbm -Di_ndbm -Di_gdbm -Duseshrplib=\'true\' $options
+./configure.gnu --prefix=/usr -Dvendorprefix=/usr -Dinstallusrbinperl -Dusethreads -Di_db -Di_dbm -Di_ndbm -Di_gdbm -Dd_dbm_open -Duseshrplib=\'true\' $options
 make %{?_smp_mflags}
 cp -p libperl.so savelibperl.so
 cp -p lib/Config.pm saveConfig.pm
@@ -164,7 +162,7 @@ make clean > /dev/null
 make clobber
 rm -rf lib
 mv savelib lib
-./configure.gnu --prefix=/usr -Dvendorprefix=/usr -Dinstallusrbinperl -Dusethreads -Di_db -Di_dbm -Di_ndbm -Di_gdbm $options
+./configure.gnu --prefix=/usr -Dvendorprefix=/usr -Dinstallusrbinperl -Dusethreads -Di_db -Di_dbm -Di_ndbm -Di_gdbm -Dd_dbm_open $options
 make %{?_smp_mflags}
 
 %check