rpms/gearbox/F-11 gearbox-9.11.fixdso.patch, NONE, 1.1 gearbox-9.11.fixinstallpaths.patch, NONE, 1.1 gearbox-9.11.fixpkgconfig.patch, NONE, 1.1 gearbox.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Tue Mar 16 02:22:49 UTC 2010

Author: rmattes

Update of /cvs/pkgs/rpms/gearbox/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26502/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	gearbox-9.11.fixdso.patch gearbox-9.11.fixinstallpaths.patch 
	gearbox-9.11.fixpkgconfig.patch gearbox.spec import.log 
Log Message:
* Mon Mar 15 2010 Rich Mattes <richmattes at gmail.com> - 9.11-5
- Initial Import


gearbox-9.11.fixdso.patch:
 gbxiceutilacfr/test/CMakeLists.txt |    2 +-
 test/CMakeLists.txt                |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE gearbox-9.11.fixdso.patch ---
diff -up ./src/gbxsickacfr/gbxiceutilacfr/test/CMakeLists.txt.fixdso ./src/gbxsickacfr/gbxiceutilacfr/test/CMakeLists.txt
--- ./src/gbxsickacfr/gbxiceutilacfr/test/CMakeLists.txt.fixdso	2010-03-11 18:54:52.000000000 -0500
+++ ./src/gbxsickacfr/gbxiceutilacfr/test/CMakeLists.txt	2010-03-11 18:55:07.000000000 -0500
@@ -1,6 +1,6 @@
 # include( ${HYDRO_CMAKE_DIR}/UseBasicRules.cmake )
 # include( ${CMAKE_CURRENT_SOURCE_DIR}/../UseHydroIceUtil.cmake )
-link_libraries( GbxIceUtilAcfr )
+link_libraries( GbxIceUtilAcfr pthread)
 
 add_executable( buffertest buffertest.cpp )
 GBX_ADD_TEST( GbxIceUtilAcfr_BufferTest buffertest )
diff -up ./src/gbxsickacfr/test/CMakeLists.txt.fixdso ./src/gbxsickacfr/test/CMakeLists.txt
--- ./src/gbxsickacfr/test/CMakeLists.txt.fixdso	2010-03-11 18:58:08.000000000 -0500
+++ ./src/gbxsickacfr/test/CMakeLists.txt	2010-03-11 18:58:15.000000000 -0500
@@ -1,6 +1,6 @@
 include( ${GBX_CMAKE_DIR}/UseBasicRules.cmake )
 
 GBX_ADD_EXECUTABLE( gbxsickacfrtest test.cpp )
-target_link_libraries( gbxsickacfrtest GbxSickAcfr )
+target_link_libraries( gbxsickacfrtest GbxSickAcfr pthread )
 
-GBX_ADD_EXAMPLE( gbxsickacfr example.cmake.in example.cmake test.cpp example.readme )
\ No newline at end of file
+GBX_ADD_EXAMPLE( gbxsickacfr example.cmake.in example.cmake test.cpp example.readme )

gearbox-9.11.fixinstallpaths.patch:
 SetupDirectories.cmake |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE gearbox-9.11.fixinstallpaths.patch ---
