PR#2: Update to release 6.0.0 - rpms/sdformat

rpms / sdformat

#2 Update to release 6.0.0

Merged 5 years ago by rmattes. Opened 5 years ago by thofmann.

rpms/ thofmann/sdformat master into master

Till Hofmann • 5 years ago

e213428

.gitignore

file modified

		`@@ -9,3 +9,4 @@`
		`/sdformat-4.2.0.tar.bz2`
		`/sdformat-5.1.0.tar.bz2`
		`/sdformat-5.2.0.tar.bz2`
		`+ /sdformat-6.0.0.tar.bz2`

sdformat.ruby-lib-install-dir.patch

file added

+21

		`@@ -0,0 +1,21 @@`
		`+ diff -urN sdformat-6.0.0.orig/CMakeLists.txt sdformat-6.0.0/CMakeLists.txt`
		`+ --- sdformat-6.0.0.orig/CMakeLists.txt 2018-01-25 20:43:24.000000000 +0000`
		`+ +++ sdformat-6.0.0/CMakeLists.txt 2018-11-23 20:04:09.020944630 +0000`
		`+ @@ -61,6 +61,8 @@`
		`+`
		`+ set (USE_FULL_RPATH OFF CACHE BOOL "Set to true to enable full rpath")`
		`+`
		`+ +set (RUBY_LIB_INSTALL_DIR "lib/ruby" CACHE STRING "Installation directory for ruby scripts (relative to CMAKE_INSTALL_PREFIX)")`
		`+ +`
		`+`
		`+ if (USE_FULL_RPATH)`
		`+ # use, i.e. don't skip the full RPATH for the build tree`
		`+ diff -urN sdformat-6.0.0.orig/src/cmd/CMakeLists.txt sdformat-6.0.0/src/cmd/CMakeLists.txt`
		`+ --- sdformat-6.0.0.orig/src/cmd/CMakeLists.txt 2018-01-25 20:43:24.000000000 +0000`
		`+ +++ sdformat-6.0.0/src/cmd/CMakeLists.txt 2018-11-23 20:04:16.367048961 +0000`
		`+ @@ -14,4 +14,4 @@`
		`+ "${CMAKE_CURRENT_BINARY_DIR}/cmdsdformat${SDF_MAJOR_VERSION}.rb" @ONLY)`
		`+`
		`+ # Install the ruby command line library in an unversioned location.`
		`+ -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cmdsdformat${SDF_MAJOR_VERSION}.rb DESTINATION lib/ruby/ignition)`
		`+ +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cmdsdformat${SDF_MAJOR_VERSION}.rb DESTINATION ${RUBY_LIB_INSTALL_DIR}/ignition)`

sdformat.spec

file modified

