rpms/bzflag/FC-4 bzflag-2.0.4-lookup.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 bzflag.spec, 1.14, 1.15 sources, 1.3, 1.4 bzflag-2.0.2-lookup.patch, 1.1, NONE
Nils Philippsen (nphilipp)
fedora-extras-commits at redhat.com
Tue Nov 29 11:59:42 UTC 2005
Author: nphilipp
Update of /cvs/extras/rpms/bzflag/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6142
Modified Files:
.cvsignore bzflag.spec sources
Added Files:
bzflag-2.0.4-lookup.patch
Removed Files:
bzflag-2.0.2-lookup.patch
Log Message:
version 2.0.4
update lookup patch
build require c-ares-devel instead of adns-devel
add newly introduced libs and includes (but exclude headers and static libs, courtesy of Matthias Saou)
use -fPIC, -pie (hopefully) correctly to avoid build problems on x86_64
rebuild to pick up new openssl version
prepare for modular X
appease ISO C++
bzflag-2.0.4-lookup.patch:
--- NEW FILE bzflag-2.0.4-lookup.patch ---
--- bzflag-2.0.4.20050930/src/net/Address.cxx.lookup 2005-09-07 23:57:38.000000000 +0200
+++ bzflag-2.0.4.20050930/src/net/Address.cxx 2005-11-21 16:49:23.000000000 +0100
@@ -136,6 +136,8 @@
int j;
struct hostent* hent;
+ struct hostent myhostent;
+
if (hname == "") { // local address
char hostname[MAXHOSTNAMELEN+1];
if (gethostname(hostname, sizeof(hostname)) >= 0)
@@ -147,7 +149,21 @@
a.addr.push_back(tempAddr);
return a;
} else { // non-local address
- hent = gethostbyname(hname.c_str());
+ // hent = gethostbyname(hname.c_str());
+ {
+ const char *hn = hname.c_str() ;
+ char buf[1024] ;
+ int my_herrno = 0;
+
+ memset(&myhostent, 0, sizeof(myhostent)) ;
+ hent = 0 ;
+
+ if(gethostbyname2_r (hn, AF_INET, &myhostent, buf,sizeof(buf),
+ &hent, &my_herrno) != 0) {
+ sprintf(buf,"gethostbyname2_r failed %d", my_herrno) ;
+ printError(buf) ;
+ }
+ }
}
if (!hent) {
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bzflag/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 23 Mar 2005 15:52:40 -0000 1.3
+++ .cvsignore 29 Nov 2005 11:59:40 -0000 1.4
@@ -1 +1 @@
-bzflag-2.0.2.20050318.tar.bz2
+bzflag-2.0.4.20050930.tar.bz2
Index: bzflag.spec
===================================================================
RCS file: /cvs/extras/rpms/bzflag/FC-4/bzflag.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- bzflag.spec 9 May 2005 14:06:24 -0000 1.14
+++ bzflag.spec 29 Nov 2005 11:59:40 -0000 1.15
@@ -1,18 +1,31 @@
+# Use --with modular_x to rebuild with modular X deps
+%define _modular_X 0%{!?_with_modular_x:1}
+
%define desktop_vendor fedora
-%define date 20050318
+%define date 20050930
Summary: 3D multi-player tank battle game
Name: bzflag
-Version: 2.0.2
-Release: 4
+Version: 2.0.4
+Release: 0.fc4.1
License: GPL
Group: Amusements/Games
URL: http://bzflag.org
Source0: http://ftp.bzflag.org/bzflag/bzflag-%{version}%{?date:.%{date}}.tar.bz2
Source1: bzflag.desktop
-Patch0: bzflag-2.0.2-lookup.patch
+Patch0: bzflag-2.0.4-lookup.patch
+Patch1: bzflag-2.0.2-isoc++.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
+%if %_modular_X
+BuildRequires: libXi-devel
+BuildRequires: libXxf86vm-devel
+BuildRequires: libXext-devel
+BuildRequires: libSM-devel
+BuildRequires: libICE-devel
+BuildRequires: libX11-devel
+%else
BuildRequires: xorg-x11-devel
+%endif
BuildRequires: libGL-devel
BuildRequires: libGLU-devel
BuildRequires: gcc-c++
@@ -20,7 +33,7 @@
BuildRequires: SDL-devel
BuildRequires: ncurses-devel
BuildRequires: curl-devel
-BuildRequires: adns-devel
+BuildRequires: c-ares-devel
# for curl version checking in configure. ugh.
BuildRequires: bc
@@ -35,23 +48,29 @@
%prep
%setup -q -n %{name}-%{version}%{?date:.%{date}}
-%patch0 -p1 -b .lookup
+%patch0 -p1 -b .isoc++
%build
# Use PIE because bzflag/bzfs are networked server applications
-CFLAGS='-fPIE -pie %optflags -fno-strict-aliasing'
-CXXFLAGS='-fPIE -pie %optflags -fno-strict-aliasing'
-%configure
+CFLAGS='-fPIC %{optflags} -fno-strict-aliasing'
+CXXFLAGS='-fPIC %{optflags} -fno-strict-aliasing'
+LDFLAGS='-pie'
+%configure \
+ --libdir=%{_libdir}/bzflag \
+ --includedir=%{_includedir}/bzflag
make %{?_smp_mflags}
%install
rm -rf %{buildroot}
-%makeinstall
+%makeinstall \
+ libdir=%{buildroot}%{_libdir}/bzflag \
+ includedir=%{buildroot}%{_includedir}/bzflag
install -D -m 644 package/rpm/bzflag-m.xpm \
%{buildroot}%{_datadir}/pixmaps/bzflag.xpm
mkdir -p %{buildroot}%{_datadir}/applications
-desktop-file-install --vendor %{desktop_vendor} --dir %{buildroot}%{_datadir}/applications \
+desktop-file-install --vendor %{desktop_vendor} \
+ --dir %{buildroot}%{_datadir}/applications \
%{SOURCE1}
%clean
@@ -62,14 +81,34 @@
%doc AUTHORS BUGS COPYING ChangeLog NEWS README README.Linux
%{_bindir}/bzadmin
%{_bindir}/bzflag
-#%{_bindir}/bzfrelay
%{_bindir}/bzfs
+%exclude %{_includedir}/bzflag/
+%dir %{_libdir}/bzflag/
+%exclude %{_libdir}/bzflag/*.a
+%exclude %{_libdir}/bzflag/*.la
+%{_libdir}/bzflag/*.so
%{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
%{_datadir}/bzflag
%{_datadir}/pixmaps/bzflag.xpm
%{_mandir}/man*/*
%changelog
+* Tue Nov 29 2005 Nils Philippsen <nphilipp at redhat.com> 2.0.4-0.fc4.1
+- rebuild for FC4
+
+* Mon Nov 21 2005 Nils Philippsen <nphilipp at redhat.com> 2.0.4-1
+- version 2.0.4
+- update lookup patch
+- build require c-ares-devel instead of adns-devel
+- add newly introduced libs and includes (but exclude headers and static libs,
+ courtesy of Matthias Saou)
+- use -fPIC, -pie (hopefully) correctly to avoid build problems on x86_64
+
+* Thu Nov 17 2005 Nils Philippsen <nphilipp at redhat.com> 2.0.2-5
+- rebuild to pick up new openssl version
+- prepare for modular X
+- appease ISO C++
+
* Mon May 09 2005 Nils Philippsen <nphilipp at redhat.com> 2.0.2-4
- build with -fno-strict-aliasing (typo)
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bzflag/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 23 Mar 2005 15:52:40 -0000 1.3
+++ sources 29 Nov 2005 11:59:40 -0000 1.4
@@ -1 +1 @@
-d4a72c6e85299fb72d5e8ab7450b31c3 bzflag-2.0.2.20050318.tar.bz2
+b91444c788996902b799f9b64efddd8f bzflag-2.0.4.20050930.tar.bz2
--- bzflag-2.0.2-lookup.patch DELETED ---
More information about the fedora-extras-commits
mailing list