From 2e046e6d9fb1b103f7737b29e50c9cda6095db62 Mon Sep 17 00:00:00 2001
From: Rich Mattes <richmattes@gmail.com>
Date: Jun 30 2012 18:57:53 +0000
Subject: boost::TIME_UTC no longer defined, use glibc's instead


- cast FILE* to gzFile for gzip functions
- Fix bug where docs were being included in both base and -doc subpackages

---

diff --git a/player-3.0.2.boostutc.patch b/player-3.0.2.boostutc.patch
new file mode 100644
index 0000000..857a612
--- /dev/null
+++ b/player-3.0.2.boostutc.patch
@@ -0,0 +1,12 @@
+diff -up ./client_libs/libplayerc++/playerclient.cc.boostutc ./client_libs/libplayerc++/playerclient.cc
+--- ./client_libs/libplayerc++/playerclient.cc.boostutc	2012-06-30 13:14:02.987701081 -0400
++++ ./client_libs/libplayerc++/playerclient.cc	2012-06-30 13:14:18.530298979 -0400
+@@ -168,7 +168,7 @@ void PlayerClient::RunThread()
+       Read();
+     };
+     boost::xtime xt;
+-    boost::xtime_get(&xt, boost::TIME_UTC);
++    boost::xtime_get(&xt, TIME_UTC);
+     // we sleep for 0 seconds
+     boost::thread::sleep(xt);
+   }
diff --git a/player-3.0.2.gzfile.patch b/player-3.0.2.gzfile.patch
new file mode 100644
index 0000000..fc9af40
--- /dev/null
+++ b/player-3.0.2.gzfile.patch
@@ -0,0 +1,21 @@
+diff -up ./server/drivers/shell/readlog.cc.gzfile ./server/drivers/shell/readlog.cc
+--- ./server/drivers/shell/readlog.cc.gzfile	2012-06-30 14:19:53.612450930 -0400
++++ ./server/drivers/shell/readlog.cc	2012-06-30 14:20:29.446824252 -0400
+@@ -665,7 +665,7 @@ void ReadLog::Main()
+       // back up to the beginning of the file
+ #if HAVE_Z
+       if (this->gzfile)
+-        ret = gzseek(this->file,0,SEEK_SET);
++        ret = gzseek((gzFile)this->file,0,SEEK_SET);
+       else
+         ret = fseek(this->file,0,SEEK_SET);
+ #else
+@@ -711,7 +711,7 @@ void ReadLog::Main()
+       // compared to fgets (on uncompressed files), so use the latter.
+ #if HAVE_Z
+       if (this->gzfile)
+-        ret = (gzgets(this->file, this->line, this->line_size) == NULL);
++        ret = (gzgets((gzFile)this->file, this->line, this->line_size) == NULL);
+       else
+         ret = (fgets(this->line, this->line_size, (FILE*) this->file) == NULL);
+ #else
diff --git a/player.spec b/player.spec
index f797baa..112b577 100644
--- a/player.spec
+++ b/player.spec
@@ -1,9 +1,6 @@
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}
-
 Name:           player
 Version:        3.0.2
-Release:        17%{?dist}
+Release:        18%{?dist}
 Summary:        Cross-platform robot device interface and server
 
 Group:          Applications/System
@@ -20,6 +17,8 @@ Patch2:         %{name}-3.0.2.fixlinuxwifi.patch
 Patch3:         %{name}-3.0.2.fixplayercam.patch
 Patch4:         %{name}-3.0.2.enablephidget.patch
 Patch5:         %{name}-3.0.2.s390x.patch
+Patch6:         %{name}-3.0.2.boostutc.patch
+Patch7:         %{name}-3.0.2.gzfile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Sort order: build tools, feature libs, within alphabetically, group related
@@ -135,13 +134,15 @@ are experimental.
 %patch3 -p0
 %patch4 -p0
 %patch5 -p1 -b .s390x
+%patch6 -p0
+%patch7 -p0
 find . -name '*.c' -exec chmod -x {} \;
 find . -name '*.cc' -exec chmod -x {} \;
 find . -name '*.cpp' -exec chmod -x {} \;
 find . -name '*.h' -exec chmod -x {} \;
 
 %build
-%cmake %{?_cmake_skip_rpath} -DBUILD_DOCUMENTATION=ON -DBUILD_PLAYERCC=ON -DSWIG_EXECUTABLE=/usr/bin/swig -DBUILD_PLAYERCC_BOOST=ON -DBUILD_PYTHONC_BINDINGS=ON -DBUILD_PYTHONCPP_BINDINGS=ON -DBUILD_EXAMPLES=ON -DBUILD_RUBYCPP_BINDINGS=ON -DBoost_USE_MULTITHREAD=ON -DENABLE_DRIVER_OCEANSERVER=OFF -DUNICAP_DIR=/usr .
+%cmake %{?_cmake_skip_rpath} -DBUILD_DOCUMENTATION=ON -DBUILD_PLAYERCC=ON -DSWIG_EXECUTABLE=/usr/bin/swig -DBUILD_PLAYERCC_BOOST=ON -DBUILD_PYTHONC_BINDINGS=ON -DBUILD_PYTHONCPP_BINDINGS=ON -DBUILD_EXAMPLES=ON -DBUILD_RUBYCPP_BINDINGS=ON -DBoost_USE_MULTITHREAD=ON -DENABLE_DRIVER_OCEANSERVER=OFF -DUNICAP_DIR=/usr  -DRUBY_BINDINGS_INSTALL_DIR=%{ruby_vendorarchdir} .
 make
 make doc
 #pushd doc
@@ -155,6 +156,7 @@ mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}/%{name}
 mv $RPM_BUILD_ROOT/%{_datadir}/%{name}/config $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}
 find $RPM_BUILD_ROOT -name '*.la' -exec rm {} \;
+rm -rf $RPM_BUILD_ROOT/%{_docdir}/*
 
 desktop-file-install --vendor="fedora"               \
 --dir=${RPM_BUILD_ROOT}%{_datadir}/applications         \
@@ -213,9 +215,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files ruby
 %defattr (-,root,root,-)
-%{ruby_sitearch}/*.so
+%{ruby_vendorarchdir}/*.so
 
 %changelog
+* Sat Jun 30 2012 Rich Mattes <richmattes@gmail.com> - 3.0.2-18
+- boost::TIME_UTC no longer defined, use glibc's instead
+- cast FILE* to gzFile for gzip functions
+- Fix bug where docs were being included in both base and -doc subpackages
+
 * Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.2-17
 - Rebuilt for c++ ABI breakage