From 85a35a5f40fa7037fae6d5e99d1e9c12e40f1672 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Wed, 15 Jun 2011 09:17:25 +0200 Subject: [PATCH 1/3] Perl mass rebuild --- subversion.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/subversion.spec b/subversion.spec index 7920b87..6246e0a 100644 --- a/subversion.spec +++ b/subversion.spec @@ -17,7 +17,7 @@ Summary: A Modern Concurrent Version Control System Name: subversion Version: 1.6.17 -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 1.1 Group: Development/Tools URL: http://subversion.apache.org/ @@ -428,6 +428,9 @@ fi %{_mandir}/man1/svn2cl.1* %changelog +* Wed Jun 15 2011 Marcela Mašláňová - 1.6.17-2 +- Perl mass rebuild + * Thu Jun 2 2011 Joe Orton - 1.6.17-1 - update to 1.6.17 (#709952) From 5d570fa978dc1d7832b0c2f6b0075fcb41f2da8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Fri, 1 Jul 2011 19:18:28 +0200 Subject: [PATCH 2/3] change cflags in Makefile.PL to work with Perl 5.14.1 --- subversion-MakeMaker.patch | 12 ++++++++++++ subversion.spec | 3 +++ 2 files changed, 15 insertions(+) create mode 100644 subversion-MakeMaker.patch diff --git a/subversion-MakeMaker.patch b/subversion-MakeMaker.patch new file mode 100644 index 0000000..e9f7d6b --- /dev/null +++ b/subversion-MakeMaker.patch @@ -0,0 +1,12 @@ +diff -up subversion-1.6.17/subversion/bindings/swig/perl/native/Makefile.PL.in.eemm subversion-1.6.17/subversion/bindings/swig/perl/native/Makefile.PL.in +--- subversion-1.6.17/subversion/bindings/swig/perl/native/Makefile.PL.in.eemm 2011-07-01 17:56:05.861063423 +0200 ++++ subversion-1.6.17/subversion/bindings/swig/perl/native/Makefile.PL.in 2011-07-01 17:56:28.675942207 +0200 +@@ -43,7 +43,7 @@ chomp $apr_shlib_path_var; + my %config = ( + ABSTRACT => 'Perl bindings for Subversion', + DEFINE => $cppflags, +- CCFLAGS => $cflags, ++ CCFLAGS => $Config{ccflags}, + INC => join(' ',$apr_cflags, $apu_cflags, + " -I$swig_srcdir/perl/libsvn_swig_perl", + " -I$svnlib_srcdir/include", diff --git a/subversion.spec b/subversion.spec index 6246e0a..c2cc239 100644 --- a/subversion.spec +++ b/subversion.spec @@ -34,6 +34,7 @@ Patch3: subversion-1.6.1-rpath.patch Patch6: subversion-1.6.11-pie.patch Patch8: subversion-1.6.6-kwallet.patch Patch9: subversion-1.6.12-disable-client-test.patch +Patch10: subversion-MakeMaker.patch BuildRequires: autoconf, libtool, python, python-devel, texinfo, which BuildRequires: db4-devel >= 4.1.25, swig >= 1.3.24, gettext BuildRequires: apr-devel >= 1.3.0, apr-util-devel >= 1.3.0 @@ -170,6 +171,7 @@ cd ../../.. %patch6 -p1 -b .pie %patch8 -p1 -b .kwallet %patch9 -p1 -b .disable-client-test +%patch10 -p1 -b .eemm sed -i -e 's|^XSL="$dir/|XSL="%{_datadir}/svn2cl/|' \ contrib/client-side/svn2cl/svn2cl.sh @@ -430,6 +432,7 @@ fi %changelog * Wed Jun 15 2011 Marcela Mašláňová - 1.6.17-2 - Perl mass rebuild +- change cflags in Makefile.PL to work with Perl 5.14.1 * Thu Jun 2 2011 Joe Orton - 1.6.17-1 - update to 1.6.17 (#709952) From e89dfaff3229534cd46f98cf3a0e72be0e7ddbf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Mon, 18 Jul 2011 14:12:48 +0200 Subject: [PATCH 3/3] Use upstream version of patch http://svn.apache.org/viewvc?view=revision&revision=1145203 --- subversion-MakeMaker.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subversion-MakeMaker.patch b/subversion-MakeMaker.patch index e9f7d6b..438d0db 100644 --- a/subversion-MakeMaker.patch +++ b/subversion-MakeMaker.patch @@ -6,7 +6,7 @@ diff -up subversion-1.6.17/subversion/bindings/swig/perl/native/Makefile.PL.in.e ABSTRACT => 'Perl bindings for Subversion', DEFINE => $cppflags, - CCFLAGS => $cflags, -+ CCFLAGS => $Config{ccflags}, ++ CCFLAGS => join(' ', $cflags, $Config{ccflags}), INC => join(' ',$apr_cflags, $apu_cflags, " -I$swig_srcdir/perl/libsvn_swig_perl", " -I$svnlib_srcdir/include",