From ec3e240dc4cb580152fee88524719d6b58f2deb9 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 14 Feb 2025 01:35:38 +0100 Subject: [PATCH] rebuilt to fix missing provides in perl-subversion [release 1.14.5-2mamba;Thu Feb 13 2025] --- subversion-1.14.0-swig-4.0.2.patch | 111 ----------------------------- subversion-1.14.2-swig-4.1.1.patch | 64 ----------------- subversion.spec | 24 +++---- 3 files changed, 10 insertions(+), 189 deletions(-) delete mode 100644 subversion-1.14.0-swig-4.0.2.patch delete mode 100644 subversion-1.14.2-swig-4.1.1.patch diff --git a/subversion-1.14.0-swig-4.0.2.patch b/subversion-1.14.0-swig-4.0.2.patch deleted file mode 100644 index 5b8b24d..0000000 --- a/subversion-1.14.0-swig-4.0.2.patch +++ /dev/null @@ -1,111 +0,0 @@ -diff -ru subversion-1.14.0/subversion/bindings/swig/ruby/core.c subversion-1.14.0.patched/subversion/bindings/swig/ruby/core.c ---- subversion-1.14.0/subversion/bindings/swig/ruby/core.c 2020-12-11 12:43:34.944166580 +0000 -+++ subversion-1.14.0.patched/subversion/bindings/swig/ruby/core.c 2020-12-11 12:23:10.686191643 +0000 -@@ -1344,6 +1344,7 @@ - - /* For backward compatibility only */ - #define SWIG_POINTER_EXCEPTION 0 -+#define SWIG_POINTER_NO_NULL 0x4 - - /* for raw pointers */ - #define SWIG_ConvertPtr(obj, pptr, type, flags) SWIG_Ruby_ConvertPtrAndOwn(obj, pptr, type, flags, 0) -diff -ru subversion-1.14.0/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion-1.14.0.patched/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h ---- subversion-1.14.0/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h 2020-12-11 12:41:32.158375688 +0000 -+++ subversion-1.14.0.patched/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h 2020-12-11 12:18:16.003491807 +0000 -@@ -22,6 +22,8 @@ - #ifndef SVN_SWIG_SWIGUTIL_RB_H - #define SVN_SWIG_SWIGUTIL_RB_H - -+#define SWIG_POINTER_NO_NULL 0x4 -+ - /* Windows hack: Allow overriding some defaults */ - #include "swigutil_rb__pre_ruby.h" - #include -diff -ru subversion-1.14.0/subversion/bindings/swig/ruby/svn_client.c subversion-1.14.0.patched/subversion/bindings/swig/ruby/svn_client.c ---- subversion-1.14.0/subversion/bindings/swig/ruby/svn_client.c 2020-12-11 12:43:41.180054387 +0000 -+++ subversion-1.14.0.patched/subversion/bindings/swig/ruby/svn_client.c 2020-12-11 12:19:35.126068810 +0000 -@@ -1592,6 +1592,8 @@ - return oldown; - } - -+#define SWIG_POINTER_NO_NULL 0x4 -+ - /* Convert a pointer value */ - SWIGRUNTIME int - SWIG_Ruby_ConvertPtrAndOwn(VALUE obj, void **ptr, swig_type_info *ty, int flags, swig_ruby_owntype *own) -diff -ru subversion-1.14.0/subversion/bindings/swig/ruby/svn_delta.c subversion-1.14.0.patched/subversion/bindings/swig/ruby/svn_delta.c ---- subversion-1.14.0/subversion/bindings/swig/ruby/svn_delta.c 2020-12-11 12:43:43.364015094 +0000 -+++ subversion-1.14.0.patched/subversion/bindings/swig/ruby/svn_delta.c 2020-12-11 12:31:07.965605741 +0000 -@@ -1344,6 +1344,7 @@ - - /* For backward compatibility only */ - #define SWIG_POINTER_EXCEPTION 0 -+#define SWIG_POINTER_NO_NULL 0x4 - - /* for raw pointers */ - #define SWIG_ConvertPtr(obj, pptr, type, flags) SWIG_Ruby_ConvertPtrAndOwn(obj, pptr, type, flags, 0) -diff -ru subversion-1.14.0/subversion/bindings/swig/ruby/svn_diff.c subversion-1.14.0.patched/subversion/bindings/swig/ruby/svn_diff.c ---- subversion-1.14.0/subversion/bindings/swig/ruby/svn_diff.c 2020-12-11 12:43:44.791989402 +0000 -+++ subversion-1.14.0.patched/subversion/bindings/swig/ruby/svn_diff.c 2020-12-11 12:32:07.604532775 +0000 -@@ -1344,6 +1344,7 @@ - - /* For backward compatibility only */ - #define SWIG_POINTER_EXCEPTION 0 -+#define SWIG_POINTER_NO_NULL 0x4 - - /* for raw pointers */ - #define SWIG_ConvertPtr(obj, pptr, type, flags) SWIG_Ruby_ConvertPtrAndOwn(obj, pptr, type, flags, 0) -diff -ru subversion-1.14.0/subversion/bindings/swig/ruby/svn_fs.c subversion-1.14.0.patched/subversion/bindings/swig/ruby/svn_fs.c ---- subversion-1.14.0/subversion/bindings/swig/ruby/svn_fs.c 2020-12-11 12:43:47.639938163 +0000 -+++ subversion-1.14.0.patched/subversion/bindings/swig/ruby/svn_fs.c 2020-12-11 12:32:38.795971606 +0000 -@@ -1344,6 +1344,7 @@ - - /* For backward compatibility only */ - #define SWIG_POINTER_EXCEPTION 0 -+#define SWIG_POINTER_NO_NULL 0x4 - - /* for raw pointers */ - #define SWIG_ConvertPtr(obj, pptr, type, flags) SWIG_Ruby_ConvertPtrAndOwn(obj, pptr, type, flags, 0) -diff -ru subversion-1.14.0/subversion/bindings/swig/ruby/svn_ra.c subversion-1.14.0.patched/subversion/bindings/swig/ruby/svn_ra.c ---- subversion-1.14.0/subversion/bindings/swig/ruby/svn_ra.c 2020-12-11 12:43:50.859880231 +0000 -+++ subversion-1.14.0.patched/subversion/bindings/swig/ruby/svn_ra.c 2020-12-11 12:33:52.366647984 +0000 -@@ -1344,6 +1344,7 @@ - - /* For backward compatibility only */ - #define SWIG_POINTER_EXCEPTION 0 -+#define SWIG_POINTER_NO_NULL 0x4 - - /* for raw pointers */ - #define SWIG_ConvertPtr(obj, pptr, type, flags) SWIG_Ruby_ConvertPtrAndOwn(obj, pptr, type, flags, 0) -diff -ru subversion-1.14.0/subversion/bindings/swig/ruby/svn_repos.c subversion-1.14.0.patched/subversion/bindings/swig/ruby/svn_repos.c ---- subversion-1.14.0/subversion/bindings/swig/ruby/svn_repos.c 2020-12-11 12:43:54.719810785 +0000 -+++ subversion-1.14.0.patched/subversion/bindings/swig/ruby/svn_repos.c 2020-12-11 12:36:33.175754821 +0000 -@@ -1344,6 +1344,7 @@ - - /* For backward compatibility only */ - #define SWIG_POINTER_EXCEPTION 0 -+#define SWIG_POINTER_NO_NULL 0x4 - - /* for raw pointers */ - #define SWIG_ConvertPtr(obj, pptr, type, flags) SWIG_Ruby_ConvertPtrAndOwn(obj, pptr, type, flags, 0) -diff -ru subversion-1.14.0/subversion/bindings/swig/ruby/svn_wc.c subversion-1.14.0.patched/subversion/bindings/swig/ruby/svn_wc.c ---- subversion-1.14.0/subversion/bindings/swig/ruby/svn_wc.c 2020-12-11 12:44:01.291692546 +0000 -+++ subversion-1.14.0.patched/subversion/bindings/swig/ruby/svn_wc.c 2020-12-11 12:38:09.194027318 +0000 -@@ -1344,6 +1344,7 @@ - - /* For backward compatibility only */ - #define SWIG_POINTER_EXCEPTION 0 -+#define SWIG_POINTER_NO_NULL 0x4 - - /* for raw pointers */ - #define SWIG_ConvertPtr(obj, pptr, type, flags) SWIG_Ruby_ConvertPtrAndOwn(obj, pptr, type, flags, 0) ---- subversion-1.14.0/subversion/bindings/swig/ruby/svn_client.c.orig 2020-12-12 11:38:18.042302678 +0100 -+++ subversion-1.14.0/subversion/bindings/swig/ruby/svn_client.c 2020-12-12 11:38:50.765891669 +0100 -@@ -1344,6 +1344,7 @@ - - /* For backward compatibility only */ - #define SWIG_POINTER_EXCEPTION 0 -+#define SWIG_POINTER_NO_NULL 0x4 - - /* for raw pointers */ - #define SWIG_ConvertPtr(obj, pptr, type, flags) SWIG_Ruby_ConvertPtrAndOwn(obj, pptr, type, flags, 0) diff --git a/subversion-1.14.2-swig-4.1.1.patch b/subversion-1.14.2-swig-4.1.1.patch deleted file mode 100644 index 3478f2c..0000000 --- a/subversion-1.14.2-swig-4.1.1.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 8ff4cfd06ce554e9df31a088c9d09f45278c6de4 Mon Sep 17 00:00:00 2001 -From: Yasuhito Futatsuki -Date: Tue, 20 Sep 2022 12:57:06 +0000 -Subject: [PATCH] swig-py: Fix conditionals by SWIG version and by Python -version for proxy code. - -We are using different code for proxy object, by Python version and by SWIG -version. The distinguish between Python 2 and Python 3 was done by SWIG -macro "SWIGPYTHON_PY3". However, the macro was dropped since SWIG commit -a343b7e[1], between SWIG 4.0.2 release and upcoming SWIG 4.1.0 release. - -As we already dropped support for the combination of SWIG >= 4.0 and Python 2, -we should detect Python 2 only in SWIG < 4.0 case. So we can rely on the macro -only in the case. - -* subversion/bindings/swig/include/proxy.swg (): -Reorder the conditionals distinguish SWIG versions and Python versions, -as described above. - -Found by: Jitka Plesnikova (jplesnik {_AT_} redhat.com) - -Suggested by: Julien Schueller (schueller {_AT_} phimeca.com) [2] - -[1] https://github.com/swig/swig/commit/a343b7e254567a64761bc1be7dc55b7b7424ec52 -[2] https://github.com/swig/swig/issues/2373#issuecomment-1250997124 - - -git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1904167 13f79535-47bb-0310-9956-ffa450edef68 ---- - subversion/bindings/swig/include/proxy.swg | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/subversion/bindings/swig/include/proxy.swg b/subversion/bindings/swig/include/proxy.swg -index ac67d434ca..7d2d0dd033 100644 ---- a/subversion/bindings/swig/include/proxy.swg -+++ b/subversion/bindings/swig/include/proxy.swg -@@ -66,7 +66,6 @@ - fn() - - %} --#if defined(SWIGPYTHON_PY3) - #if SWIG_VERSION >= 0x040000 - %pythoncode %{ - # -classic and -modern options have been dropped and this variable -@@ -76,7 +75,7 @@ - _set_instance_attr = _swig_setattr_nondynamic_instance_variable(object.__setattr__) - - %} --#else -+#elif defined(SWIGPYTHON_PY3) - %pythoncode %{ - # SWIG classes generated with -modern do not define this variable - try: -@@ -90,7 +89,6 @@ - _set_instance_attr = _swig_setattr_nondynamic_method(object.__setattr__) - - %} --#endif - #else - %pythoncode %{ - # SWIG classes generated with -classic do not define this variable, --- -2.37.3 - diff --git a/subversion.spec b/subversion.spec index 0c96ed7..5a19bb5 100644 --- a/subversion.spec +++ b/subversion.spec @@ -9,8 +9,8 @@ %define swigdirs swig_pydir=%{python3_sitearch}/libsvn swig_pydir_extra=%{python3_sitearch}/svn %define svn2cl_version 0.11 Name: subversion -Version: 1.14.4 -Release: 1mamba +Version: 1.14.5 +Release: 2mamba Summary: A version control system that is a compelling replacement for CVS Group: Development/Tools Vendor: openmamba @@ -20,9 +20,7 @@ URL: https://subversion.apache.org/ Source0: https://www.apache.org/dist/subversion/subversion-%{version}.tar.bz2 Source1: http://www.xsteve.at/prg/emacs/psvn.el Source2: psvn-init.el -Patch6: subversion-1.6.0-ruby185.patch -Patch8: subversion-1.14.0-swig-4.0.2.patch -Patch9: subversion-1.14.2-swig-4.1.1.patch +Patch0: subversion-1.6.0-ruby185.patch License: Apache License, BSD ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -152,21 +150,14 @@ Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} %description svn2cl svn2cl is a simple XSL transformation and shell script wrapper forgenerating a classic GNU-style ChangeLog from a subversion repository log. It is made from several changelog-like scripts using common XSLT constructs found in different places. -%debug_package - %prep %setup -q -#-D -T -#:<< _EOF -%patch 6 -p1 +%patch 0 -p1 sed -i 's,Makefile.PL.in$,& libsvn_swig_perl,' Makefile.in rm subversion/bindings/swig/proxy/*.swg -%patch 8 -p1 -#%patch 9 -p1 -b .swig-4.1.1 - ./autogen.sh --release %build @@ -290,7 +281,6 @@ mkdir -p %{buildroot}%{_mandir}/man1 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" rm -f .packlist - %post -n apache-mod_svn if [ $1 -eq 1 ]; then #install @@ -386,6 +376,12 @@ fi #%{_mandir}/man1/svn2cl.1.gz %changelog +* Thu Feb 13 2025 Silvan Calarco 1.14.5-2mamba +- rebuilt to fix missing provides in perl-subversion + +* Fri Jan 03 2025 Automatic Build System 1.14.5-1mamba +- automatic version update by autodist + * Sat Oct 12 2024 Automatic Build System 1.14.4-1mamba - automatic version update by autodist