From dd5093446f03c961e20ba22fe9e4e75ed9bf6244 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Aug 14 2014 17:15:29 +0000 Subject: 4.7.80, gst1-only now --- diff --git a/.gitignore b/.gitignore index a7ad43d..238dfb1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ /phonon-backend-gstreamer-4.7.2.tar.xz -/phonon-backend-gstreamer-4.7.2-gstreamer1-20140408.tar.xz +/phonon-backend-gstreamer-4.7.80.tar.xz diff --git a/phonon-backend-gstreamer.spec b/phonon-backend-gstreamer.spec index 883dc5b..bd14e40 100644 --- a/phonon-backend-gstreamer.spec +++ b/phonon-backend-gstreamer.spec @@ -1,12 +1,12 @@ # snapshot from the 1.0-porting-for-merge branch, supports both GStreamer 0.10 # and GStreamer 1.x -%global snap gstreamer1-20140408 +#global snap gstreamer1-20140408 Summary: Gstreamer phonon backend Name: phonon-backend-gstreamer Epoch: 2 -Version: 4.7.2 -Release: 2.gstreamer1.20140408git1c8de75487228%{?dist} +Version: 4.7.80 +Release: 1%{?dist} License: LGPLv2+ URL: http://phonon.kde.org/ @@ -15,34 +15,30 @@ Source0: phonon-backend-gstreamer-%{version}-%{snap}.tar.xz # run this script to generate a snapshot tarball Source1: phonon-gstreamer_snapshot.sh %else -Source0: http://download.kde.org/stable/phonon/phonon-backend-gstreamer/%{version}/src/phonon-backend-gstreamer-%{version}.tar.xz +%global revision %(echo %{version} | cut -d. -f3) +%if %{revision} >= 50 +%global stable unstable +%else +%global stable stable +%endif +Source0: http://download.kde.org/%{stable}/phonon/phonon-backend-gstreamer/%{version}/phonon-backend-gstreamer-%{version}.tar.xz %endif ## upstream patches -%if 0%{?fedora} > 20 || 0%{?rhel} > 7 BuildRequires: pkgconfig(gstreamer-1.0) BuildRequires: pkgconfig(gstreamer-app-1.0) pkgconfig(gstreamer-audio-1.0) pkgconfig(gstreamer-video-1.0) Requires: gstreamer1-plugins-good -%else -# We don't want to use GStreamer 1 where the rest of the Qt 4 stack doesn't, -# or we run into symbol conflicts. So build against GStreamer 0.10 on Fedora up -# to 20 and RHEL up to 7. (Up to RHEL 6, GStreamer 0.10 is the only option.) -BuildRequires: pkgconfig(gstreamer-0.10) -BuildRequires: pkgconfig(gstreamer-app-0.10) pkgconfig(gstreamer-audio-0.10) pkgconfig(gstreamer-video-0.10) - -Requires: gstreamer-plugins-good -%endif BuildRequires: automoc4 BuildRequires: cmake -BuildRequires: pkgconfig(phonon) >= 4.7.0 -BuildRequires: pkgconfig(phonon4qt5) >= 4.7.0 +BuildRequires: pkgconfig(phonon) >= 4.7.80 +BuildRequires: pkgconfig(phonon4qt5) >= 4.7.80 BuildRequires: pkgconfig(QtOpenGL) BuildRequires: pkgconfig(Qt5OpenGL) -%global phonon_version %(pkg-config --modversion phonon 2>/dev/null || echo 4.7.0) +%global phonon_version %(pkg-config --modversion phonon 2>/dev/null || echo 4.7.80) Provides: phonon-backend%{?_isa} = %{phonon_version} @@ -127,6 +123,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null ||: %changelog +* Thu Aug 14 2014 Rex Dieter 2:4.7.80-1 +- 4.7.80, gst1-only now + * Sun Jul 20 2014 Kevin Kofler 2:4.7.2-2.gstreamer1.20140408git1c8de75487228 - update to a snapshot from the 1.0-porting-for-merge branch - build against GStreamer 1 on F21+ (#1092643) diff --git a/sources b/sources index 2dfa280..3ba574f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8af8d2311c5d5367019fc61991421810 phonon-backend-gstreamer-4.7.2-gstreamer1-20140408.tar.xz +212408bee40573b1d20edb680ce6caee phonon-backend-gstreamer-4.7.80.tar.xz