rpms/glob2/devel .cvsignore, 1.3, 1.4 glob2-gcc43.patch, 1.1, 1.2 glob2-texts.pl.patch, 1.1, 1.2 glob2.spec, 1.6, 1.7 sources, 1.3, 1.4

Rafał Psota (rafalzaq) fedora-extras-commits at redhat.com
Sun May 4 20:33:22 UTC 2008 

Author: rafalzaq

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

Modified Files:
	.cvsignore glob2-gcc43.patch glob2-texts.pl.patch glob2.spec 
	sources 
Log Message:
update to 0.9.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glob2/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Sep 2007 15:51:25 -0000	1.3
+++ .cvsignore	4 May 2008 20:32:13 -0000	1.4
@@ -1 +1 @@
-glob2-0.9.1.tar.gz
+glob2-0.9.3.tar.gz

glob2-gcc43.patch:

Index: glob2-gcc43.patch
===================================================================
RCS file: /cvs/extras/rpms/glob2/devel/glob2-gcc43.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glob2-gcc43.patch	14 Feb 2008 17:38:29 -0000	1.1
+++ glob2-gcc43.patch	4 May 2008 20:32:13 -0000	1.2
@@ -1,40 +1,10 @@
---- libgag/include/FileManager.h.orig	2007-09-02 05:15:23.000000000 +0200
-+++ libgag/include/FileManager.h	2008-02-14 16:48:07.000000000 +0100
-@@ -24,6 +24,7 @@
- #include <vector>
- #include <fstream>
- #include <string>
-+#include <ctime>
+--- src/FertilityCalculatorThreadMessage.cpp.orig	2008-03-08 06:27:17.000000000 +0100
++++ src/FertilityCalculatorThreadMessage.cpp	2008-05-04 20:43:29.000000000 +0200
+@@ -19,6 +19,7 @@
+ #include "FertilityCalculatorThreadMessage.h"
  
- //! this is the host filesystem directory separator
- #ifndef DIR_SEPARATOR
---- libgag/src/FileManager.cpp.orig	2008-02-14 16:59:36.000000000 +0100
-+++ libgag/src/FileManager.cpp	2008-02-14 16:58:46.000000000 +0100
-@@ -32,6 +32,7 @@
- #include <zlib.h>
- #include "BinaryStream.h"
- #include "TextStream.h"
-+#include <ctime>
- 
- // here we handle compile time options
- #ifdef HAVE_CONFIG_H
---- src/AIEcho.cpp.orig	2007-09-02 05:15:03.000000000 +0200
-+++ src/AIEcho.cpp	2008-02-14 17:26:24.000000000 +0100
-@@ -30,6 +30,7 @@
- #include <iterator>
- #include "Utilities.h"
- #include "Brush.h"
-+#include <limits>
- 
- using namespace AIEcho;
- using namespace AIEcho::Gradients;
---- src/MultiplayerGameEvent.cpp.orig	2007-09-02 05:15:10.000000000 +0200
-+++ src/MultiplayerGameEvent.cpp	2008-02-14 17:57:12.000000000 +0100
-@@ -18,6 +18,7 @@
- 
- #include "MultiplayerGameEvent.h"
  #include <sstream>
 +#include <typeinfo>
  
- 
- MGPlayerListChangedEvent::MGPlayerListChangedEvent()
+ FCTUpdateCompletionPercent::FCTUpdateCompletionPercent(float percent)
+ 	: percent(percent)

glob2-texts.pl.patch:

Index: glob2-texts.pl.patch
===================================================================
RCS file: /cvs/extras/rpms/glob2/devel/glob2-texts.pl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glob2-texts.pl.patch	8 Sep 2007 15:51:25 -0000	1.1
+++ glob2-texts.pl.patch	4 May 2008 20:32:13 -0000	1.2
@@ -1,15 +1,6 @@
---- 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 @@
+--- data/texts.pl.txt.orig	2008-04-02 04:44:41.000000000 +0200
++++ data/texts.pl.txt	2008-05-04 17:31:31.000000000 +0200
+@@ -365,7 +365,7 @@
  [fruit]
  
  [fullscreen]
@@ -18,7 +9,7 @@
  [game full]
  Komplet graczy
  [game shortcuts]
-@@ -691,7 +691,7 @@
+@@ -659,7 +659,7 @@
  [sand]
  Piasek
  [save before quit?]
@@ -27,7 +18,7 @@
  [save game]
  Zapisz grÄ™
  [save map]
-@@ -1077,7 +1077,7 @@
+@@ -1035,7 +1035,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]
@@ -36,12 +27,3 @@
  [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]


