Skip to content

Commit

Permalink
Rebase from 'rpm/noetic/soem'
Browse files Browse the repository at this point in the history
  • Loading branch information
mgruhler committed Aug 3, 2020
1 parent 1de6fa0 commit 790292c
Show file tree
Hide file tree
Showing 6 changed files with 74 additions and 67 deletions.
Empty file removed .write_tar
Empty file.
5 changes: 5 additions & 0 deletions CHANGELOG.rst
Expand Up @@ -2,6 +2,11 @@
Changelog for package soem
^^^^^^^^^^^^^^^^^^^^^^^^^^

1.4.1003 (2020-08-03)
---------------------
* fixes `#40 <https://github.com/mgruhler/soem/issues/40>`_: export include directories properly
* Contributors: Matthias Gruhler

1.4.1002 (2020-06-24)
---------------------
* Merge pull request `#39 <https://github.com/mgruhler/soem/issues/39>`_ from mgruhler/fix/warnings_as_errors_focal
Expand Down
1 change: 1 addition & 0 deletions cmake/soem-ros-extras.cmake.in
@@ -1 +1,2 @@
list(APPEND @PROJECT_NAME@_INCLUDE_DIRS "${@PROJECT_NAME@_PREFIX}/@CATKIN_GLOBAL_INCLUDE_DESTINATION@")
list(APPEND @PROJECT_NAME@_INCLUDE_DIRS "${@PROJECT_NAME@_PREFIX}/@CATKIN_GLOBAL_INCLUDE_DESTINATION@/soem")
2 changes: 1 addition & 1 deletion package.xml
Expand Up @@ -19,7 +19,7 @@
The idea for this approach was taken from the cartographer_ros package at
https://github.com/ros2/cartographer_ros
-->
<version>1.4.1002</version>
<version>1.4.1003</version>
<description>
ROS wrapper for the Simple Open EtherCAT Master SOEM.
This is an updated version of the original SOEM wrapper released into ROS now including
Expand Down
66 changes: 0 additions & 66 deletions rpm/ros-noetic-soem.spec

This file was deleted.

67 changes: 67 additions & 0 deletions rpm/template.spec.em
@@ -0,0 +1,67 @@
%bcond_without weak_deps

%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
%global __provides_exclude_from ^@(InstallationPrefix)/.*$
%global __requires_exclude_from ^@(InstallationPrefix)/.*$

Name: @(Package)
Version: @(Version)
Release: @(RPMInc)%{?dist}%{?release_suffix}
Summary: ROS @(Name) package

License: @(License)
@[if Homepage and Homepage != '']URL: @(Homepage)@\n@[end if]@
Source0: %{name}-%{version}.tar.gz
@[if NoArch]@\nBuildArch: noarch@\n@[end if]@

@[for p in Depends]Requires: @p@\n@[end for]@
@[for p in BuildDepends]BuildRequires: @p@\n@[end for]@
@[for p in Conflicts]Conflicts: @p@\n@[end for]@
@[for p in Replaces]Obsoletes: @p@\n@[end for]@
@[for p in Provides]Provides: @p@\n@[end for]@
@[if Supplements]@\n%if 0%{?with_weak_deps}
@[for p in Supplements]Supplements: @p@\n@[end for]@
%endif@\n@[end if]@

%description
@(Description)

%prep
%autosetup

%build
# In case we're installing to a non-standard location, look for a setup.sh
# in the install tree that was dropped by catkin, and source it. It will
# set things like CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH.
if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi
mkdir -p obj-%{_target_platform} && cd obj-%{_target_platform}
%cmake3 \
-UINCLUDE_INSTALL_DIR \
-ULIB_INSTALL_DIR \
-USYSCONF_INSTALL_DIR \
-USHARE_INSTALL_PREFIX \
-ULIB_SUFFIX \
-DCMAKE_INSTALL_LIBDIR="lib" \
-DCMAKE_INSTALL_PREFIX="@(InstallationPrefix)" \
-DCMAKE_PREFIX_PATH="@(InstallationPrefix)" \
-DSETUPTOOLS_DEB_LAYOUT=OFF \
-DCATKIN_BUILD_BINARY_PACKAGE="1" \
..

%make_build

%install
# In case we're installing to a non-standard location, look for a setup.sh
# in the install tree that was dropped by catkin, and source it. It will
# set things like CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH.
if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi
%make_install -C obj-%{_target_platform}

%files
@(InstallationPrefix)

%changelog@
@[for change_version, (change_date, main_name, main_email) in changelogs]
* @(change_date) @(main_name) <@(main_email)> - @(change_version)
- Autogenerated by Bloom
@[end for]

0 comments on commit 790292c

Please sign in to comment.