- new URLs, updated to 0.6.2 (note: new soname; now uses C++11 instead of boost)

- added gtest-no-install patch (don't install local gtest/gmock system wide)
- removed obsolete OpenColorIO note

diff --git a/yaml-cpp-gtest-no-install.patch b/yaml-cpp-gtest-no-install.patch
new file mode 100644 (file)
index 0000000..3711fb9
--- /dev/null
+++ b/yaml-cpp-gtest-no-install.patch
@@ -0,0 +1,26 @@
+--- yaml-cpp-yaml-cpp-0.6.2/test/gtest-1.8.0/googlemock/CMakeLists.txt.orig    2018-03-06 05:56:23.000000000 +0100
++++ yaml-cpp-yaml-cpp-0.6.2/test/gtest-1.8.0/googlemock/CMakeLists.txt 2018-06-25 18:05:05.861189115 +0200
+@@ -103,10 +103,6 @@
+ ########################################################################
+ #
+ # Install rules
+-install(TARGETS gmock gmock_main
+-  DESTINATION lib)
+-install(DIRECTORY ${gmock_SOURCE_DIR}/include/gmock
+-  DESTINATION include)
+ 
+ ########################################################################
+ #
+--- yaml-cpp-yaml-cpp-0.6.2/test/gtest-1.8.0/googletest/CMakeLists.txt.orig    2018-03-06 05:56:23.000000000 +0100
++++ yaml-cpp-yaml-cpp-0.6.2/test/gtest-1.8.0/googletest/CMakeLists.txt 2018-06-25 18:05:19.014522293 +0200
+@@ -102,10 +102,6 @@
+ ########################################################################
+ #
+ # Install rules
+-install(TARGETS gtest gtest_main
+-  DESTINATION lib)
+-install(DIRECTORY ${gtest_SOURCE_DIR}/include/gtest
+-  DESTINATION include)
+ 
+ ########################################################################
+ #

diff --git a/yaml-cpp.spec b/yaml-cpp.spec
index 79953f9fe2a0d7c6b79c0709a0dbe7ccc01df028..3a769d2d74323fdccb1dfa88ee9a5e245b69f4d2 100644 (file)
--- a/yaml-cpp.spec
+++ b/yaml-cpp.spec
@@ -1,19 +1,17 @@
-# Note: the only package that requires yaml-cpp is OpenColorIO, and it requires
-#      the old API (as in yaml-cpp 0.3.0), so please don't STBR the new API until
-#      OpenColorIO is updated.
 Summary:       YAML parser and emitter for C++
 Summary(pl.UTF-8):     Biblioteka C++ analizująca i generująca YAML
 Name:          yaml-cpp
-Version:       0.5.1
-Release:       5
+Version:       0.6.2
+Release:       1
 License:       MIT
 Group:         Libraries
-#Source0Download: http://code.google.com/p/yaml-cpp/downloads/list
-Source0:       http://yaml-cpp.googlecode.com/files/%{name}-%{version}.tar.gz
-# Source0-md5: 0fa47a5ed8fedefab766592785c85ee7
-URL:           http://code.google.com/p/yaml-cpp/
+#Source0Download: https://github.com/jbeder/yaml-cpp/releases
+Source0:       https://github.com/jbeder/yaml-cpp/archive/%{name}-%{version}.tar.gz
+# Source0-md5: 5b943e9af0060d0811148b037449ef82
+Patch0:                %{name}-gtest-no-install.patch
+URL:           https://github.com/jbeder/yaml-cpp/
 BuildRequires: cmake >= 2.6
-BuildRequires: libstdc++-devel
+BuildRequires: libstdc++-devel >= 6:4.7
 BuildRequires: rpmbuild(macros) >= 1.605
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -28,7 +26,7 @@ Summary:      Header files for yaml-cpp library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki yaml-cpp
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      libstdc++-devel
+Requires:      libstdc++-devel >= 6:4.7
 
 %description devel
 Header files for yaml-cpp library.
@@ -37,16 +35,19 @@ Header files for yaml-cpp library.
 Pliki nagłówkowe biblioteki yaml-cpp.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{name}-%{version}
+%patch0 -p1
 
 %build
-%cmake .
+install -d build
+cd build
+%cmake ..
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
+%{__make} -C build install \
        DESTDIR=$RPM_BUILD_ROOT
 
 %clean
@@ -57,12 +58,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc license.txt
+%doc LICENSE README.md
 %attr(755,root,root) %{_libdir}/libyaml-cpp.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libyaml-cpp.so.0.5
+%attr(755,root,root) %ghost %{_libdir}/libyaml-cpp.so.0.6
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libyaml-cpp.so
 %{_includedir}/yaml-cpp
 %{_pkgconfigdir}/yaml-cpp.pc
+%{_libdir}/cmake/yaml-cpp