Hello community, here is the log from the commit of package crawl for openSUSE:Factory checked in at 2020-08-28 21:21:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/crawl (Old) and /work/SRC/openSUSE:Factory/.crawl.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "crawl" Fri Aug 28 21:21:21 2020 rev:34 rq:829547 version:0.25.1 Changes: -------- --- /work/SRC/openSUSE:Factory/crawl/crawl.changes 2020-04-16 23:03:35.695693011 +0200 +++ /work/SRC/openSUSE:Factory/.crawl.new.3399/crawl.changes 2020-08-28 21:22:23.884354399 +0200 @@ -1,0 +2,16 @@ +Mon Aug 17 11:45:57 UTC 2020 - Dirk Mueller <dmuel...@suse.com> + +- update to 0.25.1 + * Change log see https://github.com/crawl/crawl/releases + + Highlights + * Spells in many schools have been redesigned to make the schools + more distinct. + * Acquirement scrolls have been despoilered, offering the player + a choice of generated items. + * Effects from spell miscasts, god wrath, death curses, and Zot + traps have been overhauled for consistency and simplicity. + +- remove CVE-2020-11722.patch (fixed upstream) + +------------------------------------------------------------------- Old: ---- CVE-2020-11722.patch stone_soup-0.24.0-nodeps.tar.xz New: ---- stone_soup-0.25.1-nodeps.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ crawl.spec ++++++ --- /var/tmp/diff_new_pack.zdP8DS/_old 2020-08-28 21:22:25.020354950 +0200 +++ /var/tmp/diff_new_pack.zdP8DS/_new 2020-08-28 21:22:25.024354952 +0200 @@ -17,36 +17,33 @@ # -%define major_ver 0.24 %define about Crawl is a fun game in the grand tradition of games like Rogue, Hack, and Moria.\ Your objective is to travel deep into a subterranean cave complex and retrieve the Orb of Zot, \ which is guarded by many horrible and hideous creatures. Name: crawl -Version: %{major_ver}.0 +Version: 0.25.1 Release: 0 Summary: Roguelike dungeon exploration game License: GPL-2.0-or-later Group: Amusements/Games/RPG URL: https://crawl.develz.org/ -Source: https://crawl.develz.org/release/%{major_ver}/stone_soup-%{version}-nodeps.tar.xz -# PATCH-FIX-UPSTREAM https://github.com/crawl/crawl/pull/464 +Source: https://github.com/crawl/crawl/releases/download/%{version}/stone_soup-%{version}-nodeps.tar.xz Patch0: desktop.patch Patch1: icon.patch Patch2: appdata.patch -# PATCH-FIX-UPSTREAM CVE-2020-11722, boo#1169381, disable LUA loadstring -Patch3: CVE-2020-11722.patch BuildRequires: dejavu-fonts BuildRequires: desktop-file-utils BuildRequires: fdupes BuildRequires: gcc-c++ +BuildRequires: git-core BuildRequires: hicolor-icon-theme BuildRequires: libpng-devel BuildRequires: lua51-devel BuildRequires: ncurses-devel BuildRequires: pkgconfig BuildRequires: pngcrush -BuildRequires: python -BuildRequires: python-PyYAML +BuildRequires: python3 +BuildRequires: python3-PyYAML BuildRequires: update-desktop-files BuildRequires: pkgconfig(SDL2_image) BuildRequires: pkgconfig(freetype2) @@ -93,10 +90,9 @@ %prep %setup -q -n stone_soup-%{version} -%patch0 -p2 -%patch1 -p2 -%patch2 -p2 -%patch3 -p1 +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build cd source @@ -133,7 +129,6 @@ %make_install -C source prefix=%{_prefix} bin_prefix=bin DATADIR=%{_datadir}/%{name} BINDIR=%{_bindir} TILES=y install -D -m0644 docs/%{name}.6 %{buildroot}%{_mandir}/man6/%{name}.6 install -D -m0755 source/crawl-sdl %{buildroot}%{_bindir}/crawl-sdl -make DESTDIR=%{buildroot} prefix=%{_prefix} install-linux-desktop install-linux-appdata -C source %fdupes %{buildroot}%{_datadir}/%{name} %post ++++++ appdata.patch ++++++ --- /var/tmp/diff_new_pack.zdP8DS/_old 2020-08-28 21:22:25.048354964 +0200 +++ /var/tmp/diff_new_pack.zdP8DS/_new 2020-08-28 21:22:25.048354964 +0200 @@ -11,26 +11,24 @@ crawl-ref/source/linux/crawl.appdata.xml | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) -diff --git a/crawl-ref/source/Makefile b/crawl-ref/source/Makefile -index d325e67b8d..e5345eb3f2 100644 ---- a/crawl-ref/source/Makefile -+++ b/crawl-ref/source/Makefile -@@ -1445,6 +1445,10 @@ install-linux-desktop: +Index: stone_soup-0.25.1/source/Makefile +=================================================================== +--- stone_soup-0.25.1.orig/source/Makefile ++++ stone_soup-0.25.1/source/Makefile +@@ -1473,7 +1473,8 @@ endif + $(COPY) linux/crawl.desktop $(prefix_fp)/share/applications [ -d $(prefix_fp)/share/icons/hicolor/scalable/apps ] || mkdir -p $(prefix_fp)/share/icons/hicolor/scalable/apps $(COPY) linux/crawl.svg $(prefix_fp)/share/icons/hicolor/scalable/apps - -+install-linux-appdata: +- + [ -d $(prefix_fp)/share/appdata ] || mkdir -p $(prefix_fp)/share/appdata + $(COPY) linux/crawl.appdata.xml $(prefix_fp)/share/appdata -+ - clean: clean-rltiles clean-webserver clean-android clean-monster - +$(MAKE) -C $(UTIL) clean - $(RM) $(GAME) $(GAME).exe $(GENERATED_FILES) $(EXTRA_OBJECTS) libw32c.o\ -diff --git a/crawl-ref/source/linux/crawl.appdata.xml b/crawl-ref/source/linux/crawl.appdata.xml -new file mode 100644 -index 0000000000..d19914f3f6 + ifeq ($(GAME),crawl.exe) + $(SED) -i 's/$$/\r/' `find $(datadir_fp) -iname '*.txt' -or -iname '*.des'` + endif +Index: stone_soup-0.25.1/source/linux/crawl.appdata.xml +=================================================================== --- /dev/null -+++ b/crawl-ref/source/linux/crawl.appdata.xml ++++ stone_soup-0.25.1/source/linux/crawl.appdata.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<component type="desktop"> @@ -64,6 +62,3 @@ + <url type="homepage">http://crawl.develz.org/</url> + <update_contact>crawl-ref-disc...@lists.sourceforge.net</update_contact> +</component> --- -2.11.0 - ++++++ desktop.patch ++++++ --- /var/tmp/diff_new_pack.zdP8DS/_old 2020-08-28 21:22:25.064354972 +0200 +++ /var/tmp/diff_new_pack.zdP8DS/_new 2020-08-28 21:22:25.064354972 +0200 @@ -9,26 +9,23 @@ crawl-ref/source/linux/crawl.desktop | 9 +++++++++ 2 files changed, 13 insertions(+) -diff --git a/crawl-ref/source/Makefile b/crawl-ref/source/Makefile -index d4b4dc4a85..4ecf1ca069 100644 ---- a/crawl-ref/source/Makefile -+++ b/crawl-ref/source/Makefile -@@ -1439,6 +1439,10 @@ ifeq ($(USE_DGAMELAUNCH),) - $(CHMOD) $(MCHMOD) $(prefix_fp)/$(bin_prefix)/$(GAME) || true - endif - -+install-linux-desktop: +Index: stone_soup-0.25.1/source/Makefile +=================================================================== +--- stone_soup-0.25.1.orig/source/Makefile ++++ stone_soup-0.25.1/source/Makefile +@@ -1469,6 +1469,8 @@ endif + $(COPY) ../docs/license/*.txt $(datadir_fp)/docs/license/ + $(COPY) ../CREDITS.txt $(datadir_fp)/docs/ + $(COPY_R) ../settings/* $(datadir_fp)/settings/ + [ -d $(prefix_fp)/share/applications ] || mkdir -p $(prefix_fp)/share/applications + $(COPY) linux/crawl.desktop $(prefix_fp)/share/applications -+ - clean: clean-rltiles clean-webserver clean-android clean-monster - +$(MAKE) -C $(UTIL) clean - $(RM) $(GAME) $(GAME).exe $(GENERATED_FILES) $(EXTRA_OBJECTS) libw32c.o\ -diff --git a/crawl-ref/source/linux/crawl.desktop b/crawl-ref/source/linux/crawl.desktop -new file mode 100644 -index 0000000000..4287381277 + ifeq ($(GAME),crawl.exe) + $(SED) -i 's/$$/\r/' `find $(datadir_fp) -iname '*.txt' -or -iname '*.des'` + endif +Index: stone_soup-0.25.1/source/linux/crawl.desktop +=================================================================== --- /dev/null -+++ b/crawl-ref/source/linux/crawl.desktop ++++ stone_soup-0.25.1/source/linux/crawl.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Dungeon Crawl Stone Soup @@ -39,6 +36,3 @@ +Exec=crawl-sdl +Terminal=false +Categories=Game;RolePlaying; --- -2.11.0 - ++++++ icon.patch ++++++ --- /var/tmp/diff_new_pack.zdP8DS/_old 2020-08-28 21:22:25.072354976 +0200 +++ /var/tmp/diff_new_pack.zdP8DS/_new 2020-08-28 21:22:25.076354977 +0200 @@ -9,24 +9,24 @@ crawl-ref/source/linux/crawl.svg | 2154 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 2156 insertions(+) -diff --git a/crawl-ref/source/Makefile b/crawl-ref/source/Makefile -index 4ecf1ca069..caf61435a7 100644 ---- a/crawl-ref/source/Makefile -+++ b/crawl-ref/source/Makefile -@@ -1442,6 +1442,8 @@ endif - install-linux-desktop: +Index: stone_soup-0.25.1/source/Makefile +=================================================================== +--- stone_soup-0.25.1.orig/source/Makefile ++++ stone_soup-0.25.1/source/Makefile +@@ -1471,6 +1471,9 @@ endif + $(COPY_R) ../settings/* $(datadir_fp)/settings/ [ -d $(prefix_fp)/share/applications ] || mkdir -p $(prefix_fp)/share/applications $(COPY) linux/crawl.desktop $(prefix_fp)/share/applications + [ -d $(prefix_fp)/share/icons/hicolor/scalable/apps ] || mkdir -p $(prefix_fp)/share/icons/hicolor/scalable/apps + $(COPY) linux/crawl.svg $(prefix_fp)/share/icons/hicolor/scalable/apps - - clean: clean-rltiles clean-webserver clean-android clean-monster - +$(MAKE) -C $(UTIL) clean -diff --git a/crawl-ref/source/linux/dcss.svg b/crawl-ref/source/linux/crawl.svg -new file mode 100644 -index 0000000000..850d72b76d ++ + ifeq ($(GAME),crawl.exe) + $(SED) -i 's/$$/\r/' `find $(datadir_fp) -iname '*.txt' -or -iname '*.des'` + endif +Index: stone_soup-0.25.1/source/linux/crawl.svg +=================================================================== --- /dev/null -+++ b/crawl-ref/source/linux/crawl.svg ++++ stone_soup-0.25.1/source/linux/crawl.svg @@ -0,0 +1,2154 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> @@ -2182,6 +2182,3 @@ + sodipodi:nodetypes="czzzzzzzzz" /> + </g> +</svg> --- -2.11.0 - ++++++ stone_soup-0.24.0-nodeps.tar.xz -> stone_soup-0.25.1-nodeps.tar.xz ++++++ /work/SRC/openSUSE:Factory/crawl/stone_soup-0.24.0-nodeps.tar.xz /work/SRC/openSUSE:Factory/.crawl.new.3399/stone_soup-0.25.1-nodeps.tar.xz differ: char 26, line 1
