|
|
@@ -1,20 +1,24 @@
|
|
|
-Name: jsoncpp
|
|
|
-Version: 0.7.1
|
|
|
-Release: 2%{?_dist_release}
|
|
|
-Summary: JSON library implemented in C++
|
|
|
-Summary(ja): C++ で実装された JSON ライブラリ
|
|
|
+Name: jsoncpp
|
|
|
+Version: 1.9.1
|
|
|
+Release: 1%{?_dist_release}
|
|
|
+Summary: JSON library implemented in C++
|
|
|
+Summary(ja): C++ で実装された JSON ライブラリ
|
|
|
|
|
|
-Group: System Environment/Libraries
|
|
|
-License: Public Domain or MIT
|
|
|
-URL: http://sourceforge.net/projects/%{name}/
|
|
|
-Source0: https://github.com/open-source-parsers/jsoncpp/archive/0.7.1.tar.gz
|
|
|
-Source1: jsoncpp.pc
|
|
|
+Group: System Environment/Libraries
|
|
|
+License: Public Domain or MIT
|
|
|
|
|
|
-Patch0: asstring.patch
|
|
|
+Vendor: Project Vine
|
|
|
+Distribution: Vine Linux
|
|
|
+
|
|
|
+URL: https://github.com/open-source-parsers/jsoncpp
|
|
|
+Source0: https://github.com/open-source-parsers/jsoncpp/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
|
|
+
|
|
|
+Patch0000: %{name}-1.9.1-fix_version.patch
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
-BuildRequires: python scons doxygen
|
|
|
-BuildRequires: graphviz
|
|
|
+BuildRequires: cmake > 3.15.0
|
|
|
+BuildRequires: python3-devel
|
|
|
+BuildRequires: python3-rpm-macros
|
|
|
|
|
|
%description
|
|
|
%{name} is an implementation of a JSON (http://json.org) reader and writer in
|
|
|
@@ -28,55 +32,37 @@ Summary: Development headers and library for %{name}
|
|
|
Summary(ja): %{name} の開発用ヘッダファイルとライブラリ
|
|
|
Group: Development/Libraries
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
-
|
|
|
+Obsoletes: %{name}-doc < 1.0.0
|
|
|
%description devel
|
|
|
This package contains the development headers and library for %{name}.
|
|
|
|
|
|
|
|
|
-%package doc
|
|
|
-Summary: Documentation for %{name}
|
|
|
-Summary(ja): %{name} のドキュメント
|
|
|
-Group: Documentation
|
|
|
-BuildArch: noarch
|
|
|
-
|
|
|
-%description doc
|
|
|
-This package contains the documentation for %{name}
|
|
|
-
|
|
|
-
|
|
|
%prep
|
|
|
-%setup -q
|
|
|
-#%patch0 -dsrc/lib_json -p1
|
|
|
-grep -e "-Wall" SConstruct
|
|
|
-sed 's/CCFLAGS = "-Wall"/CCFLAGS = "%{optflags}"/' -i SConstruct
|
|
|
-sed 's/README\.txt/README\.md/' -i SConstruct
|
|
|
+%autosetup -p1
|
|
|
|
|
|
%build
|
|
|
-scons platform=linux-gcc %{?_smp_mflags}
|
|
|
-# Now, lets make a proper shared lib. :P
|
|
|
-g++ -o libjsoncpp.so.0.0.0 -shared -Wl,-soname,libjsoncpp.so.0 buildscons/linux-gcc-*/src/lib_json/*.os -lpthread
|
|
|
-# Build the doc
|
|
|
-python doxybuild.py --with-dot --doxygen %{_bindir}/doxygen
|
|
|
+mkdir -p %{_target_platform}
|
|
|
+pushd %{_target_platform}
|
|
|
+
|
|
|
+%cmake -DBUILD_STATIC_LIBS=OFF \
|
|
|
+ -DJSONCPP_WITH_WARNING_AS_ERROR=OFF \
|
|
|
+ -DJSONCPP_WITH_PKGCONFIG_SUPPORT=ON \
|
|
|
+ -DJSONCPP_WITH_CMAKE_PACKAGE=ON \
|
|
|
+ -DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF \
|
|
|
+ -DPYTHON_EXECUTABLE="%{__python3}" \
|
|
|
+ ..
|
|
|
+popd
|
|
|
+%make_build -C %{_target_platform}
|
|
|
+
|
|
|
|
|
|
%check
|
|
|
-# Fails due to patch0
|
|
|
-# scons platform=linux-gcc check %{?_smp_mflags}
|
|
|
+%make_build -C %{_target_platform} jsoncpp_check
|
|
|
+
|
|
|
|
|
|
%install
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
-install -p -D lib%{name}.so.0.0.0 $RPM_BUILD_ROOT%{_libdir}/lib%{name}.so.0.0.0
|
|
|
-ln -s %{_libdir}/lib%{name}.so.0.0.0 $RPM_BUILD_ROOT%{_libdir}/lib%{name}.so
|
|
|
-ln -s %{_libdir}/lib%{name}.so.0.0.0 $RPM_BUILD_ROOT%{_libdir}/lib%{name}.so.0
|
|
|
-
|
|
|
-install -d $RPM_BUILD_ROOT%{_includedir}/%{name}/json
|
|
|
-install -p -m 0644 include/json/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}/json
|
|
|
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}/html
|
|
|
-for f in AUTHORS LICENSE NEWS.txt README.md; do
|
|
|
- install -p -m 0644 $f $RPM_BUILD_ROOT%{_docdir}/%{name}
|
|
|
-done
|
|
|
-install -p -m 0644 dist/doxygen/*/*.{html,png} $RPM_BUILD_ROOT%{_docdir}/%{name}/html
|
|
|
-install -d $RPM_BUILD_ROOT%{_libdir}/pkgconfig
|
|
|
-install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/
|
|
|
-sed -i 's|@@LIBDIR@@|%{_libdir}|g' $RPM_BUILD_ROOT%{_libdir}/pkgconfig/jsoncpp.pc
|
|
|
+%make_install -C %{_target_platform}
|
|
|
+
|
|
|
|
|
|
%clean
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
@@ -85,20 +71,26 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
%postun -p /sbin/ldconfig
|
|
|
|
|
|
%files
|
|
|
-%{_docdir}/%{name}/
|
|
|
-%exclude %{_docdir}/%{name}/html
|
|
|
-%{_libdir}/lib%{name}.so.0
|
|
|
-%{_libdir}/lib%{name}.so.0.0.0
|
|
|
+%license AUTHORS LICENSE
|
|
|
+%doc README*
|
|
|
+%{_libdir}/lib%{name}.so.*
|
|
|
|
|
|
%files devel
|
|
|
+%doc doc/*.html
|
|
|
%{_libdir}/lib%{name}.so
|
|
|
-%{_includedir}/%{name}/
|
|
|
-%{_libdir}/pkgconfig/jsoncpp.pc
|
|
|
+%{_includedir}/json
|
|
|
+%{_libdir}/cmake/*
|
|
|
+%{_libdir}/pkgconfig/%{name}.pc
|
|
|
|
|
|
-%files doc
|
|
|
-%{_docdir}/%{name}/
|
|
|
|
|
|
%changelog
|
|
|
+* Sat Sep 21 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.9.1-1
|
|
|
+- new upstream release.
|
|
|
+- dropped Source1.
|
|
|
+- dropped Patch0.
|
|
|
+- imported Patch0000 from rawhide.
|
|
|
+- dropped a sub-package "doc".
|
|
|
+
|
|
|
* Thu Jun 30 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 0.7.1-2
|
|
|
- rebuild with gcc-5.4.0
|
|
|
|
tomop