rpms/bzflag/devel bzflag-2.0.14-gold.patch, NONE, 1.1 bzflag.spec, 1.51, 1.52 bzflag-2.0.12-gcc-4.4.patch, 1.1, NONE bzflag-2.0.4-lookup.patch, 1.1, NONE

[Nils Philippsen]

Author: nphilipp

Update of /cvs/pkgs/rpms/bzflag/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29608

Modified Files:
	bzflag.spec 
Added Files:
	bzflag-2.0.14-gold.patch 
Removed Files:
	bzflag-2.0.12-gcc-4.4.patch bzflag-2.0.4-lookup.patch 
Log Message:
version 2.0.14
don't run autoreconf
remove obsolete lookup patch (see http://sourceforge.net/tracker/index.php?func=detail&aid=1197856&group_id=3248&atid=303248)
remove obsolete gcc patch
use --disable-static instead of removing *.a files
remove bzfquery man page
sanitize source URL, get rid of %date
explicitly link libraries (#565122, patch by Jeff Makey, slightly modified)


bzflag-2.0.14-gold.patch:
 Makefile.am |    1 +
 Makefile.in |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE bzflag-2.0.14-gold.patch ---
diff -up bzflag-2.0.14/src/bzfs/Makefile.am.gold bzflag-2.0.14/src/bzfs/Makefile.am
--- bzflag-2.0.14/src/bzfs/Makefile.am.gold	2007-12-18 22:23:00.000000000 +0100
+++ bzflag-2.0.14/src/bzfs/Makefile.am	2010-03-09 16:02:13.759923242 +0100
@@ -14,6 +14,7 @@ plugin_files =
 endif
 
 bzfs_LDFLAGS = -export-dynamic -static
+bzfs_LIBADD = -ldl
 bzfs_SOURCES = \
 	${plugin_files}	\
 	AccessControlList.cxx \
diff -up bzflag-2.0.14/src/bzfs/Makefile.in.gold bzflag-2.0.14/src/bzfs/Makefile.in
--- bzflag-2.0.14/src/bzfs/Makefile.in.gold	2010-02-15 01:23:51.000000000 +0100
+++ bzflag-2.0.14/src/bzfs/Makefile.in	2010-03-09 16:02:56.816174051 +0100
@@ -193,7 +193,7 @@ LIBCURL = @LIBCURL@
 LIBCURL_CPPFLAGS = @LIBCURL_CPPFLAGS@
 LIBDIR = @LIBDIR@
 LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
+LIBS = @LIBS@ -ldl
 LIBTOOL = @LIBTOOL@
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
 LN_S = @LN_S@


Index: bzflag.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzflag/devel/bzflag.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- bzflag.spec	24 Jul 2009 18:32:19 -0000	1.51
+++ bzflag.spec	9 Mar 2010 15:16:05 -0000	1.52
@@ -28,20 +28,18 @@
 %bcond_without SDL
 
 %define desktop_vendor fedora
-#define date           20050930
 
 Summary: 3D multi-player tank battle game
 Name: bzflag
-Version: 2.0.12
-Release: 6%{?dist}
+Version: 2.0.14
+Release: 1%{?dist}
 License: LGPLv2
 Group: Amusements/Games
 URL: http://bzflag.org
-Source0: http://downloads.sourceforge.net/bzflag/bzflag-%{version}%{?date:.%{date}}.tar.bz2
+Source0: http://downloads.sourceforge.net/bzflag/bzflag-%{version}.tar.bz2
 Source1: bzflag.desktop
-Patch0: bzflag-2.0.4-lookup.patch
-Patch1: bzflag-2.0.12-gcc-4.4.patch
-Patch2: bzflag-2.0.12-findresolutions.patch
+Patch0: bzflag-2.0.12-findresolutions.patch
+Patch1: bzflag-2.0.14-gold.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 %if %{with modular_x}
 BuildRequires: libXi-devel
@@ -74,12 +72,6 @@ BuildRequires: sed
 Requires: opengl-games-utils
 %endif
 
-## the following deps are needed for autoreconf after applying patches
-BuildRequires: gettext
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: libtool
-
 %description
 BZFlag is a 3D multi-player tank battle game  that  allows users to play
 against each other in a networked environment.  There are five teams: red,
@@ -90,22 +82,20 @@ cannot shoot teammates and they do not h
 There are two main styles of play: capture-the-flag and free-for-all.
 
 %prep
-%setup -q -n %{name}-%{version}%{?date:.%{date}}
-%patch0 -p1 -b .lookup
-%patch1 -p1 -b .gcc-4.4
-%patch2 -p1 -b .findresolutions
+%setup -q -n %{name}-%{version}
+%patch0 -p1 -b .findresolutions
+%patch1 -p1 -b .gold
 
 %build
-autoreconf -i
 # Use PIE because bzflag/bzfs are networked server applications
-CFLAGS='-fPIC %{optflags} -fno-strict-aliasing'
-CXXFLAGS='-fPIC %{optflags} -fno-strict-aliasing'
-LDFLAGS='-pie'
+CFLAGS='-fPIC %{optflags} -fno-strict-aliasing' \
+CXXFLAGS='-fPIC %{optflags} -fno-strict-aliasing' \
+LDFLAGS='-pie' \
 %configure \
 %if ! %{with SDL}
     --without-SDL \
 %endif
-    --enable-optimized \
+    --disable-static \
     --enable-shared
 make %{?_smp_mflags}
 
@@ -114,8 +104,8 @@ rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 install -D -m 644 package/rpm/bzflag-m.xpm \
     %{buildroot}%{_datadir}/pixmaps/bzflag.xpm
-rm -f %{buildroot}%{_libdir}/bzflag/*.a
 rm -f %{buildroot}%{_libdir}/bzflag/*.la
+rm -f %{buildroot}%{_mandir}/*/bzfquery.*
 
 %if %{with opengl_wrapper}
 ln -snf opengl-game-wrapper.sh %{buildroot}%{_bindir}/bzflag-wrapper
@@ -149,7 +139,21 @@ rm -rf %{buildroot}
 %{_mandir}/man*/*
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.12-6
+* Tue Mar 03 2010 Nils Philippsen <nils at redhat.com> 2.0.14-1
+- explicitly link libraries (#565122, patch by Jeff Makey, slightly modified)
+
+* Tue Feb 16 2010 Nils Philippsen <nils at redhat.com>
+- version 2.0.14
+- don't run autoreconf
+- remove obsolete lookup patch (see
+  http://sourceforge.net/tracker/index.php?func=detail&aid=1197856&group_id=3248&atid=303248)
+- remove obsolete gcc patch
+- use --disable-static instead of removing *.a files
+- remove bzfquery man page
+- sanitize source URL, get rid of %%date
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
+* - 2.0.12-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Mon Mar 02 2009 Nils Philippsen <nils at redhat.com> 2.0.12-5


--- bzflag-2.0.12-gcc-4.4.patch DELETED ---


--- bzflag-2.0.4-lookup.patch DELETED ---