From abe6adb82f8422d52ae3bf3b0b0d1f12f984f05feed1e1ce978453f757a9b594 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Tue, 26 Mar 2019 14:01:11 +0000
Subject: [PATCH] Accepting request 688732 from
 home:olh:branches:devel:tools:scm:svn

- Install pkgconfig into libdir instead of datadir with
  subversion-pkgconfig.patch

OBS-URL: https://build.opensuse.org/request/show/688732
OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm:svn/subversion?expand=0&rev=299
---
 subversion.changes         |  6 ++++++
 subversion.spec            |  4 +++-
 subversion-pkgconfig.patch | 11 +++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 subversion-pkgconfig.patch

diff --git a/subversion.changes b/subversion.changes
index 7292ed9..e7563f0 100644
--- a/subversion.changes
+++ b/subversion.changes
@@ -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
 
diff --git a/subversion.spec b/subversion.spec
index 05dda55..2bc90bf 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -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
 
diff --git a/subversion-pkgconfig.patch b/subversion-pkgconfig.patch
new file mode 100644
index 0000000..f2205e6
--- /dev/null
+++ b/subversion-pkgconfig.patch
@@ -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