diff --git a/.gitignore b/.gitignore index 4cdff24..b981cb6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /ros-console_bridge-0.1.4-0-g96c8951.tar.gz +/console_bridge-0.2.4-e54b38b.tar.gz diff --git a/console-bridge-0.1.4-libdir.patch b/console-bridge-0.1.4-libdir.patch deleted file mode 100644 index 4451363..0000000 --- a/console-bridge-0.1.4-libdir.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -up ./CMakeLists.txt.libdir ./CMakeLists.txt ---- ./CMakeLists.txt.libdir 2013-03-12 18:43:34.000000000 -0400 -+++ ./CMakeLists.txt 2013-04-09 19:08:55.086137126 -0400 -@@ -15,15 +15,19 @@ if(MSVC) - add_definitions(-DBOOST_ALL_NO_LIB) - endif(MSVC) - -+set(PROJECT_SOVERSION "0" CACHE STRING "Library SOVERSION") -+set(LIB_INSTALL_DIR "lib" CACHE PATH "Library installation directory") -+ - include_directories(include) - include_directories(${Boost_INCLUDE_DIR}) - link_directories(${Boost_LIBRARY_DIRS}) - - add_library(${PROJECT_NAME} SHARED src/console.cpp) - target_link_libraries(${PROJECT_NAME} ${Boost_LIBRARIES}) -+set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION ${PROJECT_SOVERSION}) - - install(TARGETS ${PROJECT_NAME} -- DESTINATION lib/) -+ DESTINATION ${LIB_INSTALL_DIR}) - - install(DIRECTORY include/ - DESTINATION include -@@ -40,7 +44,7 @@ if (NOT MSVC) - set(PKG_CB_LIBS "-l${PROJECT_NAME}") - set(pkg_conf_file "${CMAKE_CURRENT_SOURCE_DIR}/console_bridge.pc") - configure_file("${pkg_conf_file}.in" "${pkg_conf_file}" @ONLY) -- install(FILES ${pkg_conf_file} DESTINATION lib/pkgconfig/ COMPONENT pkgconfig) -+ install(FILES ${pkg_conf_file} DESTINATION ${LIB_INSTALL_DIR}/pkgconfig/ COMPONENT pkgconfig) - endif() - - # Install catkin package.xml diff --git a/console-bridge-0.2.4-libdir.patch b/console-bridge-0.2.4-libdir.patch new file mode 100644 index 0000000..426d48f --- /dev/null +++ b/console-bridge-0.2.4-libdir.patch @@ -0,0 +1,38 @@ +diff -up ./CMakeLists.txt.libdir ./CMakeLists.txt +--- ./CMakeLists.txt.libdir 2013-06-19 05:03:54.000000000 -0400 ++++ ./CMakeLists.txt 2013-08-21 21:59:44.716646643 -0400 +@@ -5,6 +5,8 @@ if (NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE Release) + endif() + ++set(PROJECT_SOVERSION "0" CACHE STRING "Library SOVERSION") ++ + find_package(Boost COMPONENTS system thread REQUIRED) + + if(MSVC OR MSVC90 OR MSVC10) +@@ -18,16 +20,16 @@ endif(MSVC) + include_directories(include) + include_directories(${Boost_INCLUDE_DIR}) + link_directories(${Boost_LIBRARY_DIRS}) +- + if(NOT DEFINED BUILD_SHARED_LIBS) + option(BUILD_SHARED_LIBS "Build dynamically-linked binaries" ON) + endif() + + add_library(${PROJECT_NAME} src/console.cpp) + target_link_libraries(${PROJECT_NAME} ${Boost_LIBRARIES}) ++set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION ${PROJECT_SOVERSION}) + + install(TARGETS ${PROJECT_NAME} +- DESTINATION lib/) ++ DESTINATION lib${LIB_SUFFIX}/) + + install(DIRECTORY include/ + DESTINATION include +@@ -44,5 +46,5 @@ if (NOT MSVC) + set(PKG_CB_LIBS "-l${PROJECT_NAME}") + set(pkg_conf_file "${CMAKE_CURRENT_SOURCE_DIR}/console_bridge.pc") + configure_file("${pkg_conf_file}.in" "${pkg_conf_file}" @ONLY) +- install(FILES ${pkg_conf_file} DESTINATION lib/pkgconfig/ COMPONENT pkgconfig) ++ install(FILES ${pkg_conf_file} DESTINATION lib${LIB_SUFFIX}/pkgconfig/ COMPONENT pkgconfig) + endif() diff --git a/console-bridge.spec b/console-bridge.spec index 03d49f5..bec34a9 100644 --- a/console-bridge.spec +++ b/console-bridge.spec @@ -1,17 +1,17 @@ +%global commit e54b38b66d60e364dfd8a4ed2db4c0c171b65947 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) %global realname console_bridge -%global gitrev 96c8951 Name: console-bridge -Version: 0.1.4 -Release: 4%{?dist} +Version: 0.2.4 +Release: 1%{?dist} Summary: Lightweight set of macros used for reporting information in libraries Group: Development/Libraries License: BSD URL: http://ros.org/wiki/console_bridge -# wget --content-disposition https://github.com/ros/console_bridge/tarball/0.1.4 -Source0: ros-%{realname}-%{version}-0-g%{gitrev}.tar.gz +Source0: https://github.com/ros/%{realname}/archive/%{commit}/%{realname}-%{version}-%{shortcommit}.tar.gz # Makes library installation directory configurable. Not yet upstream -Patch0: %{name}-0.1.4-libdir.patch +Patch0: %{name}-0.2.4-libdir.patch BuildRequires: cmake BuildRequires: boost-devel @@ -25,10 +25,11 @@ Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} %description devel -%summary +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. %prep -%setup -q -n ros-%{realname}-%{gitrev} +%setup -qn %{realname}-%{commit} %patch0 -p0 -b .libdir %build @@ -56,6 +57,9 @@ make -C build install DESTDIR=%{buildroot} %changelog +* Wed Aug 21 2013 Rich Mattes - 0.2.4-1 +- Update to release 0.2.4 + * Sat Aug 03 2013 Fedora Release Engineering - 0.1.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index 3f56683..eeef3e3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e399c3a72afa7875956a6a404d8095a1 ros-console_bridge-0.1.4-0-g96c8951.tar.gz +7f60d840fa238fd23e3d843d534fdd37 console_bridge-0.2.4-e54b38b.tar.gz