[packages/lincity-ng] - up to 2.10.0

Sat Mar 9 13:59:38 CET 2024

commit 221770db7d2bc2a1958747730bc9da6d61af4842
Author: Krzysztof Mrozowicz <mrozowik at pld-linux.org>
Date:   Sat Mar 9 12:07:43 2024 +0000

    - up to 2.10.0

 format-security.patch    | 11 ----------
 lincity-ng-desktop.patch |  9 +++++----
 lincity-ng.spec          | 52 ++++++++++++++++++++++++++++++------------------
 3 files changed, 38 insertions(+), 34 deletions(-)
---

diff --git a/lincity-ng.spec b/lincity-ng.spec
index 899e8fb..abe1299 100644
--- a/lincity-ng.spec
+++ b/lincity-ng.spec
@@ -1,15 +1,14 @@
 Summary:	Lincity - a Next Generation city/country simulation
 Summary(pl.UTF-8):	Lincity - symulator miasta/kraju Następnej Generacji
 Name:		lincity-ng
-Version:	2.9.0
+Version:	2.10.0
 Release:	1
 License:	GPL v2+
 Group:		X11/Applications/Games
 Source0:	https://github.com/lincity-ng/lincity-ng/archive/refs/tags/%{name}-%{version}.tar.gz
-# Source0-md5:	8a8a487210eecc5a1b71398c2ff90b6d
+# Source0-md5:	414a9a69043e2538fd904846c1847282
 Patch0:		%{name}-desktop.patch
-Patch1:		format-security.patch
-URL:		http://lincity-ng.berlios.de/wiki/index.php/Main_Page
+URL:		https://www.berlios.de/software/lincity-ng
 BuildRequires:	OpenGL-GLU-devel
 BuildRequires:	OpenGL-devel
 BuildRequires:	SDL2-devel >= 2.0.0
@@ -17,17 +16,16 @@ 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:	cmake
 BuildRequires:	gettext-tools
-BuildRequires:	jam >= 2.5
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool
 BuildRequires:	libxml2-devel >= 2.6.11
+BuildRequires:	libxslt-devel
 BuildRequires:	physfs-devel >= 1.0.0
 BuildRequires:	pkgconfig
 BuildRequires:	sed >= 4.0
 BuildRequires:	zlib-devel >= 1.0
-# needs jam from jam.spec
-BuildConflicts:	boost-jam
 Requires:	SDL2 >= 2.0.0
 Requires:	SDL2_gfx >= 1.0.0
 Requires:	SDL2_image >= 2.0.0
@@ -35,8 +33,6 @@ Requires:	SDL2_mixer >= 2.0.0
 Requires:	SDL2_ttf >= 2.0.12
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		filterout	-DNDEBUG
-
 %description
 You are required to build and maintain a city. You must feed, house,
 provide jobs and goods for your residents. You can build a sustainable
@@ -54,31 +50,46 @@ odpadów. Można też wielkim wysiłkiem zbudować rakiety, aby uciec z
 zanieczyszczonej, pozbawionej zasobów planety. Całe życie miasta
 znajduje się w rękach gracza.
 
+%post
+%update_desktop_database
+%update_icon_cache hicolor
+
+%postun
+%update_desktop_database
+%update_icon_cache hicolor
+
 %prep
 %setup -q -n %{name}-%{name}-%{version}
 %patch0 -p1
-%patch1 -p1
-%{__sed} 's/ -O3 -g / /' -i Jamrules
-%{__sed} -i 's/CREDITS\ //g' Jamfile
 
 %build
-sh autogen.sh
-%configure
-jam
+mkdir build
+cd build
+touch README.md
+cmake .. \
+	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
+	-DCMAKE_INSTALL_PREFIX=%{_prefix}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-jam -s DESTDIR=$RPM_BUILD_ROOT install
+cd build
+%{__make} install \
+        DESTDIR=$RPM_BUILD_ROOT
+
+# these go to doc
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/lincity-ng/{COPYING,COPYING-*,README.md,RELNOTES}
+# not needed copy
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/lincity-ng/{lincity-ng.desktop,lincity-ng.png}
 
-%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc COPYING-* README TODO RELNOTES
+%doc COPYING COPYING-* RELNOTES README.md doc/{README-*,TODO,lincityconfig.xml,translation.md,units,userconfig.xml}
 %attr(755,root,root) %{_bindir}/*
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*.pal
@@ -105,7 +116,9 @@ rm -rf $RPM_BUILD_ROOT
 %lang(sv) %{_datadir}/%{name}/help/sv
 %lang(tr) %{_datadir}/%{name}/help/tr
 %dir %{_datadir}/%{name}/locale
+%{_datadir}/lincity-ng/locale/messages.pot
 %dir %{_datadir}/%{name}/locale/gui
+%{_datadir}/lincity-ng/locale/gui/messages.pot
 %lang(ca) %{_datadir}/%{name}/locale/ca.po
 %lang(ca) %{_datadir}/%{name}/locale/gui/ca.po
 %lang(cs) %{_datadir}/%{name}/locale/cs.po
@@ -140,4 +153,5 @@ rm -rf $RPM_BUILD_ROOT
 %lang(zh_CN) %{_datadir}/%{name}/locale/zh_CN.po
 %lang(zh_CN) %{_datadir}/%{name}/locale/gui/zh_CN.po
 %{_desktopdir}/*.desktop
-%{_pixmapsdir}/*
+%{_iconsdir}/hicolor/128x128/apps/lincity-ng.png
+%{_mandir}/lincity-ng.6*
diff --git a/format-security.patch b/format-security.patch
deleted file mode 100644
index 0e0721d..0000000
--- a/format-security.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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("%s",_("Out of memory: malloc failure\n"));
-+    puts(_("Out of memory: malloc failure\n"));
-     exit(1);
- }
- 
diff --git a/lincity-ng-desktop.patch b/lincity-ng-desktop.patch
index d92922b..14b1303 100644
--- a/lincity-ng-desktop.patch
+++ b/lincity-ng-desktop.patch
@@ -1,14 +1,15 @@
---- 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
+--- lincity-ng-lincity-ng-2.10.0/data/lincity-ng.desktop~	2024-03-09 03:30:37.000000000 +0000
++++ lincity-ng-lincity-ng-2.10.0/data/lincity-ng.desktop	2024-03-09 10:52:39.823340396 +0000
+@@ -5,11 +5,13 @@
  GenericName=City Simulation Game
  GenericName[de]=Stadtsimulationsspiel
+ GenericName[gd]=Geama samhlachadh baile
 +GenericName[pl]=Symulator miasta
  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[gd]=Planaig is tog baile agus stiùirich an còmhdhail, an eaconamaidh, na seirbheisean dealain is a bharrachd.
 +Comment[pl]=Zaplanuj i zbuduj miasto oraz dbaj o transport, ekonomię, elektryczność i inne rzeczy
  Comment[ru]=Стройте и развивайте город, его экономику, транспорт, инфраструктуру и т.д.
  Comment[tr]=Bir şehir planlayın, inşa edin ve ulaşım, ekonomi, elektrik ve diğer ihtiyaçları ile ilgilenin.
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/lincity-ng.git/commitdiff/221770db7d2bc2a1958747730bc9da6d61af4842

