rpms/glob2/F-7 glob2-0.8.21-configure.diff, NONE, 1.1 glob2-0.8.21-texts.pl.patch, NONE, 1.1 glob2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Wed May 23 13:28:55 UTC 2007

Author: rafalzaq

Update of /cvs/extras/rpms/glob2/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5084/F-7

Modified Files:
	.cvsignore sources 
Added Files:
	glob2-0.8.21-configure.diff glob2-0.8.21-texts.pl.patch 
	glob2.spec 
Log Message:
import glob2


glob2-0.8.21-configure.diff:

--- NEW FILE glob2-0.8.21-configure.diff ---
diff -uNr glob2-0.8.21.orig/configure glob2-0.8.21/configure
--- glob2-0.8.21.orig/configure	2006-08-05 01:07:21.000000000 +0200
+++ glob2-0.8.21/configure	2007-01-28 05:26:19.000000000 +0100
@@ -2348,7 +2348,7 @@
 ac_config_headers="$ac_config_headers config.h"
 
 
-CXXFLAGS="$CXXFLAGS -O3"
+: CXXFLAGS="$CXXFLAGS -O3"
 
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
diff -uNr glob2-0.8.21.orig/configure.in glob2-0.8.21/configure.in
--- glob2-0.8.21.orig/configure.in	2006-08-05 01:06:15.000000000 +0200
+++ glob2-0.8.21/configure.in	2007-01-28 05:26:15.000000000 +0100
@@ -6,7 +6,7 @@
 AC_CONFIG_SRCDIR([src/Game.cpp])
 AM_CONFIG_HEADER(config.h)
 
-CXXFLAGS="$CXXFLAGS -O3"
+: CXXFLAGS="$CXXFLAGS -O3"
 
 dnl Programs 
 AC_PROG_CXX

glob2-0.8.21-texts.pl.patch:

--- NEW FILE glob2-0.8.21-texts.pl.patch ---
--- data/texts.pl.txt	2006-07-31 17:32:21.000000000 +0200
+++ data/texts.pl.txt.new	2007-01-24 21:21:42.000000000 +0100
@@ -583,7 +583,7 @@
 [YESTS_CONNECTION_REFUSED_NOT_CONNECTED_YET]
 
 [YESTS_CONNECTION_REFUSED_UNEXPLAINED]
-Metaserwer YOG odmÄ‚Å‚wiÄ¹Â‚ poÄ¹Â‚Ã„Â…czenia bez dalszego wyjaÄ¹Â›nienia.
+Metaserwer YOG odmÃ³Å‚wiÅ‚ poÅ‚Ä…czenia bez dalszego wyjaÅ›nienia.
 [The player %0 has left YOG]
 Gracz %0 opuÅ›ciÅ‚ YOG.
 [The player %0 has joined YOG]
@@ -591,7 +591,7 @@
 [You are now marked as away]
 JesteÅ› oznaczony jako nieaktywny.
 [You are no more marked as away]
-Nie jesteÄ¹Â› juÄ¹Åº oznaczony jako nieaktywny.
+Nie jesteÅ› juÅ¼ oznaczony jako nieaktywny.
 [YOG_HELP]
 System komunikacji YOG ma dwie komendy, "msg" oraz "away". Napisz "/help <komenda>" aby siÄ™ o nich wiÄ™cej dowiedzieÄ‡.
 [YOG_HELP_AWAY]
@@ -599,7 +599,7 @@
 [YOG_HELP_MSG]
 Komenda "/msg <nazwa> <wiadomoÅ›Ä‡>" pozwala Ci przesÅ‚aÄ‡ wiadomoÅ›Ä‡ do jednej osoby. Np. "/msg Daemon42 Twoje tÅ‚umaczenie ssie...". W skrÃ³cie "/m"
 [save before quit?]
-Czy chcesz zapisaÃ„Â‡ stan gry, przed jej zakoÄ¹Â„czeniem ?
+Czy chcesz zapisaÄ‡ stan gry, przed jej zakoÅ„czeniem ?
 [Yes]
 Tak
 [No]
@@ -629,11 +629,11 @@
 [username]
 Nazwa uÅ¼ytkownika
 [fullscreen]