diff -up ./cmake/SetupDirectories.cmake.fixinstallpaths ./cmake/SetupDirectories.cmake
--- ./cmake/SetupDirectories.cmake.fixinstallpaths	2009-11-10 21:07:00.000000000 -0500
+++ ./cmake/SetupDirectories.cmake	2009-11-10 21:14:40.000000000 -0500
@@ -75,15 +75,15 @@ set( GBX_SHARE_INSTALL_SUFFIX share/${PR
 set( GBX_CMAKE_INSTALL_SUFFIX ${GBX_SHARE_INSTALL_SUFFIX}/cmake )
 
 if( GBX_PROC_64BIT )
-    set( GBX_LIB_INSTALL_SUFFIX lib64/${PROJECT_NAME} )
+    set( GBX_LIB_INSTALL_SUFFIX lib64 )
     set( GBX_PKGCONFIG_INSTALL_SUFFIX lib64/pkgconfig )
 else()
-    set( GBX_LIB_INSTALL_SUFFIX lib/${PROJECT_NAME} )
+    set( GBX_LIB_INSTALL_SUFFIX lib)
     set( GBX_PKGCONFIG_INSTALL_SUFFIX lib/pkgconfig )
 endif()
 
 # by convention, we install cmake package-config files with the libraries
-set( GBX_CMAKE_PKGCONFIG_INSTALL_SUFFIX ${GBX_LIB_INSTALL_SUFFIX} )
+set( GBX_CMAKE_PKGCONFIG_INSTALL_SUFFIX ${GBX_LIB_INSTALL_SUFFIX}/gearbox )
 
 # now the acutal install directories
 set( GBX_BIN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/${GBX_BIN_INSTALL_SUFFIX} )

gearbox-9.11.fixpkgconfig.patch:
 gbxgarminacfr/CMakeLists.txt       |    2 +-
 gbxnovatelacfr/CMakeLists.txt      |    2 +-
 gbxserialacfr/CMakeLists.txt       |    2 +-
 gbxsickacfr/CMakeLists.txt         |    2 +-
 gbxsmartbatteryacfr/CMakeLists.txt |    2 +-
 hokuyo_aist/CMakeLists.txt         |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE gearbox-9.11.fixpkgconfig.patch ---
diff -up ./src/gbxgarminacfr/CMakeLists.txt.fixpkgconfig ./src/gbxgarminacfr/CMakeLists.txt
--- ./src/gbxgarminacfr/CMakeLists.txt.fixpkgconfig	2010-02-13 17:29:08.000000000 -0500
+++ ./src/gbxgarminacfr/CMakeLists.txt	2010-02-13 17:29:24.000000000 -0500
@@ -19,7 +19,7 @@ if( build )
 
     GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${lib_version} ${srcs} )
     target_link_libraries( ${lib_name} ${dep_libs} )
-    GBX_ADD_PKGCONFIG( ${lib_name} ${lib_desc} dep_libs "" "" "" ${lib_version} )
+    GBX_ADD_PKGCONFIG( ${lib_name} ${lib_desc} "" dep_libs "" "" ${lib_version} )
 
     GBX_ADD_HEADERS( gbxgarminacfr ${hdrs} )
 
diff -up ./src/gbxnovatelacfr/CMakeLists.txt.fixpkgconfig ./src/gbxnovatelacfr/CMakeLists.txt
--- ./src/gbxnovatelacfr/CMakeLists.txt.fixpkgconfig	2010-02-13 17:28:34.000000000 -0500
+++ ./src/gbxnovatelacfr/CMakeLists.txt	2010-02-13 17:28:46.000000000 -0500
@@ -23,7 +23,7 @@ if( build )
 
     GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${lib_version} ${srcs} )
     target_link_libraries( ${lib_name} ${dep_libs} )
-    GBX_ADD_PKGCONFIG( ${lib_name} ${lib_desc} dep_libs "" "" "" ${lib_version} )
+    GBX_ADD_PKGCONFIG( ${lib_name} ${lib_desc} "" dep_libs "" "" ${lib_version} )
 
     GBX_ADD_HEADERS( gbxnovatelacfr ${hdrs} )
 
diff -up ./src/gbxserialacfr/CMakeLists.txt.fixpkgconfig ./src/gbxserialacfr/CMakeLists.txt
--- ./src/gbxserialacfr/CMakeLists.txt.fixpkgconfig	2010-02-13 17:28:02.000000000 -0500
+++ ./src/gbxserialacfr/CMakeLists.txt	2010-02-13 17:28:20.000000000 -0500
@@ -25,7 +25,7 @@ if( build )
 
     GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${lib_version} ${srcs} )
     target_link_libraries( ${lib_name} ${dep_libs} )
-    GBX_ADD_PKGCONFIG( ${lib_name} ${lib_desc} dep_libs "" "" "" ${lib_version})
+    GBX_ADD_PKGCONFIG( ${lib_name} ${lib_desc} "" dep_libs "" "" ${lib_version})
 
     GBX_ADD_HEADERS( gbxserialacfr ${hdrs} )
 
