From 7b8443f85d54d67a4b26d62026c8934ebb5961a0 Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: Jan 12 2020 15:57:21 +0000 Subject: Update to 10174 --- diff --git a/.gitignore b/.gitignore index 8669d1f..4a161a2 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /cataclysm-dda-0.D.10045.20191221git8d27979.tar.gz /cataclysm-dda-0.D.10047.20191221git1e8f27e.tar.gz /cataclysm-dda-0.D.10053.20191222git8761541.tar.gz +/cataclysm-dda-0.D.10174.20200112git00699b2.tar.gz diff --git a/cataclysm-dda.spec b/cataclysm-dda.spec index e3358bb..d0c8317 100644 --- a/cataclysm-dda.spec +++ b/cataclysm-dda.spec @@ -1,4 +1,4 @@ -### Optimize for build time or performance +# Optimize for build time or performance %bcond_without release_build %if %{with release_build} @@ -6,12 +6,12 @@ %global optflags %{optflags} -O0 %endif -%global commit 8761541010d9a3d1a8535fb8dcfcfc9232e90096 +%global commit 00699b2756ae44e01794b7ab76576b3ccd2a4e8e %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global date 20191222 +%global date 20200112 Name: cataclysm-dda -Version: 0.D.10053 +Version: 0.D.10174 Release: 1.%{date}git%{shortcommit}%{?dist} Summary: Turn-based survival game set in a post-apocalyptic world @@ -19,7 +19,7 @@ License: CC-BY-SA URL: http://cataclysmdda.org Source0: https://github.com/CleverRaven/Cataclysm-DDA/archive/%{commit}/%{name}-%{version}.%{date}git%{shortcommit}.tar.gz -### Due virtual memory exhausted and fail build +# Due virtual memory exhausted and build fail ExcludeArch: i686 BuildRequires: astyle @@ -76,9 +76,9 @@ BuildArch: noarch Requires: %{name}-tiles = %{version}-%{release} Requires: hicolor-icon-theme -# Recommends: unifont-fonts +#Recommends: unifont-fonts -### Bundled, hardcoded fonts. Tiles version doesn't work if delete. +# Bundled, hardcoded fonts. Tiles version doesn't work if delete. Provides: bundled(fixedsys) Provides: bundled(square) Provides: bundled(Square-Smallcaps) @@ -95,7 +95,7 @@ Data files for %{name}-tiles. %build %set_build_flags -### Don't use LTO for builds in COPR due to limited resources +# Don't use LTO for builds in COPR due to limited resources %make_build \ PREFIX=%{_prefix} \ USE_HOME_DIR=1 \ @@ -104,7 +104,7 @@ Data files for %{name}-tiles. LTO=1 \ %endif -### Version with gfx and sound +# Version with gfx and sound %make_build \ PREFIX=%{_prefix} \ SOUND=1 \ @@ -125,7 +125,7 @@ Data files for %{name}-tiles. LTO=1 \ %endif -### Version with gfx and sound +# Version with gfx and sound %make_install \ PREFIX=%{_prefix} \ SOUND=1 \ @@ -136,21 +136,21 @@ Data files for %{name}-tiles. LTO=1 \ %endif -### Install desktop file, icon and appdata manifest +# Install desktop file, icon and appdata manifest install -m 0644 -Dp data/xdg/%{name}.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop install -m 0644 -Dp data/xdg/%{name}.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg install -m 0644 -Dp data/xdg/%{name}.appdata.xml %{buildroot}%{_metainfodir}/%{name}.appdata.xml -### FIXME: Remove bundled fonts -### * This for next builds and requires some testing -# rm -r %{buildroot}%{_datadir}/%{name}/font +# FIXME: Remove bundled fonts +# * This for next builds and requires some testing +#rm -r %{buildroot}%{_datadir}/%{name}/font rm -r %{buildroot}%{_datadir}/%{name}/font/terminus.fon -### Remove duplicate license file +# Remove duplicate license file rm %{buildroot}%{_datadir}/%{name}/LICENSE.txt -### Move changelog info in proper location +# Move changelog info in proper location rm %{buildroot}%{_datadir}/%{name}/changelog.txt @@ -190,6 +190,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %changelog +* Sun Jan 12 2020 Artem Polishchuk - 0.D.10174-1.20200112git00699b2 +- Update to 10174 + * Sun Dec 22 2019 Artem Polishchuk - 0.D.10053-1.20191222git8761541 - Update to 10053 - Exclude i686 arch diff --git a/sources b/sources index 20c1fb6..6b4f1e1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cataclysm-dda-0.D.10053.20191222git8761541.tar.gz) = dc83fadba7884e66aa8af97eb830dfd77864d75319d763f0a3f839304d14cde44af5d8705e1b72fa0ceb6f7ae0f90fe2e9f78b8ff3624ea021f9bf8317b6a605 +SHA512 (cataclysm-dda-0.D.10174.20200112git00699b2.tar.gz) = 04baa3a57241a1ecb32dee930ddeb01be558afc401555c640f52afd2bbc8e1f07fcb9489939b4954281a01d1be68dc00febe800e80d4142ae2797adfc96d0751