[pragha] Update to 1.2 (fixes #1013020)

Christoph Wickert cwickert at fedoraproject.org
Fri Feb 14 19:33:55 UTC 2014


commit 169da30f36a1ad48548e660648484f815d4a2548
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Fri Feb 14 20:34:34 2014 +0100

    Update to 1.2 (fixes #1013020)
    
    - Build against gstreamer 1.0 on Fedora >= 20

 .gitignore  |    1 +
 pragha.spec |   29 ++++++++++++++++++++++++-----
 sources     |    2 +-
 3 files changed, 26 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7eeeb32..d20acac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 /pragha-1.1.2.tar.bz2
 /pragha-1.1.2.1.tar.bz2
 /pragha-1.1.2.2.tar.bz2
+/pragha-1.2.tar.bz2
diff --git a/pragha.spec b/pragha.spec
index 9c4d0e7..b42b850 100644
--- a/pragha.spec
+++ b/pragha.spec
@@ -1,8 +1,8 @@
 # Review request: https://bugzilla.redhat.com/show_bug.cgi?id=721043
 
 Name:           pragha
-Version:        1.1.2.2
-Release:        2%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        Lightweight GTK+ music manager
 
 Group:          Applications/Multimedia
@@ -16,10 +16,20 @@ BuildRequires:  pkgconfig(dbus-1) >= 1.1
 BuildRequires:  pkgconfig(dbus-glib-1) >= 0.84
 BuildRequires:  pkgconfig(gtk+-2.0) >= 2.24.0
 BuildRequires:  pkgconfig(keybinder) >= 0.2.0
+
+%if (0%{?fedora} && 0%{?fedora} >= 20) || (0%{?rhel} && 0%{?rhel} >= 7)
+BuildRequires:  pkgconfig(gstreamer-1.0) >= 0.11.90
+BuildRequires:  pkgconfig(gstreamer-base-1.0) >= 0.11.90
+BuildRequires:  pkgconfig(gstreamer-audio-1.0) >= 0.11.90
+# N/A. Error in configure or not yet packaged?
+#BuildRequires:  pkgconfig(gstreamer-interfaces-1.0) >= 0.11.90
+%else
 BuildRequires:  pkgconfig(gstreamer-0.10) >= 0.10
 BuildRequires:  pkgconfig(gstreamer-base-0.10) >= 0.10
 BuildRequires:  pkgconfig(gstreamer-audio-0.10) >= 0.10
 BuildRequires:  pkgconfig(gstreamer-interfaces-0.10) >= 0.10
+%endif
+
 BuildRequires:  pkgconfig(libcddb) >= 1.3.0
 BuildRequires:  pkgconfig(libcdio_paranoia) >= 0.80
 BuildRequires:  pkgconfig(libcdio) >= 0.80
@@ -49,10 +59,17 @@ author.
 %setup -q
 
 %build
-%configure
+%configure \
+%if (0%{?fedora} && 0%{?fedora} >= 20) || (0%{?rhel} && 0%{?rhel} >= 7)
+  --with-gstreamer=1.0
+%else
+  --with-gstreamer=0.10
+%endif
+
 make %{?_smp_mflags} V=1
 
 
+
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} INSTALL='install -p'
@@ -91,6 +108,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 # FIXME add AUTHORS if not empty
 %doc ChangeLog COPYING FAQ NEWS README
 %{_bindir}/pragha
+%{_datadir}/appdata/%{name}.appdata.xml
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*x*/apps/%{name}.png
 %{_datadir}/pixmaps/%{name}/
@@ -98,8 +116,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
-* Mon Dec 16 2013 Adrian Reber <adrian at lisas.de> - 1.1.2.2-2
-- Rebuild for libcdio-0.92
+* Thu Feb 13 2014 Christoph Wickert <cwickert at fedoraproject.org> - 1.2-1
+- Update to 1.2 (fixes #1013020)
+- Build against gstreamer 1.0 on Fedora >= 20
 
 * Mon Oct 21 2013 Christoph Wickert <cwickert at fedoraproject.org> - 1.1.2.2-1
 - Update to 1.1.2.2 (fixes #1016264)
diff --git a/sources b/sources
index e675b8e..66650f4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0b15ceae6f03cfa38e351003859192be  pragha-1.1.2.2.tar.bz2
+3df15042fbd5ae6accc8b434a3cca12c  pragha-1.2.tar.bz2


More information about the scm-commits mailing list