diff -up ./src/gbxsickacfr/CMakeLists.txt.fixpkgconfig ./src/gbxsickacfr/CMakeLists.txt
--- ./src/gbxsickacfr/CMakeLists.txt.fixpkgconfig	2010-02-13 17:27:24.000000000 -0500
+++ ./src/gbxsickacfr/CMakeLists.txt	2010-02-13 17:27:40.000000000 -0500
@@ -27,7 +27,7 @@ if( build )
 
     GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${lib_version} ${srcs} )
     target_link_libraries( ${lib_name} ${dep_libs} )
-    GBX_ADD_PKGCONFIG( ${lib_name} ${lib_desc} dep_libs "" "" "" ${lib_version} )
+    GBX_ADD_PKGCONFIG( ${lib_name} ${lib_desc} "" dep_libs "" "" ${lib_version} )
 
     GBX_ADD_HEADERS( gbxsickacfr ${hdrs} )
 
diff -up ./src/gbxsmartbatteryacfr/CMakeLists.txt.fixpkgconfig ./src/gbxsmartbatteryacfr/CMakeLists.txt
--- ./src/gbxsmartbatteryacfr/CMakeLists.txt.fixpkgconfig	2010-02-13 17:27:00.000000000 -0500
+++ ./src/gbxsmartbatteryacfr/CMakeLists.txt	2010-02-13 17:27:17.000000000 -0500
@@ -19,7 +19,7 @@ if( build )
 
     GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${lib_version} ${srcs} )
     target_link_libraries( ${lib_name} ${dep_libs} )
-    GBX_ADD_PKGCONFIG( ${lib_name} ${lib_desc} dep_libs "" "" "" ${lib_version} )
+    GBX_ADD_PKGCONFIG( ${lib_name} ${lib_desc} "" dep_libs "" "" ${lib_version} )
 
     GBX_ADD_HEADERS( gbxsmartbatteryacfr ${hdrs} )
 
diff -up ./src/hokuyo_aist/CMakeLists.txt.fixpkgconfig ./src/hokuyo_aist/CMakeLists.txt
--- ./src/hokuyo_aist/CMakeLists.txt.fixpkgconfig	2010-02-13 17:26:27.000000000 -0500
+++ ./src/hokuyo_aist/CMakeLists.txt	2010-02-13 17:26:38.000000000 -0500
@@ -24,7 +24,7 @@ if (build)
 	endif (WIN32)
 	GBX_ADD_LIBRARY (${libName} DEFAULT ${libVersion} ${srcs})
 	target_link_libraries (${libName} ${reqLibs})
-	GBX_ADD_PKGCONFIG (${libName} ${libDesc} reqLibs "" "" "" ${libVersion})
+	GBX_ADD_PKGCONFIG (${libName} ${libDesc} "" reqLibs "" "" ${libVersion})
 
 	GBX_ADD_HEADERS (${libName} ${hdrs})
 


--- NEW FILE gearbox.spec ---
Name:           gearbox
Version:        9.11
Release:        5%{?dist}
Summary:        A collection of usable peer-reviewed robotics-related libraries

Group:          Development/Libraries
License:        LGPLv3 and LGPLv2+ and GPLv2+
URL:            http://gearbox.sourceforge.net
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
# Moves the library installation path from %libdir/name to %libdir
Patch0:         gearbox-9.11.fixinstallpaths.patch
# Fixes some pkg-config errors, submitted at https://sourceforge.net/tracker/?func=detail&aid=2951375&group_id=216468&atid=1037801
Patch1:         gearbox-9.11.fixpkgconfig.patch
# Fixes DSO-related link errors.  Not yet submitted upstream
Patch2:         gearbox-9.11.fixdso.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  cmake
BuildRequires:  doxygen
BuildRequires:  graphviz

#ice isn't present on ppc64, just require it for non ppc64 systems
%ifnarch ppc64
BuildRequires:  ice-devel

Requires:       ice
%endif


