- up to 2.9.beta

diff --git a/format-security.patch b/format-security.patch
index 40685a0e541ef08dba8893141f214708eaad40b2..0e0721d173f18cbd3448331aad6b38eb64f36a97 100644 (file)
--- a/format-security.patch
+++ b/format-security.patch
@@ -1,22 +1,11 @@
---- lincity-ng-2.0/src/lincity/fileutil.cpp~   2009-01-26 05:20:41.000000000 +0900
-+++ lincity-ng-2.0/src/lincity/fileutil.cpp    2017-07-13 23:48:55.355365373 +0900
-@@ -498,7 +498,7 @@
+--- lincity-ng-b9062bec252632ca5d26b98d71453b8762c63173/src/lincity/fileutil.cpp~      2021-11-25 16:42:03.000000000 +0000
++++ lincity-ng-b9062bec252632ca5d26b98d71453b8762c63173/src/lincity/fileutil.cpp       2022-11-23 15:07:17.930255408 +0000
+@@ -469,7 +469,7 @@
  
  void malloc_failure(void)
  {
--    printf(_("Out of memory: malloc failure\n"));
+-    printf("%s",_("Out of memory: malloc failure\n"));
 +    puts(_("Out of memory: malloc failure\n"));
      exit(1);
  }
  
---- lincity-ng-2.0/src/lincity-ng/Dialog.cpp~  2009-01-26 05:20:43.000000000 +0900
-+++ lincity-ng-2.0/src/lincity-ng/Dialog.cpp   2017-07-13 23:49:41.569815446 +0900
-@@ -378,7 +378,7 @@
-         setParagraphN( "statistic_text", line++, outf );
-     }
-     if (sustain_flag){
--          snprintf (outf, maxlength, _("Economy is sustainable"));
-+          snprintf (outf, maxlength, "%s", _("Economy is sustainable"));
-         setParagraphN( "statistic_text", line++, outf );
-     }
-     snprintf (outf, maxlength, _("Population  %d  of which  %d  are not housed.")

diff --git a/lincity-ng-desktop.patch b/lincity-ng-desktop.patch
index 921121b8d51db1ac7b32480eb80b04580d553f10..d92922bf3b13f40da0d6e88c3619cf863c57ebe1 100644 (file)
--- a/lincity-ng-desktop.patch
+++ b/lincity-ng-desktop.patch
@@ -1,16 +1,15 @@
---- lincity-ng-1.1.1/lincity-ng.desktop~       2007-08-22 21:19:28.000000000 +0200
-+++ lincity-ng-1.1.1/lincity-ng.desktop        2007-08-22 21:21:48.000000000 +0200
-@@ -5,9 +5,12 @@
+--- lincity-ng-b9062bec252632ca5d26b98d71453b8762c63173/lincity-ng.desktop~    2021-11-25 16:42:03.000000000 +0000
++++ lincity-ng-b9062bec252632ca5d26b98d71453b8762c63173/lincity-ng.desktop     2022-11-23 15:04:10.143953590 +0000
+@@ -4,10 +4,12 @@
  Name=Lincity-NG
  GenericName=City Simulation Game
  GenericName[de]=Stadtsimulationsspiel
--Comment=Plan and Build a city and take care of transport, economics, electricityand others.
 +GenericName[pl]=Symulator miasta
-+Comment=Plan and Build a city and take care of transport, economics, electricity and others
+ GenericName[ru]=Градостроительный симулятор
+ GenericName[tr]=Şehir Simulasyon Oyunu
+ Comment=Plan and build a city and take care of transport, economics, electricity and others.
+ Comment[de]=Plane und baue eine Stadt und kümmere dich um das Verkehrswesen, die Wirtschaft, Elektrizität und mehr.
 +Comment[pl]=Zaplanuj i zbuduj miasto oraz dbaj o transport, ekonomię, elektryczność i inne rzeczy
- Icon=lincity-ng.png
- Exec=lincity-ng
- Terminal=false
- StartupNotify=false
- Categories=Game;Simulation;
-+# vi: encoding=utf-8
+ Comment[ru]=Стройте и развивайте город, его экономику, транспорт, инфраструктуру и т.д.
+ Comment[tr]=Bir şehir planlayın, inşa edin ve ulaşım, ekonomi, elektrik ve diğer ihtiyaçları ile ilgilenin.
+ Icon=lincity-ng

diff --git a/lincity-ng.spec b/lincity-ng.spec
index 2cfffef8feab7d44017a61a86194a8cebe521f8b..fdcedf593a6f07144d3843361ac2acf2566fbcab 100644 (file)
--- a/lincity-ng.spec
+++ b/lincity-ng.spec
@@ -1,22 +1,24 @@
 Summary:       Lincity - a Next Generation city/country simulation
 Summary(pl.UTF-8):     Lincity - symulator miasta/kraju Następnej Generacji
+%define                git_commit      b9062bec252632ca5d26b98d71453b8762c63173
+%define                git_commit_date         20211121
 Name:          lincity-ng
-Version:       2.0
-Release:       3
+Version:       2.9.beta.%{git_commit_date}
+Release:       0.1
 License:       GPL v2+
 Group:         X11/Applications/Games
-Source0:       http://download.berlios.de/lincity-ng/%{name}-%{version}.tar.bz2
-# Source0-md5: 1bd0f58e0f2b131d70044f4230600ed1
+Source0:       https://github.com/lincity-ng/lincity-ng/archive/%{git_commit}/%{name}-%{version}.tar.gz
+# Source0-md5: 9264a82a5ef770c249298b09445baf76
 Patch0:                %{name}-desktop.patch
 Patch1:                format-security.patch
 URL:           http://lincity-ng.berlios.de/wiki/index.php/Main_Page
 BuildRequires: OpenGL-GLU-devel
 BuildRequires: OpenGL-devel
-BuildRequires: SDL-devel >= 1.2.5
-BuildRequires: SDL_gfx-devel >= 2.0.13
-BuildRequires: SDL_image-devel >= 1.2.3
-BuildRequires: SDL_mixer-devel >= 1.2.4
-BuildRequires: SDL_ttf-devel >= 2.0.8
+BuildRequires: SDL2-devel >= 2.0.0
+BuildRequires: SDL2_gfx-devel >= 1.0.0
+BuildRequires: SDL2_image-devel >= 2.0.0
+BuildRequires: SDL2_mixer-devel >= 2.0.0
+BuildRequires: SDL2_ttf-devel >= 2.0.12
 BuildRequires: gettext-tools
 BuildRequires: jam >= 2.5
 BuildRequires: libstdc++-devel
@@ -28,11 +30,11 @@ BuildRequires:      sed >= 4.0
 BuildRequires: zlib-devel >= 1.0
 # needs jam from jam.spec
 BuildConflicts:        boost-jam
-Requires:      SDL >= 1.2.5
-Requires:      SDL_gfx >= 2.0.13
-Requires:      SDL_image >= 1.2.3
-Requires:      SDL_mixer >= 1.2.4
-Requires:      SDL_ttf >= 2.0.8
+Requires:      SDL2 >= 2.0.0
+Requires:      SDL2_gfx >= 1.0.0
+Requires:      SDL2_image >= 2.0.0
+Requires:      SDL2_mixer >= 2.0.0
+Requires:      SDL2_ttf >= 2.0.12
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                filterout       -DNDEBUG
@@ -55,12 +57,14 @@ zanieczyszczonej, pozbawionej zasobów planety. Całe życie miasta
 znajduje się w rękach gracza.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{git_commit}
 %patch0 -p1
 %patch1 -p1
 %{__sed} 's/ -O3 -g / /' -i Jamrules
+%{__sed} -i 's/CREDITS\ //g' Jamfile
 
 %build
+sh autogen.sh
 %configure
 jam
 
@@ -69,14 +73,16 @@ rm -rf $RPM_BUILD_ROOT
 
 jam -s DESTDIR=$RPM_BUILD_ROOT install
 
-%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+#%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+# temporaty solution until the full version is released
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}-2.9.beta
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc COPYING-* CREDITS README TODO RELNOTES
+%doc COPYING-* README TODO RELNOTES
 %attr(755,root,root) %{_bindir}/*
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*.pal
@@ -91,9 +97,11 @@ rm -rf $RPM_BUILD_ROOT
 %lang(ca) %{_datadir}/%{name}/help/ca
 %lang(cs) %{_datadir}/%{name}/help/cs
 %lang(de) %{_datadir}/%{name}/help/de
+%lang(el) %{_datadir}/%{name}/help/el
 %lang(en) %{_datadir}/%{name}/help/en
 %lang(es) %{_datadir}/%{name}/help/es
 %lang(fr) %{_datadir}/%{name}/help/fr
+%lang(gd) %{_datadir}/%{name}/help/gd
 %lang(gl) %{_datadir}/%{name}/help/gl
 %lang(nl) %{_datadir}/%{name}/help/nl
 %lang(pt_BR) %{_datadir}/%{name}/help/pt_BR
@@ -109,6 +117,10 @@ rm -rf $RPM_BUILD_ROOT
 %lang(da) %{_datadir}/%{name}/locale/da.po
 %lang(de) %{_datadir}/%{name}/locale/de.po
 %lang(de) %{_datadir}/%{name}/locale/gui/de.po
+%lang(el) %{_datadir}/%{name}/locale/el.po
+%lang(el) %{_datadir}/%{name}/locale/gui/el.po
+%lang(gd) %{_datadir}/%{name}/locale/gd.po
+%lang(gd) %{_datadir}/%{name}/locale/gui/gd.po
 %lang(es) %{_datadir}/%{name}/locale/es.po
 %lang(es) %{_datadir}/%{name}/locale/gui/es.po
 %lang(fr) %{_datadir}/%{name}/locale/fr.po
@@ -129,5 +141,7 @@ rm -rf $RPM_BUILD_ROOT
 %lang(sv) %{_datadir}/%{name}/locale/gui/sv.po
 %lang(tr) %{_datadir}/%{name}/locale/tr.po
 %lang(tr) %{_datadir}/%{name}/locale/gui/tr.po
+%lang(zh_CN) %{_datadir}/%{name}/locale/zh_CN.po
+%lang(zh_CN) %{_datadir}/%{name}/locale/gui/zh_CN.po
 %{_desktopdir}/*.desktop
 %{_pixmapsdir}/*