commit 12b2ac5a4f363da8e86174c292c8c3ac2dda7f0c
Author: Remi Collet <remi at fedoraproject.org>
Date: Thu Mar 19 23:50:37 2015 +0100
- switch perl(GStreamer1) on Fedora 22+
- fix license handling
.gitignore | 8 +-------
gmusicbrowser.spec | 34 ++++++++++++++++++++++------------
2 files changed, 23 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 61b9aa4..4c794b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,2 @@
-*~
-/gmusicbrowser-1.1.7.tar.gz
-/gmusicbrowser-1.1.8.tar.gz
-/gmusicbrowser-1.1.9.tar.gz
-/gmusicbrowser-1.1.10.tar.gz
-/gmusicbrowser-1.1.12.tar.gz
-/gmusicbrowser-1.1.13.tar.gz
+clog
/gmusicbrowser-1.1.14.tar.gz
diff --git a/gmusicbrowser.spec b/gmusicbrowser.spec
index 8943c8c..2caa8b3 100644
--- a/gmusicbrowser.spec
+++ b/gmusicbrowser.spec
@@ -21,18 +21,22 @@
%else
%global with_appindicator 0
%endif
+%if 0%{?fedora} > 21
+%global with_gst1 1
+%else
+%global with_gst1 0
+%endif
Name: gmusicbrowser
Summary: Jukebox for large collections of music files
Version: 1.1.14
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv3+
Group: Applications/Multimedia
URL: http://gmusicbrowser.org/
Source0: http://gmusicbrowser.org/download/%{name}-%{version}.tar.gz
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: desktop-file-utils
@@ -44,10 +48,14 @@ Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
# Optionnal Deps and not detected
-Requires: perl(Gtk2::TrayIcon), perl(Locale::gettext) >= 1.04, perl(GStreamer)
+Requires: perl(Gtk2::TrayIcon), perl(Locale::gettext) >= 1.04
Requires: vorbis-tools, flac123, alsa-utils
Requires: perl(Gtk2::WebKit)
-
+%if %{with_gst1}
+Requires: perl(GStreamer1)
+%else
+Requires: perl(GStreamer)
+%endif
# We need to keep perl(Gtk2) perl(Gtk2::MozEmbed) perl(Gtk2::Notify)
# perl(Gtk2::Pango) perl(Gtk2::TrayIcon) perl(Gtk2::WebKit)
@@ -113,6 +121,9 @@ Main features :
- customizable labels can be set for each song
- filters with unlimited nesting of conditions
- customizable weighted random mode
+%if ! %{with_gst1}
+Optional dependency: perl-GStreamer1 for GStreamer 1.x support.
+%endif
%prep
@@ -129,8 +140,6 @@ sed -e '/DOCS/d' \
%install
-rm -rf %{buildroot}
-
make install \
prefix=%{_prefix} \
DESTDIR=%{buildroot}
@@ -153,10 +162,6 @@ rm %{buildroot}%{_datadir}/%{name}/plugins/appindicator.pm
%find_lang %{name}
-%clean
-rm -rf %{buildroot}
-
-
%post
update-desktop-database &> /dev/null ||:
@@ -166,8 +171,9 @@ update-desktop-database &> /dev/null ||:
%files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING README NEWS layout_doc.html
+%{!?_licensedir:%global license %%doc}
+%license COPYING
+%doc AUTHORS README NEWS layout_doc.html
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/%{name}.desktop
@@ -181,6 +187,10 @@ update-desktop-database &> /dev/null ||:
%changelog
+* Thu Mar 19 2015 Remi Collet <remi at fedoraproject.org> - 1.1.14.2
+- switch perl(GStreamer1) on Fedora 22+
+- fix license handling
+
* Thu Mar 19 2015 Remi Collet <remi at fedoraproject.org> - 1.1.14.1
- update to 1.1.14