pool/subversion
SHA256
11
0
Fork 1
Code Issues Pull Requests Activity

- Convert dependencies to pkgconfig counterparts

Browse Source 
- Do not conflict with jdk10
- Add dependency on liblz4
- Refresh patches:
  * subversion-1.8.0-rpath.patch
  * subversion-no-build-date.patch
  * subversion-fix-parallel-build-support-for-perl-bindings.patch
- Updated patch subversion-perl-underlinking.patch

OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm:svn/subversion?expand=0&rev=265
This commit is contained in:
Tomáš Chvátal
2018-04-12 09:22:01 +00:00
committed by Git OBS Bridge
parent 993713e70b
commit 944e34f8fd
5 changed files with 62 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
subversion-1.8.0-rpath.patch
View File

@@ -12,11 +12,11 @@ patch by David Kimdon <dwhedon@debian.org>. The basic theory is:
build/generator/gen_base.py | 3 ++-
3 files changed, 11 insertions(+), 8 deletions(-)
Index: subversion-1.10.0-alpha2/Makefile.in
Index: subversion-1.10.0/Makefile.in
===================================================================
--- subversion-1.10.0-alpha2.orig/Makefile.in 2017-02-24 15:56:33.957214744 +0100
+++ subversion-1.10.0-alpha2/Makefile.in 2017-02-24 15:56:33.985214981 +0100
@@ -256,10 +256,10 @@ COMPILE_CXXHL_CXX = $(LT_COMPILE_CXX) $(
--- subversion-1.10.0.orig/Makefile.in
+++ subversion-1.10.0/Makefile.in
@@ -264,10 +264,10 @@ COMPILE_CXXHL_CXX = $(LT_COMPILE_CXX) $(
COMPILE_GOOGLEMOCK_CXX = $(LT_COMPILE_CXX_NOWARN) $(GOOGLEMOCK_LIB_INCLUDES) -o $@ -c
COMPILE_CXXHL_GOOGLEMOCK_CXX = $(LT_COMPILE_CXX) $(CXXHL_INCLUDES) $(GOOGLEMOCK_INCLUDES) -o $@ -c
@@ -30,11 +30,11 @@ Index: subversion-1.10.0-alpha2/Makefile.in
+LINK_CXX_LIB = $(LINK_CXX) $(LT_SO_VERSION) -rpath $(libdir)
# special link rule for mod_dav_svn
LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS)
@@ -845,7 +845,9 @@ $(SWIG_PL_DIR)/native/Makefile.PL: $(SWI
LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS) -shared
@@ -864,7 +864,9 @@ $(SWIG_PL_DIR)/native/Makefile.PL: $(SWI
./config.status subversion/bindings/swig/perl/native/Makefile.PL
$(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL
$(SWIG_PL_DIR)/native/Makefile: libsvn_swig_perl $(SWIG_PL_DIR)/native/Makefile.PL
- cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL PREFIX=$(prefix)
+ cd $(SWIG_PL_DIR)/native; \
+ $(PERL) Makefile.PL PREFIX=$(prefix) INSTALLDIRS=vendor; \
@@ -42,11 +42,11 @@ Index: subversion-1.10.0-alpha2/Makefile.in
# There is a "readlink -f" command on some systems for the same purpose,
# but it's not as portable (e.g. Mac OS X doesn't have it). These should
Index: subversion-1.10.0-alpha2/build.conf
Index: subversion-1.10.0/build.conf
===================================================================
--- subversion-1.10.0-alpha2.orig/build.conf 2017-02-20 12:52:46.000000000 +0100
+++ subversion-1.10.0-alpha2/build.conf 2017-02-24 15:56:33.985214981 +0100
@@ -567,7 +567,7 @@ lang = python
--- subversion-1.10.0.orig/build.conf
+++ subversion-1.10.0/build.conf
@@ -568,7 +568,7 @@ lang = python
path = subversion/bindings/swig/python/libsvn_swig_py
libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_subr
apriconv apr python swig
@@ -55,7 +55,7 @@ Index: subversion-1.10.0-alpha2/build.conf
install = swig-py-lib
# need special build rule to include -DSWIGPYTHON
compile-cmd = $(COMPILE_SWIG_PY)
@@ -592,7 +592,7 @@ type = swig_lib
@@ -594,7 +594,7 @@ type = swig_lib
lang = ruby
path = subversion/bindings/swig/ruby/libsvn_swig_ruby
libs = libsvn_client libsvn_wc libsvn_delta libsvn_subr apriconv apr ruby swig
@@ -64,11 +64,11 @@ Index: subversion-1.10.0-alpha2/build.conf
install = swig-rb-lib
# need special build rule to include
compile-cmd = $(COMPILE_SWIG_RB)
Index: subversion-1.10.0-alpha2/build/generator/gen_base.py
Index: subversion-1.10.0/build/generator/gen_base.py
===================================================================
--- subversion-1.10.0-alpha2.orig/build/generator/gen_base.py 2016-03-16 03:57:40.000000000 +0100
+++ subversion-1.10.0-alpha2/build/generator/gen_base.py 2017-02-24 15:56:33.985214981 +0100
@@ -591,7 +591,7 @@ class TargetLinked(Target):
--- subversion-1.10.0.orig/build/generator/gen_base.py
+++ subversion-1.10.0/build/generator/gen_base.py
@@ -599,7 +599,7 @@ class TargetLinked(Target):
self.install = options.get('install')
self.compile_cmd = options.get('compile-cmd')
self.sources = options.get('sources', '*.c *.cpp')
@@ -77,7 +77,7 @@ Index: subversion-1.10.0-alpha2/build/generator/gen_base.py
self.external_lib = options.get('external-lib')
self.external_project = options.get('external-project')
@@ -645,6 +645,7 @@ class TargetExe(TargetLinked):
@@ -653,6 +653,7 @@ class TargetExe(TargetLinked):
extmap = self.gen_obj._extension_map
self.objext = extmap['exe', 'object']
self.filename = build_path_join(self.path, name + extmap['exe', 'target'])

10
subversion-fix-parallel-build-support-for-perl-bindings.patch
View File

@@ -1,6 +1,8 @@
--- Makefile.in 2011-07-16 13:50:53.000000000 +0200
+++ Makefile.in.new 2012-03-11 12:13:57.000000000 +0100
@@ -732,7 +732,7 @@
Index: Makefile.in
===================================================================
--- Makefile.in.orig
+++ Makefile.in
@@ -860,7 +860,7 @@ clean-swig-headers:
extraclean-swig-headers: clean-swig-headers
$(EXTRACLEAN_SWIG_HEADERS)
@@ -8,4 +10,4 @@
+$(SWIG_PL_DIR)/native/Makefile.PL: $(SWIG_SRC_DIR)/perl/native/Makefile.PL.in libsvn_swig_perl
./config.status subversion/bindings/swig/perl/native/Makefile.PL
$(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL
$(SWIG_PL_DIR)/native/Makefile: libsvn_swig_perl $(SWIG_PL_DIR)/native/Makefile.PL

36
subversion-no-build-date.patch
View File

@@ -13,10 +13,10 @@ Prevent unneccessary rebuilds of binary packages differing only by date, time an
subversion/tests/cmdline/getopt_tests_data/svn--version_stdout | 1 -
5 files changed, 6 insertions(+), 12 deletions(-)
Index: subversion-1.9.6/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
Index: subversion-1.10.0/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
===================================================================
--- subversion-1.9.6.orig/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java 2015-06-10 06:00:23.000000000 +0200
+++ subversion-1.9.6/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java 2017-07-07 13:35:05.534444939 +0200
--- subversion-1.10.0.orig/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
+++ subversion-1.10.0/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
@@ -144,10 +144,10 @@ public class BasicTests extends SVNTests
{
vx = client.getVersionExtended(false);
@@ -30,11 +30,11 @@ Index: subversion-1.9.6/subversion/bindings/javahl/tests/org/apache/subversion/j
throw new Exception("Build time empty");
result = vx.getBuildHost();
if (result == null || result.trim().length() == 0)
Index: subversion-1.9.6/subversion/libsvn_subr/opt.c
Index: subversion-1.10.0/subversion/libsvn_subr/opt.c
===================================================================
--- subversion-1.9.6.orig/subversion/libsvn_subr/opt.c 2014-10-29 13:54:38.000000000 +0100
+++ subversion-1.9.6/subversion/libsvn_subr/opt.c 2017-07-07 13:35:05.562445219 +0200
@@ -1109,12 +1109,8 @@ svn_opt__print_version_info(const char *
--- subversion-1.10.0.orig/subversion/libsvn_subr/opt.c
+++ subversion-1.10.0/subversion/libsvn_subr/opt.c
@@ -1118,12 +1118,8 @@ svn_opt__print_version_info(const char *
if (quiet)
return svn_cmdline_printf(pool, "%s\n", SVN_VER_NUMBER);
@@ -49,11 +49,11 @@ Index: subversion-1.9.6/subversion/libsvn_subr/opt.c
SVN_ERR(svn_cmdline_printf(pool, "%s\n", svn_version_ext_copyright(info)));
if (footer)
Index: subversion-1.9.6/subversion/libsvn_subr/version.c
Index: subversion-1.10.0/subversion/libsvn_subr/version.c
===================================================================
--- subversion-1.9.6.orig/subversion/libsvn_subr/version.c 2017-06-30 14:33:23.000000000 +0200
+++ subversion-1.9.6/subversion/libsvn_subr/version.c 2017-07-07 13:35:05.562445219 +0200
@@ -132,8 +132,8 @@ svn_version_extended(svn_boolean_t verbo
--- subversion-1.10.0.orig/subversion/libsvn_subr/version.c
+++ subversion-1.10.0/subversion/libsvn_subr/version.c
@@ -139,8 +139,8 @@ svn_version_extended(svn_boolean_t verbo
{
svn_version_extended_t *info = apr_pcalloc(pool, sizeof(*info));
@@ -63,21 +63,21 @@ Index: subversion-1.9.6/subversion/libsvn_subr/version.c
+ info->build_time = "";
info->build_host = SVN_BUILD_HOST;
info->copyright = apr_pstrdup
(pool, _("Copyright (C) 2017 The Apache Software Foundation.\n"
Index: subversion-1.9.6/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout
(pool, _("Copyright (C) 2018 The Apache Software Foundation.\n"
Index: subversion-1.10.0/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout
===================================================================
--- subversion-1.9.6.orig/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout 2015-05-14 06:00:23.000000000 +0200
+++ subversion-1.9.6/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout 2017-07-07 13:35:05.562445219 +0200
--- subversion-1.10.0.orig/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout
+++ subversion-1.10.0/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout
@@ -1,5 +1,4 @@
svn, version 1.9.0-dev (under development)
- compiled Feb 26 2014, 15:15:42 on x86_64-unknown-openbsd5.5
Copyright (C) 2012 The Apache Software Foundation.
This software consists of contributions made by many people;
Index: subversion-1.9.6/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
Index: subversion-1.10.0/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
===================================================================
--- subversion-1.9.6.orig/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout 2015-05-14 06:00:23.000000000 +0200
+++ subversion-1.9.6/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout 2017-07-07 13:35:05.562445219 +0200
--- subversion-1.10.0.orig/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
+++ subversion-1.10.0/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
@@ -1,5 +1,4 @@
svn, version 1.9.0-dev (under development)
- compiled Feb 26 2014, 15:15:42 on x86_64-unknown-openbsd5.5

12
subversion.changes
View File

@@ -1,3 +1,14 @@
-------------------------------------------------------------------
Thu Apr 12 09:08:24 UTC 2018 - tchvatal@suse.com
- Convert dependencies to pkgconfig counterparts
- Do not conflict with jdk10
- Add dependency on liblz4
- Refresh patches:
* subversion-1.8.0-rpath.patch
* subversion-no-build-date.patch
* subversion-fix-parallel-build-support-for-perl-bindings.patch
-------------------------------------------------------------------
Thu Apr 12 09:04:52 UTC 2018 - tchvatal@suse.com
@@ -15,6 +26,7 @@ Thu Apr 12 08:45:18 UTC 2018 - astieger@suse.com
- dropped patches:
* subversion-1.8.11-autocheck-time.patch, upstream
* subversion-1.9.0-allow-httpd-2.4.6.patch, no longer required
- Updated patch subversion-perl-underlinking.patch
-------------------------------------------------------------------
Thu Apr 12 08:19:41 UTC 2018 - tchvatal@suse.com

20
subversion.spec
View File

@@ -65,17 +65,12 @@ Patch40: subversion-perl-underlinking.patch
BuildRequires: apache-rpm-macros
BuildRequires: apache2-devel >= 2.2.0
BuildRequires: apache2-prefork
BuildRequires: bash-completion
BuildRequires: cyrus-sasl-devel
BuildRequires: db-devel
BuildRequires: dbus-1-devel
BuildRequires: doxygen
BuildRequires: file-devel
BuildRequires: gcc-c++
BuildRequires: glib2-devel
BuildRequires: java-devel >= 1.6.0
BuildRequires: junit
BuildRequires: krb5-devel
BuildRequires: libstdc++-devel
BuildRequires: libtool
BuildRequires: pkgconfig
@@ -85,16 +80,20 @@ BuildRequires: python-pysqlite
BuildRequires: python2-devel >= 2.7
BuildRequires: python2-xml
BuildRequires: ruby-devel >= 1.8.2
BuildRequires: sqlite3-devel >= %{sqlite_minimum_version}
BuildRequires: swig
BuildRequires: update-alternatives
BuildRequires: zlib-devel
BuildRequires: pkgconfig(apr-1) >= 1.3.0
BuildRequires: pkgconfig(apr-util-1) >= 1.3.0
BuildRequires: pkgconfig(libsecret-1)
BuildRequires: pkgconfig(bash-completion)
BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(krb5)
BuildRequires: pkgconfig(liblz4)
BuildRequires: pkgconfig(libsasl2)
BuildRequires: pkgconfig(serf-1) >= 1.3.4
BuildRequires: pkgconfig(sqlite3) >= %{sqlite_minimum_version}
BuildRequires: pkgconfig(systemd)
BuildConflicts: java-devel >= 10
BuildRequires: pkgconfig(zlib)
Requires: libsqlite3-0 >= %{sqlite_minimum_version}
Requires(post): %fillup_prereq
Requires(pre): pwdutils
@@ -118,7 +117,6 @@ BuildRequires: ctypesgen
%if %{with_kde}
BuildRequires: kdelibs4-core
BuildRequires: libkde4-devel
BuildRequires: libqt4-devel
%else
# In a case we migrate from system that had the kwallet integration we need it
# gone from the package to allow update
@@ -221,7 +219,7 @@ Provides GNOME keyring support for Subversion
Summary: Bash Completion for %{name}
Group: Development/Tools/Version Control
Requires: %{name} = %{version}
Requires: bash-completion
Requires: pkgconfig(bash-completion)
BuildArch: noarch
%description bash-completion