Changeset 1732 for spec/trunk/SPECS/jsoncpp.spec

Timestamp:

Oct 25, 2020, 3:44:57 PM (5 years ago)

Author:

tellie

Message:

spec: jsoncpp: Release version 1.9.4-1.

File:

• spec/trunk/SPECS/jsoncpp.spec (modified) (8 diffs)

spec/trunk/SPECS/jsoncpp.spec

@@ -13 +13 @@
 
 Name:           jsoncpp
-Version:        1.9.3
+Version:        1.9.4
 Release:        1%{?dist}
 Summary:        JSON library implemented in C++
@@ -22 +22 @@
 Source0:        %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 %else
-%scm_source github https://github.com/tellie/%{name}-os2 master-os2
+%scm_source github https://github.com/tellie/%{name}-os2 %{version}-os2
 %endif
 
@@ -66 +66 @@
 %if !0%{?os2_version}
 %autosetup -p 1
+%else
+%scm_setup
 %endif
 
@@ -72 +74 @@
 sed -i -e 's!^DOT_FONTNAME.*=.*!DOT_FONTNAME =!g' doc/doxyfile.in
 %endif
-%scm_setup
 
 %build
@@ -80 +81 @@
 export LDFLAGS="-Zhigh-mem -Zomf -Zargs-wild -Zargs-resp" 
 export LIBS="-lcx"
+echo PACKAGE_VERSION="%{version}" > package_version
 
 %cmake                                         \
-  -DBUILD_SHARED_LIBS:BOOL=OFF                 \
-  -DBUILD_SHARED_LIBS:BOOL=ON                \
+  -DBUILD_STATIC_LIBS:BOOL=OFF                 \
+  -DBUILD_OBJECT_LIBS:BOOL=OFF                 \
   -DJSONCPP_WITH_CMAKE_PACKAGE:BOOL=ON         \
   -DJSONCPP_WITH_EXAMPLE:BOOL=OFF              \
@@ -91 +93 @@
   -DJSONCPP_WITH_TESTS:BOOL=ON                 \
   -DJSONCPP_WITH_WARNING_AS_ERROR:BOOL=OFF     \
-    ..
+   ..
+
 %if !0%{?os2_version}
   -DPYTHON_EXECUTABLE:STRING="%{__python3}"
 %cmake_build
+%else
+make %{?_smp_mflags}
 %endif
-make %{?_smp_mflags}
 
 %if %{with jsoncpp_enables_doc} 
@@ -133 +137 @@
 %exclude %{_docdir}/%{name}/html
 %endif
-%{_libdir}/*.dll
 %if !0%{?os2_version}
 %{_libdir}/lib%{name}.so.%{version}
+%else
+%{_libdir}/*.dll
 %endif
 
@@ -151 +156 @@
 
 %changelog
+* Sun Oct 25 2020 Elbert Pol <elbert.pol@gmail.com> - 1.9.4-1
+- Update to latest version
+- Update spec file
+
 * Fri Sep 18 2020 Elbert Pol <elbert.pol@gmail.com> - 1.9.3-1
 - First RPM for OS2