commit fce4372f15ede97a873eca6fc463fa6062c8f25b Author: leigh123linux <leigh123linux(a)googlemail.com&gt; Date: Thu Oct 27 22:37:12 2016 +0100 Fix appdata (rfbz#4311) AppData_fix.patch | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ mixxx.spec | 7 ++++- 2 files changed, 96 insertions(+), 1 deletion(-) --- diff --git a/AppData_fix.patch b/AppData_fix.patch new file mode 100644 index 0000000..d655967 --- /dev/null +++ b/AppData_fix.patch @@ -0,0 +1,90 @@ +From 5b2fb4787b5b99fc7e914efca78c53302cf6541d Mon Sep 17 00:00:00 2001 +From: Richard Hughes <richard(a)hughsie.com&gt; +Date: Wed, 12 Oct 2016 12:05:39 +0100 +Subject: [PATCH] Fix the AppData file to actual validate + +Also, while we're here update the file to the latest spec level and match the +style guide somewhat closer. +--- + res/linux/mixxx.appdata.xml | 59 ++++++++++++++++++++++++--------------------- + 1 file changed, 31 insertions(+), 28 deletions(-) + +diff --git a/res/linux/mixxx.appdata.xml b/res/linux/mixxx.appdata.xml +index 2f8575c..85498fc 100644 +--- a/res/linux/mixxx.appdata.xml ++++ b/res/linux/mixxx.appdata.xml +@@ -5,43 +5,46 @@ + <metadata_license>CC-BY-SA-3.0</metadata_license> + <project_license>GPL-2.0</project_license> + <name>Mixxx DJ Software</name> +- <summary>Everything you need to perform live DJ mixes.</summary> ++ <summary>Everything you need to perform live DJ mixes</summary> + <description> +- <p><b>Mixxx/</b> is free DJ software that gives you +- everything you need to perform live DJ mixes. Blend songs together with +- automatic BPM matching and remix on-the-fly with looping and hot cues. ++ <p> ++ Mixxx is free DJ software that gives you everything you need to perform ++ live DJ mixes. Blend songs together with automatic BPM matching and ++ remix on-the-fly with looping and hot cues. + Whether you're a pro DJ or just getting started, Mixxx has you covered. + </p> + <p> +- <b>Mixxx</b> works with ALSA, JACK, OSS and supports many popular DJ +- controllers. ++ Mixxx works with ALSA, JACK, OSS and supports many popular DJ ++ controllers. Key features include: + </p> +- <b>KEY FEATURES</b> + <ul> +- <li>Parallel or split scratchable waveform displays.</li> +- <li>MP3, OGG, WAVE, FLAC, and optional AAC (M4A) playback.</li> +- <li>WAVE, OGG, and optional MP3 recording.</li> +- <li>Fast, database-powered library.</li> +- <li>Crates and playlists for organizing your music.</li> +- <li>Reads iTunes, Traktor, and Rhythmbox libraries.</li> +- <li>Cross-platform - works on Windows, Mac OS X and Linux.</li> +- <li>Shoutcast and Icecast broadcasting.</li> +- <li>Support for many DJ MIDI and HID controllers out-of-the-box.</li> +- <li>Advanced MIDI scripting engine for maximum flexibility.</li> +- <li>Vinyl emulation with Serato, Traktor, and Mixvibes timecode support.</li> +- <li>Beat and key detection.</li> +- <li>ReplayGain volume normalization.</li> +- <li>Automatic crossfading with Auto DJ.</li> +- <li>Skinnable interface with several skins bundled.</li> ++ <li>Parallel or split scratchable waveform displays</li> ++ <li>MP3, OGG, WAVE, FLAC, and optional AAC (M4A) playback</li> ++ <li>WAVE, OGG, and optional MP3 recording</li> ++ <li>Fast, database-powered library</li> ++ <li>Crates and playlists for organizing your music</li> ++ <li>Reads iTunes, Traktor, and Rhythmbox libraries</li> ++ <li>Cross-platform - works on Windows, Mac OS X and Linux</li> ++ <li>Shoutcast and Icecast broadcasting</li> ++ <li>Support for many DJ MIDI and HID controllers out-of-the-box</li> ++ <li>Advanced MIDI scripting engine for maximum flexibility</li> ++ <li>Vinyl emulation with Serato, Traktor, and Mixvibes timecode support</li> ++ <li>Beat and key detection</li> ++ <li>ReplayGain volume normalization</li> ++ <li>Automatic crossfading with Auto DJ</li> ++ <li>Skinnable interface with several skins bundled</li> + </ul> +- <p>For a full list of features go to: +- <a href="http://mixxx.org/features/" target="_top">http://mixxx.org/features/</a> +- </p> + </description> + <screenshots> +- <screenshot type="default">http://www.mixxx.org/images/press_art/mixxx_1... +- <caption>Mixxx 1.11.0 with the default Deere skin.</caption> ++ <screenshot type="default"> ++ <image>http://www.mixxx.org/static/images/press_art/mixxx_200_deere_ski... ++ <caption>Mixxx with the default Deere skin</caption> ++ </screenshot> + </screenshots> + <url type="homepage">http://mixxx.org</url> +- <updatecontact&gt;mixxx-devel(a)lists.sourceforge.net&lt;/updatecontact&gt; ++ <url type="bugtracker">https://bugs.launchpad.net/mixxx/</url> ++ <url type="donation">http://www.mixxx.org/support/</url> ++ <url type="help">http://www.mixxx.org/support/</url> ++ <url type="translate">https://www.transifex.com/mixxx-dj-software... ++ <update_contact&gt;mixxx-devel(a)lists.sourceforge.net&lt;/update_contact&gt; + </component> diff --git a/mixxx.spec b/mixxx.spec index 90f9f74..0ce122e 100644 --- a/mixxx.spec +++ b/mixxx.spec @@ -5,7 +5,7 @@ Name: mixxx Version: 2.0.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Mixxx is open source software for DJ'ing Group: Applications/Multimedia @@ -15,6 +15,7 @@ Source0: http://downloads.mixxx.org/mixxx-%{version}/%{name}-%{version}-s Patch0: %{name}-%{version}-build.patch Patch1: %{name}-gcc6.patch Patch2: %{name}-arm.patch +Patch3: AppData_fix.patch #Build tools @@ -72,6 +73,7 @@ controllers including MIDI devices, and more. %patch0 -p1 %patch1 -p1 -b .gcc6 %patch2 -p1 +%patch3 -p1 # TODO remove bundle libs #rm -rf lib/vamp-2.3 lib/xwax lib/gmock-1.7.0 lib/gtest-1.7.0 @@ -126,6 +128,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir} %{_datadir}/appdata/%{name}.appdata.xml %changelog +* Thu Oct 27 2016 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 2.0.0-6 +- Fix appdata (rfbz#4311) + * Sun Aug 21 2016 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 2.0.0-5 - Add udev rule (rfbz#4064)