%description
Gearbox provides a collection of usable peer-reviewed robotics-related
libraries. Gearbox is not an integration framework. It provides a set
of implementations, without insisting on a standard API, for use by
any number of existing frameworks.  Gearbox includes cross-platform
libraries to communicate over TCP, UDP, and serial, and implements the
communication protocols of many popular sensors.


%package devel
Summary: Header files and libraries for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: cmake
%ifnarch ppc64
Requires: ice-devel
%endif
%description devel
Contains the header files and libraries for %{name}. 
If you like to develop programs using %{name},
you will need to install %{name}-devel.


%prep
%setup -q
# Moves shared libraries from libdir/gearbox to libdir, as per FHS standards
%patch0 -p1 -b .fixinstallpaths
%patch1 -p1 -b .fixpkgconfig
%patch2 -p1 -b .fixdso

%build
%cmake -DENABLE_LIB_BASICEXAMPLE=OFF -DENABLE_LIB_GBXUTILACFR=ON -DENABLE_LIB_GBXGARMINACFR=ON -DENABLE_LIB_GBXSERIALACFR=ON -DHOKUYO_AIST_BUILD_BINDINGS=OFF -DGBX_BUILD_TESTS=ON -DCMAKE_SKIP_RPATH:BOOL=ON\
%ifarch ppc64 
 -DENABLE_LIB_GBXSICKACFR=OFF\
%else
 -DENABLE_LIB_GBXSICKACFR=ON\
%endif
.

make VERBOSE=1
pushd doc
doxygen doxyfile
popd

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove the examples that gearbox installs.  If needed
# they can be built from source contained in the datadir
rm $RPM_BUILD_ROOT%{_bindir}/*

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc LICENSE
%{_libdir}/*.so.*

%files devel
%defattr (-,root,root,-)
%doc doc/html
%doc doc/images
%{_libdir}/*.so
%{_libdir}/%{name}
%{_includedir}/%{name}
%{_libdir}/pkgconfig/*.pc
%{_datadir}/%{name}



%changelog
* Thu Mar 11 2010 Rich Mattes <richmattes at gmail.com> - 9.11-5
- Fixed DSO related compile issues
- Removed -ice subpackage
- Fixed directory ownership
- Removed rpath
- Fixed source download URL

* Sat Feb 13 2010 Rich Mattes <richmattes at gmail.com> - 9.11-4
- Fixed pkg-config files from requiring non-existent packages

* Mon Jan 18 2010 Rich Mattes <richmattes at gmail.com> - 9.11-3
- Fixed package versioning
- Fixed sourceforge download URL
- Fixed gearbox-ice post operations

* Sat Jan 9 2010 Rich Mattes <richmattes at gmail.com> - 9.11-2
- Split libraries that use ICE into gearbox-ice subpackage
- Gearbox now builds on ppc64 without gearbox-ice subpackage

* Fri Nov 20 2009 Rich Mattes <richmattes at gmail.com> - 9.11-1
- Updated to version 9.11
- Updated package description

* Sun Nov 8 2009 Rich Mattes <richmattes at gmail.com> - 9.07-3
- Fixed cmake module install paths
- Fixed cmake file generation
- Aligned licenses with upstream
- Enabled ppc build

* Thu Oct 22 2009 Rich Mattes <richmattes at gmail.com> - 9.07-2
- Fixed library install path
- Fixed build order problem
- Fixed cmake module install path

* Wed Oct 21 2009 Rich Mattes <richmattes at gmail.com> - 9.07-1
- First build
- Fixed cmake 64 bit install paths
- Fixed license file


--- NEW FILE import.log ---
gearbox-9_11-5_fc12:F-11:gearbox-9.11-5.fc12.src.rpm:1268706130


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gearbox/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	15 Mar 2010 22:23:33 -0000	1.1
+++ .cvsignore	16 Mar 2010 02:22:49 -0000	1.2
@@ -0,0 +1 @@
+gearbox-9.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gearbox/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	15 Mar 2010 22:23:34 -0000	1.1
+++ sources	16 Mar 2010 02:22:49 -0000	1.2
@@ -0,0 +1 @@
+726480f8322596c404dfd71468329761  gearbox-9.11.tar.gz

