[gmusicbrowser/f20] update to 1.1.13

Remi Collet remi at fedoraproject.org
Sat Sep 13 15:52:55 UTC 2014


commit 7929efb15c9be4a06569433cc07780ff6d0ed98f
Author: Remi Collet <remi at fedoraproject.org>
Date:   Sat Sep 13 17:52:46 2014 +0200

    update to 1.1.13

 .gitignore         |    1 +
 gmusicbrowser.spec |   37 +++++++++++++++++++++++++++++++++++--
 sources            |    2 +-
 3 files changed, 37 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ab90b1a..2b91807 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /gmusicbrowser-1.1.9.tar.gz
 /gmusicbrowser-1.1.10.tar.gz
 /gmusicbrowser-1.1.12.tar.gz
+/gmusicbrowser-1.1.13.tar.gz
diff --git a/gmusicbrowser.spec b/gmusicbrowser.spec
index 3601978..f214e9b 100644
--- a/gmusicbrowser.spec
+++ b/gmusicbrowser.spec
@@ -6,10 +6,22 @@
 #
 # Please, preserve the changelog entries
 #
+
+%if 0%{?fedora} > 19
+%global with_appdata      1
+%else
+%global with_appdata      0
+%endif
+%if 0%{?fedora} > 17
+%global with_appindicator 0
+%else
+%global with_appindicator 0
+%endif
+
 Name:      gmusicbrowser
 Summary:   Jukebox for large collections of music files
-Version:   1.1.12
-Release:   2%{?dist}
+Version:   1.1.13
+Release:   1%{?dist}
 License:   GPLv3+
 Group:     Applications/Multimedia
 
@@ -20,6 +32,9 @@ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
 BuildRequires:    desktop-file-utils
+%if %{with_appdata}
+BuildRequires:    appdata-tools
+%endif
 BuildRequires:    perl-devel
 Requires(post):   desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -122,6 +137,15 @@ desktop-file-install --vendor="" \
    --dir=%{buildroot}%{_datadir}/applications/ \
    %{buildroot}/%{_datadir}/applications/%{name}.desktop
 
+%if %{with_appdata}
+appdata-validate --relax --nonet %{name}.appdata.xml
+install -D -pm 0644 %{name}.appdata.xml %{buildroot}/%{_datadir}/appdata/%{name}.appdata.xml
+%else
+%endif
+%if ! %{with_appindicator}
+rm %{buildroot}%{_datadir}/%{name}/plugins/appindicator.pm
+%endif
+
 %find_lang %{name}
 
 
@@ -143,6 +167,9 @@ update-desktop-database &> /dev/null ||:
 %{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/applications/%{name}.desktop
+%if %{with_appdata}
+%{_datadir}/appdata/%{name}.appdata.xml
+%endif
 %{_mandir}/man1/%{name}*
 %{_datadir}/icons/%{name}.png
 %{_datadir}/icons/large/%{name}.png
@@ -150,6 +177,12 @@ update-desktop-database &> /dev/null ||:
 
 
 %changelog
+* Sun Sep  7 2014 Remi Collet <remi at fedoraproject.org> - 1.1.13.1
+- update to 1.1.13
+- ship appdata provided by upstream, F20+
+- drop appindicator plugin as GtK::AppIndicator not available
+- add appdata
+
 * Mon May  5 2014 Remi Collet <remi at fedoraproject.org> - 1.1.12-2
 - update to 1.1.12
 
diff --git a/sources b/sources
index 040b419..5aec329 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-348029d561be345540198cb415c6cd25  gmusicbrowser-1.1.12.tar.gz
+9d16a6cb4abf884a8438b62b026cb2ad  gmusicbrowser-1.1.13.tar.gz


More information about the scm-commits mailing list