Index: glob2.spec
===================================================================
RCS file: /cvs/extras/rpms/glob2/devel/glob2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- glob2.spec	14 Feb 2008 17:38:29 -0000	1.6
+++ glob2.spec	4 May 2008 20:32:13 -0000	1.7
@@ -1,21 +1,20 @@
 Name:           glob2
-Version:        0.9.1
-Release:        3%{?dist}
+Version:        0.9.3
+Release:        1%{?dist}
 Summary:        An innovative RTS game
 
 Group:          Amusements/Games
 License:        GPLv3+
 URL:            http://globulation2.org/
 Source0:        http://dl.sv.nongnu.org/releases/%{name}/%{version}/%{name}-%{version}.tar.gz
-Source3:        glob2.desktop
+#Source3:        glob2.desktop
 #patch0 fixes polish diacritics
 Patch0:         glob2-texts.pl.patch
-Patch1:         glob2-desktopfileinstall.patch
 Patch2:         glob2-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils,zlib-devel,speex-devel,boost-devel
-BuildRequires:  libvorbis-devel,scons
+BuildRequires:  libvorbis-devel,scons,python
 BuildRequires:  SDL_net-devel,SDL_ttf-devel,SDL_image-devel
 Requires:       hicolor-icon-theme
 
@@ -34,40 +33,35 @@
 %prep
 %setup -q
 %patch0 -p0
-%patch1 -p0
 %patch2 -p0
 
-chmod -x {src/*.h,src/*.cpp,libgag/include/*.h,gnupg/*,libgag/src/*.cpp,scripts/*,data/*.txt,campaigns/*,AUTHORS,COPYING,README,TODO}
-%if "%{?fedora}" > "7"
-sed -i 's|boost_thread|boost_thread-mt|' SConstruct
-%endif
+sed -i -e '3d' -e '12d' data/glob2.desktop
+sed -i s#"Icon=glob2-icon-48x48"#"Icon=glob2.png"# data/glob2.desktop
 
+chmod -x campaigns/Tutorial_Campaign.txt
+sed -i 's/\r//' campaigns/Tutorial_Campaign.txt
 
 %build
-scons %{?_smp_mflags} INSTALLDIR=%{_datadir} BINDIR=%{_bindir} CXXFLAGS="%{optflags}"
+scons %{?_smp_mflags} INSTALLDIR=$RPM_BUILD_ROOT%{_datadir} BINDIR=$RPM_BUILD_ROOT%{_bindir} DATADIR=%{_datadir} CXXFLAGS="%{optflags}"
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-#scons INSTALLDIR=$RPM_BUILD_ROOT%{_datadir} BINDIR=$RPM_BUILD_ROOT%{_bindir} install
+scons install
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/glob2/{data/fonts,data/gfx/cursor,data/gui,data/icons,data/zik,maps,scripts,campaigns}
-cp -rp {data,campaigns,scripts,maps} $RPM_BUILD_ROOT%{_datadir}/%{name}/
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/
+cp -p data/icons/glob2-icon-64x64.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/glob2.png
 
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-cp src/glob2 $RPM_BUILD_ROOT%{_bindir}/
-
-find $RPM_BUILD_ROOT -name SConscript -exec rm -f {} \;
-
-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}/glob2/data/icons/glob2-icon-$f.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$f/apps/glob2.png
+for f in 128x128 16x16 24x24 32x32 48x48; do
+mv $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$f/apps/glob2-icon-$f.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$f/apps/glob2.png
 done
 rm -rf $RPM_BUILD_ROOT%{_datadir}/glob2/data/icons
 
 desktop-file-install --vendor="fedora"                  \
         --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
-        %{SOURCE3}
+        --remove-category=Application                   \
+        --delete-original                               \
+        $RPM_BUILD_ROOT%{_datadir}/applications/glob2.desktop
 
 %post
 touch --no-create %{_datadir}/icons/hicolor
@@ -88,14 +82,16 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README TODO
-%{_bindir}/*
+%doc AUTHORS COPYING README
+%{_bindir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 %{_datadir}/%{name}
 
 
 %changelog
+* Sun May 04 2008 Rafał Psota <rafalzaq at gmail.com> - 0.9.3-1
+- update to 0.9.3
 * Thu Feb 14 2008 Rafał Psota <rafalzaq at gmail.com> - 0.9.1-3
 - gcc 4.3 patch
 * Sun Sep 16 2007 Rafał Psota <rafalzaq at gmail.com> - 0.9.1-2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glob2/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Sep 2007 15:51:25 -0000	1.3
+++ sources	4 May 2008 20:32:13 -0000	1.4
@@ -1 +1 @@
-172d9becf087ffea4eda003307507260  glob2-0.9.1.tar.gz
+e0483d5864cff4ace5ac8e39eae27429  glob2-0.9.3.tar.gz

More information about the fedora-extras-commits mailing list