[catkin] Initial import
rmattes
rmattes at fedoraproject.org
Thu Apr 11 02:09:51 UTC 2013
commit 150a05f9335c5cf0403d2c747a285c6a12fafe73
Author: Rich Mattes <richmattes at gmail.com>
Date: Wed Apr 10 22:09:21 2013 -0400
Initial import
.gitignore | 1 +
catkin-0.4.5-catkinsphinx.patch | 22 +++++++
catkin-0.4.5-catkinutil.patch | 49 +++++++++++++++
catkin-0.4.5-etc.patch | 57 +++++++++++++++++
catkin-0.4.5-scripts.patch | 18 ++++++
catkin.spec | 128 +++++++++++++++++++++++++++++++++++++++
sources | 1 +
7 files changed, 276 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..8064101 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/ros-catkin-0.4.5-0-gd4f1f24.tar.gz
diff --git a/catkin-0.4.5-catkinsphinx.patch b/catkin-0.4.5-catkinsphinx.patch
new file mode 100644
index 0000000..45ab354
--- /dev/null
+++ b/catkin-0.4.5-catkinsphinx.patch
@@ -0,0 +1,22 @@
+diff -up ./doc/conf.py.catkinsphinx ./doc/conf.py
+--- ./doc/conf.py.catkinsphinx 2012-06-13 18:08:58.000000000 -0400
++++ ./doc/conf.py 2013-03-20 21:53:41.140973622 -0400
+@@ -18,8 +18,7 @@ import sys, os, subprocess
+ # Add any Sphinx extension module names here, as strings. They can be extensions
+ # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+ extensions = ['sphinx.ext.ifconfig', 'sphinx.ext.todo', 'sphinx.ext.graphviz',
+- 'sphinx.ext.intersphinx',
+- 'catkin_sphinx.ShLexer', 'catkin_sphinx.cmake']
++ 'sphinx.ext.intersphinx']
+ todo_include_todos = True
+
+ # Add any paths that contain templates here, relative to this directory.
+@@ -107,7 +106,7 @@ html_theme_path = [os.path.join(os.path.
+
+ # The theme to use for HTML and HTML Help pages. Major themes that come with
+ # Sphinx are currently 'default' and 'sphinxdoc'.
+-html_theme = 'ros-theme'
++#html_theme = 'ros-theme'
+
+ # Theme options are theme-specific and customize the look and feel of a theme
+ # further. For a list of options available for each theme, see the
diff --git a/catkin-0.4.5-catkinutil.patch b/catkin-0.4.5-catkinutil.patch
new file mode 100644
index 0000000..859467d
--- /dev/null
+++ b/catkin-0.4.5-catkinutil.patch
@@ -0,0 +1,49 @@
+diff -up ./bin/catkin_util.sh.catkinutil ./bin/catkin_util.sh
+diff -up ./bin/CMakeLists.txt.catkinutil ./bin/CMakeLists.txt
+--- ./bin/CMakeLists.txt.catkinutil 2013-03-20 21:34:35.274310081 -0400
++++ ./bin/CMakeLists.txt 2013-03-20 21:35:04.407447682 -0400
+@@ -5,8 +5,12 @@ install(PROGRAMS
+ catkin-topological-order
+ catkin-version
+ catkin_install_parse
+- catkin_util.sh
+ git-catkin
+ git-catkin-track-all
+ DESTINATION bin
+ )
++
++install(FILES
++ catkin_util.sh
++ DESTINATION share/catkin
++)
+diff -up ./bin/git-catkin.catkinutil ./bin/git-catkin
+--- ./bin/git-catkin.catkinutil 2013-03-20 21:35:22.104137858 -0400
++++ ./bin/git-catkin 2013-03-20 21:35:34.860635374 -0400
+@@ -4,7 +4,7 @@
+ # Possibly lousy assumption: workspace is two directories up.
+ #
+ TOP=$(cd `dirname $0`; /bin/pwd)
+-. $TOP/catkin_util.sh
++. /usr/share/catkin/catkin_util.sh
+
+
+ gc_help() {
+diff -up ./bin/git-catkin-track-all.catkinutil ./bin/git-catkin-track-all
+--- ./bin/git-catkin-track-all.catkinutil 2013-03-20 21:35:45.253040695 -0400
++++ ./bin/git-catkin-track-all 2013-03-20 21:35:57.324511508 -0400
+@@ -2,7 +2,7 @@
+
+ WORK=$(pwd)
+ TOP=$(cd `dirname $0` ; pwd)
+-. $TOP/catkin_util.sh
++. /usr/bin/catkin/catkin_util.sh
+
+ LONG_USAGE=$(/bin/echo <<EOF
+ usage: git catkin-track-all
+@@ -15,4 +15,4 @@ USAGE=$LONG_USAGE
+ require_work_tree
+
+ _track_all
+-exit 0
+\ No newline at end of file
++exit 0
diff --git a/catkin-0.4.5-etc.patch b/catkin-0.4.5-etc.patch
new file mode 100644
index 0000000..f6ef211
--- /dev/null
+++ b/catkin-0.4.5-etc.patch
@@ -0,0 +1,57 @@
+diff -up ./cmake/templates/setup.bash.buildspace.in.etc ./cmake/templates/setup.bash.buildspace.in
+--- ./cmake/templates/setup.bash.buildspace.in.etc 2013-03-27 21:29:26.003485388 -0400
++++ ./cmake/templates/setup.bash.buildspace.in 2013-03-27 21:33:09.866099717 -0400
+@@ -1,4 +1,3 @@
+-#!/bin/bash
+ # This file is generated by catkin.
+
+ CATKIN_SHELL=bash
+diff -up ./cmake/templates/setup.bash.installable.in.etc ./cmake/templates/setup.bash.installable.in
+--- ./cmake/templates/setup.bash.installable.in.etc 2013-03-27 21:28:57.112545792 -0400
++++ ./cmake/templates/setup.bash.installable.in 2013-03-27 21:32:08.723824631 -0400
+@@ -1,4 +1,3 @@
+-#!/bin/bash
+ # This file is generated by catkin.
+
+ CATKIN_SHELL=bash
+diff -up ./cmake/templates/setup.sh.buildspace.in.etc ./cmake/templates/setup.sh.buildspace.in
+--- ./cmake/templates/setup.sh.buildspace.in.etc 2013-03-27 21:29:51.631408046 -0400
++++ ./cmake/templates/setup.sh.buildspace.in 2013-03-27 21:31:18.415140756 -0400
+@@ -1,4 +1,3 @@
+-#!/bin/sh
+ # This file is generated by catkin.
+
+ export PYTHONPATH=@CMAKE_BINARY_DIR@/gen/py:$PYTHONPATH
+diff -up ./cmake/templates/setup.sh.installable.in.etc ./cmake/templates/setup.sh.installable.in
+--- ./cmake/templates/setup.sh.installable.in.etc 2012-06-13 18:08:58.000000000 -0400
++++ ./cmake/templates/setup.sh.installable.in 2013-03-27 21:27:49.709867613 -0400
+@@ -1,4 +1,3 @@
+-#!/bin/sh
+ # This file is generated by catkin.
+
+ #
+@@ -34,7 +33,7 @@ if [ -z "$CATKIN_SHELL" ] ; then
+ fi
+
+ FIND=`which find`
+-for envfile in `$FIND @CMAKE_INSTALL_PREFIX@/etc/catkin/profile.d -maxdepth 1 -name "*.all" 2>/dev/null` `$FIND @CMAKE_INSTALL_PREFIX@/etc/catkin/profile.d -maxdepth 1 -name "*.$CATKIN_SHELL" 2>/dev/null`
++for envfile in `$FIND /etc/catkin/profile.d -maxdepth 1 -name "*.all" 2>/dev/null` `$FIND /etc/catkin/profile.d -maxdepth 1 -name "*.$CATKIN_SHELL" 2>/dev/null`
+ do
+ . $envfile
+ done
+diff -up ./cmake/templates/setup.zsh.buildspace.in.etc ./cmake/templates/setup.zsh.buildspace.in
+--- ./cmake/templates/setup.zsh.buildspace.in.etc 2013-03-27 21:31:32.949119181 -0400
++++ ./cmake/templates/setup.zsh.buildspace.in 2013-03-27 21:31:46.171865816 -0400
+@@ -1,4 +1,3 @@
+-#!/bin/zsh
+
+ CATKIN_SHELL=zsh
+ . @CMAKE_BINARY_DIR@/setup.sh
+diff -up ./cmake/templates/setup.zsh.installable.in.etc ./cmake/templates/setup.zsh.installable.in
+--- ./cmake/templates/setup.zsh.installable.in.etc 2013-03-27 21:28:01.396525549 -0400
++++ ./cmake/templates/setup.zsh.installable.in 2013-03-27 21:33:22.325684958 -0400
+@@ -1,4 +1,3 @@
+-#!/bin/zsh
+
+ CATKIN_SHELL=zsh
+ . @CMAKE_INSTALL_PREFIX@/setup.sh
diff --git a/catkin-0.4.5-scripts.patch b/catkin-0.4.5-scripts.patch
new file mode 100644
index 0000000..57b5874
--- /dev/null
+++ b/catkin-0.4.5-scripts.patch
@@ -0,0 +1,18 @@
+diff -up ./cmake/interrogate_setup_dot_py.py.scripts ./cmake/interrogate_setup_dot_py.py
+--- ./cmake/interrogate_setup_dot_py.py.scripts 2012-06-13 18:08:58.000000000 -0400
++++ ./cmake/interrogate_setup_dot_py.py 2013-03-27 21:43:36.785296891 -0400
+@@ -1,5 +1,3 @@
+-#!/usr/bin/env python
+-
+ from __future__ import print_function
+ import pprint, sys, os
+
+diff -up ./cmake/templates/update_project_index.py.in.scripts ./cmake/templates/update_project_index.py.in
+--- ./cmake/templates/update_project_index.py.in.scripts 2013-03-27 21:45:04.669881525 -0400
++++ ./cmake/templates/update_project_index.py.in 2013-03-27 21:45:16.774399314 -0400
+@@ -1,5 +1,3 @@
+-#!/usr/bin/env python
+-
+ import sys, yaml
+
+ pkgfile = "@CMAKE_BINARY_DIR@/packages.yaml"
diff --git a/catkin.spec b/catkin.spec
new file mode 100644
index 0000000..d13b903
--- /dev/null
+++ b/catkin.spec
@@ -0,0 +1,128 @@
+%global gitrev d4f1f24
+
+Name: catkin
+Version: 0.4.5
+Release: 6.git%{gitrev}%{?dist}
+Summary: Collection of CMake macros for ROS
+
+License: BSD
+URL: http://ros.org/doc/fuerte/api/catkin/html/
+#wget --content-disposition https://github.com/ros/catkin/tarball/0.4.5
+Source0: ros-%{name}-%{version}-0-g%{gitrev}.tar.gz
+# Moves all instances of /usr/etc to /etc
+Patch0: %{name}-0.4.5-etc.patch
+# Moves the helper file catkin_util.sh to /usr/share
+Patch1: %{name}-0.4.5-catkinutil.patch
+# Remove dependencies on catkin-sphinx utilities (not yet packaged)
+Patch2: %{name}-0.4.5-catkinsphinx.patch
+# Remove #!/usr/bin/env from python helpers. Not upstream
+Patch3: %{name}-0.4.5-scripts.patch
+
+Provides: ros-%{name} = %{version}-%{release}
+BuildArch: noarch
+
+BuildRequires: cmake
+BuildRequires: gtest
+BuildRequires: git
+BuildRequires: python-argparse
+BuildRequires: python-empy
+BuildRequires: python-nose
+BuildRequires: python-rospkg
+BuildRequires: python-setuptools-devel
+BuildRequires: python-sphinx
+BuildRequires: python-yaml
+BuildRequires: ros-release
+
+Requires: cmake
+Requires: gtest
+Requires: python-argparse
+Requires: python-empy
+Requires: python-nose
+Requires: python-rospkg
+Requires: python-yaml
+Requires: ros-release
+
+%description
+Catkin is the Willow Garage low-level build system macros and infrastructure.
+
+%package devel
+Summary: Development files for %{name}
+Provides: ros-%{name}-devel = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
+Requires: python-setuptools-devel
+
+%description devel
+%{summary}.
+
+%prep
+%setup -q -n ros-%{name}-%{gitrev}
+%patch0 -p0
+%patch1 -p0 -b .catkinutil
+%patch2 -p0 -b .catkinsphinx
+%patch3 -p0
+
+%build
+mkdir build
+pushd build
+%cmake -DSETUPTOOLS_DEB_LAYOUT=OFF ..
+popd
+
+pushd doc
+make html
+rm -fr _build/html/.buildinfo
+popd
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make -C build install DESTDIR=$RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
+rm $RPM_BUILD_ROOT%{_usr}/.rosinstall
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/ros
+mv $RPM_BUILD_ROOT%{_usr}/setup.* $RPM_BUILD_ROOT%{_datadir}/ros
+mv $RPM_BUILD_ROOT%{_usr}/env.sh $RPM_BUILD_ROOT%{_datadir}/ros
+
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pkgconfig
+mv $RPM_BUILD_ROOT%{_usr}/lib/pkgconfig/catkin.pc $RPM_BUILD_ROOT/%{_datadir}/pkgconfig
+
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/profile.d
+mv $RPM_BUILD_ROOT%{_usr}/etc/%{name}/profile.d/* $RPM_BUILD_ROOT/etc/%{name}/profile.d
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%doc doc/_build/html
+%{_bindir}/*
+%dir %{_sysconfdir}/%{name}
+%dir %{_sysconfdir}/%{name}/profile.d
+%config(noreplace) %{_sysconfdir}/%{name}/profile.d/00.*
+%exclude %{_datadir}/%{name}/cmake
+%{_datadir}/%{name}
+%{python_sitelib}/*
+%{_datadir}/ros/*
+
+%files devel
+%{_datadir}/pkgconfig/*
+%{_datadir}/%{name}/cmake
+
+%changelog
+* Thu Mar 28 2013 Rich Mattes <richmattes at gmail.com> - 0.4.5-6.gitd4f1f24
+- Remove shebangs from shell templates and python helper functions
+
+* Mon Mar 25 2013 Rich Mattes <richmattes at gmail.com> - 0.4.5-5.gitd4f1f24
+- Rename to "catkin"
+- Add clean section for epel6
+
+* Thu Mar 21 2013 Rich Mattes <richmattes at gmail.com> - 0.4.5-4.gitd4f1f24
+- Moved /usr/bin/catkin_util.sh to /usr/share/catkin
+- Removed shebangs from environment setup files
+- Added html documentation
+
+* Mon Jan 28 2013 Rich Mattes <richmattes at gmail.com> - 0.4.5-3.gitd4f1f24
+- Update patches and install paths
+
+* Mon Jan 14 2013 Rich Mattes <richmattes at gmail.com> - 0.4.5-2.gitd4f1f24
+- Remove "ros-release" requirement
+
+* Sun Jan 13 2013 Rich Mattes <richmattes at gmail.com> - 0.4.5-1.gitd4f1f24
+- Initial fuerte release
diff --git a/sources b/sources
index e69de29..edf72b5 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+fbe57e40527794372bb7ba913ef59792 ros-catkin-0.4.5-0-gd4f1f24.tar.gz
More information about the scm-commits
mailing list