-PeÄ¹Â‚ny ekran
+PeÅ‚ny ekran
 [hwaccel]
-Przyspieszenie sprzÃ„Â™towe
+Przyspieszenie sprzÄ™towe
 [dblbuff]
-PodwÄ‚Å‚jne buforowanie
+PodwÃ³jne buforowanie
 [lowquality]
 Niska jakoÅ›Ä‡
 [audio]


--- NEW FILE glob2.spec ---
Name:           glob2
Version:        0.8.21
Release:        2%{?dist}
Summary:        An innovative RTS game

Group:          Amusements/Games
License:        GPL
URL:            http://globulation2.org/
Source0:        http://dl.sv.nongnu.org/releases/%{name}/%{version}/%{name}-%{version}.tar.gz
#patch0 fixes polish diacritics
Patch0:         glob2-0.8.21-texts.pl.patch
#patch1 fixes CXXFLAGS
Patch1:         glob2-0.8.21-configure.diff
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  desktop-file-utils,zlib-devel,speex-devel,boost-devel
BuildRequires:  libvorbis-devel
BuildRequires:  SDL_net-devel,SDL_ttf-devel,SDL_image-devel,SDL-devel
Requires:       hicolor-icon-theme

%description
Globulation 2 brings a new type of gameplay to RTS games. The player chooses
the number of units to assign to various tasks, and the units do their best to
satisfy the requests. This allows players to manage more units and focus on
strategy rather than individual unit's jobs. Globulation 2 also features AI
allowing single-player games or any possible combination of human-computer
teams. Also included is a scripting language for versatile gameplay or
tutorials and an integrated map editor. Globulation2 can be played in single
player mode, through your local network, or over the Internet with Ysagoon
Online Gaming (or YOG for short).


%prep
%setup -q
%patch0 -p0
%patch1 -p1

chmod a-x src/{MainMenuScreen*,MultiplayersChooseMapScreen*,MultiplayersCrossConnectable*,MultiplayersOfferScreen*}

sed -i 's/MultipleArgs\=false/Encoding\=UTF\-8/' data/%{name}.desktop
sed -i 's|Icon=glob2-icon-48x48.png|Icon=glob2.png|' data/%{name}.desktop
touch -c -r aclocal.m4 configure configure.in
sed -i 's|INSTALL_DATA = @INSTALL_DATA@|INSTALL_DATA = @INSTALL_DATA@ -p|' data/{gfx,gfx/cursor,fonts,gui,icons,zik}/Makefile.in

%build
%configure --disable-dependency-tracking
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/AUTHORS

for f in 128x128 16x16 24x24 32x32 48x48 64x64; do
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$f/apps
mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/glob2-icon-$f.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$f/apps/glob2.png
done
rm -rf $RPM_BUILD_ROOT%{_datadir}/pixmaps

desktop-file-install --vendor="fedora"                  \
        --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
        --delete-original                               \
        --remove-category Application                   \
        $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop

%post
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :

%postun
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README TODO
%{_bindir}/*
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_datadir}/%{name}


%changelog
* Tue May 22 2007 RafaÅ‚ Psota <rafalzaq at gmail.com> - 0.8.21-2
- fix Source0
* Sun May 20 2007 RafaÅ‚ Psota <rafalzaq at gmail.com> - 0.8.21-1
- back to 0.8.21
- merge data subpackage to core package
* Fri May 04 2007 RafaÅ‚ Psota <rafalzaq at gmail.com> - 0.8.23-1
- Update to 0.8.23
* Mon Jan 29 2007 RafaÅ‚ Psota <rafalzaq at gmail.com> - 0.8.21-2
- RPM_OPT_FLAGS fix
* Wed Jan 24 2007 RafaÅ‚ Psota <rafalzaq at gmail.com> - 0.8.21-1
- Initial release

Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glob2/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 May 2007 19:10:42 -0000	1.1
+++ .cvsignore	23 May 2007 13:28:20 -0000	1.2
@@ -0,0 +1 @@
+glob2-0.8.21.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glob2/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 May 2007 19:10:42 -0000	1.1
+++ sources	23 May 2007 13:28:20 -0000	1.2
@@ -0,0 +1 @@
+3173f82572f1dd5fba79019ebc43d427  glob2-0.8.21.tar.gz


