rpms/player/F-9 player-2.1.1-pkgconfig.patch, NONE, 1.1 player.spec, 1.3, 1.4
Tim Niemueller
timn at fedoraproject.org
Mon Sep 29 11:03:51 UTC 2008
Author: timn
Update of /cvs/pkgs/rpms/player/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18724
Modified Files:
player.spec
Added Files:
player-2.1.1-pkgconfig.patch
Log Message:
Added pkgconfig patch fixing .pc files on x86_64 (hardcoded libdir path)
Tim
player-2.1.1-pkgconfig.patch:
--- NEW FILE player-2.1.1-pkgconfig.patch ---
diff -urN player-2.1.1/client_libs/libplayerc/playerc.pc.in player-2.1.1-pkgconfig/client_libs/libplayerc/playerc.pc.in
--- player-2.1.1/client_libs/libplayerc/playerc.pc.in 2008-04-13 00:16:35.000000000 +0200
+++ player-2.1.1-pkgconfig/client_libs/libplayerc/playerc.pc.in 2008-09-29 12:41:10.000000000 +0200
@@ -1,8 +1,10 @@
prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
Name: playerc
Description: Andrew Howard's Player C client library - part of the Player/Stage Project
Version: @VERSION@
Requires: playerxdr playererror
-Libs: -L${prefix}/lib -lplayerc -lm
-Cflags: -I${prefix}/include/player- at PLAYER_MAJOR_VERSION@. at PLAYER_MINOR_VERSION@
+Libs: -L${libdir} -lplayerc -lm
+Cflags: -I${includedir}/player- at PLAYER_MAJOR_VERSION@. at PLAYER_MINOR_VERSION@
diff -urN player-2.1.1/client_libs/libplayerc++/playerc++.pc.in player-2.1.1-pkgconfig/client_libs/libplayerc++/playerc++.pc.in
--- player-2.1.1/client_libs/libplayerc++/playerc++.pc.in 2008-04-13 00:16:42.000000000 +0200
+++ player-2.1.1-pkgconfig/client_libs/libplayerc++/playerc++.pc.in 2008-09-29 12:41:32.000000000 +0200
@@ -1,4 +1,6 @@
prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
# this gives access to the player header files for compiling plugins
@@ -6,5 +8,5 @@
Description: C++ wrapper for libplayerc
Version: @VERSION@
Requires: playerxdr playerc
-Libs: -L${prefix}/lib -lplayerc++ @PLAYERCC_LIB@
-Cflags: -I${prefix}/include/player- at PLAYER_MAJOR_VERSION@. at PLAYER_MINOR_VERSION@ @PLAYERCC_EXTRA_CFLAGS@
+Libs: -L${libdir} -lplayerc++ @PLAYERCC_LIB@
+Cflags: -I${includedir}/player- at PLAYER_MAJOR_VERSION@. at PLAYER_MINOR_VERSION@ @PLAYERCC_EXTRA_CFLAGS@
diff -urN player-2.1.1/libplayercore/playercore.pc.in player-2.1.1-pkgconfig/libplayercore/playercore.pc.in
--- player-2.1.1/libplayercore/playercore.pc.in 2008-04-13 00:16:48.000000000 +0200
+++ player-2.1.1-pkgconfig/libplayercore/playercore.pc.in 2008-09-29 12:42:05.000000000 +0200
@@ -1,6 +1,8 @@
# DO NOT edit playercore.pc; edit playercore.pc.in instead
prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
# this gives access to the player header files for compiling plugins
@@ -8,5 +10,5 @@
Description: Player robot interface library - part of the Player Project
Version: @VERSION@
Requires: playererror
-Libs: -L${prefix}/lib -lplayercore @LIBLTDL_FLAG@ -lpthread
-Cflags: -I${prefix}/include/player- at PLAYER_MAJOR_VERSION@. at PLAYER_MINOR_VERSION@
+Libs: -L${libdir} -lplayercore @LIBLTDL_FLAG@ -lpthread
+Cflags: -I${includedir}/player- at PLAYER_MAJOR_VERSION@. at PLAYER_MINOR_VERSION@
diff -urN player-2.1.1/libplayercore/playererror.pc.in player-2.1.1-pkgconfig/libplayercore/playererror.pc.in
--- player-2.1.1/libplayercore/playererror.pc.in 2008-04-13 00:16:48.000000000 +0200
+++ player-2.1.1-pkgconfig/libplayercore/playererror.pc.in 2008-09-29 12:41:51.000000000 +0200
@@ -1,6 +1,8 @@
# DO NOT edit playererror.pc; edit playererror.pc.in instead
prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
# this gives access to the player header files for compiling plugins
@@ -8,5 +10,5 @@
Description: Player error reporting library - part of the Player Project
Version: @VERSION@
Requires:
-Libs: -L${prefix}/lib -lplayererror
-Cflags: -I${prefix}/include/player- at PLAYER_MAJOR_VERSION@. at PLAYER_MINOR_VERSION@
+Libs: -L${libdir} -lplayererror
+Cflags: -I${includedir}/player- at PLAYER_MAJOR_VERSION@. at PLAYER_MINOR_VERSION@
diff -urN player-2.1.1/libplayercore/playerutils.pc.in player-2.1.1-pkgconfig/libplayercore/playerutils.pc.in
--- player-2.1.1/libplayercore/playerutils.pc.in 2008-04-13 00:16:48.000000000 +0200
+++ player-2.1.1-pkgconfig/libplayercore/playerutils.pc.in 2008-09-29 12:42:23.000000000 +0200
@@ -1,6 +1,8 @@
# DO NOT edit playerutils.pc; edit playerutils.pc.in instead
prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
# this gives access to the player header files for compiling plugins
@@ -8,5 +10,5 @@
Description: Player utilities library - part of the Player Project
Version: @VERSION@
Requires:
-Libs: -L${prefix}/lib -lplayerutils
-Cflags: -I${prefix}/include/player- at PLAYER_MAJOR_VERSION@. at PLAYER_MINOR_VERSION@
+Libs: -L${libdir} -lplayerutils
+Cflags: -I${includedir}/player- at PLAYER_MAJOR_VERSION@. at PLAYER_MINOR_VERSION@
diff -urN player-2.1.1/libplayersd/playersd.pc.in player-2.1.1-pkgconfig/libplayersd/playersd.pc.in
--- player-2.1.1/libplayersd/playersd.pc.in 2008-04-13 00:16:22.000000000 +0200
+++ player-2.1.1-pkgconfig/libplayersd/playersd.pc.in 2008-09-29 12:38:11.000000000 +0200
@@ -6,5 +6,5 @@
Description: Player service discovery library - part of the Player Project
Version: @VERSION@
Requires: playererror playerutils
-Libs: -L${prefix}/lib -lplayersd @EXTRA_DNS_SD_LIBS@ -lpthread
-Cflags: -I${prefix}/include/player- at PLAYER_MAJOR_VERSION@. at PLAYER_MINOR_VERSION@
+Libs: -L at libdir@ -lplayersd @EXTRA_DNS_SD_LIBS@ -lpthread
+Cflags: -I at includedir@/player- at PLAYER_MAJOR_VERSION@. at PLAYER_MINOR_VERSION@
diff -urN player-2.1.1/libplayertcp/playertcp.pc.in player-2.1.1-pkgconfig/libplayertcp/playertcp.pc.in
--- player-2.1.1/libplayertcp/playertcp.pc.in 2008-04-13 00:15:28.000000000 +0200
+++ player-2.1.1-pkgconfig/libplayertcp/playertcp.pc.in 2008-09-29 12:40:16.000000000 +0200
@@ -1,10 +1,12 @@
# DO NOT edit playertcp.pc; edit playertcp.pc.in instead
prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
Name: playertcp
Description: Player TCP messaging library - part of the Player/Stage Project
Version: @VERSION@
Requires: playererror playercore
-Libs: -L${prefix}/lib -lplayertcp
-Cflags: -I${prefix}/include/player- at PLAYER_MAJOR_VERSION@. at PLAYER_MINOR_VERSION@
+Libs: -L${libdir} -lplayertcp
+Cflags: -I${includedir}/player- at PLAYER_MAJOR_VERSION@. at PLAYER_MINOR_VERSION@
diff -urN player-2.1.1/libplayertcp/playerudp.pc.in player-2.1.1-pkgconfig/libplayertcp/playerudp.pc.in
--- player-2.1.1/libplayertcp/playerudp.pc.in 2008-04-13 00:15:28.000000000 +0200
+++ player-2.1.1-pkgconfig/libplayertcp/playerudp.pc.in 2008-09-29 12:40:32.000000000 +0200
@@ -1,10 +1,12 @@
# DO NOT edit playerudp.pc; edit playerudp.pc.in instead
prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
Name: playerudp
Description: Player UDP messaging library - part of the Player/Stage Project
Version: @VERSION@
Requires: playererror playercore
-Libs: -L${prefix}/lib -lplayerudp
-Cflags: -I${prefix}/include/player- at PLAYER_MAJOR_VERSION@. at PLAYER_MINOR_VERSION@
+Libs: -L${libdir} -lplayerudp
+Cflags: -I${includedir}/player- at PLAYER_MAJOR_VERSION@. at PLAYER_MINOR_VERSION@
diff -urN player-2.1.1/libplayerxdr/playerxdr.pc.in player-2.1.1-pkgconfig/libplayerxdr/playerxdr.pc.in
--- player-2.1.1/libplayerxdr/playerxdr.pc.in 2008-04-13 00:16:56.000000000 +0200
+++ player-2.1.1-pkgconfig/libplayerxdr/playerxdr.pc.in 2008-09-29 12:42:41.000000000 +0200
@@ -1,10 +1,12 @@
# DO NOT edit playerxdr.pc; edit playerxdr.pc.in instead
prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
Name: playerxdr
Description: Player XDR messaging library - part of the Player/Stage Project
Version: @VERSION@
Requires:
-Libs: -L${prefix}/lib -lplayerxdr
-Cflags: -I${prefix}/include/player- at PLAYER_MAJOR_VERSION@. at PLAYER_MINOR_VERSION@
+Libs: -L${libdir} -lplayerxdr
+Cflags: -I${includedir}/player- at PLAYER_MAJOR_VERSION@. at PLAYER_MINOR_VERSION@
diff -urN player-2.1.1/server/libplayerdrivers/playerdrivers.pc.in player-2.1.1-pkgconfig/server/libplayerdrivers/playerdrivers.pc.in
--- player-2.1.1/server/libplayerdrivers/playerdrivers.pc.in 2008-04-13 00:15:31.000000000 +0200
+++ player-2.1.1-pkgconfig/server/libplayerdrivers/playerdrivers.pc.in 2008-09-29 12:40:54.000000000 +0200
@@ -1,6 +1,8 @@
# DO NOT edit playerdrivers.pc; edit playerdrivers.pc.in instead
prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
# this gives access to the player header files for compiling plugins
@@ -8,5 +10,5 @@
Description: Player driver library - part of the Player/Stage Project
Version: @VERSION@
Requires: playercore
-Libs: -L${prefix}/lib -lplayerdrivers -lpthread
-Cflags: -I${prefix}/include/player- at PLAYER_MAJOR_VERSION@. at PLAYER_MINOR_VERSION@
+Libs: -L${libdir} -lplayerdrivers -lpthread
+Cflags: -I${includedir}/player- at PLAYER_MAJOR_VERSION@. at PLAYER_MINOR_VERSION@
Index: player.spec
===================================================================
RCS file: /cvs/pkgs/rpms/player/F-9/player.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- player.spec 2 Sep 2008 18:09:48 -0000 1.3
+++ player.spec 29 Sep 2008 11:03:21 -0000 1.4
@@ -2,7 +2,7 @@
Name: player
Version: 2.1.1
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Cross-platform robot device interface and server
Group: Applications/System
@@ -16,6 +16,7 @@
Patch1: %{name}-2.1.1-norpath.patch
Patch2: %{name}-2.1.0rc2-paths.patch
Patch3: %{name}-2.1.1-plugindir.patch
+Patch4: %{name}-2.1.1-pkgconfig.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf, automake
@@ -102,6 +103,7 @@
%patch1 -p1 -b .norpath
%patch2 -p1 -b .paths
%patch3 -p1 -b .plugindir
+%patch4 -p1 -b .pkgconfig
%build
@@ -196,6 +198,9 @@
%{_libdir}/*.a
%changelog
+* Mon Sep 29 2008 Tim Niemueller <tim at niemueller.de> - 2.1.1-6
+- Added pkgconfig patch
+
* Tue Sep 02 2008 Tim Niemueller <tim at niemueller.de> - 2.1.1-5
- Added plugindir patch
More information about the fedora-extras-commits
mailing list