pool/libyajl
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 688389 from home:olh:branches:devel:libraries:c_c++

Browse Source 
- 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
This commit is contained in:
Jan Engelhardt 2019-04-01 23:35:53 +00:00 committed by Git OBS Bridge
parent 632784c89f
commit 44950951e3
5 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libyajl-lib_suffix.patch
View File

@ -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

7
libyajl-optflags.patch
View File

@ -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")

8
libyajl-pkgconfig.patch Normal file
View File

@ -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)

6
libyajl.changes
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 libyajl-pkgconfig.patch
- Use autosetup and make_build macro
-------------------------------------------------------------------
Tue Mar 27 11:44:33 CEST 2018 - kukuk@suse.de

9
libyajl.spec
View File

@ -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)