diff --git a/.gitignore b/.gitignore index 327a370..4064917 100644 --- a/.gitignore +++ b/.gitignore @@ -5,5 +5,3 @@ /urdfdom_headers-1.0.1.tar.gz /urdfdom_headers-1.0.2.tar.gz /urdfdom_headers-1.0.5.tar.gz -/urdfdom_headers-1.1.1.tar.gz -/urdfdom_headers-1.1.2.tar.gz diff --git a/sources b/sources index be52e0a..14f8b6c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (urdfdom_headers-1.1.2.tar.gz) = 5636865ab93e92dd99851a4e19b18552b51131a0fa39c83fd64aa020060237ae0c8bbfd361ddec5abcd4c2300d92c3e78da20e3b599c882ea148e82e9abc1603 +SHA512 (urdfdom_headers-1.0.5.tar.gz) = c16d83282c189d7720326ed0628c4b3359a859f45157e08f78ffa10a5607d01e6f64b2caa3b721ab9fcf2d83ee1240bc6f43ab484946e7a381122b27bd057b58 diff --git a/urdfdom-headers-1.1.2-fedora.patch b/urdfdom-headers-1.1.2-fedora.patch deleted file mode 100644 index 6864f49..0000000 --- a/urdfdom-headers-1.1.2-fedora.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -up ./CMakeLists.txt.fedora ./CMakeLists.txt ---- ./CMakeLists.txt.fedora 2023-12-26 13:51:36.000000000 -0500 -+++ ./CMakeLists.txt 2024-04-02 23:12:14.851750368 -0400 -@@ -31,7 +31,7 @@ install(DIRECTORY include/ DESTINATION $ - if(WIN32 AND NOT CYGWIN) - set(CMAKE_CONFIG_INSTALL_DIR CMake) - else() -- set(CMAKE_CONFIG_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/cmake) -+ set(CMAKE_CONFIG_INSTALL_DIR ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake) - endif() - string(REGEX REPLACE "[^/]+" ".." RELATIVE_PATH_CMAKE_DIR_TO_PREFIX "${CMAKE_CONFIG_INSTALL_DIR}") - string(REGEX REPLACE "[^/]+" ".." RELATIVE_PATH_LIBDIR_TO_PREFIX "${CMAKE_INSTALL_LIBDIR}") -@@ -43,11 +43,12 @@ set(cmake_conf_version_file "${PROJECT_N - # allow users of gazebo to specify the API or version to depend on - # TODO: keep this instruction until deprecate Ubuntu/Precise and update with - # https://github.com/Kitware/CMake/blob/v2.8.8/Modules/CMakePackageConfigHelpers.cmake --include(WriteBasicConfigVersionFile) --write_basic_config_version_file( -+include(CMakePackageConfigHelpers) -+write_basic_package_version_file( - ${CMAKE_CURRENT_BINARY_DIR}/${cmake_conf_version_file} - VERSION "${URDF_VERSION}" -- COMPATIBILITY SameMajorVersion) -+ COMPATIBILITY SameMajorVersion -+ ARCH_INDEPENDENT) - install(FILES - "${CMAKE_BINARY_DIR}/${cmake_conf_file}" - "${CMAKE_BINARY_DIR}/${cmake_conf_version_file}" -@@ -57,7 +58,7 @@ install(FILES - set(PACKAGE_DESC "Unified Robot Description Format") - set(pkg_conf_file "urdfdom_headers.pc") - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/pkgconfig/${pkg_conf_file}.in" "${CMAKE_BINARY_DIR}/${pkg_conf_file}" @ONLY) --install(FILES "${CMAKE_BINARY_DIR}/${pkg_conf_file}" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig/ COMPONENT pkgconfig) -+install(FILES "${CMAKE_BINARY_DIR}/${pkg_conf_file}" DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig/ COMPONENT pkgconfig) - - add_library(${PROJECT_NAME} INTERFACE) - target_include_directories(${PROJECT_NAME} INTERFACE -diff -up ./cmake/pkgconfig/urdfdom_headers.pc.in.fedora ./cmake/pkgconfig/urdfdom_headers.pc.in diff --git a/urdfdom-headers-fedora.patch b/urdfdom-headers-fedora.patch new file mode 100644 index 0000000..937ccc1 --- /dev/null +++ b/urdfdom-headers-fedora.patch @@ -0,0 +1,73 @@ +diff -up ./CMakeLists.txt.fedora ./CMakeLists.txt +--- ./CMakeLists.txt.fedora 2020-05-08 14:20:07.000000000 -0400 ++++ ./CMakeLists.txt 2020-08-04 20:32:32.586955156 -0400 +@@ -26,7 +26,7 @@ add_subdirectory(urdf_exception) + if(WIN32 AND NOT CYGWIN) + set(CMAKE_CONFIG_INSTALL_DIR CMake) + else() +- set(CMAKE_CONFIG_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/cmake) ++ set(CMAKE_CONFIG_INSTALL_DIR ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake) + endif() + string(REGEX REPLACE "[^/]+" ".." RELATIVE_PATH_CMAKE_DIR_TO_PREFIX "${CMAKE_CONFIG_INSTALL_DIR}") + +@@ -38,11 +38,12 @@ set(cmake_conf_version_file "${PROJECT_N + # allow users of gazebo to specify the API or version to depend on + # TODO: keep this instruction until deprecate Ubuntu/Precise and update with + # https://github.com/Kitware/CMake/blob/v2.8.8/Modules/CMakePackageConfigHelpers.cmake +-include(WriteBasicConfigVersionFile) +-write_basic_config_version_file( ++include(CMakePackageConfigHelpers) ++write_basic_package_version_file( + ${CMAKE_CURRENT_BINARY_DIR}/${cmake_conf_version_file} + VERSION "${URDF_VERSION}" +- COMPATIBILITY SameMajorVersion) ++ COMPATIBILITY SameMajorVersion ++ ARCH_INDEPENDENT) + install(FILES + "${CMAKE_BINARY_DIR}/${cmake_conf_file}" + "${CMAKE_BINARY_DIR}/${cmake_conf_version_file}" +@@ -53,7 +54,7 @@ if (NOT MSVC) + set(PACKAGE_DESC "Unified Robot Description Format") + set(pkg_conf_file "urdfdom_headers.pc") + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/pkgconfig/${pkg_conf_file}.in" "${CMAKE_BINARY_DIR}/${pkg_conf_file}" @ONLY) +- install(FILES "${CMAKE_BINARY_DIR}/${pkg_conf_file}" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig/ COMPONENT pkgconfig) ++ install(FILES "${CMAKE_BINARY_DIR}/${pkg_conf_file}" DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig/ COMPONENT pkgconfig) + endif() + + add_library(${PROJECT_NAME} INTERFACE) +diff -up ./cmake/pkgconfig/urdfdom_headers.pc.in.fedora ./cmake/pkgconfig/urdfdom_headers.pc.in +--- ./cmake/pkgconfig/urdfdom_headers.pc.in.fedora 2020-05-08 14:20:07.000000000 -0400 ++++ ./cmake/pkgconfig/urdfdom_headers.pc.in 2020-08-04 20:31:08.536562909 -0400 +@@ -1,7 +1,7 @@ + # This file was generated by CMake for @PROJECT_NAME@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} +-includedir=${prefix}/include ++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ + + Name: @PACKAGE_NAME@ + Description: @PACKAGE_DESC@ +diff -up ./urdf_exception/CMakeLists.txt.fedora ./urdf_exception/CMakeLists.txt +--- ./urdf_exception/CMakeLists.txt.fedora 2020-05-08 14:20:07.000000000 -0400 ++++ ./urdf_exception/CMakeLists.txt 2020-08-04 20:31:08.536562909 -0400 +@@ -1 +1 @@ +-INSTALL(DIRECTORY include/urdf_exception DESTINATION include) ++INSTALL(DIRECTORY include/urdf_exception DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) +diff -up ./urdf_model/CMakeLists.txt.fedora ./urdf_model/CMakeLists.txt +--- ./urdf_model/CMakeLists.txt.fedora 2020-05-08 14:20:07.000000000 -0400 ++++ ./urdf_model/CMakeLists.txt 2020-08-04 20:31:08.537562902 -0400 +@@ -1 +1 @@ +-INSTALL(DIRECTORY include/urdf_model DESTINATION include) ++INSTALL(DIRECTORY include/urdf_model DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) +diff -up ./urdf_model_state/CMakeLists.txt.fedora ./urdf_model_state/CMakeLists.txt +--- ./urdf_model_state/CMakeLists.txt.fedora 2020-05-08 14:20:07.000000000 -0400 ++++ ./urdf_model_state/CMakeLists.txt 2020-08-04 20:31:08.537562902 -0400 +@@ -1 +1 @@ +-INSTALL(DIRECTORY include/urdf_model_state DESTINATION include) ++INSTALL(DIRECTORY include/urdf_model_state DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) +diff -up ./urdf_sensor/CMakeLists.txt.fedora ./urdf_sensor/CMakeLists.txt +--- ./urdf_sensor/CMakeLists.txt.fedora 2020-05-08 14:20:07.000000000 -0400 ++++ ./urdf_sensor/CMakeLists.txt 2020-08-04 20:31:08.537562902 -0400 +@@ -1 +1 @@ +-INSTALL(DIRECTORY include/urdf_sensor DESTINATION include) ++INSTALL(DIRECTORY include/urdf_sensor DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) diff --git a/urdfdom-headers.spec b/urdfdom-headers.spec index 18413cb..2b01f37 100644 --- a/urdfdom-headers.spec +++ b/urdfdom-headers.spec @@ -1,21 +1,23 @@ +%undefine __cmake_in_source_build + %global realname urdfdom_headers Name: urdfdom-headers -Version: 1.1.2 -Release: 5%{?dist} +Version: 1.0.5 +Release: 1%{?dist} Summary: The URDF (U-Robot Description Format) headers -License: BSD-3-Clause +License: BSD URL: http://ros.org/wiki/urdf Source0: https://github.com/ros/%{realname}/archive/%{version}/%{realname}-%{version}.tar.gz BuildArch: noarch # Install configs to arch independent paths # https://github.com/ros/urdfdom_headers/issues/27 -Patch0: urdfdom-headers-1.1.2-fedora.patch +Patch0: urdfdom-headers-fedora.patch -BuildRequires: gcc -BuildRequires: gcc-c++ +BuildRequires: gcc +BuildRequires: gcc-c++ BuildRequires: cmake %description @@ -35,10 +37,11 @@ For now, the details of the URDF specifications reside on http://ros.org/wiki/urdf %prep -%autosetup -Sgendiff -p1 -n %{realname}-%{version} +%setup -qn %{realname}-%{version} +%patch0 -p1 -b .fedora %build -%cmake -DCMAKE_BUILD_TYPE:STRING=Release +%cmake -DCMAKE_BUILD_TYPE=Release %cmake_build %install @@ -47,57 +50,15 @@ http://ros.org/wiki/urdf %files devel %license LICENSE %doc README.md -%{_includedir}/urdfdom_headers +%{_includedir}/urdf_exception +%{_includedir}/urdf_model +%{_includedir}/urdf_model_state +%{_includedir}/urdf_sensor +%{_includedir}/urdf_world %{_datadir}/pkgconfig/*.pc %{_datadir}/%{realname} %changelog -* Fri Jul 17 2026 Fedora Release Engineering - 1.1.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Sat Jan 17 2026 Fedora Release Engineering - 1.1.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Fri Jul 25 2025 Fedora Release Engineering - 1.1.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jan 19 2025 Fedora Release Engineering - 1.1.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jan 10 2025 Scott K Logan - 1.1.2-1 -- Update to release 1.1.2 -- Review SPDX license identifier - -* Wed Sep 04 2024 Miroslav Suchý - 1.1.1-3 -- convert license to SPDX - -* Sat Jul 20 2024 Fedora Release Engineering - 1.1.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Apr 02 2024 Rich Mattes - 1.1.1-1 -- Update to release 1.1.1 - -* Sat Jan 27 2024 Fedora Release Engineering - 1.0.5-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 1.0.5-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 1.0.5-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 1.0.5-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 1.0.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 1.0.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 1.0.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - * Tue Aug 04 2020 Rich Mattes - 1.0.5-1 - Update to release 1.0.5