+17 -10

		`@@ -1,8 +1,9 @@`
		`- %global apiver 5.2`
		`+ %global apiver_major 6`
		`+ %global apiver %{apiver_major}.0`

		`Name: sdformat`
		`- Version: 5.2.0`
		`- Release: 5%{?dist}`
		`+ Version: 6.0.0`
		`+ Release: 1%{?dist}`
		`Summary: The Simulation Description Format`

		`License: ASL 2.0`
		`@@ -10,6 +11,8 @@`
		`Source0: http://gazebosim.org/distributions/%{name}/releases/%{name}-%{version}.tar.bz2`
		`# Disable doxygen latex documentation`
		`Patch0: %{name}-2.0.1-latex.patch`
		`+ # Make ruby install path configurable`
		`+ Patch1: %{name}.ruby-lib-install-dir.patch`

		`BuildRequires: gcc-c++`
		`BuildRequires: boost-devel`
		`@@ -18,7 +21,7 @@`
		`BuildRequires: graphviz`
		`BuildRequires: gtest-devel`
		`BuildRequires: ignition-math-devel`
		`- BuildRequires: ruby >= 1.9`
		`+ BuildRequires: ruby-devel >= 1.9`
		`BuildRequires: /usr/bin/ruby`
		`BuildRequires: rubygem-multi_xml`
		`BuildRequires: texlive-refman`
		`@@ -55,6 +58,7 @@`
		`%prep`
		`%setup -q`
		`%patch0 -p0 -b .latex`
		`+ %patch1 -p1`
		`# Remove bundled urdf components`
		`rm -rf src/urdf`

		`@@ -66,6 +70,7 @@`
		`-DCMAKE_C_FLAGS_RELWITHDEBINFO="-std=c++11 %{optflags}" \`
		`-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="-std=c++11 %{optflags}" \`
		`-DLIB_INSTALL_DIR:STRING=%{_lib} \`
		`+ -DRUBY_LIB_INSTALL_DIR:STRING=%{ruby_vendorlibdir} \`
		`-DUSE_EXTERNAL_URDF=ON \`
		`-DSSE3_FOUND=false \`
		`-DSSSE3_FOUND=false \`
		`@@ -91,15 +96,12 @@`
		`export GTEST_COLOR=no`
		`make -C build test ARGS="-V -E INTEGRATION_schema_test"`

		`- %post -p /sbin/ldconfig`
		`-`
		`- %postun -p /sbin/ldconfig`
		`-`
		`%files`
		`%license LICENSE COPYING`
		`- %doc AUTHORS README`
		`- %exclude %{_datadir}/%{name}/cmake`
		`+ %doc AUTHORS README.md Changelog.md Migration.md`
		`%{_datadir}/%{name}`
		`+ %{_datadir}/ignition/sdformat%{apiver_major}.yaml`
		`+ %{ruby_vendorlibdir}/ignition/cmdsdformat%{apiver_major}.rb`
		`%{_libdir}/.so.`

		`%files devel`
		`@@ -113,6 +115,11 @@`
		`%doc build/doxygen/html`

		`%changelog`
		`+ * Fri Nov 23 2018 Till Hofmann <thofmann@fedoraproject.org> - 6.0.0-1`
		`+ - Update to release 6.0.0`
		`+ - Install ruby script into %%{ruby_vendorlibdir}`
		`+ - Remove obsolete %%post and %%postun ldconfig scriptlets`
		`+`
		`* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.0-5`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (sdformat-5.2.0.tar.bz2) = 65df9f0d351ab894af41cc2081dc8ab179336092ceba17979720bed4d58f77e9648863501d83f073ea8478197e7e0a7d7a9f8efd3a54d22ee28d74765cebcee7`
		`+ SHA512 (sdformat-6.0.0.tar.bz2) = 2188de97cb1eb1117a694d54a0a42112bd7e5b5a4b00c04e049de73a10947904940565e36df93ca08ea5910e628983e234d07c57694c463e0794c48e20cedb21`

thofmann commented 5 years ago

Update to release 6.0.0
Install ruby script into %%{ruby_vendorlibdir}
Remove obsolete %%post and %%postun ldconfig scriptlets

thofmann commented 5 years ago

Hm please don't merge yet, there is a problem with ignition-math when trying to use sdformat for a gazebo 9 build:

 Problem: cannot install the best candidate for the job
  - nothing provides pkgconfig(ignition-math4) needed by sdformat-devel-6.0.0-1.fc30.x86_64

full log

rmattes commented 5 years ago

Should I try to upgrade ignition-math to version 4 in rawhide?

rmattes commented 5 years ago

sdformat/cmake/SearchForStuff.cmake sets IGNITION-MATH_REQUIRED_MAJOR_VERSION to 4, but then falls back to searching for 3 if it doesn't find 4. It doesn't update the variable to 3 when it falls back though, so the pkg-config is emitted with the wrong version.

I think we just need to add a line to re-set IGNITION-MATH_REQUIRED_MAJOR_VERSION to 3 when it falls back.

thofmann commented 5 years ago

Sorry, just saw your comments, I was fiddling with the regex for ignition-math on release-monitoring.org, (they this weird tagging scheme ignition-math${maj}_${maj}.${min}.${patch}).

Anyway, I think it would be best to upgrade ignition-math, this will be necessary eventually anyway.

rmattes commented 5 years ago

Yes, it looks like gazebo-9 does have a hard dependency on ignition-math4. I'll upgrade that and the rest of the ignition packages in rawhide.