rpms/urg/F-12 import.log, NONE, 1.1 urg-0.8.7-autoconf259.patch, NONE, 1.1 urg-0.8.7-boost133.patch, NONE, 1.1 urg-0.8.7-noforwdecl.patch, NONE, 1.1 urg-0.8.7-norpath.patch, NONE, 1.1 urg.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Tim Niemueller]

Author: timn

Update of /cvs/pkgs/rpms/urg/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5638/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log urg-0.8.7-autoconf259.patch 
	urg-0.8.7-boost133.patch urg-0.8.7-noforwdecl.patch 
	urg-0.8.7-norpath.patch urg.spec 
Log Message:
Initial import


--- NEW FILE import.log ---
urg-0_8_7-2_fc12:F-12:urg-0.8.7-2.fc12.src.rpm:1264976289

urg-0.8.7-autoconf259.patch:
 aclocal.m4   |    4 ++--
 configure.in |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE urg-0.8.7-autoconf259.patch ---
diff -urN urg-0.8.7/aclocal.m4 urg-0.8.7.autoconf259/aclocal.m4
--- urg-0.8.7/aclocal.m4	2010-01-30 01:29:05.000000000 +0100
+++ urg-0.8.7.autoconf259/aclocal.m4	2010-01-30 23:41:05.000000000 +0100
@@ -11,8 +11,8 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-m4_if(m4_PACKAGE_VERSION, [2.61],,
-[m4_fatal([this file was generated for autoconf 2.61.
+m4_if(m4_PACKAGE_VERSION, [2.59],,
+[m4_fatal([this file was generated for autoconf 2.59.
 You have another version of autoconf.  If you want to use that,
 you should regenerate the build system entirely.], [63])])
 
diff -urN urg-0.8.7/configure.in urg-0.8.7.autoconf259/configure.in
--- urg-0.8.7/configure.in	2010-01-30 01:28:05.000000000 +0100
+++ urg-0.8.7.autoconf259/configure.in	2010-01-30 23:40:44.000000000 +0100
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_PREREQ(2.61)
+AC_PREREQ(2.59)
 
 AC_INIT(urg, 0.8.7, satofumi at users.sourceforge.jp)
 AM_INIT_AUTOMAKE

urg-0.8.7-boost133.patch:
 configure.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE urg-0.8.7-boost133.patch ---
diff -urN urg-0.8.7/configure.in urg-0.8.7.boost133/configure.in
--- urg-0.8.7/configure.in	2010-01-30 01:28:05.000000000 +0100
+++ urg-0.8.7.boost133/configure.in	2010-01-30 23:37:45.000000000 +0100
@@ -54,7 +54,7 @@
 #---
 #> 			AC_MSG_NOTICE([[We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option.  If you are sure you have boost installed, then check your version number looking in <boost/version.hpp>. See http://randspringer.de/boost for more documentation.]])
 
-BOOST_VERSION=1.34.1
+BOOST_VERSION=1.33.1
 AX_BOOST_BASE($BOOST_VERSION)
 AX_BOOST_SYSTEM
 AX_BOOST_REGEX

urg-0.8.7-noforwdecl.patch:
 scip_handler.c |    2 --
 urg_ctrl.c     |    2 --
 2 files changed, 4 deletions(-)

--- NEW FILE urg-0.8.7-noforwdecl.patch ---
diff -urN urg-0.8.7/src/c/urg/scip_handler.c urg-0.8.7.nofrwdecl/src/c/urg/scip_handler.c
--- urg-0.8.7/src/c/urg/scip_handler.c	2010-01-09 06:51:23.000000000 +0100
+++ urg-0.8.7.nofrwdecl/src/c/urg/scip_handler.c	2010-01-30 23:55:31.000000000 +0100
@@ -24,8 +24,6 @@
 #define snprintf _snprintf
 #endif
 
-extern int snprintf(char *, size_t, const char *, ...);
-
 
 /*! \todo Standardize with  urg_ctrl.c */
 enum {
diff -urN urg-0.8.7/src/c/urg/urg_ctrl.c urg-0.8.7.nofrwdecl/src/c/urg/urg_ctrl.c
--- urg-0.8.7/src/c/urg/urg_ctrl.c	2010-01-23 23:41:58.000000000 +0100
+++ urg-0.8.7.nofrwdecl/src/c/urg/urg_ctrl.c	2010-01-30 23:55:42.000000000 +0100
@@ -25,8 +25,6 @@
 #define snprintf _snprintf
 #endif
 
-extern int snprintf(char *, size_t, const char *, ...);
-
 
 enum {
   ScipTimeout = 1000,      /*!< [msec] */

urg-0.8.7-norpath.patch:
 c_urg-config.in |    2 +-
 urg-config.in   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE urg-0.8.7-norpath.patch ---
diff -urN urg-0.8.7/c_urg-config.in urg-0.8.7.norpath/c_urg-config.in
--- urg-0.8.7/c_urg-config.in	2009-08-22 10:54:35.000000000 +0200
+++ urg-0.8.7.norpath/c_urg-config.in	2010-01-31 18:44:39.000000000 +0100
@@ -19,7 +19,7 @@
       echo -I at includedir@/c_urg
       ;;
     --libs)
-      echo -L at prefix@/lib/c_urg -Wl,-rpath, at prefix@/lib/c_urg @C_INSTALL_LIBS@
+      echo @C_INSTALL_LIBS@
       ;;
     *)
       echo "${usage}" 1>&2
diff -urN urg-0.8.7/urg-config.in urg-0.8.7.norpath/urg-config.in
--- urg-0.8.7/urg-config.in	2009-08-22 10:54:35.000000000 +0200
+++ urg-0.8.7.norpath/urg-config.in	2010-01-31 18:44:31.000000000 +0100
@@ -19,7 +19,7 @@
       echo -I at includedir@/urg
       ;;
     --libs)
-      echo -L at prefix@/lib/urg -Wl,-rpath, at prefix@/lib/urg @INSTALL_LIBS@
+      echo @INSTALL_LIBS@
       ;;
     *)
       echo "${usage}" 1>&2


--- NEW FILE urg.spec ---
Name:           urg
Version:        0.8.7
Release:        2%{?dist}
Summary:        Library to access Hokuyo URG laser range finders

Group:          System Environment/Libraries
License:        LGPLv3
URL:            http://www.hokuyo-aut.jp/cgi-bin/urg_programs_en/
Source0:        http://jaist.dl.sourceforge.jp/qrobosdk/45672/urg-0.8.7.zip
Patch0:         urg-0.8.7-norpath.patch
Patch1:         urg-0.8.7-boost133.patch
Patch2:         urg-0.8.7-autoconf259.patch
Patch3:         urg-0.8.7-noforwdecl.patch
ExcludeArch:    ppc64
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  autoconf automake libtool
BuildRequires:  SDL_net-devel
BuildRequires:  boost-devel >= 1.33.1

%description
This library uses the SCIP2.0 protocol to provide access to devices of
Hokuyo URG laser range finder series.


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:	boost-devel

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q
%patch0 -p1 -b .norpath
%patch1 -p1 -b .boost133
%patch2 -p1 -b .autoconf259
%patch3 -p1 -b .noforwdecl

%build
#libtoolize --copy
#aclocal -I m4
#autoconf
#automake
# Required due to Boost 1.33.1 patch
autoreconf --install --force
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc ChangeLog AUTHORS COPYING README
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%{_bindir}/*
%{_includedir}/*
%{_libdir}/*.so


%changelog
* Sun Jan 31 2010 Tim Niemueller <tim at niemueller.de> - 0.8.7-2
- Fixes from review request #560322: source set to direct file URL,
  revised norpath patch to completely remove references to /usr/lib,
  added boost-devel as requirement for devel sub-package

* Sat Jan 30 2010 Tim Niemueller <tim at niemueller.de> - 0.8.7-1
- Update to 0.8.7 which contains another upstreamed patch
  (separate m4 dir for macros, Boost macros separated)
- Exclude ppc64, does not compile atm
- Add patch to remove rpath, submitted upstream awaiting inclusion
- Add patch to require only Boost 1.33.1 (RHEL/CentOS)
- Add patch to require only Autoconf 2.59 (RHEL/CentOS)
- Add patch to remove some forward declarations (RHEL/CentOS)

* Mon Jan 25 2010 Tim Niemueller <tim at niemueller.de> - 0.8.6-1
- Update to 0.8.6 which contains my upstreamed patches
  (fixes for 64bit and GCC 4.4, renaming and placing of libs)

* Fri Nov 27 2009 Tim Niemueller <tim at niemueller.de> - 0.7.3-1
- Initial package



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/urg/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	31 Jan 2010 19:12:38 -0000	1.1
+++ .cvsignore	31 Jan 2010 22:18:38 -0000	1.2
@@ -0,0 +1 @@
+urg-0.8.7.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/urg/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	31 Jan 2010 19:12:39 -0000	1.1
+++ sources	31 Jan 2010 22:18:38 -0000	1.2
@@ -0,0 +1 @@
+1bcbb29586b3e51f9eccdfbdfd808889  urg-0.8.7.zip