rebuilt by autoport with build requirements: libutf8proc-devel>=2.9.0-1mamba [release 1.14.2-3mamba;Sat Nov 18 2023]

This commit is contained in:
Automatic Build System 2024-01-05 18:11:05 +01:00
parent fd0c73029f
commit 7bb1604c9c
2 changed files with 80 additions and 10 deletions

View File

@ -0,0 +1,64 @@
From 8ff4cfd06ce554e9df31a088c9d09f45278c6de4 Mon Sep 17 00:00:00 2001
From: Yasuhito Futatsuki <futatuki@apache.org>
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

View File

@ -10,7 +10,7 @@
%define svn2cl_version 0.11
Name: subversion
Version: 1.14.2
Release: 2mamba
Release: 3mamba
Summary: A version control system that is a compelling replacement for CVS
Group: Development/Tools
Vendor: openmamba
@ -30,22 +30,21 @@ Patch5: subversion-1.6.6-kwallet.patch
Patch6: subversion-1.6.0-ruby185.patch
Patch7: subversion-1.9.4-swig-3.0.10.patch
Patch8: subversion-1.14.0-swig-4.0.2.patch
Patch9: subversion-1.14.2-swig-4.1.1.patch
License: Apache License, BSD
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
BuildRequires: libapr-devel
BuildRequires: libaprutil-devel
BuildRequires: libbzip2-devel
BuildRequires: libdb53-devel
BuildRequires: libexpat-devel
BuildRequires: libgcc
BuildRequires: libglib-devel
BuildRequires: liblz4-devel
BuildRequires: liblzma-devel
BuildRequires: libmagic-devel
BuildRequires: libnsl-devel
BuildRequires: libperl
BuildRequires: libpython3-devel
BuildRequires: libpython311-devel
BuildRequires: libruby-devel
BuildRequires: libsasl2-devel
BuildRequires: libsecret-devel
@ -53,10 +52,12 @@ BuildRequires: libserf-devel
BuildRequires: libsqlite-devel
BuildRequires: libstdc++6-devel
BuildRequires: libutf8proc-devel
BuildRequires: libuuid-devel
BuildRequires: libxcrypt-devel
BuildRequires: libz-devel
BuildRequires: perl-Scalar-List-Utils
BuildRequires: perl-devel
## AUTOBUILDREQ-END
BuildRequires: libutf8proc-devel >= 2.9.0-1mamba
BuildRequires: apache
BuildRequires: apache-devel
BuildRequires: gettext-devel
@ -70,7 +71,7 @@ BuildRequires: libpostgresql-devel
BuildRequires: libz-devel
BuildRequires: perl
BuildRequires: perl-Config-IniFiles
BuildRequires: python
BuildRequires: python3
BuildRequires: ruby-devel
BuildRequires: swig
BuildRequires: python-py3c-py3
@ -165,7 +166,7 @@ svn2cl is a simple XSL transformation and shell script wrapper forgenerating a c
%setup -q
#-D -T
#:<< _EOF
%patch6 -p1
%patch 6 -p1
#sed -i -e 's|^XSL="$dir/|XSL="%{_datadir}/svn2cl/|' \
# contrib/client-side/svn2cl/svn2cl.sh
@ -178,13 +179,16 @@ svn2cl is a simple XSL transformation and shell script wrapper forgenerating a c
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
# executing autogen.sh because there are problems with libtool and libs creation
#./autogen.sh
#autoheader && autoconf && ./gen-make.py --reload
./autogen.sh --release
%patch8 -p1
%build
#:<< _EOF
perl -pi -e 's|/usr/bin/env perl -w|%{__perl} -w|' tools/hook-scripts/*.pl.in
@ -372,7 +376,6 @@ fi
%{_includedir}/subversion-%{majversion}/*
%{_libdir}/libsvn_*.so
%{_libdir}/libsvn_*.a
%{_libdir}/libsvn_*.la
%{_datadir}/pkgconfig/libsvn_*.pc
%doc BUGS CHANGES README
@ -409,6 +412,9 @@ fi
#%{_mandir}/man1/svn2cl.1.gz
%changelog
* Sat Nov 18 2023 Automatic Build System <autodist@mambasoft.it> 1.14.2-3mamba
- rebuilt by autoport with build requirements: libutf8proc-devel>=2.9.0-1mamba
* Sun Aug 14 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 1.14.2-2mamba
- removed requirement for jdk