mschwendt pushed to audacious (f22). "Update to 3.6.1 (22k diff)."

[notifications at fedoraproject.org]

>From 93aabdcd31dafac326aafacc4642828b8b19e3f5 Mon Sep 17 00:00:00 2001
From: Michael Schwendt <mschwendt at fedoraproject.org>
Date: Tue, 14 Apr 2015 15:58:38 +0200
Subject: Update to 3.6.1 (22k diff).


diff --git a/audacious.appdata.xml b/audacious.appdata.xml
deleted file mode 100644
index 046b9e3..0000000
--- a/audacious.appdata.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<!-- Copyright 2015 Audacious developers -->
-
-<?xml version="1.0" encoding="UTF-8"?>
-<component>
-  <id type="desktop">audacious.desktop</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>BSD-2-Clause</project_license>
-  <name>Audacious</name>
-  <summary>Lightweight audio player</summary>
-  <description>
-    <p>
-      Audacious is an open source audio player. Originally a descendant of XMMS,
-      Audacious plays your music how you want it, without stealing away your
-      computer’s resources from other tasks.
-    </p>
-    <p>
-      Drag and drop folders and individual song files, search for artists and
-      albums in your entire music library, or create and edit your own custom
-      playlists. Listen to CD’s or stream music from the Internet. Tweak the
-      sound with the graphical equalizer or experiment with LADSPA
-      effects. Enjoy the modern GTK-themed interface or change things up with
-      Winamp Classic skins. Use the plugins included with Audacious to fetch
-      lyrics for your music, to set an alarm in the morning, and more.
-    </p>
-  </description>
-  <url type="homepage">http://audacious-media-player.org</url>
-  <screenshots>
-    <screenshot type="default">http://audacious-media-player.org/images/gtk-interface.png</screenshot>
-    <screenshot>http://audacious-media-player.org/images/winamp-interface.png</screenshot>
-    <screenshot>http://audacious-media-player.org/images/settings-window.png</screenshot>
-  </screenshots>
-</component>
diff --git a/audacious.spec b/audacious.spec
index 259d5c4..b1ac236 100644
--- a/audacious.spec
+++ b/audacious.spec
@@ -6,8 +6,8 @@
 %bcond_with qt
 
 Name: audacious
-Version: 3.6
-Release: 5%{?dist}
+Version: 3.6.1
+Release: 1%{?dist}
 
 %if %{with gtk2}
   %global tar_ver %{version}
@@ -27,11 +27,6 @@ Group: Applications/Multimedia
 
 Source0: http://distfiles.audacious-media-player.org/%{name}-%{tar_ver}.tar.bz2
 
-# 2015-03-08:
-#   $ appstream-util validate-relax audacious.appdata.xml
-#   audacious.appdata.xml: OK
-Source1: https://raw.githubusercontent.com/audacious-media-player/audacious/master/contrib/audacious.appdata.xml
-
 # for /usr/bin/appstream-util
 BuildRequires: libappstream-glib
 
@@ -153,7 +148,7 @@ desktop-file-install  \
     --dir ${RPM_BUILD_ROOT}%{_datadir}/applications  \
     ${RPM_BUILD_ROOT}%{_datadir}/applications/audacious.desktop
 
-install -D -m0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/appdata/%{name}.appdata.xml
+install -D -m0644 contrib/%{name}.appdata.xml ${RPM_BUILD_ROOT}%{_datadir}/appdata/%{name}.appdata.xml
 appstream-util validate-relax --nonet ${RPM_BUILD_ROOT}%{_datadir}/appdata/%{name}.appdata.xml
 
 
@@ -204,6 +199,9 @@ fi
 
 
 %changelog
+* Thu Apr  9 2015 Michael Schwendt <mschwendt at fedoraproject.org> - 3.6.1-1
+- Update to 3.6.1 (22k diff).
+
 * Sun Mar  8 2015 Michael Schwendt <mschwendt at fedoraproject.org> - 3.6-5
 - Merge latest appdata file git master as suggested by Thomas Lange.
   Screenshots are enabled now.
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/audacious.git/commit/?h=f22&id=93aabdcd31dafac326aafacc4642828b8b19e3f5