Rebase from 'rpm/indigo/homer_mapping'

CHANGELOG.rst

@@ -2,6 +2,11 @@
 Changelog for package homer_mapping
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.0.8 (2015-11-30)
+------------------
+* added qt4 build dependency
+* Contributors: Niklas Yann Wettengel
+
 1.0.7 (2015-11-28)
 ------------------
 * updated changelog

package.xml

 <package>
 	<name>homer_mapping</name>
-	<version>1.0.7</version>
+	<version>1.0.8</version>
 	<description>
 
 		homer_mapping
@@ -22,8 +22,10 @@
 	<build_depend>roslib</build_depend>
 	<build_depend>homer_nav_libs</build_depend>
 	<build_depend>cmake_modules</build_depend>
-
 	<build_depend>homer_mapnav_msgs</build_depend>
+	<build_depend>libqt4</build_depend>
+	<build_depend>libqt4-dev</build_depend>
+	<build_depend>libqtgui4</build_depend>
 
 
 	<run_depend>std_msgs</run_depend>
@@ -33,6 +35,9 @@
 	<run_depend>tf</run_depend>
 	<run_depend>roslib</run_depend>  
 	<run_depend>homer_nav_libs</run_depend>
+	<run_depend>libqt4</run_depend>
+	<run_depend>libqt4-dev</run_depend>
+	<run_depend>libqtgui4</run_depend>
 
 	<run_depend>homer_mapnav_msgs</run_depend>
 </package>

rpm/ros-indigo-homer-mapping.spec → rpm/template.spec.em

-Name:           ros-indigo-homer-mapping
-Version:        1.0.7
-Release:        0%{?dist}
-Summary:        ROS homer_mapping package
+Name:           @(Package)
+Version:        @(Version)
+Release:        @(RPMInc)%{?dist}
+Summary:        ROS @(Name) package
 
 Group:          Development/Libraries
-License:        GPLv3
-Source0:        %{name}-%{version}.tar.gz
-
-Requires:       ros-indigo-homer-mapnav-msgs
-Requires:       ros-indigo-homer-nav-libs
-Requires:       ros-indigo-nav-msgs
-Requires:       ros-indigo-roscpp
-Requires:       ros-indigo-roslib
-Requires:       ros-indigo-sensor-msgs
-Requires:       ros-indigo-std-msgs
-Requires:       ros-indigo-tf
-BuildRequires:  ros-indigo-catkin
-BuildRequires:  ros-indigo-cmake-modules
-BuildRequires:  ros-indigo-homer-mapnav-msgs
-BuildRequires:  ros-indigo-homer-nav-libs
-BuildRequires:  ros-indigo-nav-msgs
-BuildRequires:  ros-indigo-roscpp
-BuildRequires:  ros-indigo-roslib
-BuildRequires:  ros-indigo-sensor-msgs
-BuildRequires:  ros-indigo-tf
-
+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]
 %description
-homer_mapping
+@(Description)
 
 %prep
 %setup -q
@@ -35,7 +18,7 @@ homer_mapping
 # 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 "/opt/ros/indigo/setup.sh" ]; then . "/opt/ros/indigo/setup.sh"; fi
+if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi
 mkdir -p obj-%{_target_platform} && cd obj-%{_target_platform}
 %cmake .. \
         -UINCLUDE_INSTALL_DIR \
@@ -43,8 +26,8 @@ mkdir -p obj-%{_target_platform} && cd obj-%{_target_platform}
         -USYSCONF_INSTALL_DIR \
         -USHARE_INSTALL_PREFIX \
         -ULIB_SUFFIX \
-        -DCMAKE_INSTALL_PREFIX="/opt/ros/indigo" \
-        -DCMAKE_PREFIX_PATH="/opt/ros/indigo" \
+        -DCMAKE_INSTALL_PREFIX="@(InstallationPrefix)" \
+        -DCMAKE_PREFIX_PATH="@(InstallationPrefix)" \
         -DSETUPTOOLS_DEB_LAYOUT=OFF \
         -DCATKIN_BUILD_BINARY_PACKAGE="1" \
 
@@ -54,44 +37,11 @@ make %{?_smp_mflags}
 # 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 "/opt/ros/indigo/setup.sh" ]; then . "/opt/ros/indigo/setup.sh"; fi
+if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi
 cd obj-%{_target_platform}
 make %{?_smp_mflags} install DESTDIR=%{buildroot}
 
 %files
-/opt/ros/indigo
-
-%changelog
-* Sat Nov 28 2015 Viktor Seib <vseib@uni-koblenz.de> - 1.0.7-0
-- Autogenerated by Bloom
-
-* Fri Nov 27 2015 Viktor Seib <vseib@uni-koblenz.de> - 1.0.6-0
-- Autogenerated by Bloom
-
-* Tue Nov 24 2015 Viktor Seib <vseib@uni-koblenz.de> - 1.0.5-0
-- Autogenerated by Bloom
-
-* Fri Nov 20 2015 Viktor Seib <vseib@uni-koblenz.de> - 1.0.4-0
-- Autogenerated by Bloom
-
-* Fri Nov 20 2015 Viktor Seib <vseib@uni-koblenz.de> - 1.0.2-0
-- Autogenerated by Bloom
-
-* Tue Nov 17 2015 Viktor Seib <vseib@uni-koblenz.de> - 1.0.1-5
-- Autogenerated by Bloom
-
-* Tue Nov 17 2015 Viktor Seib <vseib@uni-koblenz.de> - 1.0.1-4
-- Autogenerated by Bloom
-
-* Tue Nov 17 2015 Viktor Seib <vseib@uni-koblenz.de> - 1.0.1-3
-- Autogenerated by Bloom
-
-* Fri Oct 09 2015 Viktor Seib <vseib@uni-koblenz.de> - 1.0.1-2
-- Autogenerated by Bloom
-
-* Fri Sep 25 2015 Viktor Seib <vseib@uni-koblenz.de> - 1.0.1-1
-- Autogenerated by Bloom
-
-* Tue Sep 15 2015 Viktor Seib <vseib@uni-koblenz.de> - 1.0.1-0
-- Autogenerated by Bloom
+@(InstallationPrefix)
 
+%changelog@[for change_version, (change_date, main_name, main_email) in changelogs]@\n* @(change_date) @(main_name) <@(main_email)> - @(change_version)@\n- Autogenerated by Bloom@\n@[end for]