update to 1.14.0 [release 1.14.0-1mamba;Wed Dec 09 2020]
This commit is contained in:
parent
fdd2bb5067
commit
4b54d42b39
111
subversion-1.14.0-swig-4.0.2.patch
Normal file
111
subversion-1.14.0-swig-4.0.2.patch
Normal file
@ -0,0 +1,111 @@
|
||||
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 <ruby.h> defaults */
|
||||
#include "swigutil_rb__pre_ruby.h"
|
||||
#include <ruby.h>
|
||||
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)
|
||||
@ -9,15 +9,15 @@
|
||||
%define swigdirs swig_pydir=%{python_sitearch}/libsvn swig_pydir_extra=%{python_sitearch}/svn
|
||||
%define svn2cl_version 0.11
|
||||
Name: subversion
|
||||
Version: 1.9.7
|
||||
Version: 1.14.0
|
||||
Release: 1mamba
|
||||
Summary: A version control system that is a compelling replacement for CVS
|
||||
Group: Development/Tools
|
||||
Vendor: openmamba
|
||||
Distribution: openmamba
|
||||
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
|
||||
URL: http://subversion.apache.org/
|
||||
Source0: http://mirror.nohup.it/apache/subversion/subversion-%{version}.tar.bz2
|
||||
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
|
||||
# http://bugs.debian.org/546990
|
||||
@ -29,30 +29,32 @@ 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
|
||||
Patch8: subversion-1.14.0-swig-4.0.2.patch
|
||||
License: Apache License, BSD
|
||||
## AUTOBUILDREQ-BEGIN
|
||||
BuildRequires: glibc-devel
|
||||
BuildRequires: ldconfig
|
||||
BuildRequires: libapr-devel
|
||||
BuildRequires: libaprutil-devel
|
||||
BuildRequires: libdb51-devel
|
||||
BuildRequires: libdbus-devel
|
||||
BuildRequires: libbzip2-devel
|
||||
BuildRequires: libdb53-devel
|
||||
BuildRequires: libe2fs-devel
|
||||
BuildRequires: libexpat-devel
|
||||
BuildRequires: libffi-devel
|
||||
BuildRequires: libgcc
|
||||
BuildRequires: libgcrypt-devel
|
||||
BuildRequires: libglib-devel
|
||||
BuildRequires: libgnome-keyring-devel
|
||||
BuildRequires: libgpg-error-devel
|
||||
BuildRequires: libkrb5-devel
|
||||
BuildRequires: liblz4-devel
|
||||
BuildRequires: liblzma-devel
|
||||
BuildRequires: libmagic-devel
|
||||
BuildRequires: libpython-devel
|
||||
BuildRequires: libsasl-devel
|
||||
BuildRequires: libnsl-devel
|
||||
BuildRequires: libperl
|
||||
BuildRequires: libruby-devel
|
||||
BuildRequires: libsasl2-devel
|
||||
BuildRequires: libserf-devel
|
||||
BuildRequires: libsqlite-devel
|
||||
BuildRequires: libstdc++6-devel
|
||||
BuildRequires: libutf8proc-devel
|
||||
BuildRequires: libuuid-devel
|
||||
BuildRequires: libz-devel
|
||||
BuildRequires: perl-devel
|
||||
BuildRequires: ruby-devel
|
||||
BuildRequires: python3
|
||||
## AUTOBUILDREQ-END
|
||||
BuildRequires: apache
|
||||
BuildRequires: apache-devel
|
||||
@ -61,7 +63,7 @@ BuildRequires: gettext-devel
|
||||
BuildRequires: jpackage-utils
|
||||
BuildRequires: jdk
|
||||
%endif
|
||||
BuildRequires: libmysql5-devel
|
||||
BuildRequires: libmariadb-devel
|
||||
BuildRequires: libneon-devel
|
||||
BuildRequires: libopenssl-devel
|
||||
BuildRequires: libpostgresql-devel
|
||||
@ -71,6 +73,7 @@ BuildRequires: perl-Config-IniFiles
|
||||
BuildRequires: python
|
||||
BuildRequires: ruby-devel
|
||||
BuildRequires: swig
|
||||
BuildRequires: python-py3c-py3
|
||||
BuildRequires: apache-devel >= 2.4.10
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
||||
|
||||
@ -158,22 +161,13 @@ 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
|
||||
#pushd contrib/client-side/svn2cl
|
||||
#%patch0 -p1 -b .newlines
|
||||
#popd
|
||||
#%patch1 -p1 -b .deplibs
|
||||
#%patch2 -p1 -b .rpath
|
||||
#patch3 -p1 -b .pie
|
||||
#%if %{with_java_subpackage}
|
||||
#%patch4 -p1
|
||||
#%endif
|
||||
#%patch5 -p1 -b .kwallet
|
||||
%patch6 -p1
|
||||
#%patch7 -p0
|
||||
|
||||
#sed -i -e 's|^XSL="$dir/|XSL="%{_datadir}/svn2cl/|' \
|
||||
# contrib/client-side/svn2cl/svn2cl.sh
|
||||
@ -186,12 +180,15 @@ svn2cl is a simple XSL transformation and shell script wrapper forgenerating a c
|
||||
|
||||
sed -i 's,Makefile.PL.in$,& libsvn_swig_perl,' Makefile.in
|
||||
|
||||
%build
|
||||
# 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
|
||||
|
||||
export svn_cv_ruby_link="%{__cc} -shared"
|
||||
@ -215,7 +212,9 @@ export CC=gcc CXX=g++
|
||||
--with-ruby-sitedir=%{ruby_sitearch} \
|
||||
--with-sasl=%{_prefix} \
|
||||
--with-serf \
|
||||
--with-apache-libexecdir=%{_libdir}/apache
|
||||
--with-apache-libexecdir=%{_libdir}/apache \
|
||||
--with-swig \
|
||||
PYTHON=%{__python3}
|
||||
|
||||
%make all
|
||||
|
||||
@ -223,7 +222,8 @@ make swig-py swig-py-lib %{swigdirs}
|
||||
make swig-rb swig-rb-lib
|
||||
|
||||
%if %{with_java_subpackage}
|
||||
make javahl-java javahl-javah
|
||||
make javahl-java
|
||||
#javahl-javah
|
||||
make javahl
|
||||
%endif
|
||||
|
||||
@ -404,7 +404,6 @@ fi
|
||||
%{python_sitearch}/svn
|
||||
%{python_sitearch}/libsvn
|
||||
|
||||
|
||||
#%files svn2cl
|
||||
#%defattr(-,root,root)
|
||||
#%{_bindir}/svn2cl
|
||||
@ -412,6 +411,12 @@ fi
|
||||
#%{_mandir}/man1/svn2cl.1.gz
|
||||
|
||||
%changelog
|
||||
* Wed Dec 09 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 1.14.0-1mamba
|
||||
- update to 1.14.0
|
||||
|
||||
* Wed Dec 09 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 1.9.7-2mamba
|
||||
- rebuilt with debug package
|
||||
|
||||
* Tue Aug 15 2017 Automatic Build System <autodist@mambasoft.it> 1.9.7-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user