rpms/bzflag/F-8 bzflag-2.0.10-plugins.patch, NONE, 1.1 bzflag.spec, 1.36, 1.37
Nils Philippsen (nphilipp)
fedora-extras-commits at redhat.com
Wed Dec 19 16:31:21 UTC 2007
Author: nphilipp
Update of /cvs/pkgs/rpms/bzflag/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4134
Modified Files:
bzflag.spec
Added Files:
bzflag-2.0.10-plugins.patch
Log Message:
build and package plugins
bzflag-2.0.10-plugins.patch:
--- NEW FILE bzflag-2.0.10-plugins.patch ---
diff -up bzflag-2.0.10/plugins/RogueGenocide/Makefile.am.plugins bzflag-2.0.10/plugins/RogueGenocide/Makefile.am
--- bzflag-2.0.10/plugins/RogueGenocide/Makefile.am.plugins 2007-11-15 23:11:31.000000000 +0100
+++ bzflag-2.0.10/plugins/RogueGenocide/Makefile.am 2007-12-19 17:01:01.000000000 +0100
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = RogueGenocide.la
+bzplugin_LTLIBRARIES = RogueGenocide.la
RogueGenocide_la_SOURCES = RogueGenocide.cpp
RogueGenocide_la_CPPFLAGS = -I$(top_srcdir)/include
diff -up bzflag-2.0.10/plugins/chathistory/Makefile.am.plugins bzflag-2.0.10/plugins/chathistory/Makefile.am
--- bzflag-2.0.10/plugins/chathistory/Makefile.am.plugins 2007-11-15 23:11:30.000000000 +0100
+++ bzflag-2.0.10/plugins/chathistory/Makefile.am 2007-12-19 17:01:01.000000000 +0100
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = chathistory.la
+bzplugin_LTLIBRARIES = chathistory.la
chathistory_la_SOURCES = chathistory.cpp
chathistory_la_CPPFLAGS = -I$(top_srcdir)/include
diff -up bzflag-2.0.10/plugins/wwzones/Makefile.am.plugins bzflag-2.0.10/plugins/wwzones/Makefile.am
--- bzflag-2.0.10/plugins/wwzones/Makefile.am.plugins 2007-11-15 23:11:31.000000000 +0100
+++ bzflag-2.0.10/plugins/wwzones/Makefile.am 2007-12-19 17:01:01.000000000 +0100
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = wwzones.la
+bzplugin_LTLIBRARIES = wwzones.la
wwzones_la_SOURCES = wwzones.cpp
wwzones_la_CPPFLAGS = -I$(top_srcdir)/include
diff -up bzflag-2.0.10/plugins/Phoenix/Makefile.am.plugins bzflag-2.0.10/plugins/Phoenix/Makefile.am
--- bzflag-2.0.10/plugins/Phoenix/Makefile.am.plugins 2007-11-15 23:11:30.000000000 +0100
+++ bzflag-2.0.10/plugins/Phoenix/Makefile.am 2007-12-19 17:01:01.000000000 +0100
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = Phoenix.la
+bzplugin_LTLIBRARIES = Phoenix.la
Phoenix_la_SOURCES = Phoenix.cpp
Phoenix_la_CXXFLAGS= -I$(top_srcdir)/include -I$(top_srcdir)/plugins/plugin_utils
diff -up bzflag-2.0.10/plugins/airspawn/Makefile.am.plugins bzflag-2.0.10/plugins/airspawn/Makefile.am
--- bzflag-2.0.10/plugins/airspawn/Makefile.am.plugins 2007-11-15 23:11:31.000000000 +0100
+++ bzflag-2.0.10/plugins/airspawn/Makefile.am 2007-12-19 17:01:01.000000000 +0100
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = airspawn.la
+bzplugin_LTLIBRARIES = airspawn.la
airspawn_la_SOURCES = airspawn.cpp
airspawn_la_CPPFLAGS = -I$(top_srcdir)/include
diff -up bzflag-2.0.10/plugins/regFlag/Makefile.am.plugins bzflag-2.0.10/plugins/regFlag/Makefile.am
--- bzflag-2.0.10/plugins/regFlag/Makefile.am.plugins 2007-11-15 23:11:31.000000000 +0100
+++ bzflag-2.0.10/plugins/regFlag/Makefile.am 2007-12-19 17:01:01.000000000 +0100
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = regFlag.la
+bzplugin_LTLIBRARIES = regFlag.la
regFlag_la_SOURCES = regFlag.cpp
regFlag_la_CXXFLAGS= -I$(top_srcdir)/include -I$(top_srcdir)/plugins/plugin_utils
diff -up bzflag-2.0.10/plugins/serverControl/Makefile.am.plugins bzflag-2.0.10/plugins/serverControl/Makefile.am
--- bzflag-2.0.10/plugins/serverControl/Makefile.am.plugins 2007-11-15 23:11:30.000000000 +0100
+++ bzflag-2.0.10/plugins/serverControl/Makefile.am 2007-12-19 17:01:01.000000000 +0100
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = serverControl.la
+bzplugin_LTLIBRARIES = serverControl.la
serverControl_la_SOURCES = serverControl.cpp
serverControl_la_CXXFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/plugins/plugin_utils
diff -up bzflag-2.0.10/plugins/rabbitTimer/Makefile.am.plugins bzflag-2.0.10/plugins/rabbitTimer/Makefile.am
--- bzflag-2.0.10/plugins/rabbitTimer/Makefile.am.plugins 2007-11-15 23:11:30.000000000 +0100
+++ bzflag-2.0.10/plugins/rabbitTimer/Makefile.am 2007-12-19 17:01:01.000000000 +0100
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = rabbitTimer.la
+bzplugin_LTLIBRARIES = rabbitTimer.la
rabbitTimer_la_SOURCES = rabbitTimer.cpp
rabbitTimer_la_CXXFLAGS= -I$(top_srcdir)/include -I$(top_srcdir)/plugins/plugin_utils
diff -up bzflag-2.0.10/plugins/logDetail/Makefile.am.plugins bzflag-2.0.10/plugins/logDetail/Makefile.am
--- bzflag-2.0.10/plugins/logDetail/Makefile.am.plugins 2007-11-15 23:11:30.000000000 +0100
+++ bzflag-2.0.10/plugins/logDetail/Makefile.am 2007-12-19 17:01:01.000000000 +0100
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = logDetail.la
+bzplugin_LTLIBRARIES = logDetail.la
logDetail_la_SOURCES = logDetail.cpp
logDetail_la_CPPFLAGS = -I$(top_srcdir)/include
diff -up bzflag-2.0.10/plugins/keepaway/Makefile.am.plugins bzflag-2.0.10/plugins/keepaway/Makefile.am
--- bzflag-2.0.10/plugins/keepaway/Makefile.am.plugins 2007-11-15 23:11:30.000000000 +0100
+++ bzflag-2.0.10/plugins/keepaway/Makefile.am 2007-12-19 17:01:01.000000000 +0100
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = keepaway.la
+bzplugin_LTLIBRARIES = keepaway.la
keepaway_la_SOURCES = keepaway.cpp
keepaway_la_CPPFLAGS = -I$(top_srcdir)/include
diff -up bzflag-2.0.10/plugins/killall/Makefile.am.plugins bzflag-2.0.10/plugins/killall/Makefile.am
--- bzflag-2.0.10/plugins/killall/Makefile.am.plugins 2007-11-15 23:11:30.000000000 +0100
+++ bzflag-2.0.10/plugins/killall/Makefile.am 2007-12-19 17:01:01.000000000 +0100
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = killall.la
+bzplugin_LTLIBRARIES = killall.la
killall_la_SOURCES = killall.cpp
killall_la_CPPFLAGS = -I$(top_srcdir)/include
diff -up bzflag-2.0.10/plugins/timedctf/Makefile.am.plugins bzflag-2.0.10/plugins/timedctf/Makefile.am
--- bzflag-2.0.10/plugins/timedctf/Makefile.am.plugins 2007-11-15 23:11:31.000000000 +0100
+++ bzflag-2.0.10/plugins/timedctf/Makefile.am 2007-12-19 17:01:01.000000000 +0100
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = timedctf.la
+bzplugin_LTLIBRARIES = timedctf.la
timedctf_la_SOURCES = timedctf.cpp
timedctf_la_CPPFLAGS = -I$(top_srcdir)/include
diff -up bzflag-2.0.10/plugins/playHistoryTracker/Makefile.am.plugins bzflag-2.0.10/plugins/playHistoryTracker/Makefile.am
--- bzflag-2.0.10/plugins/playHistoryTracker/Makefile.am.plugins 2007-11-15 23:11:31.000000000 +0100
+++ bzflag-2.0.10/plugins/playHistoryTracker/Makefile.am 2007-12-19 17:01:01.000000000 +0100
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = playHistoryTracker.la
+bzplugin_LTLIBRARIES = playHistoryTracker.la
playHistoryTracker_la_SOURCES = playHistoryTracker.cpp
playHistoryTracker_la_CPPFLAGS = -I$(top_srcdir)/include
diff -up bzflag-2.0.10/plugins/recordmatch/Makefile.am.plugins bzflag-2.0.10/plugins/recordmatch/Makefile.am
--- bzflag-2.0.10/plugins/recordmatch/Makefile.am.plugins 2007-11-15 23:11:30.000000000 +0100
+++ bzflag-2.0.10/plugins/recordmatch/Makefile.am 2007-12-19 17:01:01.000000000 +0100
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = recordmatch.la
+bzplugin_LTLIBRARIES = recordmatch.la
recordmatch_la_SOURCES = recordmatch.cpp
recordmatch_la_CPPFLAGS = -I$(top_srcdir)/include
diff -up bzflag-2.0.10/plugins/teamflagreset/Makefile.am.plugins bzflag-2.0.10/plugins/teamflagreset/Makefile.am
--- bzflag-2.0.10/plugins/teamflagreset/Makefile.am.plugins 2007-11-15 23:11:30.000000000 +0100
+++ bzflag-2.0.10/plugins/teamflagreset/Makefile.am 2007-12-19 17:01:01.000000000 +0100
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = teamflagreset.la
+bzplugin_LTLIBRARIES = teamflagreset.la
teamflagreset_la_SOURCES = teamflagreset.cpp
teamflagreset_la_CPPFLAGS = -I$(top_srcdir)/include
diff -up bzflag-2.0.10/plugins/vocaliser/Makefile.am.plugins bzflag-2.0.10/plugins/vocaliser/Makefile.am
--- bzflag-2.0.10/plugins/vocaliser/Makefile.am.plugins 2007-11-15 23:11:30.000000000 +0100
+++ bzflag-2.0.10/plugins/vocaliser/Makefile.am 2007-12-19 17:01:01.000000000 +0100
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = vocaliser.la
+bzplugin_LTLIBRARIES = vocaliser.la
vocaliser_la_SOURCES = vocaliser.cpp
vocaliser_la_CPPFLAGS = -I$(top_srcdir)/include
diff -up bzflag-2.0.10/plugins/HoldTheFlag/Makefile.am.plugins bzflag-2.0.10/plugins/HoldTheFlag/Makefile.am
--- bzflag-2.0.10/plugins/HoldTheFlag/Makefile.am.plugins 2007-11-15 23:11:31.000000000 +0100
+++ bzflag-2.0.10/plugins/HoldTheFlag/Makefile.am 2007-12-19 17:01:01.000000000 +0100
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = HoldTheFlag.la
+bzplugin_LTLIBRARIES = HoldTheFlag.la
HoldTheFlag_la_SOURCES = HoldTheFlag.cpp
HoldTheFlag_la_CPPFLAGS = -I$(top_srcdir)/include
diff -up bzflag-2.0.10/plugins/koth/Makefile.am.plugins bzflag-2.0.10/plugins/koth/Makefile.am
--- bzflag-2.0.10/plugins/koth/Makefile.am.plugins 2007-11-15 23:11:30.000000000 +0100
+++ bzflag-2.0.10/plugins/koth/Makefile.am 2007-12-19 17:01:01.000000000 +0100
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = koth.la
+bzplugin_LTLIBRARIES = koth.la
koth_la_SOURCES = koth.cpp
koth_la_CPPFLAGS = -I$(top_srcdir)/include
diff -up bzflag-2.0.10/plugins/SAMPLE_PLUGIN/Makefile.am.plugins bzflag-2.0.10/plugins/SAMPLE_PLUGIN/Makefile.am
--- bzflag-2.0.10/plugins/SAMPLE_PLUGIN/Makefile.am.plugins 2007-11-15 23:11:31.000000000 +0100
+++ bzflag-2.0.10/plugins/SAMPLE_PLUGIN/Makefile.am 2007-12-19 17:01:01.000000000 +0100
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = SAMPLE_PLUGIN.la
+bzplugin_LTLIBRARIES = SAMPLE_PLUGIN.la
SAMPLE_PLUGIN_la_SOURCES = SAMPLE_PLUGIN.cpp
SAMPLE_PLUGIN_la_CXXFLAGS= -I$(top_srcdir)/include -I$(top_srcdir)/plugins/plugin_utils
diff -up bzflag-2.0.10/plugins/hiddenAdmin/Makefile.am.plugins bzflag-2.0.10/plugins/hiddenAdmin/Makefile.am
--- bzflag-2.0.10/plugins/hiddenAdmin/Makefile.am.plugins 2007-11-15 23:11:30.000000000 +0100
+++ bzflag-2.0.10/plugins/hiddenAdmin/Makefile.am 2007-12-19 17:01:01.000000000 +0100
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = hiddenAdmin.la
+bzplugin_LTLIBRARIES = hiddenAdmin.la
hiddenAdmin_la_SOURCES = hiddenAdmin.cpp
hiddenAdmin_la_CPPFLAGS = -I$(top_srcdir)/include
diff -up bzflag-2.0.10/plugins/shockwaveDeath/Makefile.am.plugins bzflag-2.0.10/plugins/shockwaveDeath/Makefile.am
--- bzflag-2.0.10/plugins/shockwaveDeath/Makefile.am.plugins 2007-11-15 23:11:31.000000000 +0100
+++ bzflag-2.0.10/plugins/shockwaveDeath/Makefile.am 2007-12-19 17:01:01.000000000 +0100
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = shockwaveDeath.la
+bzplugin_LTLIBRARIES = shockwaveDeath.la
shockwaveDeath_la_SOURCES = shockwaveDeath.cpp
shockwaveDeath_la_CPPFLAGS = -I$(top_srcdir)/include
diff -up bzflag-2.0.10/plugins/torBlock/Makefile.am.plugins bzflag-2.0.10/plugins/torBlock/Makefile.am
--- bzflag-2.0.10/plugins/torBlock/Makefile.am.plugins 2007-11-15 23:11:31.000000000 +0100
+++ bzflag-2.0.10/plugins/torBlock/Makefile.am 2007-12-19 17:01:01.000000000 +0100
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = torBlock.la
+bzplugin_LTLIBRARIES = torBlock.la
torBlock_la_SOURCES = torBlock.cpp
torBlock_la_CPPFLAGS = -I$(top_srcdir)/include
diff -up bzflag-2.0.10/plugins/python/Makefile.am.plugins bzflag-2.0.10/plugins/python/Makefile.am
--- bzflag-2.0.10/plugins/python/Makefile.am.plugins 2007-11-15 23:11:30.000000000 +0100
+++ bzflag-2.0.10/plugins/python/Makefile.am 2007-12-19 17:01:01.000000000 +0100
@@ -1,5 +1,5 @@
# change EXTRA to lib to enable this plugin
-# lib_LTLIBRARIES = PyBZFlag.la
+# bzplugin_LTLIBRARIES = PyBZFlag.la
EXTRA_LTLIBRARIES = PyBZFlag.la
PyBZFlag_la_LDFLAGS = -module -avoid-version
diff -up bzflag-2.0.10/plugins/flagStay/Makefile.am.plugins bzflag-2.0.10/plugins/flagStay/Makefile.am
--- bzflag-2.0.10/plugins/flagStay/Makefile.am.plugins 2007-11-15 23:11:31.000000000 +0100
+++ bzflag-2.0.10/plugins/flagStay/Makefile.am 2007-12-19 17:01:01.000000000 +0100
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = flagStay.la
+bzplugin_LTLIBRARIES = flagStay.la
flagStay_la_SOURCES = flagStay.cpp
flagStay_la_CPPFLAGS = -I$(top_srcdir)/include
diff -up bzflag-2.0.10/plugins/rabidRabbit/Makefile.am.plugins bzflag-2.0.10/plugins/rabidRabbit/Makefile.am
--- bzflag-2.0.10/plugins/rabidRabbit/Makefile.am.plugins 2007-11-15 23:11:31.000000000 +0100
+++ bzflag-2.0.10/plugins/rabidRabbit/Makefile.am 2007-12-19 17:01:01.000000000 +0100
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = rabidRabbit.la
+bzplugin_LTLIBRARIES = rabidRabbit.la
rabidRabbit_la_SOURCES = rabidRabbit.cpp
rabidRabbit_la_CXXFLAGS= -I$(top_srcdir)/include -I$(top_srcdir)/plugins/plugin_utils
diff -up bzflag-2.0.10/plugins/nagware/Makefile.am.plugins bzflag-2.0.10/plugins/nagware/Makefile.am
--- bzflag-2.0.10/plugins/nagware/Makefile.am.plugins 2007-11-15 23:11:31.000000000 +0100
+++ bzflag-2.0.10/plugins/nagware/Makefile.am 2007-12-19 17:01:01.000000000 +0100
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = nagware.la
+bzplugin_LTLIBRARIES = nagware.la
nagware_la_SOURCES = nagware.cpp
nagware_la_CPPFLAGS = -I$(top_srcdir)/include
diff -up bzflag-2.0.10/configure.ac.plugins bzflag-2.0.10/configure.ac
--- bzflag-2.0.10/configure.ac.plugins 2007-11-15 23:11:36.000000000 +0100
+++ bzflag-2.0.10/configure.ac 2007-12-19 17:24:04.000000000 +0100
@@ -119,6 +119,11 @@ AC_DISABLE_SHARED
if test x$enable_shared != xno ; then
AC_DEFINE(_USE_BZ_API, 1, [Enable plugins])
+ bzlibdir="$libdir/bzflag"
+ bzplugindir="$bzlibdir/plugins"
+ AC_SUBST(bzplugindir)
+ CFLAGS="$CFLAGS -DBZ_LIB_DIR=\\\"$bzlibdir/\\\""
+ CXXFLAGS="$CXXFLAGS -DBZ_LIB_DIR=\\\"$bzlibdir/\\\""
fi
AM_CONDITIONAL(BUILD_PLUGINS, test "x$enable_shared" != "xno")
diff -up bzflag-2.0.10/src/bzfs/bzfsPlugins.cxx.plugins bzflag-2.0.10/src/bzfs/bzfsPlugins.cxx
--- bzflag-2.0.10/src/bzfs/bzfsPlugins.cxx.plugins 2007-11-15 23:10:56.000000000 +0100
+++ bzflag-2.0.10/src/bzfs/bzfsPlugins.cxx 2007-12-19 17:20:13.000000000 +0100
@@ -31,7 +31,7 @@ std::string extension = ".dll";
std::string globalPluginDir = ".\\plugins\\";
#else
std::string extension = ".so";
-std::string globalPluginDir = "$(prefix)/lib/bzflag/";
+std::string globalPluginDir = BZ_LIB_DIR;
#endif
typedef std::map<std::string, bz_APIPluginHandler*> tmCustomPluginMap;
Index: bzflag.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzflag/F-8/bzflag.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- bzflag.spec 17 Dec 2007 14:05:45 -0000 1.36
+++ bzflag.spec 19 Dec 2007 16:30:43 -0000 1.37
@@ -22,13 +22,14 @@
Summary: 3D multi-player tank battle game
Name: bzflag
Version: 2.0.10
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPLv2
Group: Amusements/Games
URL: http://bzflag.org
Source0: http://download.sourceforge.net/bzflag/bzflag-%{version}%{?date:.%{date}}.tar.bz2
Source1: bzflag.desktop
Patch0: bzflag-2.0.4-lookup.patch
+Patch1: bzflag-2.0.10-plugins.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
%if %_modular_x
BuildRequires: libXi-devel
@@ -54,6 +55,8 @@
BuildRequires: sed
Requires: opengl-games-utils
%endif
+BuildRequires: automake
+BuildRequires: autoconf
%description
BZFlag is a 3D multi-player tank battle game that allows users to play
@@ -67,24 +70,26 @@
%prep
%setup -q -n %{name}-%{version}%{?date:.%{date}}
%patch0 -p1 -b .lookup
+%patch1 -p1 -b .plugins
%build
+autoreconf
# Use PIE because bzflag/bzfs are networked server applications
CFLAGS='-fPIC %{optflags} -fno-strict-aliasing'
CXXFLAGS='-fPIC %{optflags} -fno-strict-aliasing'
LDFLAGS='-pie'
%configure \
- --libdir=%{_libdir}/bzflag \
- --includedir=%{_includedir}/bzflag
+ --enable-optimized \
+ --enable-shared
make %{?_smp_mflags}
%install
rm -rf %{buildroot}
-%makeinstall \
- libdir=%{buildroot}%{_libdir}/bzflag \
- includedir=%{buildroot}%{_includedir}/bzflag
+make DESTDIR=%{buildroot} install
install -D -m 644 package/rpm/bzflag-m.xpm \
%{buildroot}%{_datadir}/pixmaps/bzflag.xpm
+rm -f %{buildroot}%{_libdir}/bzflag/plugins/*.a
+rm -f %{buildroot}%{_libdir}/bzflag/plugins/*.la
%if %_opengl_wrapper
ln -snf opengl-game-wrapper.sh %{buildroot}%{_bindir}/bzflag-wrapper
@@ -110,12 +115,18 @@
%{_bindir}/bzflag-wrapper
%endif
%{_bindir}/bzfs
+%dir %{_libdir}/bzflag
+%dir %{_libdir}/bzflag/plugins
+%{_libdir}/bzflag/plugins/*.so
%{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
%{_datadir}/bzflag
%{_datadir}/pixmaps/bzflag.xpm
%{_mandir}/man*/*
%changelog
+* Mon Dec 17 2007 Nils Philippsen <nphilipp at redhat.com> 2.0.10-2
+- build and package plugins
+
* Mon Dec 17 2007 Nils Philippsen <nphilipp at redhat.com> 2.0.10-1
- version 2.0.10
More information about the fedora-extras-commits
mailing list