rpms/freeciv/devel NEWS-1.14.2, NONE, 1.1 freeciv-1.13.0-aifill.patch, NONE, 1.1 freeciv-desktop-xauth.patch, NONE, 1.1 freeciv-desktop.patch, NONE, 1.1 freeciv.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Brian Pepple (bpepple)
fedora-extras-commits at redhat.com
Thu Mar 24 01:08:09 UTC 2005
Author: bpepple
Update of /cvs/extras/rpms/freeciv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21705/devel
Modified Files:
.cvsignore sources
Added Files:
NEWS-1.14.2 freeciv-1.13.0-aifill.patch
freeciv-desktop-xauth.patch freeciv-desktop.patch freeciv.spec
Log Message:
auto-import freeciv-1.14.2-4 on branch devel from freeciv-1.14.2-4.src.rpm
--- NEW FILE NEWS-1.14.2 ---
=======================
Welcome to Freeciv 1.14
=======================
This is release 1.14.2.
Thanks again to all our developers, who continue to work so hard.
This release includes lots of changes, outlined below. Those who
are interested in seeing the detailed changes should check the
ChangeLog file.
WHAT'S CHANGED SINCE 1.14.1
- important compile fixes for some platforms
- game balance adjustments:
x all buildings except wonders and space parts 30% cheaper
x some wonders cheaper: Colossus, Copernicus, Isaac Newton's,
King Richard's, Oracle and Shakespeare's
x submarine has more attack and movement, and costs less
- reputation recovery fixed (now much slower)
- a few other minor bugfixes
freeciv-1.13.0-aifill.patch:
--- NEW FILE freeciv-1.13.0-aifill.patch ---
--- freeciv-1.13.0/common/game.h.aifill 2002-11-07 14:02:46.000000000 +0100
+++ freeciv-1.13.0/common/game.h 2002-11-07 14:03:13.000000000 +0100
@@ -300,7 +300,7 @@
#define GAME_MIN_MAX_PLAYERS 1
#define GAME_MAX_MAX_PLAYERS MAX_NUM_PLAYERS
-#define GAME_DEFAULT_AIFILL 0
+#define GAME_DEFAULT_AIFILL 5
#define GAME_MIN_AIFILL 0
#define GAME_MAX_AIFILL GAME_MAX_MAX_PLAYERS
freeciv-desktop-xauth.patch:
--- NEW FILE freeciv-desktop-xauth.patch ---
diff -rcN freeciv-1.14.2,orig/desktop/civclient-wrapper.in freeciv-1.14.2/desktop/civclient-wrapper.in
*** freeciv-1.14.2,orig/desktop/civclient-wrapper.in 2004-10-25 20:02:15.588044089 -0400
--- freeciv-1.14.2/desktop/civclient-wrapper.in 2004-10-25 20:06:14.243634855 -0400
***************
*** 4,13 ****
test -d $HOME/.freeciv/client || mkdir $HOME/.freeciv/client
cd $HOME/.freeciv/client || exit 1
! if test ! -w /etc
then
! [ ! -e ~/.civclientrc ] && touch ~/.civclientrc
! @bindir@/civclient "$@" &
! else
! su nobody -c "@bindir@/civclient $@ &"
fi
--- 4,44 ----
test -d $HOME/.freeciv/client || mkdir $HOME/.freeciv/client
cd $HOME/.freeciv/client || exit 1
! if test -w /etc
then
! if su -s /bin/bash nobody -c "id >/dev/null 2>/dev/null"; then
! TMP=`mktemp /tmp/xauthXXXXXX`
! xauth extract $TMP $DISPLAY
! chown nobody:nobody $TMP
! su -s /bin/bash nobody -c "XAUTHORITY=$TMP @bindir@/civclient $@" &
! sleep 3
! rm -f $TMP
! else
! BASEMESSAGE=$(printf "You are logged in as the super user (root).\n\nFreeCiv would prefer to run as a less-privileged user, such as nobody, just in case there is a bug in FreeCiv that would allow a malicious server to compromise your system. However, FreeCiv is unable to change from root to nobody.")
! ERRORMESSAGE=$(printf "${BASEMESSAGE}\n\nYou can not run this version of FreeCiv as root.")
! QUESTIONMESSAGE=$(printf "${BASEMESSAGE}\n\nWould you like to run FreeCiv as root anyway?")
! ANSWER=
! if civclient --help >/dev/null 2>/dev/null; then
! if [ -t 1 ]; then
! read -s -n 1 -p "${QUESTIONMESSAGE} [n]" ANSWER
! else
! if zenity --question --text="${QUESTIONMESSAGE}"; then
! ANSWER=y
! fi
! fi
! if [ x"${ANSWER}" != xy ]; then
! exit 1
! fi
! else
! if [ -t 0 ]; then
! echo "${ERRORMESSAGE}"
! else
! zenity --error --text="${ERRORMESSAGE}"
! fi
! exit 1
! fi
! fi
fi
+
+ [ ! -e ~/.civclientrc ] && touch ~/.civclientrc
+ exec @bindir@/civclient "$@"
diff -rcN freeciv-1.14.2,orig/desktop/civserver-wrapper.in freeciv-1.14.2/desktop/civserver-wrapper.in
*** freeciv-1.14.2,orig/desktop/civserver-wrapper.in 2004-10-25 20:02:15.594043249 -0400
--- freeciv-1.14.2/desktop/civserver-wrapper.in 2004-10-25 20:07:59.911842434 -0400
***************
*** 4,12 ****
test -d $HOME/.freeciv/server || mkdir $HOME/.freeciv/server
cd $HOME/.freeciv/server || exit 1
! if test ! -w /etc
then
! xterm -sb -fn 10x20 -fg black -bg white -T FreeCiv -e sh -c @bindir@/civserver &
! else
! su nobody -c 'xterm -sb -fn 10x20 -fg black -bg white -T FreeCiv -e @bindir@/civserver &'
fi
--- 4,43 ----
test -d $HOME/.freeciv/server || mkdir $HOME/.freeciv/server
cd $HOME/.freeciv/server || exit 1
! if test -w /etc
then
! if su -s /bin/bash nobody -c "id >/dev/null 2>/dev/null"; then
! TMP=`mktemp /tmp/xauthXXXXXX`
! xauth extract $TMP $DISPLAY
! chown nobody:nobody $TMP
! su -s /bin/bash nobody -c "XAUTHORITY=$TMP xterm -sb -fn 10x20 -fg black -bg white -T FreeCiv -e @bindir@/civserver $@" &
! sleep 3
! rm -f $TMP
! else
! BASEMESSAGE=$(printf "You are logged in as the super user (root).\n\nFreeCiv would prefer to run as a less-privileged user, such as nobody, just in case there is a bug in FreeCiv that would allow a malicious server to compromise your system. However, FreeCiv is unable to change from root to nobody.")
! ERRORMESSAGE=$(printf "${BASEMESSAGE}\n\nYou can not run this version of FreeCiv as root.")
! QUESTIONMESSAGE=$(printf "${BASEMESSAGE}\n\nWould you like to run FreeCiv as root anyway?")
! ANSWER=
! if civserver --help >/dev/null 2>/dev/null; then
! if [ -t 1 ]; then
! read -s -n 1 -p "${QUESTIONMESSAGE} [n]" ANSWER
! else
! if zenity --question --text="${QUESTIONMESSAGE}"; then
! ANSWER=y
! fi
! fi
! if [ x"${ANSWER}" != xy ]; then
! exit 1
! fi
! else
! if [ -t 0 ]; then
! echo "${ERRORMESSAGE}"
! else
! zenity --error --text="${ERRORMESSAGE}"
! fi
! exit 1
! fi
! fi
fi
+
+ xterm -sb -fn 10x20 -fg black -bg white -T FreeCiv -e sh -c @bindir@/civserver &
freeciv-desktop.patch:
--- NEW FILE freeciv-desktop.patch ---
--- freeciv-1.14.0/configure.in.desktop 2003-01-17 10:09:14.000000000 +0100
+++ freeciv-1.14.0/configure.in 2003-05-09 01:01:28.000000000 +0200
@@ -710,4 +710,10 @@
intl/Makefile
po/Makefile.in
doc/Makefile
+ desktop/civclient-wrapper
+ desktop/civserver-wrapper
+ desktop/freeciv-engels.desktop
+ desktop/freeciv-server.desktop
+ desktop/freeciv-trident.desktop
+ desktop/freeciv-client.desktop
undep.sh, [ chmod +x undep.sh ; ./undep.sh ])
--- freeciv-1.14.0/configure.desktop 2003-01-17 10:10:32.000000000 +0100
+++ freeciv-1.14.0/configure 2003-05-09 01:01:58.000000000 +0200
@@ -14388,7 +14388,7 @@
- ac_config_files="$ac_config_files Makefile data/Makefile data/misc/Makefile data/trident/Makefile data/isotrident/Makefile data/default/Makefile data/civ1/Makefile data/civ2/Makefile data/scenario/Makefile data/nation/Makefile data/history/Makefile common/Makefile ai/Makefile client/Makefile client/agents/Makefile client/include/Makefile client/gui-gtk/Makefile client/gui-gtk-2.0/Makefile client/gui-xaw/Makefile client/gui-win32/Makefile client/gui-stub/Makefile server/Makefile intl/Makefile po/Makefile.in doc/Makefile undep.sh"
+ ac_config_files="$ac_config_files Makefile data/Makefile data/misc/Makefile data/trident/Makefile data/isotrident/Makefile data/default/Makefile data/civ1/Makefile data/civ2/Makefile data/scenario/Makefile data/nation/Makefile data/history/Makefile common/Makefile ai/Makefile client/Makefile client/agents/Makefile client/include/Makefile client/gui-gtk/Makefile client/gui-gtk-2.0/Makefile client/gui-xaw/Makefile client/gui-win32/Makefile client/gui-stub/Makefile desktop/civclient-wrapper desktop/civserver-wrapper desktop/freeciv-engels.desktop desktop/freeciv-server.desktop desktop/freeciv-trident.desktop desktop/freeciv-client.desktop server/Makefile intl/Makefile po/Makefile.in doc/Makefile undep.sh"
ac_config_commands="$ac_config_commands default"
--- NEW FILE freeciv.spec ---
%define desktop_file 1
%if %{desktop_file}
%define desktop_file_utils_version 0.2.93
%endif
Summary: The Freeciv multi-player strategy game.
Name: freeciv
Version: 1.14.2
Release: 4
Source: ftp://freeciv.org/pub/freeciv/stable/%{name}-%{version}.tar.bz2
Source1: freeciv-desktop.tar.bz2
Source2: http://www.freeciv.org/ftp/contrib/sounds/sets/stdsounds2.tar.gz
Source3: NEWS-1.14.2
Patch1: freeciv-desktop.patch
Patch2: freeciv-desktop-xauth.patch
Patch3: freeciv-1.13.0-aifill.patch
License: GPL
Group: Amusements/Games
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildPrereq: gtk2-devel >= 2.0.5 imlib-devel
%if %{desktop_file}
Requires: /usr/bin/desktop-file-install
BuildPrereq: desktop-file-utils >= %{desktop_file_utils_version}
%endif
%description
Freeciv is a turn-based, multi-player, X based strategy game. Freeciv
is generally comparable to, and has compatible rules with, the
Civilization II(R) game by Microprose(R). In Freeciv, each player is
the leader of a civilization, and is competing with the other players
in order to become the leader of the greatest civilization.
%prep
%setup -a 1
%patch1 -p1 -b .desktop
%patch2 -p1 -b .xauth
%patch3 -p1 -b .aifill
%build
export OLD_PO_FILE_INPUT=yes
CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \
%configure --enable-debug=no --enable-client=gtk-2.0
#--with-gtk-prefix=/usr/lib/gtk-2.0 #not used because of with-xaw3d
#--prefix=/usr --bindir=/usr/bin --with-glib-prefix=/usr
make
cp %{SOURCE3} .
%install
rm -rf $RPM_BUILD_ROOT
%makeinstall
chmod +x desktop/*wrapper
cp desktop/*wrapper $RPM_BUILD_ROOT/usr/bin
mkdir -p $RPM_BUILD_ROOT/etc/X11/applnk/Games $RPM_BUILD_ROOT/usr/share/pixmaps
cp desktop/*.desktop $RPM_BUILD_ROOT/etc/X11/applnk/Games
%if %{desktop_file}
mkdir -p $RPM_BUILD_ROOT/usr/share/applications
desktop-file-install --vendor net \
--dir $RPM_BUILD_ROOT/usr/share/applications \
--add-category "Application;Game;X-Red-Hat-Extra" \
$RPM_BUILD_ROOT/etc/X11/applnk/Games/freeciv-client.desktop
desktop-file-install --vendor net \
--dir $RPM_BUILD_ROOT/usr/share/applications \
--add-category "Application;Game;X-Red-Hat-Extra" \
$RPM_BUILD_ROOT/etc/X11/applnk/Games/freeciv-server.desktop
rm $RPM_BUILD_ROOT/etc/X11/applnk/Games/*.desktop
%endif
cp desktop/*.xpm $RPM_BUILD_ROOT/usr/share/pixmaps
pushd client
perl -p -i -e "s/CFLAGS = $RPM_OPT_FLAGS/CFLAGS = $RPM_OPT_FLAGS \`gtk-config --cflags\`/" gui-gtk/Makefile
make clean
for i in 0 1 2 3 4 5 6 7 8 9 10; do
perl -p -i -e "s/gui-xaw/gui-gtk/" Makefile
perl -p -i -e "s|-I/usr/X11R6/include|\`glib-config --cflags\` \`gtk-config --cflags\` \`imlib-config --cflags-gdk\` -I/usr/X11R6/include|" Makefile
perl -p -i -e "s|-lXaw3d|\`glib-config --libs\` \`gtk-config --libs\` \`imlib-config --libs-gdk\`|" Makefile
done
make
cp civclient $RPM_BUILD_ROOT/usr/bin/civclient-gtk
popd
/usr/bin/install -c civ $RPM_BUILD_ROOT/usr/bin/civ
/usr/bin/install -d $RPM_BUILD_ROOT/usr/X11R6/lib/X11/app-defaults
mv $RPM_BUILD_ROOT/usr/share/freeciv/Freeciv $RPM_BUILD_ROOT/usr/X11R6/lib/X11/app-defaults/Freeciv
mv $RPM_BUILD_ROOT/usr/bin/civclient $RPM_BUILD_ROOT/usr/bin/civclient-xaw
ln -sf civclient-gtk $RPM_BUILD_ROOT/usr/bin/civclient
(cd $RPM_BUILD_ROOT/usr/share/freeciv; tar xzf %{SOURCE2}; )
%find_lang %name
%clean
rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(-,root,root)
%if %{desktop_file}
%config /usr/share/applications/*
%doc NEWS*
%else
%config /etc/X11/applnk/Games/*
%endif
%config /usr/X11R6/lib/X11/app-defaults/Freeciv
%{_bindir}/*
%{_datadir}/freeciv
%{_datadir}/pixmaps/*
%changelog
* Wed Jan 12 2005 Tim Waugh <twaugh at redhat.com> 1.14.2-4
- Rebuilt for new readline.
* Tue Oct 26 2004 Daniel Reed <djr at redhat.com> 1.14.2-3
- [136921] Try a little harder to run as nobody
* Mon Oct 25 2004 Daniel Reed <djr at redhat.com> 1.14.2-2
- [136921] Provide the user with the opportunity to run FreeCiv as root if unable to su to nobody, and throw up an error message if everything fails
* Mon Sep 13 2004 Karsten Hopp <karsten at redhat.de> 1.14.2-1
- update to latest stable version
* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Mon Feb 23 2004 Karsten Hopp <karsten at redhat.de> 1.14.1-3
- rebuild with new chown syntax
* Mon Feb 23 2004 Tim Waugh <twaugh at redhat.com>
- Use ':' instead of '.' as separator for chown.
* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Wed Dec 03 2003 Karsten Hopp <karsten at redhat.de> 1.14.1-1
- update to bugfix release 1.14.1
* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Thu May 08 2003 Karsten Hopp <karsten at redhat.de> 1.14.0-1
- update
* Thu Feb 20 2003 Karsten Hopp <karsten at redhat.de> 1.13.0-6
- remove last patch (obsolete)
* Wed Feb 19 2003 Karsten Hopp <karsten at redhat.de>
- fix message translation (#84599)
* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt
* Thu Nov 07 2002 Karsten Hopp <karsten at redhat.de>
- spelling fix (#75021)
- set aifill to 5 on new servers to get some opponents (#72586)
* Thu Aug 01 2002 Karsten Hopp <karsten at redhat.de>
- desktop fixes (#69391)
* Wed Jul 24 2002 Karsten Hopp <karsten at redhat.de>
- 0.1.13
- s/Games/Game in desktop-file-install
- fix URL
- add standard sounds
* Wed Jul 17 2002 Karsten Hopp <karsten at redhat.de> 1.12.0-6
- fix path to datafiles if FREECIV_PATH is not set (#67922)
- fix desktop files (#67920)
- use desktop-file-install
* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
- automated rebuild
* Thu May 23 2002 Tim Powers <timp at redhat.com>
- automated rebuild
* Thu Jan 24 2002 Bernhard Rosenkraenzer <bero at redhat.com> 1.12.0-2
- Rebuild in current environment
* Thu Aug 23 2001 Bernhard Rosenkraenzer <bero at redhat.com> 1.12.0-1
- 1.12.0 (non-beta)
* Tue Jul 31 2001 Bernhard Rosenkraenzer <bero at redhat.com> 1.11.4-9
- Rebuild - the fix for #49442 didn't seem to get in last time.
* Mon Jul 30 2001 Bernhard Rosenkraenzer <bero at redhat.com> 1.11.4-8
- Fix up demographics (#50119)
* Wed Jun 27 2001 Than Ngo <than at redhat.com>
- support new gettext
- add patch to build against new libtool
* Tue Mar 20 2001 Florian La Roche <Florian.LaRoche at redhat.de>
- use gtk-config instead of glib-config
* Sun Feb 25 2001 Bernhard Rosenkraenzer <bero at redhat.com>
- Fix up civclient-wrapper so it doesn't fail silently when started as
potentially harmful user (Bug #28928)
* Tue Aug 1 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- Fix warning in civclient-wrapper (Bug 14860)
* Fri Jul 21 2000 Trond Eivind Glomsrød <teg at redhat.com>
- 1.11.4
- move to /usr/bin and /usr/share/freeciv (no more /usr/games)
* Wed Jul 12 2000 Trond Eivind Glomsrød <teg at redhat.com>
- remove icon, glint is obsoleted
- don't use find to build file lists, it claimed to own
lots of directories
- use %%{_tmppath}
* Wed Jul 12 2000 Prospector <bugzilla at redhat.com>
- automatic rebuild
* Mon Jul 10 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- 1.11.0 (Bug #13610)
- Add .desktop files (Bug #13610)
- Add BuildPrereq: lines
- fix build
* Thu Jun 8 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- move to dist
- update
- clean up the spec file
- fix build with gcc 2.96
- make the gtk client default; it's better than the Xaw one by now.
* Thu Feb 24 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- 1.10.0
* Fri Feb 4 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- 1.9.2
- use the configure macro
* Sun Nov 7 1999 Bernhard Rosenkraenzer <bero at redhat.com>
- redo RPM for 1.9.0 (many changes to build/install procedure)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/freeciv/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 24 Mar 2005 01:04:33 -0000 1.1
+++ .cvsignore 24 Mar 2005 01:08:07 -0000 1.2
@@ -0,0 +1,3 @@
+freeciv-1.14.2.tar.bz2
+freeciv-desktop.tar.bz2
+stdsounds2.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/freeciv/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 24 Mar 2005 01:04:33 -0000 1.1
+++ sources 24 Mar 2005 01:08:07 -0000 1.2
@@ -0,0 +1,3 @@
+280770591c8f87ac542dcd50702da205 freeciv-1.14.2.tar.bz2
+4f8f5234c6d9719b8eb6fa2526616124 freeciv-desktop.tar.bz2
+63b06631addeaccf45bc4bf6b8ddf7b3 stdsounds2.tar.gz
More information about the fedora-extras-commits
mailing list