From db549b08a8d285b463f7c43e64ea43b0764b91a4 Mon Sep 17 00:00:00 2001
From: Adam Samalik <asamalik@redhat.com>
Date: Thu, 29 Jun 2023 14:29:11 +0200
Subject: [PATCH] re-import sources as agreed with the maintainer

---
 .gitignore                                  |  6 ++++-
 lloyd-yajl-2.0.4-pkgconfig-includedir.patch | 13 +++++++++
 lloyd-yajl-2.0.4-pkgconfig-location.patch   | 29 +++++++++++++++++++++
 3 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 lloyd-yajl-2.0.4-pkgconfig-includedir.patch
 create mode 100644 lloyd-yajl-2.0.4-pkgconfig-location.patch

diff --git a/.gitignore b/.gitignore
index 8916781..2c6726a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,5 @@
-/yajl-2.1.0.tar.gz
+.build*.log
+*.rpm
+i386
+x86_64
+*.tar.gz
diff --git a/lloyd-yajl-2.0.4-pkgconfig-includedir.patch b/lloyd-yajl-2.0.4-pkgconfig-includedir.patch
new file mode 100644
index 0000000..2593c61
--- /dev/null
+++ b/lloyd-yajl-2.0.4-pkgconfig-includedir.patch
@@ -0,0 +1,13 @@
+Only in lloyd-yajl-fee1ebe.new/src: CMakeLists.txt~
+diff -rup lloyd-yajl-fee1ebe.orig/src/yajl.pc.cmake lloyd-yajl-fee1ebe.new/src/yajl.pc.cmake
+--- lloyd-yajl-fee1ebe.orig/src/yajl.pc.cmake	2011-12-20 00:23:22.000000000 +0000
++++ lloyd-yajl-fee1ebe.new/src/yajl.pc.cmake	2012-08-06 14:05:49.639854538 +0100
+@@ -1,6 +1,6 @@
+ prefix=${CMAKE_INSTALL_PREFIX}
+ libdir=${dollar}{prefix}/lib${LIB_SUFFIX}
+-includedir=${dollar}{prefix}/include/yajl
++includedir=${dollar}{prefix}/include
+ 
+ Name: Yet Another JSON Library
+ Description: A Portable JSON parsing and serialization library in ANSI C
+Only in lloyd-yajl-fee1ebe.new/src: yajl.pc.cmake~
diff --git a/lloyd-yajl-2.0.4-pkgconfig-location.patch b/lloyd-yajl-2.0.4-pkgconfig-location.patch
new file mode 100644
index 0000000..26da5ff
--- /dev/null
+++ b/lloyd-yajl-2.0.4-pkgconfig-location.patch
@@ -0,0 +1,29 @@
+diff -rup lloyd-yajl-fee1ebe.orig/src/CMakeLists.txt lloyd-yajl-fee1ebe.new/src/CMakeLists.txt
+--- lloyd-yajl-fee1ebe.orig/src/CMakeLists.txt	2011-12-20 00:23:22.000000000 +0000
++++ lloyd-yajl-fee1ebe.new/src/CMakeLists.txt	2012-08-06 13:59:02.222065755 +0100
+@@ -30,7 +30,7 @@ ADD_DEFINITIONS(-DYAJL_BUILD)
+ # set up some paths
+ SET (libDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib)
+ SET (incDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/include/yajl)
+-SET (shareDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/share/pkgconfig)
++SET (pkgconfigDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib/pkgconfig)
+ 
+ # set the output path for libraries
+ SET(LIBRARY_OUTPUT_PATH ${libDir})
+@@ -61,7 +61,7 @@ FILE(MAKE_DIRECTORY ${incDir})
+ # generate build-time source
+ SET(dollar $)
+ CONFIGURE_FILE(api/yajl_version.h.cmake ${incDir}/yajl_version.h)
+-CONFIGURE_FILE(yajl.pc.cmake ${shareDir}/yajl.pc)
++CONFIGURE_FILE(yajl.pc.cmake ${pkgconfigDir}/yajl.pc)
+ 
+ # copy public headers to output directory
+ FOREACH (header ${PUB_HDRS})
+@@ -82,5 +82,5 @@ IF(NOT WIN32)
+   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 ${pkgconfigDir}/yajl.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig)
+ ENDIF()
+Only in lloyd-yajl-fee1ebe.new/src: CMakeLists.txt~