rpms/glest/devel glest-3.0.0-unicode.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 glest.spec, 1.14, 1.15 sources, 1.3, 1.4 glest-2.0.0-unicode.patch, 1.1, NONE glest-2.0.1-keyboard.patch, 1.1, NONE
Aurelien Bompard (abompard)
fedora-extras-commits at redhat.com
Sat Feb 2 18:19:22 UTC 2008
- Previous message (by thread): rpms/glest/F-8 glest-3.0.0-unicode.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 glest.spec, 1.14, 1.15 sources, 1.3, 1.4 glest-2.0.0-unicode.patch, 1.1, NONE glest-2.0.1-keyboard.patch, 1.1, NONE
- Next message (by thread): rpms/jd/F-7 .cvsignore, 1.165, 1.166 jd.spec, 1.190, 1.191 sources, 1.166, 1.167
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: abompard
Update of /cvs/pkgs/rpms/glest/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3886/devel
Modified Files:
.cvsignore glest.spec sources
Added Files:
glest-3.0.0-unicode.patch
Removed Files:
glest-2.0.0-unicode.patch glest-2.0.1-keyboard.patch
Log Message:
* Sat Feb 02 2008 Aurelien Bompard <abompard at fedoraproject.org> 3.0.0-1
- version 3.0.0
- use gentoo patch for unicode
- patch1 merged upstream
glest-3.0.0-unicode.patch:
--- NEW FILE glest-3.0.0-unicode.patch ---
diff -Naur glest-source-3.0.0.org/configure.ac glest-source-3.0.0/configure.ac
--- configure.ac 2008-01-31 10:27:01.000000000 +0100
+++ configure.ac 2008-02-01 14:00:52.000000000 +0100
@@ -116,7 +116,7 @@
XIPH_PATH_OGG(, [AC_MSG_ERROR([Please install ogg/vorbis])])
AM_OPTIONS_WXCONFIG
-AM_PATH_WXCONFIG([2.6.0], [WX_AVAILABLE="yes"], [WX_AVAILABLE="no"], [std,gl], [--unicode=no])
+AM_PATH_WXCONFIG([2.8.0], [WX_AVAILABLE="yes"], [WX_AVAILABLE="no"], [std,gl])
AC_SUBST([WX_AVAILABLE])
AC_INIT_JAM
diff -Naur glest-source-3.0.0.org/glest_map_editor/main.cpp glest-source-3.0.0/glest_map_editor/main.cpp
--- glest_map_editor/main.cpp 2008-01-22 23:55:24.000000000 +0100
+++ glest_map_editor/main.cpp 2008-02-01 14:54:39.000000000 +0100
@@ -10,8 +10,8 @@
namespace Glest{ namespace MapEditor{
-const string MainWindow::versionString= "v1.2.3";
-const string MainWindow::winHeader= "Glest Map Editor " + versionString + " - Built: " + __DATE__;
+const wxString MainWindow::versionString=_("v1.2.3");
+const wxString MainWindow::winHeader= _("Glest Map Editor ") + versionString + _(" - Built: ") + _T(__DATE__);
// ===============================================
// class MainWindow
@@ -40,34 +40,34 @@
//file
menuFile= new wxMenu();
- menuFile->Append(miFileLoad, "Load");
+ menuFile->Append(miFileLoad, _("Load"));
menuFile->AppendSeparator();
- menuFile->Append(miFileSave, "Save");
- menuFile->Append(miFileSaveAs, "Save As");
+ menuFile->Append(miFileSave, _("Save"));
+ menuFile->Append(miFileSaveAs, _("Save As"));
menuFile->AppendSeparator();
- menuFile->Append(miFileExit, "Exit");
- menuBar->Append(menuFile, "File");
+ menuFile->Append(miFileExit, _("Exit"));
+ menuBar->Append(menuFile, _("File"));
//edit
menuEdit= new wxMenu();
- menuEdit->Append(miEditReset, "Reset");
- menuEdit->Append(miEditResetPlayers, "Reset Players");
- menuEdit->Append(miEditResize, "Resize");
- menuEdit->Append(miEditFlipX, "Flip X");
- menuEdit->Append(miEditFlipY, "Flip Y");
- menuEdit->Append(miEditRandomizeHeights, "Randomize Heights");
- menuEdit->Append(miEditRandomize, "Randomize");
- menuEdit->Append(miEditSwitchSurfaces, "Switch Surfaces");
- menuEdit->Append(miEditInfo, "Info");
- menuEdit->Append(miEditAdvanced, "Advanced");
- menuBar->Append(menuEdit, "Edit");
+ menuEdit->Append(miEditReset, _("Reset"));
+ menuEdit->Append(miEditResetPlayers, _("Reset Players"));
+ menuEdit->Append(miEditResize, _("Resize"));
+ menuEdit->Append(miEditFlipX, _("Flip X"));
+ menuEdit->Append(miEditFlipY, _("Flip Y"));
+ menuEdit->Append(miEditRandomizeHeights, _("Randomize Heights"));
+ menuEdit->Append(miEditRandomize, _("Randomize"));
+ menuEdit->Append(miEditSwitchSurfaces, _("Switch Surfaces"));
+ menuEdit->Append(miEditInfo, _("Info"));
+ menuEdit->Append(miEditAdvanced, _("Advanced"));
+ menuBar->Append(menuEdit, _("Edit"));
//misc
menuMisc= new wxMenu();
- menuMisc->Append(miMiscResetZoomAndPos, "Reset zoom and pos");
- menuMisc->Append(miMiscAbout, "About");
- menuMisc->Append(miMiscHelp, "Help");
- menuBar->Append(menuMisc, "Misc");
+ menuMisc->Append(miMiscResetZoomAndPos, _("Reset zoom and pos"));
+ menuMisc->Append(miMiscAbout, _("About"));
+ menuMisc->Append(miMiscHelp, _("Help"));
+ menuBar->Append(menuMisc, _("Misc"));
//brush
menuBrush= new wxMenu();
@@ -75,66 +75,70 @@
//height
menuBrushHeight= new wxMenu();
for(int i=0; i<heightCount; ++i){
- menuBrushHeight->AppendCheckItem(miBrushHeight+i+1, intToStr(i-heightCount/2).c_str());
+ menuBrushHeight->AppendCheckItem(miBrushHeight+i+1, intToWxStr(i-heightCount/2).c_str());
}
menuBrushHeight->Check(miBrushHeight + 1 + heightCount/2, true);
- menuBrush->Append(miBrushHeight, "Height", menuBrushHeight);
+ menuBrush->Append(miBrushHeight, _("Height"), menuBrushHeight);
//surface
menuBrushSurface= new wxMenu();
- menuBrushSurface->AppendCheckItem(miBrushSurface+1, "1 - Grass");
- menuBrushSurface->AppendCheckItem(miBrushSurface+2, "2 - Secondary Grass");
- menuBrushSurface->AppendCheckItem(miBrushSurface+3, "3 - Road");
- menuBrushSurface->AppendCheckItem(miBrushSurface+4, "4 - Stone");
- menuBrushSurface->AppendCheckItem(miBrushSurface+5, "5 - Custom");
- menuBrush->Append(miBrushSurface, "Surface", menuBrushSurface);
+ menuBrushSurface->AppendCheckItem(miBrushSurface+1, _("1 - Grass"));
+ menuBrushSurface->AppendCheckItem(miBrushSurface+2, _("2 - Secondary Grass"));
+ menuBrushSurface->AppendCheckItem(miBrushSurface+3, _("3 - Road"));
+ menuBrushSurface->AppendCheckItem(miBrushSurface+4, _("4 - Stone"));
+ menuBrushSurface->AppendCheckItem(miBrushSurface+5, _("5 - Custom"));
+ menuBrush->Append(miBrushSurface, _("Surface"), menuBrushSurface);
//objects
menuBrushObject= new wxMenu();
- menuBrushObject->AppendCheckItem(miBrushObject+1, "0 - None");
- menuBrushObject->AppendCheckItem(miBrushObject+2, "1 - Tree");
- menuBrushObject->AppendCheckItem(miBrushObject+3, "2 - Dead Tree");
- menuBrushObject->AppendCheckItem(miBrushObject+4, "3 - Stone");
- menuBrushObject->AppendCheckItem(miBrushObject+5, "4 - Bush");
- menuBrushObject->AppendCheckItem(miBrushObject+6, "5 - Water Object");
- menuBrushObject->AppendCheckItem(miBrushObject+7, "6 - Custom 1");
- menuBrushObject->AppendCheckItem(miBrushObject+8, "7 - Custom 2");
- menuBrushObject->AppendCheckItem(miBrushObject+9, "8 - Custom 3");
- menuBrushObject->AppendCheckItem(miBrushObject+10, "9 - Custom 4");
- menuBrushObject->AppendCheckItem(miBrushObject+11, "10 - Custom 5");
- menuBrush->Append(miBrushObject, "Object", menuBrushObject);
+ menuBrushObject->AppendCheckItem(miBrushObject+1, _("0 - None"));
+ menuBrushObject->AppendCheckItem(miBrushObject+2, _("1 - Tree"));
+ menuBrushObject->AppendCheckItem(miBrushObject+3, _("2 - Dead Tree"));
+ menuBrushObject->AppendCheckItem(miBrushObject+4, _("3 - Stone"));
+ menuBrushObject->AppendCheckItem(miBrushObject+5, _("4 - Bush"));
+ menuBrushObject->AppendCheckItem(miBrushObject+6, _("5 - Water Object"));
+ menuBrushObject->AppendCheckItem(miBrushObject+7, _("6 - Custom 1"));
+ menuBrushObject->AppendCheckItem(miBrushObject+8, _("7 - Custom 2"));
+ menuBrushObject->AppendCheckItem(miBrushObject+9, _("8 - Custom 3"));
+ menuBrushObject->AppendCheckItem(miBrushObject+10, _("9 - Custom 4"));
+ menuBrushObject->AppendCheckItem(miBrushObject+11, _("10 - Custom 5"));
+ menuBrush->Append(miBrushObject, _("Object"), menuBrushObject);
//resources
menuBrushResource= new wxMenu();
- menuBrushResource->AppendCheckItem(miBrushResource+1, "0 - None");
- menuBrushResource->AppendCheckItem(miBrushResource+2, "1 - Custom 1");
- menuBrushResource->AppendCheckItem(miBrushResource+3, "2 - Custom 2");
- menuBrushResource->AppendCheckItem(miBrushResource+4, "3 - Custom 3");
- menuBrushResource->AppendCheckItem(miBrushResource+5, "4 - Custom 4");
- menuBrushResource->AppendCheckItem(miBrushResource+6, "5 - Custom 5");
- menuBrush->Append(miBrushResource, "Resource", menuBrushResource);
+ menuBrushResource->AppendCheckItem(miBrushResource+1, _("0 - None"));
+ menuBrushResource->AppendCheckItem(miBrushResource+2, _("1 - Custom 1"));
+ menuBrushResource->AppendCheckItem(miBrushResource+3, _("2 - Custom 2"));
+ menuBrushResource->AppendCheckItem(miBrushResource+4, _("3 - Custom 3"));
+ menuBrushResource->AppendCheckItem(miBrushResource+5, _("4 - Custom 4"));
+ menuBrushResource->AppendCheckItem(miBrushResource+6, _("5 - Custom 5"));
+ menuBrush->Append(miBrushResource, _("Resource"), menuBrushResource);
//players
menuBrushStartLocation= new wxMenu();
- menuBrushStartLocation->AppendCheckItem(miBrushStartLocation+1, "1 - Player 1");
- menuBrushStartLocation->AppendCheckItem(miBrushStartLocation+2, "2 - Player 2");
- menuBrushStartLocation->AppendCheckItem(miBrushStartLocation+3, "3 - Player 3");
- menuBrushStartLocation->AppendCheckItem(miBrushStartLocation+4, "4 - Player 4");
- menuBrush->Append(miBrushStartLocation, "Player", menuBrushStartLocation);
+ menuBrushStartLocation->AppendCheckItem(miBrushStartLocation+1, _("1 - Player 1"));
+ menuBrushStartLocation->AppendCheckItem(miBrushStartLocation+2, _("2 - Player 2"));
+ menuBrushStartLocation->AppendCheckItem(miBrushStartLocation+3, _("3 - Player 3"));
+ menuBrushStartLocation->AppendCheckItem(miBrushStartLocation+4, _("4 - Player 4"));
+ menuBrush->Append(miBrushStartLocation, _("Player"), menuBrushStartLocation);
- menuBar->Append(menuBrush, "Brush");
+ menuBar->Append(menuBrush, _("Brush"));
//radius
menuRadius= new wxMenu();
for(int i=0; i<radiusCount; ++i){
- menuRadius->AppendCheckItem(miRadius+i, intToStr(i+1).c_str());
+ menuRadius->AppendCheckItem(miRadius+i, intToWxStr(i+1).c_str());
}
menuRadius->Check(miRadius, true);
- menuBar->Append(menuRadius, "Radius");
+ menuBar->Append(menuRadius, _("Radius"));
SetMenuBar(menuBar);
}
+wxString MainWindow::intToWxStr(int i) {
+ return wxString() << i;
+}
+
void MainWindow::init(){
glCanvas->SetCurrent();
program= new Program(GetClientSize().x, GetClientSize().y);
@@ -189,17 +193,17 @@
}
void MainWindow::onMenuFileLoad(wxCommandEvent &event){
- string fileName;
+ wxString fileName;
wxFileDialog fileDialog(this);
- fileDialog.SetWildcard("Glest Binary Map (*.gbm)|*.gbm");
+ fileDialog.SetWildcard(_("Glest Binary Map (*.gbm)|*.gbm"));
if(fileDialog.ShowModal()==wxID_OK){
fileName= fileDialog.GetPath();
- program->loadMap(fileName);
+ program->loadMap(wxStrToStr(fileName));
}
currentFile= fileName;
- SetTitle((winHeader + "; " + currentFile).c_str());
+ SetTitle((winHeader + wxT("; ") + currentFile).c_str());
}
void MainWindow::onMenuFileSave(wxCommandEvent &event){
@@ -208,22 +212,38 @@
onMenuFileSaveAs(ev);
}
else{
- program->saveMap(currentFile);
+ program->saveMap(wxStrToStr(currentFile));
}
}
+static string wxStrToStr(wxString &s){
+#ifdef _UNICODE
+ return (const char*)s.mb_str(wxConvUTF8);
+#else
+ return s.c_str();
+#endif
+}
+
+static wxString strToWxStr(string &s){
+#ifdef _UNICODE
+ return wxString(s.c_str(), wxConvUTF8);
+#else
+ return wxString(s.c_str());
+#endif
+}
+
void MainWindow::onMenuFileSaveAs(wxCommandEvent &event){
- string fileName;
+ wxString fileName;
- wxFileDialog fileDialog(this, "Select file", "", "", "*.gbm", wxSAVE);
- fileDialog.SetWildcard("Glest Binary Map (*.gbm)|*.gbm");
+ wxFileDialog fileDialog(this, _("Select file"), wxT(""), wxT(""), wxT("*.gbm"), wxSAVE);
+ fileDialog.SetWildcard(_("Glest Binary Map (*.gbm)|*.gbm"));
if(fileDialog.ShowModal()==wxID_OK){
fileName= fileDialog.GetPath();
- program->saveMap(fileName);
+ program->saveMap(wxStrToStr(fileName));
}
currentFile= fileName;
- SetTitle((winHeader + "; " + currentFile).c_str());
+ SetTitle((winHeader + wxT("; ") + currentFile).c_str());
}
void MainWindow::onMenuFileExit(wxCommandEvent &event){
@@ -246,7 +266,7 @@
strToInt(simpleDialog.getValue("Surface")));
}
catch(const exception &e){
- wxMessageDialog(NULL, e.what(), "Exception", wxOK | wxICON_ERROR).ShowModal();
+ wxMessageDialog(NULL, wxString(e.what(), wxConvUTF8), _("Exception"), wxOK | wxICON_ERROR).ShowModal();
}
}
@@ -260,7 +280,7 @@
program->resetPlayers(strToInt(simpleDialog.getValue("Players")));
}
catch(const exception &e){
- wxMessageDialog(NULL, e.what(), "Exception", wxOK | wxICON_ERROR).ShowModal();
+ wxMessageDialog(NULL, wxString(e.what(), wxConvUTF8), _("Exception"), wxOK | wxICON_ERROR).ShowModal();
}
}
@@ -280,7 +300,7 @@
strToInt(simpleDialog.getValue("Surface")));
}
catch(const exception &e){
- wxMessageDialog(NULL, e.what(), "Exception", wxOK | wxICON_ERROR).ShowModal();
+ wxMessageDialog(NULL, wxString(e.what(), wxConvUTF8), _("Exception"), wxOK | wxICON_ERROR).ShowModal();
}
}
@@ -312,7 +332,7 @@
strToInt(simpleDialog.getValue("Surface2")));
}
catch(const exception &e){
- wxMessageDialog(NULL, e.what(), "Exception", wxOK | wxICON_ERROR).ShowModal();
+ wxMessageDialog(NULL, wxString(e.what(), wxConvUTF8), _("Exception"), wxOK | wxICON_ERROR).ShowModal();
}
}
@@ -342,7 +362,7 @@
strToInt(simpleDialog.getValue("Water Level")));
}
catch(const exception &e){
- wxMessageDialog(NULL, e.what(), "Exception", wxOK | wxICON_ERROR).ShowModal();
+ wxMessageDialog(NULL, wxString(e.what(), wxConvUTF8), _("Exception"), wxOK | wxICON_ERROR).ShowModal();
}
}
@@ -351,11 +371,11 @@
}
void MainWindow::onMenuMiscAbout(wxCommandEvent &event){
- wxMessageDialog(NULL, "Glest Map Editor - Copyright 2004 The Glest Team", "About").ShowModal();
+ wxMessageDialog(NULL, _("Glest Map Editor - Copyright 2004 The Glest Team"), _("About")).ShowModal();
}
void MainWindow::onMenuMiscHelp(wxCommandEvent &event){
- wxMessageDialog(NULL, "Left mouse click: draw\nRight mouse drag: move\nCenter mouse drag: zoom", "Help").ShowModal();
+ wxMessageDialog(NULL, _("Left mouse click: draw\nRight mouse drag: move\nCenter mouse drag: zoom"), _("Help")).ShowModal();
}
void MainWindow::onMenuBrushHeight(wxCommandEvent &event){
@@ -481,7 +501,7 @@
// =====================================================
GlCanvas::GlCanvas(MainWindow * mainWindow):
- wxGLCanvas(mainWindow, -1)
+ wxGLCanvas(mainWindow, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, wxT("GLCanvas"))
{
this->mainWindow = mainWindow;
}
@@ -518,15 +538,15 @@
void SimpleDialog::show(){
- Create(NULL, -1, "Edit Values");
+ Create(NULL, -1, _("Edit Values"));
wxSizer *sizer= new wxFlexGridSizer(2);
vector<wxTextCtrl*> texts;
for(Values::iterator it= values.begin(); it!=values.end(); ++it){
- sizer->Add(new wxStaticText(this, -1, it->first.c_str()), 0, wxALL, 5);
- wxTextCtrl *text= new wxTextCtrl(this, -1, it->second.c_str());
+ sizer->Add(new wxStaticText(this, -1, strToWxStr(it->first)), 0, wxALL, 5);
+ wxTextCtrl *text= new wxTextCtrl(this, -1, strToWxStr(it->second));
sizer->Add(text, 0, wxALL, 5);
texts.push_back(text);
}
@@ -535,7 +555,8 @@
ShowModal();
for(int i=0; i<texts.size(); ++i){
- values[i].second= texts[i]->GetValue();
+ wxString tmp = texts[i]->GetValue();
+ values[i].second= wxStrToStr(tmp);
}
}
@@ -555,7 +576,7 @@
return wxApp::MainLoop();
}
catch(const exception &e){
- wxMessageDialog(NULL, e.what(), "Exception", wxOK | wxICON_ERROR).ShowModal();
+ wxMessageDialog(NULL, wxString(e.what(), wxConvUTF8), _("Exception"), wxOK | wxICON_ERROR).ShowModal();
}
return 0;
}
diff -Naur glest-source-3.0.0.org/glest_map_editor/main.h glest-source-3.0.0/glest_map_editor/main.h
--- glest_map_editor/main.h 2007-09-06 17:16:30.000000000 +0200
+++ glest_map_editor/main.h 2008-02-01 14:52:18.000000000 +0100
@@ -26,8 +26,8 @@
DECLARE_EVENT_TABLE()
private:
- static const string versionString;
- static const string winHeader;
+ static const wxString versionString;
+ static const wxString winHeader;
static const int heightCount= 11;
static const int surfaceCount= 5;
static const int objectCount= 11;
@@ -83,7 +83,7 @@
wxMenu *menuBrushStartLocation;
wxMenu *menuRadius;
- string currentFile;
+ wxString currentFile;
int height;
int surface;
@@ -135,6 +135,8 @@
void uncheckBrush();
void uncheckRadius();
+private:
+ wxString intToWxStr(int i);
};
// =====================================================
@@ -173,6 +175,9 @@
void show();
};
+static wxString strToWxStr(string &s);
+static string wxStrToStr(wxString &s);
+
// =====================================================
// class App
// =====================================================
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glest/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 2 Sep 2007 12:47:24 -0000 1.3
+++ .cvsignore 2 Feb 2008 18:18:50 -0000 1.4
@@ -1 +1 @@
-glest_source_2.0.1.zip
+glest-source-3.0.0.tar.gz
Index: glest.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glest/devel/glest.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- glest.spec 6 Dec 2007 07:55:13 -0000 1.14
+++ glest.spec 2 Feb 2008 18:18:50 -0000 1.15
@@ -1,20 +1,20 @@
Name: glest
-Version: 2.0.1
-Release: 5%{?dist}
+Version: 3.0.0
+Release: 1%{?dist}
Summary: 3D real time strategy game
Group: Amusements/Games
License: GPLv2+
URL: http://glest.org
-Source0: http://dl.sf.net/glest/glest_source_%{version}.zip
+Source0: http://dl.sf.net/glest/glest-source-%{version}.tar.gz
Source1: glest.sh
-Patch0: glest-2.0.0-unicode.patch
-Patch1: glest-2.0.1-keyboard.patch
+# http://bugs.gentoo.org/attachment.cgi?id=142379
+Patch0: glest-3.0.0-unicode.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: jam, libX11-devel, SDL-devel, openal-devel, xerces-c-devel
BuildRequires: libogg-devel, libvorbis-devel, autoconf, automake
-BuildRequires: desktop-file-utils
+BuildRequires: desktop-file-utils, wxGTK-devel, recode
Requires: glest-data = %{version}
# Used in the wrapper script
@@ -34,19 +34,18 @@
%prep
-%setup -q -c
-%patch0 -p1 -b .unicode
-# https://bugzilla.redhat.com/411911
-%patch1 -p0 -b .keyboard
+%setup -q -n glest-source-%{version}
+%patch0 -p0 -b .unicode
find . -type f | xargs sed -i -e "s/\r//g"
+recode ISO-8859-1..UTF-8 README
#find . -type f | while read file; do
# grep -qs "\r\n" $file && dos2unix $file
#done
%build
-cd mk/linux
+#cd mk/linux
#sed -i -e "s/\r//g" autogen.sh configure.ac glest.ini Jamfile Jamrules mk/jam/* mk/autoconf/*
chmod +x autogen.sh
./autogen.sh
@@ -59,15 +58,17 @@
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/glest
mkdir -p $RPM_BUILD_ROOT%{_datadir}/glest
-install -p -m 755 mk/linux/glest $RPM_BUILD_ROOT%{_libexecdir}/glest/
-install -p -m 644 mk/linux/glest.ini $RPM_BUILD_ROOT%{_datadir}/glest/
+install -p -m 755 glest $RPM_BUILD_ROOT%{_libexecdir}/glest/
+install -p -m 755 glest_editor $RPM_BUILD_ROOT%{_libexecdir}/glest/
+install -p -m 644 glest.ini $RPM_BUILD_ROOT%{_datadir}/glest/
# Wrapper
mkdir -p $RPM_BUILD_ROOT%{_bindir}
install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/glest
ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
+ln -s %{_libexecdir}/glest/glest_editor $RPM_BUILD_ROOT%{_bindir}/glest_editor
-# Desktop file
+# Desktop files
cat > glest.desktop << EOF
[Desktop Entry]
Encoding=UTF-8
@@ -84,6 +85,22 @@
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
glest.desktop
+cat > glest_editor.desktop << EOF
+[Desktop Entry]
+Encoding=UTF-8
+Name=Glest Map Editor
+Comment=Map Editor for the game Glest
+Exec=glest_editor
+Icon=%{_datadir}/glest/glest-0.png
+StartupNotify=true
+Terminal=false
+Type=Application
+Categories=Application;Game;StrategyGame;
+EOF
+desktop-file-install --vendor fedora \
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ glest_editor.desktop
+
%clean
@@ -92,8 +109,9 @@
%files
%defattr(-,root,root,-)
-%doc docs/README.linux docs/license.txt
+%doc README README.linux license.txt
%{_bindir}/glest
+%{_bindir}/glest_editor
%{_bindir}/glest-wrapper
%{_datadir}/applications/*.desktop
%{_libexecdir}/glest
@@ -101,6 +119,11 @@
%changelog
+* Sat Feb 02 2008 Aurelien Bompard <abompard at fedoraproject.org> 3.0.0-1
+- version 3.0.0
+- use gentoo patch for unicode
+- patch1 merged upstream
+
* Thu Dec 06 2007 Aurelien Bompard <abompard at fedoraproject.org> 2.0.1-5
- fix keyboard (bug 411911)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glest/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 2 Sep 2007 12:47:24 -0000 1.3
+++ sources 2 Feb 2008 18:18:50 -0000 1.4
@@ -1 +1 @@
-2d35a5d08331957f63240cadc9766b75 glest_source_2.0.1.zip
+899cf1b5dba702348a5412806bb60487 glest-source-3.0.0.tar.gz
--- glest-2.0.0-unicode.patch DELETED ---
--- glest-2.0.1-keyboard.patch DELETED ---
- Previous message (by thread): rpms/glest/F-8 glest-3.0.0-unicode.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 glest.spec, 1.14, 1.15 sources, 1.3, 1.4 glest-2.0.0-unicode.patch, 1.1, NONE glest-2.0.1-keyboard.patch, 1.1, NONE
- Next message (by thread): rpms/jd/F-7 .cvsignore, 1.165, 1.166 jd.spec, 1.190, 1.191 sources, 1.166, 1.167
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list