Accepting request 688741 from devel:tools:scm:svn

OBS-URL: https://build.opensuse.org/request/show/688741
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/subversion?expand=0&rev=163
This commit is contained in:
Dominique Leuenberger 2019-04-01 10:32:54 +00:00 committed by Git OBS Bridge
commit de2134c013
3 changed files with 20 additions and 1 deletions

View File

@ -0,0 +1,11 @@
--- a/Makefile.in
+++ b/Makefile.in
@@ -91,7 +91,7 @@ swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/sv
toolsdir = @bindir@/svn-tools
# where to install pkg-config files
-pkgconfig_dir = $(datadir)/pkgconfig
+pkgconfig_dir = $(libdir)/pkgconfig
javahl_javadir = @libdir@/svn-javahl
javahl_javahdir = @libdir@/svn-javahl/include

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 25 16:58:41 UTC 2019 - olaf@aepfle.de
- Install pkgconfig into libdir instead of datadir with
subversion-pkgconfig.patch
-------------------------------------------------------------------
Fri Jan 18 14:03:54 UTC 2019 - astieger@suse.com

View File

@ -54,6 +54,7 @@ Source43: subversion.svndiff.sh
Source50: https://people.apache.org/keys/group/subversion.asc#/subversion.keyring
Source51: https://www.apache.org/dist/subversion/%{name}-%{version}.tar.bz2.asc
Source92: %{name}-rpmlintrc
Patch0: subversion-pkgconfig.patch
Patch1: subversion-1.10.2-javadoc.patch
Patch11: subversion.libtool-verbose.patch
Patch20: subversion-swig-perl-install_vendor.patch
@ -240,6 +241,7 @@ parameters and keywords for the svn command and other tools.
%prep
%setup -q -a 4
%patch0 -p1
%patch1 -p1
%patch11 -p1
%patch20 -p1
@ -522,7 +524,7 @@ systemd-tmpfiles --create %{_tmpfilesdir}/svnserve.conf
%files devel
%dir %{_includedir}/subversion-1
%{_libdir}/libsvn_*.so
%{_datadir}/pkgconfig/*.pc
%{_libdir}/pkgconfig/*.pc
%{_includedir}/subversion-1/*
%doc doc/doxygen/html