Hello community, here is the log from the commit of package crawl for openSUSE:Factory checked in at 2017-03-28 15:21:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/crawl (Old) and /work/SRC/openSUSE:Factory/.crawl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "crawl" Tue Mar 28 15:21:01 2017 rev:26 rq:460927 version:0.19.4 Changes: -------- --- /work/SRC/openSUSE:Factory/crawl/crawl.changes 2016-05-10 09:28:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.crawl.new/crawl.changes 2017-03-28 15:21:03.727424027 +0200 @@ -1,0 +2,8 @@ +Sat Feb 18 12:13:17 UTC 2017 - [email protected] + +- Update to version 0.19.4 +- Add desktop.patch for a menu starter +- Add appdata.patch for https://en.opensuse.org/openSUSE:AppStore +- Add icon.patch for installing a SVG icon + +------------------------------------------------------------------- Old: ---- crawl.desktop stone_soup-0.18.1-nodeps.tar.xz New: ---- appdata.patch desktop.patch icon.patch stone_soup-0.19.4-nodeps.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ crawl.spec ++++++ --- /var/tmp/diff_new_pack.vk9PR4/_old 2017-03-28 15:21:06.687004862 +0200 +++ /var/tmp/diff_new_pack.vk9PR4/_new 2017-03-28 15:21:06.691004295 +0200 @@ -1,7 +1,7 @@ # # spec file for package crawl # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2011 Sascha Peilicke <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -18,29 +18,35 @@ Name: crawl -Version: 0.18.1 +Version: 0.19.4 Release: 0 Summary: Roguelike dungeon exploration game License: GPL-2.0+ Group: Amusements/Games/RPG Url: http://crawl.develz.org/ -Source0: https://crawl.develz.org/release/stone_soup-%{version}-nodeps.tar.xz -Source1: %{name}.desktop -Patch: %{name}-0.17.1-datetime.patch -BuildRequires: SDL2-devel -BuildRequires: SDL2_image-devel +Source: https://crawl.develz.org/release/stone_soup-%{version}-nodeps.tar.xz +# PATCH-FIX-OPENSUSE for reproducible builds +Patch0: %{name}-0.17.1-datetime.patch +# PATCH-FIX-UPSTREAM https://github.com/crawl/crawl/pull/464 +Patch1: desktop.patch +Patch2: icon.patch +Patch3: appdata.patch BuildRequires: dejavu-fonts BuildRequires: desktop-file-utils BuildRequires: fdupes -BuildRequires: freetype2-devel BuildRequires: gcc-c++ +BuildRequires: hicolor-icon-theme BuildRequires: libpng-devel BuildRequires: lua51-devel BuildRequires: ncurses-devel BuildRequires: pkg-config -BuildRequires: sqlite-devel +BuildRequires: pngcrush BuildRequires: update-desktop-files +BuildRequires: pkgconfig(SDL2_image) +BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(glu) +BuildRequires: pkgconfig(sdl2) +BuildRequires: pkgconfig(sqlite3) BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(pre): pwdutils Requires: %{name}-data = %{version} @@ -81,7 +87,10 @@ %prep %setup -q -n stone_soup-%{version} -%patch -p1 +%patch0 -p1 +%patch1 -p2 +%patch2 -p2 +%patch3 -p2 %build cd source @@ -93,10 +102,10 @@ tmpflags="$tmpflags -U__ALTIVEC__" %endif make clean -make %{?_smp_flags} DATADIR="%{_datadir}/%{name}/" EXTRA_FLAGS="${tmpflags}" +make %{?_smp_flags} prefix=%{_prefix} bin_prefix=bin DATADIR="%{_datadir}/%{name}/" BINDIR=%{_bindir} EXTRA_FLAGS="${tmpflags}" mv crawl crawl.tty # avoid name clashes temporarily make clean -make %{?_smp_flags} DATADIR="%{_datadir}/%{name}/" EXTRA_FLAGS="${tmpflags}" TILES="1" +make %{?_smp_flags} prefix=%{_prefix} bin_prefix=bin DATADIR="%{_datadir}/%{name}/" BINDIR=%{_bindir} EXTRA_FLAGS="${tmpflags}" TILES="1" mv crawl crawl-sdl mv crawl.tty crawl @@ -112,44 +121,36 @@ fi %install -# binaries -install -D -m 0755 source/crawl %{buildroot}%{_bindir}/crawl -install -D -m 0755 source/crawl-sdl %{buildroot}%{_bindir}/crawl-sdl -# man pages -install -D -m 0644 docs/crawl.6 %{buildroot}%{_mandir}/man6/crawl.6 -# documentation -install -d %{buildroot}%{_docdir}/%{name} -install -m 0644 docs/{arena,changelog,keybind,ssh_guide}.txt %{buildroot}%{_docdir}/%{name} -chmod -x docs/develop/git/pre-commit -cp -a docs/develop docs/license %{buildroot}%{_docdir}/%{name} -# those are needed ingame, therefore they move elsewhere -install -d %{buildroot}%{_datadir}/%{name}/docs -install -m 0644 docs/{aptitudes,crawl_manual,macros_guide,options_guide,quickstart,tiles_help}.txt %{buildroot}%{_datadir}/%{name}/docs -# common data -cp -a source/dat %{buildroot}%{_datadir}/%{name}/dat -# config -cp -a settings %{buildroot}%{_datadir}/%{name}/settings -#install -m 755 -d %%{buildroot}%%{_sysconfdir}/%%{name} -#touch %%{buildroot}%%{_sysconfdir}/%%{name}/crawlrc -# icon and desktop file -install -D -m 0644 source/dat/tiles/stone_soup_icon-32x32.png %{buildroot}%{_datadir}/pixmaps/%{name}.png +%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} -%suse_update_desktop_file -i %{name} Game RolePlaying + +%post +%desktop_database_post +%icon_theme_cache_post + +%postun +%desktop_database_postun +%icon_theme_cache_postun %files sdl %defattr (-,root,root) -%{_datadir}/applications/%{name}.desktop -%{_datadir}/pixmaps/%{name}.png %attr(0755,root,root) %{_bindir}/%{name}-sdl +%{_datadir}/applications/%{name}.desktop +%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg +%dir %{_datadir}/appdata/ +%{_datadir}/appdata/%{name}.appdata.xml %files data %defattr (-,root,root) -%{_docdir}/%{name} +%doc CREDITS.txt licence.txt %{_datadir}/%{name} %files %defattr(-,root,root) -%{_mandir}/man6/* %attr(0755,root,root) %{_bindir}/%{name} +%{_mandir}/man6/* %changelog ++++++ appdata.patch ++++++ >From 9380778b8c89a9280d541730eb3bced827605bba Mon Sep 17 00:00:00 2001 Message-Id: <9380778b8c89a9280d541730eb3bced827605bba.1487494889.git.matth...@mailaender.name> In-Reply-To: <a870232c936c5a813ebef44758127b20ee07933e.1487494889.git.matth...@mailaender.name> References: <a870232c936c5a813ebef44758127b20ee07933e.1487494889.git.matth...@mailaender.name> From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <[email protected]> Date: Sat, 18 Feb 2017 13:09:07 +0100 Subject: [PATCH 3/3] Add an appdata.xml file for Linux software galleries --- crawl-ref/source/Makefile | 4 ++++ 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: [ -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 --- /dev/null +++ b/crawl-ref/source/linux/crawl.appdata.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<component type="desktop"> + <id>crawl.desktop</id> + <metadata_license>CC0-1.0</metadata_license> + <project_license>GPL-2.0</project_license> + <name>Dungeon Crawl Stone Soup </name> + <summary>Roguelike dungeon exploration game</summary> + <description> + <p> + Dungeon Crawl Stone Soup is a free roguelike game of exploration and treasure-hunting in dungeons filled with dangerous and unfriendly monsters in a quest for the mystifyingly fabulous Orb of Zot. + </p> + <p> + Dungeon Crawl Stone Soup has diverse species and many different character backgrounds to choose from, deep tactical game-play, sophisticated magic, religion and skill systems, and a grand variety of monsters to fight and run from, making each game unique and challenging. + </p> + <p> + Dungeon Crawl Stone Soup can be played offline, or online on a public telnet/ssh server. These public servers allow you to meet other players’ ghosts, watch other people playing, and, in general, have a blast! + </p> + </description> + <screenshots> + <screenshot type="default"> + <image>http://crawl.develz.org/wordpress/wp-content/uploads/2014/05/sonja.png</image> + </screenshot> + <screenshot> + <image>http://crawl.develz.org/wordpress/wp-content/uploads/2014/05/roxanne.png</image> + </screenshot> + <screenshot> + <image>http://crawl.develz.org/wordpress/wp-content/uploads/2014/05/ashenzari.png</image> + </screenshot> + </screenshots> + <url type="homepage">http://crawl.develz.org/</url> + <update_contact>[email protected]</update_contact> +</component> -- 2.11.0 ++++++ desktop.patch ++++++ >From a870232c936c5a813ebef44758127b20ee07933e Mon Sep 17 00:00:00 2001 Message-Id: <a870232c936c5a813ebef44758127b20ee07933e.1487494889.git.matth...@mailaender.name> From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <[email protected]> Date: Sat, 18 Feb 2017 13:07:36 +0100 Subject: [PATCH 1/3] Add a FreeDesktop compliant start menu launcher --- crawl-ref/source/Makefile | 4 ++++ 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: + [ -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 --- /dev/null +++ b/crawl-ref/source/linux/crawl.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Dungeon Crawl Stone Soup +GenericName=Roguelike dungeon exploration game +Comment=A fun game in the grand tradition of games like Rogue, Hack, and Moria +Type=Application +Icon=crawl +Exec=crawl-sdl +Terminal=false +Categories=Game;RolePlaying; -- 2.11.0 ++++++ icon.patch ++++++ ++++ 2187 lines (skipped) ++++++ stone_soup-0.18.1-nodeps.tar.xz -> stone_soup-0.19.4-nodeps.tar.xz ++++++ /work/SRC/openSUSE:Factory/crawl/stone_soup-0.18.1-nodeps.tar.xz /work/SRC/openSUSE:Factory/.crawl.new/stone_soup-0.19.4-nodeps.tar.xz differ: char 25, line 1
