diff --git a/.gitignore b/.gitignore index d2a904c..7839ca5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ apache.zip /nlohmann-json-d7d0509.tar.gz +/nlohmann-json-3948630.tar.gz diff --git a/json.spec b/json.spec index 946741e..474cee6 100644 --- a/json.spec +++ b/json.spec @@ -1,12 +1,12 @@ -%global gitdate 20150410 -%global gittag d7d05091617d8173923df14cf46bc74311dc176e +%global gitdate 20151110 +%global gittag 3948630374210ac6b794fe9cc3a0223436494322 %global shorttag %(c=%{gittag}; echo ${c:0:7}) %global user nlohmann %global debug_package %{nil} Name: json Version: 0 -Release: 5.%{gitdate}git%{shorttag}%{?dist} +Release: 6.%{gitdate}git%{shorttag}%{?dist} Summary: JSON for Modern C++ Group: Development/Libraries License: MIT @@ -19,7 +19,6 @@ BuildRequires: cppcheck BuildRequires: /usr/bin/make BuildRequires: doxygen -Patch0: nlohmann-json-d7d0509-gcc5fix.patch %description This is a packages version of the nlohmann/json header-only C++ @@ -38,10 +37,9 @@ applications that use %{name}. %prep %setup -q -n %{user}-%{name}-%{shorttag} -%patch0 -p1 %build -doxygen Doxyfile +doxygen doc/Doxyfile %check make cppcheck @@ -58,6 +56,9 @@ install -p -m 0644 src/json.hpp %{buildroot}%{_includedir}/json.hpp %{_includedir}/json.hpp %changelog +* Tue Nov 10 2015 Daniel Kopecek - 0-6.20151110git3948630 +- update to rev 3948630 + * Wed Jun 17 2015 Fedora Release Engineering - 0-5.20150410gitd7d0509 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/nlohmann-json-d7d0509-gcc5fix.patch b/nlohmann-json-d7d0509-gcc5fix.patch deleted file mode 100644 index c20e536..0000000 --- a/nlohmann-json-d7d0509-gcc5fix.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -up nlohmann-json-d7d0509/Makefile.gcc5fix nlohmann-json-d7d0509/Makefile ---- nlohmann-json-d7d0509/Makefile.gcc5fix 2015-04-14 15:47:27.740625005 +0200 -+++ nlohmann-json-d7d0509/Makefile 2015-04-14 15:47:57.579337323 +0200 -@@ -3,7 +3,7 @@ RE2C = re2c - SED = gsed - - # additional flags --FLAGS = -Wall -Wextra -pedantic -Weffc++ -Wcast-align -Wcast-qual -Wctor-dtor-privacy -Wdisabled-optimization -Wformat=2 -Winit-self -Wmissing-declarations -Wmissing-include-dirs -Wold-style-cast -Woverloaded-virtual -Wredundant-decls -Wshadow -Wsign-conversion -Wsign-promo -Wstrict-overflow=5 -Wswitch -Wundef -Wno-unused -Wnon-virtual-dtor -Wreorder -Wdeprecated -Wfloat-equal -+FLAGS = -Wall -Wextra -pedantic -Wcast-align -Wcast-qual -Wctor-dtor-privacy -Wdisabled-optimization -Wformat=2 -Winit-self -Wmissing-declarations -Wmissing-include-dirs -Wold-style-cast -Woverloaded-virtual -Wredundant-decls -Wshadow -Wsign-conversion -Wsign-promo -Wstrict-overflow=5 -Wswitch -Wundef -Wno-unused -Wnon-virtual-dtor -Wreorder -Wdeprecated -Wfloat-equal - - all: json_unit - -@@ -13,7 +13,7 @@ clean: - - # build unit tests - json_unit: test/unit.cpp src/json.hpp test/catch.hpp -- $(CXX) -std=c++11 $(CXXFLAGS) $(FLAGS) $(CPPFLAGS) -I src -I test -Dprivate=public $< $(LDFLAGS) -o $@ -+ $(CXX) -std=c++11 $(CXXFLAGS) $(FLAGS) $(CPPFLAGS) -I src -I test $< $(LDFLAGS) -o $@ - - # create scanner with re2c - re2c: src/json.hpp.re2c -diff -up nlohmann-json-d7d0509/test/unit.cpp.gcc5fix nlohmann-json-d7d0509/test/unit.cpp ---- nlohmann-json-d7d0509/test/unit.cpp.gcc5fix 2015-04-14 15:47:36.726538369 +0200 -+++ nlohmann-json-d7d0509/test/unit.cpp 2015-04-14 15:48:29.880025903 +0200 -@@ -10,9 +10,6 @@ - #define CATCH_CONFIG_MAIN - #include "catch.hpp" - --#include "json.hpp" --using nlohmann::json; -- - #include - #include - #include -@@ -24,6 +21,10 @@ using nlohmann::json; - #include - #include - -+#define private public -+#include "json.hpp" -+using nlohmann::json; -+ - TEST_CASE("constructors") - { - SECTION("create an empty value with a given type") diff --git a/sources b/sources index f22633f..39706df 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5e82819e92310869b3a344a858296bcb nlohmann-json-d7d0509.tar.gz +12dd84152a3c8612398695b30eb699e8 nlohmann-json-3948630.tar.gz