From 327ec9a73bf1e899ebb08a17e95324c6fada731cbe3eeaa800025169d3838d1f Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Fri, 6 Feb 2015 18:24:02 +0000 Subject: [PATCH] Accepting request 284239 from home:pluskalm:branches:devel:libraries:c_c++ - Patch jsoncpp-1.0.0-lib_suffix.patch is longer necessary - Update to version 1.4: * Updated the type system's behavior, in order to better support backwards compatibility with code that was written before 64-bit integer support was introduced. OBS-URL: https://build.opensuse.org/request/show/284239 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/jsoncpp?expand=0&rev=6 --- 1.0.0.tar.gz | 3 -- 1.4.0.tar.gz | 3 ++ jsoncpp-1.0.0-lib_suffix.patch | 59 ---------------------------------- jsoncpp.changes | 8 +++++ jsoncpp.spec | 14 ++++---- 5 files changed, 17 insertions(+), 70 deletions(-) delete mode 100644 1.0.0.tar.gz create mode 100644 1.4.0.tar.gz delete mode 100644 jsoncpp-1.0.0-lib_suffix.patch diff --git a/1.0.0.tar.gz b/1.0.0.tar.gz deleted file mode 100644 index 8f76f5d..0000000 --- a/1.0.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e7eeb9b96d10cfd2f6205a09899f9800931648f652e09731821854c9ce0c7a1a -size 165343 diff --git a/1.4.0.tar.gz b/1.4.0.tar.gz new file mode 100644 index 0000000..a3b2d76 --- /dev/null +++ b/1.4.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:97cb6d3fb2511e5003a94a16f7d859edf99795e32d0c862143007e6d6d2f3235 +size 170418 diff --git a/jsoncpp-1.0.0-lib_suffix.patch b/jsoncpp-1.0.0-lib_suffix.patch deleted file mode 100644 index e778444..0000000 --- a/jsoncpp-1.0.0-lib_suffix.patch +++ /dev/null @@ -1,59 +0,0 @@ -From f8a3a599ac2afaeaf408847b189404f65691251d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= -Date: Mon, 1 Dec 2014 23:44:08 +0100 -Subject: [PATCH] Adapt libdir for 64bit RPM-based distros RPM-based distros - such as Fedora or Mageia put 64bit libraries in /usr/lib64 while 32bit - libraries go to /usr/lib. This is usually taken into account in CMake - projects using a LIB_SUFFIX parameter that can be set to "" or "64". - ---- - CMakeLists.txt | 10 ++++++---- - pkg-config/jsoncpp.pc.in | 2 +- - 2 files changed, 7 insertions(+), 5 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2def6ca..3e8f96e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -17,15 +17,17 @@ IF(NOT WIN32) - ENDIF(NOT CMAKE_BUILD_TYPE) - ENDIF(NOT WIN32) - -+SET(LIB_SUFFIX "" CACHE STRING "Optional arch-dependent suffix for the library installation directory") -+ - SET(RUNTIME_INSTALL_DIR bin - CACHE PATH "Install dir for executables and dlls") --SET(ARCHIVE_INSTALL_DIR lib -+SET(ARCHIVE_INSTALL_DIR lib${LIB_SUFFIX} - CACHE PATH "Install dir for static libraries") --SET(LIBRARY_INSTALL_DIR lib -+SET(LIBRARY_INSTALL_DIR lib${LIB_SUFFIX} - CACHE PATH "Install dir for shared libraries") - SET(INCLUDE_INSTALL_DIR include - CACHE PATH "Install dir for headers") --SET(PACKAGE_INSTALL_DIR lib/cmake -+SET(PACKAGE_INSTALL_DIR lib${LIB_SUFFIX}/cmake - CACHE PATH "Install dir for cmake package config files") - MARK_AS_ADVANCED( RUNTIME_INSTALL_DIR ARCHIVE_INSTALL_DIR INCLUDE_INSTALL_DIR PACKAGE_INSTALL_DIR ) - -@@ -101,7 +103,7 @@ IF(JSONCPP_WITH_PKGCONFIG_SUPPORT) - "pkg-config/jsoncpp.pc" - @ONLY) - INSTALL(FILES "${CMAKE_BINARY_DIR}/pkg-config/jsoncpp.pc" -- DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig") -+ DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig") - ENDIF(JSONCPP_WITH_PKGCONFIG_SUPPORT) - - IF(JSONCPP_WITH_CMAKE_PACKAGE) -diff --git a/pkg-config/jsoncpp.pc.in b/pkg-config/jsoncpp.pc.in -index 5de8105..9613181 100644 ---- a/pkg-config/jsoncpp.pc.in -+++ b/pkg-config/jsoncpp.pc.in -@@ -1,6 +1,6 @@ - prefix=@CMAKE_INSTALL_PREFIX@ - exec_prefix=${prefix} --libdir=${exec_prefix}/lib -+libdir=${exec_prefix}/@LIBRARY_INSTALL_DIR@ - includedir=${prefix}/@INCLUDE_INSTALL_DIR@ - - Name: jsoncpp diff --git a/jsoncpp.changes b/jsoncpp.changes index 82a9214..81dd8ed 100644 --- a/jsoncpp.changes +++ b/jsoncpp.changes @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Feb 5 20:07:09 UTC 2015 - mpluskal@suse.com + +- Patch jsoncpp-1.0.0-lib_suffix.patch is longer necessary +- Update to version 1.4: + * Updated the type system's behavior, in order to better support + backwards compatibility with code that was written before + 64-bit integer support was introduced. +------------------------------------------------------------------- Sat Dec 20 17:31:29 UTC 2014 - mpluskal@suse.com - Update packace categories diff --git a/jsoncpp.spec b/jsoncpp.spec index cee8880..342741d 100644 --- a/jsoncpp.spec +++ b/jsoncpp.spec @@ -1,7 +1,7 @@ # # spec file for package jsoncpp # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,22 +17,20 @@ Name: jsoncpp -Version: 1.0.0 +Version: 1.4.0 Release: 0 Summary: C++ library that allows manipulating with JSON License: MIT Group: Devel/Libraries/C and C++ Url: https://github.com/open-source-parsers/jsoncpp Source0: https://github.com/open-source-parsers/%{name}/archive/%{version}.tar.gz -Patch0: jsoncpp-1.0.0-lib_suffix.patch BuildRequires: cmake BuildRequires: doxygen +BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: pkg-config BuildRequires: python BuildRoot: %{_tmppath}/%{name}-%{version}-build -# On i386, jsoncpp fails it's own unittests -ExcludeArch: i586 %description JSON is a lightweight data-interchange format. It can represent numbers, @@ -85,19 +83,19 @@ format to store user input files. %prep %setup -q -%patch0 -p1 %build -python doxybuild.py --doxygen=%{_bindir}/doxygen +python doxybuild.py --doxygen=%{_bindir}/doxygen --open --with-dot # path needs to be exported otherwise unit tests will fail -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%{_builddir}/%{name}-%{version}/build/lib +export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%{_builddir}/%{name}-%{version}/build/src/lib_json %cmake -DJSONCPP_LIB_BUILD_SHARED=ON make %{?_smp_mflags} %install %cmake_install +%fdupes -s %{buildroot} %post -n lib%{name}1 -p /sbin/ldconfig