rpms/glob2/devel glob2-desktopfileinstall.patch, NONE, 1.1 glob2-texts.pl.patch, NONE, 1.1 glob2.desktop, NONE, 1.1 .cvsignore, 1.2, 1.3 glob2.spec, 1.3, 1.4 sources, 1.2, 1.3

Sat Sep 8 15:51:58 UTC 2007

Author: rafalzaq

Update of /cvs/extras/rpms/glob2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1295

Modified Files:
	.cvsignore glob2.spec sources 
Added Files:
	glob2-desktopfileinstall.patch glob2-texts.pl.patch 
	glob2.desktop 
Log Message:
update to 0.9.1

glob2-desktopfileinstall.patch:

--- NEW FILE glob2-desktopfileinstall.patch ---
--- data/SConscript.orig	2007-09-02 05:14:54.000000000 +0200
+++ data/SConscript	2007-09-04 18:41:04.000000000 +0200
@@ -10,9 +10,9 @@
             env.Install(env["INSTALLDIR"] + "/glob2/data", file)
         
     
-    env.Install(env["INSTALLDIR"] + "/applications", "glob2.desktop")
+#    env.Install(env["INSTALLDIR"] + "/applications", "glob2.desktop")
     env.Alias("install", env["INSTALLDIR"]+"/glob2/data")
-    env.Alias("install", env["INSTALLDIR"]+"/applications")
+#    env.Alias("install", env["INSTALLDIR"]+"/applications")
     PackTar(env["TARFILE"], "SConscript")
     
 SConscript("fonts/SConscript")

glob2-texts.pl.patch:

--- NEW FILE glob2-texts.pl.patch ---
--- data/texts.pl.txt.orig	2007-09-02 05:14:55.000000000 +0200
+++ data/texts.pl.txt	2007-09-04 19:32:26.000000000 +0200
@@ -245,7 +245,7 @@
 [Damaged Map]
 
 [dblbuff]
-PodwÄ‚Å‚jne buforowanie
+PodwÃ³jne buforowanie
 [decrease units working]
 
 [default terrain]
@@ -373,7 +373,7 @@
 [fruit]
 
 [fullscreen]
-PeÄ¹Â‚ny ekran
+PeÅ‚ny ekran
 [game full]
 Komplet graczy
 [game shortcuts]
@@ -691,7 +691,7 @@
 [sand]
 Piasek
 [save before quit?]
-Czy chcesz zapisaÃ„Â‡ stan gry, przed jej zakoÄ¹Â„czeniem ?
+Czy chcesz zapisaÄ‡ stan gry, przed jej zakoÅ„czeniem ?
 [save game]
 Zapisz grÄ™
 [save map]
@@ -1077,7 +1077,7 @@
 [YESTS_CONNECTION_REFUSED_PROTOCOL_TOO_OLD]
 Metaserwer YOG odmÃ³wiÅ‚ poÅ‚Ä…czenia, poniewaÅ¼ Twoja wersja Globulation 2 jest zbyt stara, by mÃ³gÅ‚ siÄ™ z niÄ… komunikowaÄ‡.
 [YESTS_CONNECTION_REFUSED_UNEXPLAINED]
-Metaserwer YOG odmÄ‚Å‚wiÄ¹Â‚ poÄ¹Â‚Ã„Â…czenia bez dalszego wyjaÄ¹Â›nienia.
+Metaserwer YOG odmÃ³wiÅ‚ poÅ‚Ä…czenia bez dalszego wyjaÅ›nienia.
 [YESTS_CONNECTION_REFUSED_USERNAME_ALLREADY_USED]
 Metaserwer YOG odmÃ³wiÅ‚ poÅ‚Ä…czenia, poniewaÅ¼ twÃ³j login jest juÅ¼ zajÄ™ty przez kogoÅ› innego.
 [YESTS_CREATED]
@@ -1099,7 +1099,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"
 [You are no more marked as away]
-Nie jesteÄ¹Â› juÄ¹Åº oznaczony jako nieaktywny.
+Nie jesteÅ› juÅ¼ oznaczony jako nieaktywny.
 [You are now marked as away]
 JesteÅ› oznaczony jako nieaktywny.
 [you have lost]


