From 0142c5d357e5ac08d1d3f29b59dc7504c305466d Mon Sep 17 00:00:00 2001 From: James Antill Date: Mon, 8 Aug 2022 12:43:20 -0400 Subject: [PATCH] Import rpm: 3d9bc35b146d1d27a887a625b67a1a7d5bd511c7 --- .gitignore | 1 + sources | 1 + yaml-cpp-include_dir.patch | 12 +++ yaml-cpp-static.patch | 116 ++++++++++++++++++++ yaml-cpp.spec | 214 +++++++++++++++++++++++++++++++++++++ 5 files changed, 344 insertions(+) create mode 100644 .gitignore create mode 100644 sources create mode 100644 yaml-cpp-include_dir.patch create mode 100644 yaml-cpp-static.patch create mode 100644 yaml-cpp.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5a20fb9 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/yaml-cpp-0.6.1.tar.gz diff --git a/sources b/sources new file mode 100644 index 0000000..86786b7 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA1 (yaml-cpp-0.6.1.tar.gz) = d447c93d2636827bb818c739b71f357473380b6c diff --git a/yaml-cpp-include_dir.patch b/yaml-cpp-include_dir.patch new file mode 100644 index 0000000..4de7320 --- /dev/null +++ b/yaml-cpp-include_dir.patch @@ -0,0 +1,12 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -335,8 +335,7 @@ else() + endif() + endif() + +-file(RELATIVE_PATH REL_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_CMAKE_DIR}" "${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_ROOT_DIR}") +-set(CONFIG_INCLUDE_DIRS "\${YAML_CPP_CMAKE_DIR}/${REL_INCLUDE_DIR}") ++set(CONFIG_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}") + + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/yaml-cpp-config.cmake.in + "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${YAML_TARGET}-config.cmake" @ONLY) diff --git a/yaml-cpp-static.patch b/yaml-cpp-static.patch new file mode 100644 index 0000000..5ae46f4 --- /dev/null +++ b/yaml-cpp-static.patch @@ -0,0 +1,116 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -274,16 +274,20 @@ set(_INSTALL_DESTINATIONS + ### + ### Library + ### +-add_library(yaml-cpp ${library_sources}) +-set_target_properties(yaml-cpp PROPERTIES +- COMPILE_FLAGS "${yaml_c_flags} ${yaml_cxx_flags}" +-) +- +-set_target_properties(yaml-cpp PROPERTIES ++if(BUILD_SHARED_LIBS) ++ add_library(yaml-cpp SHARED ${library_sources}) ++ set_target_properties(yaml-cpp PROPERTIES + VERSION "${YAML_CPP_VERSION}" + SOVERSION "${YAML_CPP_VERSION_MAJOR}.${YAML_CPP_VERSION_MINOR}" + PROJECT_LABEL "yaml-cpp ${LABEL_SUFFIX}" ++ COMPILE_FLAGS "${yaml_c_flags} ${yaml_cxx_flags}" + ) ++else() ++ add_library(yaml-cpp STATIC ${library_sources}) ++ set_target_properties(yaml-cpp PROPERTIES ++ COMPILE_FLAGS "${yaml_c_flags} ${yaml_cxx_flags}" ++ ) ++endif() + + if(IPHONE) + set_target_properties(yaml-cpp PROPERTIES +@@ -303,48 +307,56 @@ if(MSVC) + endif() + endif() + +-install(TARGETS yaml-cpp EXPORT yaml-cpp-targets ${_INSTALL_DESTINATIONS}) + install( + DIRECTORY ${header_directory} + DESTINATION ${INCLUDE_INSTALL_DIR} + FILES_MATCHING PATTERN "*.h" + ) + +-export( +- TARGETS yaml-cpp +- FILE "${PROJECT_BINARY_DIR}/yaml-cpp-targets.cmake") +-export(PACKAGE yaml-cpp) +-set(EXPORT_TARGETS yaml-cpp CACHE INTERNAL "export targets") ++if(BUILD_SHARED_LIBS) ++ set(YAML_TARGET "yaml-cpp") ++else() ++ set(YAML_TARGET "yaml-cpp-static") ++endif() + ++install(TARGETS yaml-cpp EXPORT ${YAML_TARGET}-targets ${_INSTALL_DESTINATIONS}) ++export(TARGETS yaml-cpp ++ FILE "${PROJECT_BINARY_DIR}/${YAML_TARGET}-targets.cmake") ++set(EXPORT_TARGETS yaml-cpp CACHE INTERNAL "export targets") + set(CONFIG_INCLUDE_DIRS "${YAML_CPP_SOURCE_DIR}/include") + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/yaml-cpp-config.cmake.in +- "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake" @ONLY) ++ "${PROJECT_BINARY_DIR}/${YAML_TARGET}-config.cmake" @ONLY) + ++if(NOT INSTALL_CMAKE_DIR) + if(WIN32 AND NOT CYGWIN) + set(INSTALL_CMAKE_DIR CMake) + else() +- set(INSTALL_CMAKE_DIR ${LIB_INSTALL_DIR}/cmake/yaml-cpp) ++ set(INSTALL_CMAKE_DIR ${LIB_INSTALL_DIR}/cmake/) ++endif() + endif() + + file(RELATIVE_PATH REL_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_CMAKE_DIR}" "${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_ROOT_DIR}") + set(CONFIG_INCLUDE_DIRS "\${YAML_CPP_CMAKE_DIR}/${REL_INCLUDE_DIR}") +-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/yaml-cpp-config.cmake.in +- "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/yaml-cpp-config.cmake" @ONLY) + ++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/yaml-cpp-config.cmake.in ++ "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${YAML_TARGET}-config.cmake" @ONLY) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/yaml-cpp-config-version.cmake.in +- "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake" @ONLY) +- ++ "${PROJECT_BINARY_DIR}/${YAML_TARGET}-config-version.cmake" @ONLY) + install(FILES +- "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/yaml-cpp-config.cmake" +- "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake" +- DESTINATION "${INSTALL_CMAKE_DIR}" COMPONENT dev) +-install(EXPORT yaml-cpp-targets DESTINATION ${INSTALL_CMAKE_DIR}) ++ "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${YAML_TARGET}-config.cmake" ++ "${PROJECT_BINARY_DIR}/${YAML_TARGET}-config-version.cmake" ++ DESTINATION "${INSTALL_CMAKE_DIR}${YAML_TARGET}" COMPONENT dev) ++install(EXPORT ${YAML_TARGET}-targets DESTINATION ${INSTALL_CMAKE_DIR}${YAML_TARGET}) + + if(UNIX) +- set(PC_FILE ${CMAKE_BINARY_DIR}/yaml-cpp.pc) +- configure_file("yaml-cpp.pc.cmake" ${PC_FILE} @ONLY) +- install(FILES ${PC_FILE} DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) ++if(BUILD_SHARED_LIBS) ++ set(PC_FILE ${CMAKE_BINARY_DIR}/yaml-cpp.pc) ++else() ++ set(PC_FILE ${CMAKE_BINARY_DIR}/yaml-cpp-static.pc) + endif() ++configure_file("yaml-cpp.pc.cmake" ${PC_FILE} @ONLY) ++install(FILES ${PC_FILE} DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) ++endif(UNIX) + + + ### +--- a/yaml-cpp-config.cmake.in ++++ b/yaml-cpp-config.cmake.in +@@ -8,7 +8,7 @@ get_filename_component(YAML_CPP_CMAKE_DI + set(YAML_CPP_INCLUDE_DIR "@CONFIG_INCLUDE_DIRS@") + + # Our library dependencies (contains definitions for IMPORTED targets) +-include("${YAML_CPP_CMAKE_DIR}/yaml-cpp-targets.cmake") ++include("${YAML_CPP_CMAKE_DIR}/@YAML_TARGET@-targets.cmake") + + # These are IMPORTED targets created by yaml-cpp-targets.cmake + set(YAML_CPP_LIBRARIES "@EXPORT_TARGETS@") diff --git a/yaml-cpp.spec b/yaml-cpp.spec new file mode 100644 index 0000000..1291ccc --- /dev/null +++ b/yaml-cpp.spec @@ -0,0 +1,214 @@ +%global sover 0.6 + +Name: yaml-cpp +Version: 0.6.1 +Release: 2%{?dist} +Summary: A YAML parser and emitter for C++ +Group: Development/Libraries +License: MIT +URL: https://github.com/jbeder/yaml-cpp +Source0: https://github.com/jbeder/yaml-cpp/archive/%{name}-%{version}.tar.gz + +Patch0: yaml-cpp-static.patch +Patch1: yaml-cpp-include_dir.patch + +BuildRequires: cmake gcc gcc-c++ + +%description +yaml-cpp is a YAML parser and emitter in C++ written around the YAML 1.2 spec. + + +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +License: MIT +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: pkgconfig +Requires: boost-devel + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + + +%package static +Summary: Static library for %{name} +Group: Development/Libraries +License: MIT +Requires: %{name}-devel%{?_isa} = %{version}-%{release} + +%description static +The %{name}-static package contains the static library for %{name}. + + +%prep +%autosetup -p1 -n %{name}-%{name}-%{version} + + +%build +rm -rf build_shared && mkdir build_shared +rm -rf build_static && mkdir build_static + +pushd build_shared +%cmake -DYAML_CPP_BUILD_TOOLS=OFF \ + -DBUILD_SHARED_LIBS=ON \ + -DYAML_CPP_BUILD_TESTS=OFF \ + ../ +%make_build +popd + +pushd build_static +%cmake -DYAML_CPP_BUILD_TOOLS=OFF \ + -DBUILD_SHARED_LIBS=OFF \ + -DYAML_CPP_BUILD_TESTS=OFF \ + ../ +%make_build + + +%install +pushd build_shared +%make_install +popd +pushd build_static +%make_install yaml-cpp + + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + + +%files +%doc CONTRIBUTING.md README.md +%license LICENSE +%{_libdir}/*.so.%{sover}* + +%files devel +%{_includedir}/yaml-cpp/ +%{_libdir}/*.so +%{_libdir}/cmake/%{name} +%{_libdir}/pkgconfig/%{name}.pc + +%files static +%license LICENSE +%{_libdir}/*.a +%{_libdir}/cmake/%{name}-static +%{_libdir}/pkgconfig/%{name}-static.pc + + +%changelog +* Mon Apr 09 2018 Richard Shaw - 0.6.1-2 +- Fixes improperly generated cmake config files, RHBZ#1558637. + +* Sun Feb 18 2018 Richard Shaw - 0.6.1-1 +- Update to 0.6.1. + +* Sun Feb 11 2018 Richard Shaw - 0.6.0-1 +- Update to 0.6.0. +- Add static library subpackage. + +* Fri Feb 09 2018 Fedora Release Engineering - 0.5.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jan 31 2018 Richard Shaw - 0.5.3-9 +- Install yaml cmake files, fixes RHBZ#1509421. + +* Tue Jan 23 2018 Jonathan Wakely - 0.5.3-8 +- Rebuilt for Boost 1.66 + +* Thu Jul 27 2017 Fedora Release Engineering - 0.5.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed Jul 19 2017 Jonathan Wakely - 0.5.3-6 +- Rebuilt for s390x binutils bug + +* Tue Jul 04 2017 Jonathan Wakely - 0.5.3-5 +- Rebuilt for Boost 1.64 + +* Sat Feb 11 2017 Fedora Release Engineering - 0.5.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Jan 27 2017 Jonathan Wakely - 0.5.3-3 +- Rebuilt for Boost 1.63 + +* Fri Jan 27 2017 Jonathan Wakely - 0.5.3-2 +- Rebuilt for Boost 1.63 + +* Tue Aug 23 2016 Richard Shaw - 0.5.3-1 +- Update to latest upstream release. + +* Fri Feb 05 2016 Fedora Release Engineering - 0.5.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Sat Jan 16 2016 Jonathan Wakely - 0.5.1-12 +- Rebuilt for Boost 1.60 + +* Thu Aug 27 2015 Jonathan Wakely - 0.5.1-11 +- Rebuilt for Boost 1.59 + +* Wed Jul 29 2015 Fedora Release Engineering - 0.5.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 + +* Wed Jul 22 2015 David Tardon - 0.5.1-9 +- rebuild for Boost 1.58 + +* Fri Jun 19 2015 Fedora Release Engineering - 0.5.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat May 02 2015 Kalev Lember - 0.5.1-7 +- Rebuilt for GCC 5 C++11 ABI change + +* Thu Feb 26 2015 Guido Grazioli - 0.5.1-6 +- Rebuild for gcc switching default to -std=gnu11 + +* Tue Jan 27 2015 Petr Machata - 0.5.1-5 +- Rebuild for boost 1.57.0 + +* Mon Aug 18 2014 Fedora Release Engineering - 0.5.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 0.5.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri May 23 2014 Petr Machata - 0.5.1-2 +- Rebuild for boost 1.55.0 + +* Thu Nov 14 2013 Richard Shaw - 0.5.1-1 +- Update to latest upstream release. + +* Sun Aug 04 2013 Fedora Release Engineering - 0.3.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Feb 15 2013 Fedora Release Engineering - 0.3.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sun Jul 22 2012 Fedora Release Engineering - 0.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Feb 10 2012 Richard Shaw - 0.3.0-1 +- Update to latest release. + +* Sat Jan 14 2012 Fedora Release Engineering +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Fri Sep 30 2011 Guido Grazioli - 0.2.7-1 +- Update to 0.2.7 +- Remove gcc 4.6 patch fixed upstream + +* Mon May 09 2011 Guido Grazioli - 0.2.6-1 +- Upstream 0.2.6 + +* Tue Feb 08 2011 Fedora Release Engineering - 0.2.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Apr 02 2010 Guido Grazioli - 0.2.5-1 +- Upstream 0.2.5 + +* Fri Jan 15 2010 Guido Grazioli - 0.2.4-1 +- Upstream 0.2.4 + +* Sat Oct 17 2009 Guido Grazioli - 0.2.2-2 +- Remove duplicate file + +* Wed Oct 14 2009 Guido Grazioli - 0.2.2-1 +- Initial packaging