diff --git a/subversion-1.9.4-swig-3.0.10.patch b/subversion-1.9.4-swig-3.0.10.patch new file mode 100644 index 0000000..df2e4e0 --- /dev/null +++ b/subversion-1.9.4-swig-3.0.10.patch @@ -0,0 +1,33 @@ +Index: subversion/bindings/swig/include/proxy.swg +=================================================================== +--- subversion/bindings/swig/include/proxy.swg (revision 1658942) ++++ subversion/bindings/swig/include/proxy.swg (working copy) +@@ -83,13 +83,13 @@ + + value = _swig_getattr(self, self.__class__, name) + +- # If we got back a different object than we have, we need to copy all our +- # metadata into it, so that it looks identical ++%{ # If we got back a different object than we have, we need to copy all our ++ # metadata into it, so that it looks identical%} + members = self.__dict__.get("_members") + if members is not None: + _copy_metadata_deep(value, members.get(name)) + +- # Verify that the new object is good ++%{ # Verify that the new object is good}% + _assert_valid_deep(value) + + return value +@@ -98,9 +98,9 @@ + """Set an attribute on this object""" + self.assert_valid() + +- # Save a copy of the object, so that the garbage ++%{ # Save a copy of the object, so that the garbage + # collector won't kill the object while it's in +- # SWIG-land ++ # SWIG-land%} + self.__dict__.setdefault("_members",{})[name] = value + + return _swig_setattr(self, self.__class__, name, value) diff --git a/subversion.spec b/subversion.spec index eddd75f..75084bc 100644 --- a/subversion.spec +++ b/subversion.spec @@ -10,7 +10,7 @@ %define svn2cl_version 0.11 Name: subversion Version: 1.9.4 -Release: 1mamba +Release: 2mamba Summary: A version control system that is a compelling replacement for CVS Group: Development/Tools Vendor: openmamba @@ -28,6 +28,7 @@ Patch3: subversion-1.6.0-pie.patch Patch4: subversion-1.6.0-java.patch Patch5: subversion-1.6.6-kwallet.patch Patch6: subversion-1.6.0-ruby185.patch +Patch7: subversion-1.9.4-swig-3.0.10.patch License: Apache License, BSD ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -159,6 +160,8 @@ svn2cl is a simple XSL transformation and shell script wrapper forgenerating a c %prep %setup -q +#-D -T +#:<< _EOF #pushd contrib/client-side/svn2cl #%patch0 -p1 -b .newlines #popd @@ -170,6 +173,7 @@ svn2cl is a simple XSL transformation and shell script wrapper forgenerating a c #%endif #%patch5 -p1 -b .kwallet %patch6 -p1 +%patch7 -p0 #sed -i -e 's|^XSL="$dir/|XSL="%{_datadir}/svn2cl/|' \ # contrib/client-side/svn2cl/svn2cl.sh @@ -408,6 +412,9 @@ fi #%{_mandir}/man1/svn2cl.1.gz %changelog +* Wed Nov 09 2016 Silvan Calarco 1.9.4-2mamba +- perl 5.24 mass rebuild + * Sat May 28 2016 Automatic Build System 1.9.4-1mamba - automatic version update by autodist