--- NEW FILE glob2.desktop ---
[Desktop Entry]
Version=1.0
Encoding=UTF-8
Name=Globulation 2
Comment=An innovative new strategy game
Exec=glob2
Icon=glob2.png
Terminal=false
Type=Application
Categories=Game;StrategyGame;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glob2/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 May 2007 13:23:01 -0000	1.2
+++ .cvsignore	8 Sep 2007 15:51:25 -0000	1.3
@@ -1 +1 @@
-glob2-0.8.21.tar.gz
+glob2-0.9.1.tar.gz


Index: glob2.spec
===================================================================
RCS file: /cvs/extras/rpms/glob2/devel/glob2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- glob2.spec	25 Aug 2007 14:42:14 -0000	1.3
+++ glob2.spec	8 Sep 2007 15:51:25 -0000	1.4
@@ -1,21 +1,21 @@
 Name:           glob2
-Version:        0.8.21
-Release:        4%{?dist}
+Version:        0.9.1
+Release:        1%{?dist}
 Summary:        An innovative RTS game
 
 Group:          Amusements/Games
-License:        GPLv2+
+License:        GPLv3+
 URL:            http://globulation2.org/
 Source0:        http://dl.sv.nongnu.org/releases/%{name}/%{version}/%{name}-%{version}.tar.gz
+Source3:        glob2.desktop
 #patch0 fixes polish diacritics
-Patch0:         glob2-0.8.21-texts.pl.patch
-#patch1 fixes CXXFLAGS
-Patch1:         glob2-0.8.21-configure.diff
+Patch0:         glob2-texts.pl.patch
+Patch1:         glob2-desktopfileinstall.patch
 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
+BuildRequires:  libvorbis-devel,scons
+BuildRequires:  SDL_net-devel,SDL_ttf-devel,SDL_image-devel
 Requires:       hicolor-icon-theme
 
 %description
@@ -33,45 +33,42 @@
 %prep
 %setup -q
 %patch0 -p0
-%patch1 -p1
+%patch1 -p0
 
-chmod a-x src/{MainMenuScreen*,MultiplayersChooseMapScreen*,MultiplayersCrossConnectable*,MultiplayersOfferScreen*}
+chmod -x {src/*.h,src/*.cpp,libgag/include/*.h,gnupg/*,libgag/src/*.cpp,scripts/*,data/*.txt,campaigns/*,AUTHORS,COPYING,README,TODO}
 
-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}
+scons %{?_smp_mflags} INSTALLDIR=%{_datadir} BINDIR=%{_bindir} CXXFLAGS="%{optflags}"
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+scons INSTALLDIR=$RPM_BUILD_ROOT%{_datadir} BINDIR=$RPM_BUILD_ROOT%{_bindir} install
 
-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
+mv $RPM_BUILD_ROOT%{_datadir}/glob2/data/icons/glob2-icon-$f.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$f/apps/glob2.png
 done
-rm -rf $RPM_BUILD_ROOT%{_datadir}/pixmaps
+rm -rf $RPM_BUILD_ROOT%{_datadir}/glob2/data/icons
 
 desktop-file-install --vendor="fedora"                  \
         --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
-        --delete-original                               \
-        --remove-category Application                   \
-        $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+        %{SOURCE3}
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -87,6 +84,8 @@
 
 
 %changelog
+* Tue Sep 04 2007 RafaÅ‚ Psota <rafalzaq at gmail.com> - 0.9.1-1
+- update to 0.9.1
 * Sat Aug 25 2007 RafaÅ‚ Psota <rafalzaq at gmail.com> - 0.8.21-4
 - BuildID rebuild
 * Mon Aug 20 2007 RafaÅ‚ Psota <rafalzaq at gmail.com> - 0.8.21-3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glob2/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 May 2007 13:23:01 -0000	1.2
+++ sources	8 Sep 2007 15:51:25 -0000	1.3
@@ -1 +1 @@
-3173f82572f1dd5fba79019ebc43d427  glob2-0.8.21.tar.gz
+172d9becf087ffea4eda003307507260  glob2-0.9.1.tar.gz


