rpms/subversion
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'master' of ssh://pkgs.fedoraproject.org/subversion

Browse Source 
Conflicts:
	subversion.spec
This commit is contained in:
Joe Orton 2011-07-20 09:28:10 +01:00
commit 83638c4128
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
subversion-MakeMaker.patch Normal file
View File

@ -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 => join(' ', $cflags, $Config{ccflags}),
INC => join(' ',$apr_cflags, $apu_cflags,
" -I$swig_srcdir/perl/libsvn_swig_perl",
" -I$svnlib_srcdir/include",

16
subversion.spec
View File

@ -17,7 +17,7 @@
Summary: A Modern Concurrent Version Control System Summary: A Modern Concurrent Version Control System
Name: subversion Name: subversion
Version: 1.6.17 Version: 1.6.17
Release: 2%{?dist} Release: 3%{?dist}
License: ASL 1.1 License: ASL 1.1
Group: Development/Tools Group: Development/Tools
URL: http://subversion.apache.org/ URL: http://subversion.apache.org/
@ -34,6 +34,7 @@ Patch3: subversion-1.6.1-rpath.patch
Patch6: subversion-1.6.11-pie.patch Patch6: subversion-1.6.11-pie.patch
Patch8: subversion-1.6.6-kwallet.patch Patch8: subversion-1.6.6-kwallet.patch
Patch9: subversion-1.6.12-disable-client-test.patch Patch9: subversion-1.6.12-disable-client-test.patch
Patch10: subversion-MakeMaker.patch
BuildRequires: autoconf, libtool, python, python-devel, texinfo, which BuildRequires: autoconf, libtool, python, python-devel, texinfo, which
BuildRequires: db4-devel >= 4.1.25, swig >= 1.3.24, gettext BuildRequires: db4-devel >= 4.1.25, swig >= 1.3.24, gettext
BuildRequires: apr-devel >= 1.3.0, apr-util-devel >= 1.3.0 BuildRequires: apr-devel >= 1.3.0, apr-util-devel >= 1.3.0
@ -74,8 +75,8 @@ Group: Development/Libraries
Summary: Python bindings for Subversion Version Control system Summary: Python bindings for Subversion Version Control system
%description python %description python
The subversion-python includes the Python bindings to the Subversion The subversion-python package includes the Python bindings to the
libraries. Subversion libraries.
%package devel %package devel
Group: Development/Tools Group: Development/Tools
@ -178,6 +179,7 @@ cd ../../..
%patch6 -p1 -b .pie %patch6 -p1 -b .pie
%patch8 -p1 -b .kwallet %patch8 -p1 -b .kwallet
%patch9 -p1 -b .disable-client-test %patch9 -p1 -b .disable-client-test
%patch10 -p1 -b .eemm
sed -i -e 's|^XSL="$dir/|XSL="%{_datadir}/svn2cl/|' \ sed -i -e 's|^XSL="$dir/|XSL="%{_datadir}/svn2cl/|' \
contrib/client-side/svn2cl/svn2cl.sh contrib/client-side/svn2cl/svn2cl.sh
@ -439,8 +441,12 @@ fi
%{_mandir}/man1/svn2cl.1* %{_mandir}/man1/svn2cl.1*
%changelog %changelog
* Fri Jun 24 2011 Joe Orton <jorton@redhat.com> - 1.6.17-2 * Wed Jul 20 2011 Joe Orton <jorton@redhat.com> - 1.6.17-3
- split out python bindings - split out python subpackage
* Wed Jun 15 2011 Marcela Mašláňová <mmaslano@redhat.com> - 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 <jorton@redhat.com> - 1.6.17-1 * Thu Jun 2 2011 Joe Orton <jorton@redhat.com> - 1.6.17-1
- update to 1.6.17 (#709952) - update to 1.6.17 (#709952)