From 44950951e3b70139f99ddb614fa7dc99bec93428aa5b7b61459dace4818832e6 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Mon, 1 Apr 2019 23:35:53 +0000
Subject: [PATCH] Accepting request 688389 from
 home:olh:branches:devel:libraries:c_c++

- Install pkgconfig into libdir instead of datadir with libyajl-pkgconfig.patch
- Use autosetup and make_build macro

OBS-URL: https://build.opensuse.org/request/show/688389
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libyajl?expand=0&rev=31
---
 libyajl-lib_suffix.patch | 7 +++----
 libyajl-optflags.patch   | 7 +++----
 libyajl-pkgconfig.patch  | 8 ++++++++
 libyajl.changes          | 6 ++++++
 libyajl.spec             | 9 ++++-----
 5 files changed, 24 insertions(+), 13 deletions(-)
 create mode 100644 libyajl-pkgconfig.patch

diff --git a/libyajl-lib_suffix.patch b/libyajl-lib_suffix.patch
index 19f8c9b..74dc32a 100644
--- a/libyajl-lib_suffix.patch
+++ b/libyajl-lib_suffix.patch
@@ -1,7 +1,6 @@
-diff -aur lloyd-yajl-66cb08c_orig/src/CMakeLists.txt lloyd-yajl-66cb08c/src/CMakeLists.txt
---- lloyd-yajl-66cb08c_orig/src/CMakeLists.txt	2014-03-19 05:58:29.000000000 +0100
-+++ lloyd-yajl-66cb08c/src/CMakeLists.txt	2014-11-01 11:04:26.327902124 +0100
-@@ -28,7 +28,7 @@
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -28,7 +28,7 @@ SET (PUB_HDRS api/yajl_parse.h api/yajl_
  ADD_DEFINITIONS(-DYAJL_BUILD)
  
  # set up some paths
diff --git a/libyajl-optflags.patch b/libyajl-optflags.patch
index 848889d..ead616c 100644
--- a/libyajl-optflags.patch
+++ b/libyajl-optflags.patch
@@ -1,7 +1,6 @@
-diff -aur lloyd-yajl-66cb08c_orig/CMakeLists.txt lloyd-yajl-66cb08c/CMakeLists.txt
---- lloyd-yajl-66cb08c_orig/CMakeLists.txt	2014-03-19 05:58:29.000000000 +0100
-+++ lloyd-yajl-66cb08c/CMakeLists.txt	2014-11-01 11:03:10.921290296 +0100
-@@ -59,7 +59,7 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -59,7 +59,7 @@ ELSE (WIN32)
        "${CMAKE_C_FLAGS} -std=c99 -pedantic -Wpointer-arith -Wno-format-y2k -Wstrict-prototypes -Wmissing-declarations -Wnested-externs -Wextra	-Wundef -Wwrite-strings -Wold-style-definition -Wredundant-decls -Wno-unused-parameter -Wno-sign-compare -Wmissing-prototypes")
  
    SET(CMAKE_C_FLAGS_DEBUG "-DDEBUG -g")
diff --git a/libyajl-pkgconfig.patch b/libyajl-pkgconfig.patch
new file mode 100644
index 0000000..2d2bde1
--- /dev/null
+++ b/libyajl-pkgconfig.patch
@@ -0,0 +1,8 @@
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -84,4 +84,4 @@ INSTALL(TARGETS yajl
+ INSTALL(TARGETS yajl_s ARCHIVE DESTINATION lib${LIB_SUFFIX})
+ INSTALL(FILES ${PUB_HDRS} DESTINATION include/yajl)
+ INSTALL(FILES ${incDir}/yajl_version.h DESTINATION include/yajl)
+-INSTALL(FILES ${shareDir}/yajl.pc DESTINATION share/pkgconfig)
++INSTALL(FILES ${shareDir}/yajl.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig)
diff --git a/libyajl.changes b/libyajl.changes
index 82879a1..314b9bd 100644
--- a/libyajl.changes
+++ b/libyajl.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Mar 25 16:58:41 UTC 2019 - olaf@aepfle.de
+
+- Install pkgconfig into libdir instead of datadir with libyajl-pkgconfig.patch
+- Use autosetup and make_build macro
+
 -------------------------------------------------------------------
 Tue Mar 27 11:44:33 CEST 2018 - kukuk@suse.de
 
diff --git a/libyajl.spec b/libyajl.spec
index b727558..5cded09 100644
--- a/libyajl.spec
+++ b/libyajl.spec
@@ -31,6 +31,7 @@ Source3:        json_verify.1
 Source99:       %{name}-rpmlintrc
 Patch1:         libyajl-optflags.patch
 Patch2:         libyajl-lib_suffix.patch
+Patch3:         libyajl-pkgconfig.patch
 BuildRequires:  bison
 BuildRequires:  cmake
 BuildRequires:  doxygen
@@ -87,13 +88,11 @@ small validating JSON generator.
 This package provides a few command-line utilities for processing JSON files.
 
 %prep
-%setup -q -n yajl-%{version}
-%patch1 -p1 -b .optflags
-%patch2 -p1 -b .lib_suffix
+%autosetup -p1 -n yajl-%{version}
 
 %build
 %cmake
-make %{?_smp_mflags}
+%make_build
 
 %install
 %cmake_install
@@ -118,7 +117,7 @@ make %{?_smp_mflags} test
 %doc README TODO
 %{_includedir}/yajl
 %{_libdir}/libyajl.so
-%{_datadir}/pkgconfig/yajl.pc
+%{_libdir}/pkgconfig/yajl.pc
 
 %files -n %{name}-devel-static
 %defattr(-,root,root)