diff --git a/.cvsignore b/.cvsignore
index e69de29..5f3bc93 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1 @@
+player-2.1.1.tar.bz2
diff --git a/import.log b/import.log
new file mode 100644
index 0000000..5607707
--- /dev/null
+++ b/import.log
@@ -0,0 +1 @@
+player-2_1_1-3_fc9:HEAD:player-2.1.1-3.fc9.src.rpm:1218618434
diff --git a/player-2.1.0rc2-norpath.patch b/player-2.1.0rc2-norpath.patch
new file mode 100644
index 0000000..e819eeb
--- /dev/null
+++ b/player-2.1.0rc2-norpath.patch
@@ -0,0 +1,230 @@
+diff -urN player-2.1.0rc2/client_libs/libplayerc++/test/Makefile.am player-2.1.0rc2.norpath/client_libs/libplayerc++/test/Makefile.am
+--- player-2.1.0rc2/client_libs/libplayerc++/test/Makefile.am	2008-04-13 00:16:39.000000000 +0200
++++ player-2.1.0rc2.norpath/client_libs/libplayerc++/test/Makefile.am	2008-05-20 01:08:54.000000000 +0200
+@@ -14,7 +14,7 @@
+                   -L${top_builddir}/client_libs/libplayerc \
+                   -L${top_builddir}/client_libs/libplayerc++
+ 
+-test_LDADD = $(PLAYERCC_LIB_DIRS) -lplayerc++ $(PLAYERCC_LIB) -lplayerc -lplayererror -lplayerxdr
++test_LDADD = $(PLAYERCC_LIB_DIRS) -lplayerc++ $(PLAYERCC_LIB) -lplayerc -lplayererror -lplayerxdr $(top_builddir)/libplayercore/libplayerutils.la
+ 
+ 
+ noinst_PROGRAMS =
+diff -urN player-2.1.0rc2/examples/libplayerc/Makefile.am player-2.1.0rc2.norpath/examples/libplayerc/Makefile.am
+--- player-2.1.0rc2/examples/libplayerc/Makefile.am	2008-04-13 00:16:59.000000000 +0200
++++ player-2.1.0rc2.norpath/examples/libplayerc/Makefile.am	2008-05-20 01:43:49.000000000 +0200
+@@ -22,15 +22,15 @@
+ example_DATA = vmap.c simple.c speech_c_client.c service_discovery.c
+ 
+ vmap_SOURCES = vmap.c
+-vmap_LDADD = -lplayerc $(PLAYERC_LIB_DIRS) -lm -lplayerxdr -lplayererror
++vmap_LDADD = -lplayerc $(PLAYERC_LIB_DIRS) -lm -lplayerxdr -lplayererror -lplayerutils
+ vmap_DEPENDENCIES = $(PLAYERC_DEPS)
+ 
+ simple_SOURCES = simple.c
+-simple_LDADD = -lplayerc $(PLAYERC_LIB_DIRS) -lm -lplayerxdr -lplayererror
++simple_LDADD = -lplayerc $(PLAYERC_LIB_DIRS) -lm -lplayerxdr -lplayererror -lplayerutils
+ simple_DEPENDENCIES = $(PLAYERC_DEPS)
+ 
+ speech_c_client_SOURCES = speech_c_client.c
+-speech_c_client_LDADD = -lplayerc $(PLAYERC_LIB_DIRS) -lm -lplayerxdr -lplayererror
++speech_c_client_LDADD = -lplayerc $(PLAYERC_LIB_DIRS) -lm -lplayerxdr -lplayererror -lplayerutils
+ speech_c_client_DEPENDENCIES = $(PLAYERC_DEPS)
+ 
+ service_discovery_SOURCES = service_discovery.c
+diff -urN player-2.1.0rc2/examples/libplayerc++/Makefile.am player-2.1.0rc2.norpath/examples/libplayerc++/Makefile.am
+--- player-2.1.0rc2/examples/libplayerc++/Makefile.am	2008-04-13 00:17:00.000000000 +0200
++++ player-2.1.0rc2.norpath/examples/libplayerc++/Makefile.am	2008-05-20 01:50:34.000000000 +0200
+@@ -62,70 +62,70 @@
+                wallfollow.cc
+ 
+ camera_SOURCES = camera.cc args.h
+-camera_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
++camera_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
+ camera_DEPENDENCIES = $(PLAYERCC_DEPS)
+ 
+ example0_SOURCES = example0.cc
+-example0_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
++example0_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
+ example0_DEPENDENCIES = $(PLAYERCC_DEPS)
+ 
+ example1_SOURCES = example1.cc args.h
+-example1_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
++example1_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
+ example1_DEPENDENCIES = $(PLAYERCC_DEPS)
+ 
+ example2_SOURCES = example2.cc
+-example2_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
++example2_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
+ example2_DEPENDENCIES = $(PLAYERCC_DEPS)
+ 
+ example3_SOURCES = example3.cc args.h
+-example3_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
++example3_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
+ example3_DEPENDENCIES = $(PLAYERCC_DEPS)
+ 
+ example4_SOURCES = example4.cc
+-example4_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
++example4_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
+ example4_DEPENDENCIES = $(PLAYERCC_DEPS)
+ 
+ goto_SOURCES = goto.cc
+-goto_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
++goto_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
+ goto_DEPENDENCIES = $(PLAYERCC_DEPS)
+ 
+ grip_SOURCES = grip.cc args.h
+-grip_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
++grip_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
+ grip_DEPENDENCIES = $(PLAYERCC_DEPS)
+ 
+ clientgraphics_SOURCES = clientgraphics.cc args.h
+-clientgraphics_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
++clientgraphics_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
+ clientgraphics_DEPENDENCIES = $(PLAYERCC_DEPS)
+ 
+ clientgraphics3d_SOURCES = clientgraphics3d.cc args.h
+-clientgraphics3d_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
++clientgraphics3d_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
+ clientgraphics3d_DEPENDENCIES = $(PLAYERCC_DEPS)
+ 
+ 
+ laserobstacleavoid_SOURCES = laserobstacleavoid.cc args.h
+-laserobstacleavoid_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
++laserobstacleavoid_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
+ laserobstacleavoid_DEPENDENCIES = $(PLAYERCC_DEPS)
+ 
+ ptz_SOURCES = ptz.cc args.h
+-ptz_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
++ptz_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
+ ptz_DEPENDENCIES = $(PLAYERCC_DEPS)
+ 
+ randomwalk_SOURCES = randomwalk.cc args.h
+-randomwalk_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
++randomwalk_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
+ randomwalk_DEPENDENCIES = $(PLAYERCC_DEPS)
+ 
+ sonarobstacleavoid_SOURCES = sonarobstacleavoid.cc args.h
+-sonarobstacleavoid_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
++sonarobstacleavoid_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
+ sonarobstacleavoid_DEPENDENCIES = $(PLAYERCC_DEPS)
+ 
+ speech_SOURCES = speech.cc args.h
+-speech_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
++speech_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
+ speech_DEPENDENCIES = $(PLAYERCC_DEPS)
+ 
+ speech_cpp_client_SOURCES = speech_cpp_client.cc
+-speech_cpp_client_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
++speech_cpp_client_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
+ speech_cpp_client_DEPENDENCIES = $(PLAYERCC_DEPS)
+ 
+ wallfollow_SOURCES = wallfollow.cc args.h
+-wallfollow_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror
++wallfollow_LDADD = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerxdr -lplayerc -lplayererror -lplayerutils
+ wallfollow_DEPENDENCIES = $(PLAYERCC_DEPS)
+diff -urN player-2.1.0rc2/examples/plugins/exampleinterface/Makefile.am player-2.1.0rc2.norpath/examples/plugins/exampleinterface/Makefile.am
+--- player-2.1.0rc2/examples/plugins/exampleinterface/Makefile.am	2008-04-13 00:16:59.000000000 +0200
++++ player-2.1.0rc2.norpath/examples/plugins/exampleinterface/Makefile.am	2008-05-20 01:44:12.000000000 +0200
+@@ -41,5 +41,5 @@
+ libeginterf_la_SOURCES = example_interface.h example_xdr.h eginterf_client.c example_functiontable.c example_xdr.c
+ 
+ example_client_SOURCES = example_client.c
+-example_client_LDADD = -lplayerc $(PLAYERC_LIB_DIRS) -lplayerxdr -lplayererror libeginterf.la
++example_client_LDADD = -lplayerc $(PLAYERC_LIB_DIRS) -lplayerxdr -lplayererror -lplayerutils libeginterf.la
+ example_client_DEPENDENCIES = $(PLAYERC_DEPS) example_interface.h
+diff -urN player-2.1.0rc2/examples/plugins/opaquedriver/Makefile.am player-2.1.0rc2.norpath/examples/plugins/opaquedriver/Makefile.am
+--- player-2.1.0rc2/examples/plugins/opaquedriver/Makefile.am	2008-04-13 00:16:58.000000000 +0200
++++ player-2.1.0rc2.norpath/examples/plugins/opaquedriver/Makefile.am	2008-05-20 01:44:24.000000000 +0200
+@@ -22,5 +22,5 @@
+ libopaquedriver_la_SOURCES = opaquedriver.cc sharedstruct.h
+ 
+ opaque_client_SOURCES = opaque.c sharedstruct.h
+-opaque_client_LDADD = $(PLAYERC_LIB_DIRS) -lplayerc -lm -lplayerxdr -lplayererror
++opaque_client_LDADD = $(PLAYERC_LIB_DIRS) -lplayerc -lm -lplayerxdr -lplayererror -lplayerutils
+ opaque_client_DEPENDENCIES = $(PLAYERC_DEPS)
+diff -urN player-2.1.0rc2/server/Makefile.am player-2.1.0rc2.norpath/server/Makefile.am
+--- player-2.1.0rc2/server/Makefile.am	2008-04-13 00:16:22.000000000 +0200
++++ player-2.1.0rc2.norpath/server/Makefile.am	2008-05-20 00:24:11.000000000 +0200
+@@ -21,6 +21,9 @@
+ if HAVE_PLAYERSD
+ player_LDADD += $(top_builddir)/libplayersd/libplayersd.la 
+ endif
++if INCLUDE_JPEG
++player_LDADD += $(top_builddir)/libplayerjpeg/libplayerjpeg.la
++endif
+ #player_LDADD   = -lm $(top_builddir)/server/libplayerdrivers/.libs/libplayerdrivers.a $(top_builddir)/libplayercore/.libs/libplayercore.a $(top_builddir)/libplayercore/.libs/libplayererror.a $(top_builddir)/libplayertcp/.libs/libplayertcp.a $(top_builddir)/libplayerxdr/.libs/libplayerxdr.a @PLAYER_DRIVER_EXTRA_LIBS@ $(RTKGUI_LIBS) $(top_builddir)/replace/.libs/libreplace.a
+ 
+ player_LDFLAGS = -export-dynamic
+diff -urN player-2.1.0rc2/utils/playercam/Makefile.am player-2.1.0rc2.norpath/utils/playercam/Makefile.am
+--- player-2.1.0rc2/utils/playercam/Makefile.am	2008-04-13 00:16:56.000000000 +0200
++++ player-2.1.0rc2.norpath/utils/playercam/Makefile.am	2008-05-20 01:57:03.000000000 +0200
+@@ -9,4 +9,4 @@
+ endif
+ 
+ playercam_SOURCES = playercam.c
+-playercam_LDADD = $(top_builddir)/client_libs/libplayerc/libplayerc.la $(top_builddir)/libplayerxdr/libplayerxdr.la $(top_builddir)/libplayercore/libplayererror.la @GTK_LIBS@
++playercam_LDADD = $(top_builddir)/client_libs/libplayerc/libplayerc.la $(top_builddir)/libplayerxdr/libplayerxdr.la $(top_builddir)/libplayercore/libplayererror.la $(top_builddir)/libplayercore/libplayerutils.la @GTK_LIBS@
+diff -urN player-2.1.0rc2/utils/playerjoy/Makefile.am player-2.1.0rc2.norpath/utils/playerjoy/Makefile.am
+--- player-2.1.0rc2/utils/playerjoy/Makefile.am	2008-04-13 00:16:56.000000000 +0200
++++ player-2.1.0rc2.norpath/utils/playerjoy/Makefile.am	2008-05-20 01:58:08.000000000 +0200
+@@ -19,7 +19,7 @@
+                 $(top_builddir)/client_libs/libplayerc++/libplayerc++.la
+ 
+ playerjoy_CPPFLAGS     = $(PLAYERCC_CFLAGS)
+-playerjoy_LDADD        = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc -lplayerc++ -lplayerxdr -lplayererror
++playerjoy_LDADD        = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc -lplayerc++ -lplayerxdr -lplayererror -lplayerutils
+ playerjoy_DEPENDENCIES = $(PLAYERCC_DEPS)
+ 
+ 
+diff -urN player-2.1.0rc2/utils/playernav/Makefile.am player-2.1.0rc2.norpath/utils/playernav/Makefile.am
+--- player-2.1.0rc2/utils/playernav/Makefile.am	2008-04-13 00:16:55.000000000 +0200
++++ player-2.1.0rc2.norpath/utils/playernav/Makefile.am	2008-05-20 01:56:30.000000000 +0200
+@@ -8,4 +8,4 @@
+ 
+ playernav_SOURCES =  playernav.c gui.c playernav.h player.c parse.c
+ 
+-playernav_LDADD = $(top_builddir)/client_libs/libplayerc/libplayerc.la $(top_builddir)/libplayerxdr/libplayerxdr.la $(top_builddir)/libplayercore/libplayererror.la @GNOMECANVAS_LIBS@
++playernav_LDADD = $(top_builddir)/client_libs/libplayerc/libplayerc.la $(top_builddir)/libplayerxdr/libplayerxdr.la $(top_builddir)/libplayercore/libplayererror.la $(top_builddir)/libplayercore/libplayerutils.la @GNOMECANVAS_LIBS@
+diff -urN player-2.1.0rc2/utils/playerprint/Makefile.am player-2.1.0rc2.norpath/utils/playerprint/Makefile.am
+--- player-2.1.0rc2/utils/playerprint/Makefile.am	2008-04-13 00:16:56.000000000 +0200
++++ player-2.1.0rc2.norpath/utils/playerprint/Makefile.am	2008-05-20 01:57:39.000000000 +0200
+@@ -19,7 +19,7 @@
+                 $(top_builddir)/client_libs/libplayerc++/libplayerc++.la
+ 
+ playerprint_CPPFLAGS     = $(PLAYERCC_CFLAGS)
+-playerprint_LDADD        = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerc -lplayerxdr -lplayererror
++playerprint_LDADD        = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerc -lplayerxdr -lplayererror -lplayerutils
+ playerprint_DEPENDENCIES = $(PLAYERCC_DEPS)
+ 
+ playerprint_SOURCES = playerprint.cc
+diff -urN player-2.1.0rc2/utils/playerprop/Makefile.am player-2.1.0rc2.norpath/utils/playerprop/Makefile.am
+--- player-2.1.0rc2/utils/playerprop/Makefile.am	2008-04-13 00:16:53.000000000 +0200
++++ player-2.1.0rc2.norpath/utils/playerprop/Makefile.am	2008-05-20 01:59:27.000000000 +0200
+@@ -19,7 +19,7 @@
+                 $(top_builddir)/client_libs/libplayerc++/libplayerc++.la
+ 
+ playerprop_CPPFLAGS     = $(PLAYERCC_CFLAGS)
+-playerprop_LDADD        = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerc -lplayerxdr -lplayererror
++playerprop_LDADD        = $(PLAYERCC_LIB_DIRS) $(PLAYERCC_LIB) -lplayerc++ -lplayerc -lplayerxdr -lplayererror -lplayerutils
+ playerprop_DEPENDENCIES = $(PLAYERCC_DEPS)
+ 
+ playerprop_SOURCES = playerprop.cpp
+diff -urN player-2.1.0rc2/utils/playervcr/Makefile.am player-2.1.0rc2.norpath/utils/playervcr/Makefile.am
+--- player-2.1.0rc2/utils/playervcr/Makefile.am	2008-04-13 00:16:55.000000000 +0200
++++ player-2.1.0rc2.norpath/utils/playervcr/Makefile.am	2008-05-20 01:55:18.000000000 +0200
+@@ -9,4 +9,4 @@
+ playervcr_SOURCES =  playervcr.c
+ 
+ playervcr_DEPENDENCIES = $(top_builddir)/client_libs/libplayerc/libplayerc.la $(top_builddir)/libplayercore/libplayererror.la $(top_builddir)/libplayerxdr/libplayerxdr.la
+-playervcr_LDADD = $(top_builddir)/client_libs/libplayerc/libplayerc.la $(top_builddir)/libplayercore/libplayererror.la $(top_builddir)/libplayerxdr/libplayerxdr.la @GTK_LIBS@
++playervcr_LDADD = $(top_builddir)/client_libs/libplayerc/libplayerc.la $(top_builddir)/libplayercore/libplayererror.la $(top_builddir)/libplayerxdr/libplayerxdr.la $(top_builddir)/libplayercore/libplayerutils.la @GTK_LIBS@
+diff -urN player-2.1.0rc2/utils/playerwritemap/Makefile.am player-2.1.0rc2.norpath/utils/playerwritemap/Makefile.am
+--- player-2.1.0rc2/utils/playerwritemap/Makefile.am	2008-04-13 00:16:55.000000000 +0200
++++ player-2.1.0rc2.norpath/utils/playerwritemap/Makefile.am	2008-05-20 01:58:40.000000000 +0200
+@@ -7,4 +7,4 @@
+ playerwritemap_SOURCES =  playerwritemap.c
+ 
+ playerwritemap_DEPENDENCIES = $(top_builddir)/client_libs/libplayerc/libplayerc.la $(top_builddir)/libplayercore/libplayererror.la $(top_builddir)/libplayerxdr/libplayerxdr.la
+-playerwritemap_LDADD = $(top_builddir)/client_libs/libplayerc/libplayerc.la $(top_builddir)/libplayerxdr/libplayerxdr.la $(top_builddir)/libplayercore/libplayererror.la @GDK_PIXBUF_LIBS@
++playerwritemap_LDADD = $(top_builddir)/client_libs/libplayerc/libplayerc.la $(top_builddir)/libplayerxdr/libplayerxdr.la $(top_builddir)/libplayercore/libplayererror.la $(top_builddir)/libplayercore/libplayerutils.la @GDK_PIXBUF_LIBS@
diff --git a/player-2.1.0rc2-paths.patch b/player-2.1.0rc2-paths.patch
new file mode 100644
index 0000000..eff502e
--- /dev/null
+++ b/player-2.1.0rc2-paths.patch
@@ -0,0 +1,90 @@
+diff -urN player-2.1.0rc2/config/Makefile.am player-2.1.0rc2.paths/config/Makefile.am
+--- player-2.1.0rc2/config/Makefile.am	2008-04-13 00:16:57.000000000 +0200
++++ player-2.1.0rc2.paths/config/Makefile.am	2008-05-22 15:53:12.000000000 +0200
+@@ -1,4 +1,4 @@
+-configdir = $(prefix)/share/player/config
++configdir = $(sysconfdir)/player/config
+ 
+ EXAMPLES = \
+ amigobot.cfg \
+diff -urN player-2.1.0rc2/examples/libplayerc/Makefile.am player-2.1.0rc2.paths/examples/libplayerc/Makefile.am
+--- player-2.1.0rc2/examples/libplayerc/Makefile.am	2008-04-13 00:16:59.000000000 +0200
++++ player-2.1.0rc2.paths/examples/libplayerc/Makefile.am	2008-05-22 15:43:26.000000000 +0200
+@@ -13,7 +13,7 @@
+ 
+ AM_CPPFLAGS = $(PLAYERC_CFLAGS) -Wall -g
+ 
+-exampledir = $(prefix)/share/player/examples/libplayerc
++exampledir = $(libdir)/player/examples/libplayerc
+ 
+ example_PROGRAMS = vmap simple speech_c_client
+ if HAVE_PLAYERSD
+diff -urN player-2.1.0rc2/examples/libplayerc++/Makefile.am player-2.1.0rc2.paths/examples/libplayerc++/Makefile.am
+--- player-2.1.0rc2/examples/libplayerc++/Makefile.am	2008-04-13 00:17:00.000000000 +0200
++++ player-2.1.0rc2.paths/examples/libplayerc++/Makefile.am	2008-05-22 15:43:41.000000000 +0200
+@@ -15,7 +15,7 @@
+ 
+ AM_CPPFLAGS = $(PLAYERCC_CFLAGS) -Wall -g
+ 
+-exampledir = $(prefix)/share/player/examples/libplayerc++
++exampledir = $(libdir)/player/examples/libplayerc++
+ 
+ example_PROGRAMS =
+ 
+diff -urN player-2.1.0rc2/examples/plugins/exampledriver/Makefile.am player-2.1.0rc2.paths/examples/plugins/exampledriver/Makefile.am
+--- player-2.1.0rc2/examples/plugins/exampledriver/Makefile.am	2008-04-13 00:16:59.000000000 +0200
++++ player-2.1.0rc2.paths/examples/plugins/exampledriver/Makefile.am	2008-05-22 15:42:25.000000000 +0200
+@@ -1,6 +1,6 @@
+ AM_CPPFLAGS = -Wall -g -I$(top_srcdir)
+ 
+-exampledir = $(prefix)/share/player/examples/plugins/exampledriver
++exampledir = $(libdir)/player/examples/plugins/exampledriver
+ 
+ example_LTLIBRARIES = libexampledriver.la 
+ libexampledriver_la_SOURCES = exampledriver.cc
+diff -urN player-2.1.0rc2/examples/plugins/exampleinterface/Makefile.am player-2.1.0rc2.paths/examples/plugins/exampleinterface/Makefile.am
+--- player-2.1.0rc2/examples/plugins/exampleinterface/Makefile.am	2008-04-13 00:16:59.000000000 +0200
++++ player-2.1.0rc2.paths/examples/plugins/exampleinterface/Makefile.am	2008-05-22 15:42:36.000000000 +0200
+@@ -28,7 +28,7 @@
+ BUILT_SOURCES = example_interface.h example_functiontable.c example_xdr.c example_xdr.h
+ CLEANFILES = $(BUILT_SOURCES)
+ 
+-exampledir = $(prefix)/share/player/examples/plugins/exampleinterface
++exampledir = $(libdir)/player/examples/plugins/exampleinterface
+ 
+ example_PROGRAMS = example_client
+ example_DATA = eginterf_client.c example_functiontable.c eginterf_driver.cc 
+diff -urN player-2.1.0rc2/examples/plugins/logplugin/Makefile.am player-2.1.0rc2.paths/examples/plugins/logplugin/Makefile.am
+--- player-2.1.0rc2/examples/plugins/logplugin/Makefile.am	2008-04-13 00:16:58.000000000 +0200
++++ player-2.1.0rc2.paths/examples/plugins/logplugin/Makefile.am	2008-05-22 15:42:43.000000000 +0200
+@@ -1,6 +1,6 @@
+ AM_CPPFLAGS = -Wall -g -I$(top_srcdir)
+ 
+-exampledir = $(prefix)/share/player/examples/plugins/logplugin
++exampledir = $(libdir)/player/examples/plugins/logplugin
+ 
+ example_LTLIBRARIES = liblogplugin.la 
+ liblogplugin_la_SOURCES = logplugin.cc
+diff -urN player-2.1.0rc2/examples/plugins/multidriver/Makefile.am player-2.1.0rc2.paths/examples/plugins/multidriver/Makefile.am
+--- player-2.1.0rc2/examples/plugins/multidriver/Makefile.am	2008-04-13 00:16:58.000000000 +0200
++++ player-2.1.0rc2.paths/examples/plugins/multidriver/Makefile.am	2008-05-22 15:42:53.000000000 +0200
+@@ -1,6 +1,6 @@
+ AM_CPPFLAGS = -Wall -g -I$(top_srcdir)
+ 
+-exampledir = $(prefix)/share/player/examples/plugins/multidriver
++exampledir = $(libdir)/player/examples/plugins/multidriver
+ 
+ example_LTLIBRARIES = libmultidriver.la 
+ libmultidriver_la_SOURCES = multidriver.cc
+diff -urN player-2.1.0rc2/examples/plugins/opaquedriver/Makefile.am player-2.1.0rc2.paths/examples/plugins/opaquedriver/Makefile.am
+--- player-2.1.0rc2/examples/plugins/opaquedriver/Makefile.am	2008-04-13 00:16:58.000000000 +0200
++++ player-2.1.0rc2.paths/examples/plugins/opaquedriver/Makefile.am	2008-05-22 15:43:05.000000000 +0200
+@@ -12,7 +12,7 @@
+ 
+ AM_CPPFLAGS = $(PLAYERC_CFLAGS) -Wall -g -I$(top_srcdir)
+ 
+-exampledir = $(prefix)/share/player/examples/plugins/opaquedriver
++exampledir = $(libdir)/player/examples/plugins/opaquedriver
+ 
+ example_LTLIBRARIES = libopaquedriver.la
+ example_PROGRAMS = opaque_client
diff --git a/player-2.1.1-gcc43.patch b/player-2.1.1-gcc43.patch
new file mode 100644
index 0000000..8d4750d
--- /dev/null
+++ b/player-2.1.1-gcc43.patch
@@ -0,0 +1,79 @@
+diff -urN player-2.1.1/server/drivers/laser/lms400_cola.cc player-2.1.1-gcc43/server/drivers/laser/lms400_cola.cc
+--- player-2.1.1/server/drivers/laser/lms400_cola.cc	2008-06-11 03:11:17.000000000 +0200
++++ player-2.1.1-gcc43/server/drivers/laser/lms400_cola.cc	2008-08-01 23:45:08.000000000 +0200
+@@ -6,6 +6,9 @@
+ */
+ #include <sys/socket.h>
+ #include <netdb.h>
++#include <cstring>
++#include <cstdlib>
++#include <unistd.h>
+ #include <libplayercore/playercore.h>
+ 
+ #include "lms400_cola.h"
+diff -urN player-2.1.1/server/drivers/mixed/mricp/src/geometry2D.cpp player-2.1.1-gcc43/server/drivers/mixed/mricp/src/geometry2D.cpp
+--- player-2.1.1/server/drivers/mixed/mricp/src/geometry2D.cpp	2008-04-13 00:15:58.000000000 +0200
++++ player-2.1.1-gcc43/server/drivers/mixed/mricp/src/geometry2D.cpp	2008-08-01 23:43:40.000000000 +0200
+@@ -5,6 +5,7 @@
+ #include "geometry2D.h"
+ #include <cmath>
+ #include <cassert>
++#include <cstdio>
+ 
+ using namespace std;
+ 
+diff -urN player-2.1.1/server/drivers/mixed/mricp/src/map.cpp player-2.1.1-gcc43/server/drivers/mixed/mricp/src/map.cpp
+--- player-2.1.1/server/drivers/mixed/mricp/src/map.cpp	2008-04-13 00:15:58.000000000 +0200
++++ player-2.1.1-gcc43/server/drivers/mixed/mricp/src/map.cpp	2008-08-01 23:43:40.000000000 +0200
+@@ -21,6 +21,7 @@
+ #include <math.h>
+ #include <cassert>
+ #include <iostream>
++#include <cstdlib>
+ using namespace std;
+ 
+ 
+diff -urN player-2.1.1/server/drivers/rfid/rfi341_protocol.cc player-2.1.1-gcc43/server/drivers/rfid/rfi341_protocol.cc
+--- player-2.1.1/server/drivers/rfid/rfi341_protocol.cc	2008-06-16 01:37:38.000000000 +0200
++++ player-2.1.1-gcc43/server/drivers/rfid/rfi341_protocol.cc	2008-08-01 23:43:40.000000000 +0200
+@@ -8,6 +8,7 @@
+ #include <iostream>
+ #include <unistd.h>
+ #include <fcntl.h>
++#include <stdlib.h>
+ #include <libplayercore/playercore.h>
+ #include <libplayercore/playercommon.h>
+ #include <stddef.h>
+diff -urN player-2.1.1/server/drivers/vectormap/vec2map.cc player-2.1.1-gcc43/server/drivers/vectormap/vec2map.cc
+--- player-2.1.1/server/drivers/vectormap/vec2map.cc	2008-04-16 04:40:20.000000000 +0200
++++ player-2.1.1-gcc43/server/drivers/vectormap/vec2map.cc	2008-08-01 23:43:40.000000000 +0200
+@@ -84,6 +84,7 @@
+ #include <cstring>
+ #include <cstdio>
+ #include <cstdarg>
++#include <cstdlib>
+ #include <ctime>
+ #include <cmath>
+ #include <vector>
+@@ -365,8 +366,8 @@
+ void Vec2Map::line(int a, int b, int c, int d, int8_t * cells, int width, int height)
+ {
+     double x, y;
+-    int distX = abs(a - c);
+-    int distY = abs(b - d);
++    int distX = labs(a - c);
++    int distY = labs(b - d);
+     double wspX;
+     double wspY;
+ 
+diff -urN player-2.1.1/server/drivers/wifi/aodv.cc player-2.1.1-gcc43/server/drivers/wifi/aodv.cc
+--- player-2.1.1/server/drivers/wifi/aodv.cc	2008-06-16 01:37:38.000000000 +0200
++++ player-2.1.1-gcc43/server/drivers/wifi/aodv.cc	2008-08-01 23:43:40.000000000 +0200
+@@ -74,6 +74,7 @@
+ #include <stddef.h>
+ #include <stdlib.h>
+ #include <netinet/in.h>
++#include <stdlib.h>
+ 
+ #include <libplayercore/playercore.h>
+ 
diff --git a/player.spec b/player.spec
new file mode 100644
index 0000000..eb8e224
--- /dev/null
+++ b/player.spec
@@ -0,0 +1,206 @@
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
+Name:           player
+Version:        2.1.1
+Release:        3%{?dist}
+Summary:        Cross-platform robot device interface and server
+
+Group:          Applications/System
+License:        GPLv2+ and LGPLv2+
+URL:            http://playerstage.sourceforge.net
+Source0:        http://mesh.dl.sourceforge.net/sourceforge/playerstage/%{name}-%{version}.tar.bz2
+Source1:        playernav.desktop 
+Source2:        playercam.desktop 
+Source3:        playerv.desktop 
+Patch0:         %{name}-2.1.1-gcc43.patch
+Patch1:         %{name}-2.1.0rc2-norpath.patch
+Patch2:         %{name}-2.1.0rc2-paths.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  libtool-ltdl-devel
+%if 0%{?fedora} <= 9
+BuildRequires:  geos-devel
+%endif
+BuildRequires:  libraw1394-devel, libdc1394-devel
+BuildRequires:  opencv-devel
+BuildRequires:  alsa-lib-devel
+BuildRequires:  libstatgrab-devel
+BuildRequires:  libpqxx-devel
+BuildRequires:  gsl-devel
+BuildRequires:  python, python-devel, swig
+BuildRequires:  libjpeg-devel
+BuildRequires:  openssl-devel
+BuildRequires:  ImageMagick-devel
+BuildRequires:  gtk2-devel, libgnomecanvas-devel
+BuildRequires:  mesa-libGL-devel, freeglut-devel
+BuildRequires:  boost-devel
+BuildRequires:  avahi-compat-howl-devel
+BuildRequires:  zlib-devel
+BuildRequires:  doxygen, graphviz
+BuildRequires: desktop-file-utils
+
+%description
+Player is a network server for robot control. Running on your robot, Player
+provides a clean and simple interface to the robot's sensors and actuators
+over the IP network. Your client program talks to Player over a TCP socket,
+reading data from sensors, writing commmands to actuators, and configuring
+devices on the fly. Player supports a variety of robot hardware.
+
+
+%package devel
+Summary: Header files and libraries for %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
+
+%description devel
+This package contains the header files and libraries
+for %{name}. If you like to develop programs using %{name},
+you will need to install %{name}-devel.
+
+%package doc
+Summary: Development documentation for Player
+Group: Documentation
+
+%description doc
+This package contains the development documentation for Player.
+
+%package python
+Summary: Player Python bindings
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: python >= 2.5
+
+%description python
+This package contains the Python bindings for %{name}.
+If you like to develop programs using %{name} in Python
+you will need to install this package.
+
+%package examples
+Summary:  Examples for Player
+Group:    Development/Tools
+Requires: %{name} = %{version}-%{release}
+
+%description examples
+This package contains examples for Player.
+
+%package static
+Summary: Static libraries for %{name}
+Group: Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+
+%description static
+This package contains static libraries that can be used to
+compile static binaries using Player.
+
+
+%prep
+%setup -q -n %{name}-%{version}
+%patch0 -p1 -b .gcc43
+%patch1 -p1 -b .norpath
+%patch2 -p1 -b .paths
+
+
+%build
+# Broken: --enable-alsa --enable-sonartoranger --enable-lasertoranger
+find ./ -name '*.c' -exec chmod a-x {} \;
+find ./ -name '*.cc' -exec chmod a-x {} \;
+find ./ -name '*.cpp' -exec chmod a-x {} \;
+find ./ -name '*.h' -exec chmod a-x {} \;
+%configure --enable-playersd
+# Get rid of rpath
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+# no smp flags, does not work properly: %{?_smp_mflags}
+make
+pushd doc
+doxygen player.dox
+popd
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+for f in `ls $RPM_BUILD_ROOT%{_bindir}/player*.py`; do mv $f $RPM_BUILD_ROOT%{_bindir}/`basename $f | awk -F. '{ print $1 }'`; done
+rm -rf $RPM_BUILD_ROOT%{_datadir}/player/java
+find $RPM_BUILD_ROOT -name '*.la' -exec rm {} \;
+rm -f $RPM_BUILD_ROOT%{_bindir}/*.pyc
+rm -f $RPM_BUILD_ROOT%{_bindir}/*.pyo
+#mv $RPM_BUILD_ROOT%{_libdir}/player/examples $RPM_BUILD_ROOT%{_datadir}/player/examples
+
+desktop-file-install --vendor="fedora"               \
+--dir=${RPM_BUILD_ROOT}%{_datadir}/applications         \
+%{SOURCE1}
+
+desktop-file-install --vendor="fedora"               \
+--dir=${RPM_BUILD_ROOT}%{_datadir}/applications         \
+%{SOURCE2}
+
+desktop-file-install --vendor="fedora"               \
+--dir=${RPM_BUILD_ROOT}%{_datadir}/applications         \
+%{SOURCE3}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+%doc COPYING COPYING.lib README AUTHORS
+%config(noreplace) %{_sysconfdir}/player
+%{_bindir}/player*
+%{_bindir}/pmaptest
+%{_libdir}/*.so.*
+%dir %{_datadir}/player
+%dir %{_libdir}/player
+%{_datadir}/applications/*.desktop
+
+%files python
+%defattr(-,root,root,-)
+%{python_sitearch}/*
+
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/player-2.1
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/*
+
+%files examples
+%defattr(-,root,root,-)
+%{_libdir}/player/examples
+
+%files doc
+%defattr(-,root,root,-)
+%doc doc/*.txt
+%doc doc/*.html
+%doc doc/player-docs
+
+%files static
+%defattr(-,root,root,-)
+%{_libdir}/*.a
+
+%changelog
+* Mon Aug 08 2008 Jef Spaleta <jspaleta at fedoraproject dot org> - 2.1.1-3
+- Review clean-ups
+
+* Tue Aug 05 2008 Tim Niemueller <tim@niemueller.de> - 2.1.1-2
+- Only BR geos-devel on Fedora 9
+
+* Fri Aug 01 2008 Tim Niemueller <tim@niemueller.de> - 2.1.1-1
+- Upgrade to 2.1.1
+
+* Mon Jun 23 2008 Jef Spaleta <jspaleta at fedoraproject dot org> - 2.1.0-0.3.rc2.fc9
+- Review clean-ups
+
+* Thu May 22 2008 Tim Niemueller <tim@niemueller.de> - 2.1.0-0.2.rc2.fc9
+- Added subpackages for doc and examples
+- Remove *.la files
+- Fix BuildRequires
+
+* Thu May 08 2008 Tim Niemueller <tim@niemueller.de> - 2.1.0-0.1.rc2.fc9
+- Initial spec file
+
diff --git a/playercam.desktop b/playercam.desktop
new file mode 100644
index 0000000..d7a8dc3
--- /dev/null
+++ b/playercam.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry] 
+Encoding=UTF-8
+Name=PlayerCam
+GenericName=Player Camera Program
+Comment=Camera visualization GUI 
+Exec=playercam
+Icon=
+Terminal=false
+Type=Application
+Categories=Education;
diff --git a/playernav.desktop b/playernav.desktop
new file mode 100644
index 0000000..5f08739
--- /dev/null
+++ b/playernav.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry] 
+Encoding=UTF-8
+Name=PlayerNav
+GenericName=Graphical Player Navigation Program
+Comment= Multi-robot localization, navigation, and path-planning GUI. 
+Exec=playernav
+Icon=
+Terminal=false
+Type=Application
+Categories=Education;
diff --git a/playerv.desktop b/playerv.desktop
new file mode 100644
index 0000000..a9a24f1
--- /dev/null
+++ b/playerv.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry] 
+Encoding=UTF-8
+Name=PlayerV
+GenericName=Graphical Player Visualization Program
+Comment= General-purpose robotic sensor visualization and device control GUI 
+Exec=playerv
+Icon=
+Terminal=false
+Type=Application
+Categories=Education;
diff --git a/sources b/sources
index e69de29..4df5dcc 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+74d221bebd7f68a8ef258aadf0ac185b  player-2.1.1.tar.bz2