Hello community, here is the log from the commit of package attractmode for openSUSE:Factory checked in at 2017-03-12 19:59:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/attractmode (Old) and /work/SRC/openSUSE:Factory/.attractmode.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "attractmode" Sun Mar 12 19:59:31 2017 rev:4 rq:462045 version:2.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/attractmode/attractmode.changes 2017-02-14 00:43:49.952934494 +0100 +++ /work/SRC/openSUSE:Factory/.attractmode.new/attractmode.changes 2017-03-12 19:59:42.206234687 +0100 @@ -1,0 +2,14 @@ +Thu Mar 2 22:49:59 UTC 2017 - [email protected] + +- Use bundled .desktop file +- Compile with correct prefix (needed for DATA_PATH in fe_settings) + and with optflags + * Added fix-no-return-in-nonvoid-function.patch to fix + nonvoid functions without return valuu. +- Workaround for missing appdata directory on Leap 42.1 +- Reported appdata file upstream + * appdata-desktop.patch +- Added to fix fix-install-target.patch install-target + of the makefile. + +------------------------------------------------------------------- Old: ---- attractmode-rpmlintrc attractmode.appdata.xml v2.2.1.tar.gz New: ---- appdata-desktop.patch attract-2.2.1.tar.gz fix-install-target.patch fix-no-return-in-nonvoid-function.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ attractmode.spec ++++++ --- /var/tmp/diff_new_pack.S1yxxT/_old 2017-03-12 19:59:45.341791014 +0100 +++ /var/tmp/diff_new_pack.S1yxxT/_new 2017-03-12 19:59:45.341791014 +0100 @@ -23,9 +23,15 @@ License: GPL-3.0 Group: System/Emulators/Other Url: https://attractmode.org -Source: https://github.com/mickelson/attract/archive/v%{version}.tar.gz -Source100: attractmode-rpmlintrc -Source101: attractmode.appdata.xml +Source0: https://github.com/mickelson/attract/archive/v%{version}/attract-%{version}.tar.gz +# PATCH-FEATURE-UPSTREAM appdata-desktop.patch - https://github.com/mickelson/attract/pull/319 +Patch0: appdata-desktop.patch +# PATCH-FIX-UPSTREAM fix-no-return-in-nonvoid-function.patch - https://github.com/mickelson/attract/pull/321 +Patch1: fix-no-return-in-nonvoid-function.patch +# PATCH-FIX-UPSTREAM fix-install-target.patch - https://github.com/mickelson/attract/pull/320 +Patch2: fix-install-target.patch +BuildRequires: fdupes +BuildRequires: freeglut-devel BuildRequires: gcc-c++ BuildRequires: libjpeg8-devel BuildRequires: pkgconfig @@ -42,11 +48,6 @@ BuildRequires: pkgconfig(sfml-graphics) BuildRequires: pkgconfig(sfml-system) BuildRequires: pkgconfig(xcb-xinerama) -%if 0%{?suse_version} < 1320 -BuildRequires: mesaglut-devel -%else -BuildRequires: pkgconfig(freeglut) -%endif Requires(post): desktop-file-utils Requires(postun): desktop-file-utils @@ -58,16 +59,23 @@ %prep %setup -q -n attract-%{version} +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build -make %{?_smp_mflags} +make %{?_smp_mflags} EXTRA_CFLAGS="%{optflags}" prefix=%{_prefix} %install -install -Dpm 0644 %{SOURCE101} %{buildroot}%{_datadir}/appdata/attractmode.appdata.xml -mkdir -p %{buildroot}%{_bindir} # Required for building on Leap 42.1 -%make_install prefix=%{_prefix} # Defaults to /usr/local without this -install -D -p -m 644 util/icon.png %{buildroot}%{_datadir}/pixmaps/attractmode.png -%suse_update_desktop_file -c attractmode 'AttractMode' 'AttractMode emulator frontend' attract attractmode Game Emulator +%make_install prefix=%{_prefix} + +# Install icon and appdata- and .desktop-file +install -Dm644 util/linux/attract-mode.appdata.xml %{buildroot}%{_datadir}/appdata/attract-mode.appdata.xml +install -Dm644 util/linux/attract-mode.png %{buildroot}%{_datadir}/pixmaps/attract-mode.png +install -Dm644 util/linux/attract-mode.desktop %{buildroot}%{_datadir}/applications/attract-mode.desktop + +# Hardlinks so users can copy it +%fdupes %{buildroot}%{_datadir}/attract %post %desktop_database_post @@ -77,12 +85,18 @@ %files %defattr(-,root,root) -%doc License.txt Readme.md +%doc Readme.md +%if ( 0%{?suse_version} == 1315 && 0%{?sle_version} == 120100 ) || ! 0%{?is_opensuse} +# Fix for Leap 42.1 and SLE (TODO: Remove when 42.1 is out of maintenance) +%dir %{_datadir}/appdata +%doc License.txt +%else +%license License.txt +%endif %{_bindir}/attract -%dir %{_datadir}/attract -%{_datadir}/attract/* -%{_datadir}/pixmaps/attractmode.png -%{_datadir}/applications/attractmode.desktop -%{_datadir}/appdata/attractmode.appdata.xml +%{_datadir}/attract +%{_datadir}/pixmaps/attract-mode.png +%{_datadir}/applications/attract-mode.desktop +%{_datadir}/appdata/attract-mode.appdata.xml %changelog ++++++ appdata-desktop.patch ++++++ diff --git a/util/linux/attract-mode.appdata.xml b/util/linux/attract-mode.appdata.xml new file mode 100644 index 0000000..f49e129 --- /dev/null +++ b/util/linux/attract-mode.appdata.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<component type="desktop"> + <id>attract-mode.desktop</id> + <metadata_license>CC0</metadata_license> + <project_license>GPL-3.0+</project_license> + <name>Attract-Mode</name> + <summary>A graphical frontend for emulators</summary> + + <description> + <p> + Attract-Mode is a graphical frontend for command line emulators such as MAME, + MESS and Nestopia. It hides the underlying operating system and is intended to + be controlled with a joystick, gamepad or spinner, making it ideal for use + in arcade cabinets. + </p> + </description> + + <screenshots> + <screenshot type="default"> + <image>http://attractmode.org/images/cools1.png</image> + </screenshot> + <screenshot> + <image>http://attractmode.org/images/attracman.png</image> + </screenshot> + <screenshot> + <image>http://attractmode.org/images/cools2.png</image> + </screenshot> + <screenshot> + <image>http://attractmode.org/images/config.png</image> + </screenshot> + </screenshots> + + <url type="homepage">http://attractmode.org/</url> + + <provides> + <binary>attract</binary> + </provides> + <categories> + <category>Game</category> + <category>Emulator</category> + </categories> +</component> diff --git a/util/linux/attract-mode.desktop b/util/linux/attract-mode.desktop index ac9c32e..11bfbb1 100644 --- a/util/linux/attract-mode.desktop +++ b/util/linux/attract-mode.desktop @@ -2,8 +2,8 @@ Version=1.0 Name=Attract-Mode Comment=Emulator Frontend -Exec=/usr/games/attract +Exec=attract Terminal=false Type=Application -Categories=Game +Categories=Game;Emulator; Icon=attract-mode ++++++ fix-install-target.patch ++++++ diff --git a/Makefile b/Makefile index 2d01a5f..1b19729 100644 --- a/Makefile +++ b/Makefile @@ -435,7 +435,6 @@ ifneq ($(FE_DEBUG),1) endif .PHONY: clean - .PHONY: install $(OBJ_DIR): @@ -677,11 +676,10 @@ $(DATA_PATH): $(MD) -p $(DESTDIR)$@ install: $(EXE) $(DATA_PATH) - install -D -t $(DESTDIR)$(bindir) $(EXE) + install -D $(EXE) $(DESTDIR)$(bindir)/$(EXE) mkdir -p $(DESTDIR)$(DATA_PATH) cp -r config/* $(DESTDIR)$(DATA_PATH) - smallclean: -$(RM) $(OBJ_DIR)/*.o *~ core ++++++ fix-no-return-in-nonvoid-function.patch ++++++ diff -Nur attract-2.2.1/extlibs/gameswf/base/tu_gc.h new/extlibs/gameswf/base/tu_gc.h --- attract-2.2.1/extlibs/gameswf/base/tu_gc.h 2017-01-06 08:01:34.000000000 +0100 +++ new/extlibs/gameswf/base/tu_gc.h 2017-03-03 01:21:21.963559124 +0100 @@ -144,6 +144,7 @@ // TODO: are arrays worth implementing? static void* operator new[](size_t sz) { assert(0); + return NULL; } };
