[packages/json-c] - updated to 0.14 (new soname, switched to cmake)
qboosh
qboosh at pld-linux.org
Thu Apr 30 06:21:39 CEST 2020
commit 1bd4b30f9c15a80f67512d6d68e1dd3aa4c7d72e
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Thu Apr 30 06:21:50 2020 +0200
- updated to 0.14 (new soname, switched to cmake)
json-c.spec | 41 +++++++++++++++++++++++++++++++----------
1 file changed, 31 insertions(+), 10 deletions(-)
---
diff --git a/json-c.spec b/json-c.spec
index 6c6d942..a2f0698 100644
--- a/json-c.spec
+++ b/json-c.spec
@@ -1,15 +1,20 @@
+#
+# Conditional build:
+%bcond_without static_libs # static library
+
Summary: A JSON implementation in C
Summary(pl.UTF-8): Implementacja JSON w C
Name: json-c
-Version: 0.13.1
+Version: 0.14
Release: 1
License: MIT
Group: Libraries
#Source0Download: https://s3.amazonaws.com/json-c_releases/releases/index.html # with AJAX (requires JavaScript)
# XML data with links (relative to https://s3.amazonaws.com/json-c_releases/) in https://s3.amazonaws.com/json-c_releases (no "/" at the end!)
Source0: https://s3.amazonaws.com/json-c_releases/releases/%{name}-%{version}.tar.gz
-# Source0-md5: 04969ad59cc37bddd83741a08b98f350
+# Source0-md5: 72cbb065b43376d825cd521d115ae1f6
URL: https://github.com/json-c/json-c/wiki
+BuildRequires: cmake >= 2.8
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -52,19 +57,32 @@ Statyczna biblioteka json-c.
%setup -q
%build
-# avoid "json_tokener.c:355:6: error: variable 'size' set but not used [-Werror=unused-but-set-variable]"
-CFLAGS="%{rpmcflags} -Wno-unused-but-set-variable"
-%configure \
- --disable-silent-rules
-%{__make} -j1
+%if %{with static_libs}
+install -d build-static
+cd build-static
+%cmake .. \
+ -DBUILD_SHARED_LIBS=OFF
+
+%{__make}
+cd ..
+%endif
+
+install -d build
+cd build
+%cmake ..
+
+%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} install \
+%if %{with static_libs}
+%{__make} -C build-static install \
DESTDIR=$RPM_BUILD_ROOT
+%endif
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
+%{__make} -C build install \
+ DESTDIR=$RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
@@ -85,14 +103,17 @@ fi
%defattr(644,root,root,755)
%doc AUTHORS COPYING ChangeLog README README.html
%attr(755,root,root) %{_libdir}/libjson-c.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libjson-c.so.4
+%attr(755,root,root) %ghost %{_libdir}/libjson-c.so.5
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libjson-c.so
%{_includedir}/json-c
%{_pkgconfigdir}/json-c.pc
+%{_libdir}/cmake/json-c
+%if %{with static_libs}
%files static
%defattr(644,root,root,755)
%{_libdir}/libjson-c.a
+%endif
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/json-c.git/commitdiff/1bd4b30f9c15a80f67512d6d68e1dd3aa4c7d72e
More information about the pld-cvs-commit
mailing list