[phonon] 4.7.80

Rex Dieter rdieter at fedoraproject.org
Thu Aug 14 17:14:32 UTC 2014


commit b8faddbfb4603ffb33188a56c4781254b91a84e7
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Aug 14 12:14:35 2014 -0500

    4.7.80

 .gitignore                                         |    1 +
 ...tive-dir-resolution-workaround-from-CMake.patch |   64 --------------------
 phonon.spec                                        |   20 ++++---
 sources                                            |    2 +-
 4 files changed, 14 insertions(+), 73 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 26bc10e..37f4416 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /phonon-4.7.2.tar.xz
+/phonon-4.7.80.tar.xz
diff --git a/phonon.spec b/phonon.spec
index da9a2e7..458d0e7 100644
--- a/phonon.spec
+++ b/phonon.spec
@@ -10,21 +10,23 @@
 
 Summary: Multimedia framework api
 Name:    phonon
-Version: 4.7.2
-Release: 1%{?dist}.1
+Version: 4.7.80
+Release: 1%{?dist}
 License: LGPLv2+
 URL:     http://phonon.kde.org/
 %if 0%{?snap}
 Source0: phonon-%{version}-%{snap}.tar.xz
 %else
-Source0: http://download.kde.org/stable/phonon/%{version}/phonon-%{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-%{version}.tar.xz
 %endif
 
 Patch0: phonon-4.7.0-rpath_use_link_path.patch 
-# workaround cmake bogosity calculating relative dirs + /usr-move
-#Patch1: phonon-4.7.0-rootDir.patch
-# better upstream fix (pulled from master branch currently)
-Patch1: import-relative-dir-resolution-workaround-from-CMake.patch
 
 ## upstream patches
 
@@ -90,7 +92,6 @@ Requires: %{name}-qt5%{?_isa} = %{version}-%{release}
 %setup -q 
 
 %patch0 -p1 -b .rpath_use_link_path
-%patch1 -p1 -b .rootDir
 
 
 %build
@@ -197,6 +198,9 @@ test "$(pkg-config --modversion phonon4qt5)" = "%{version}"
 
 
 %changelog
+* Thu Aug 14 2014 Rex Dieter <rdieter at fedoraproject.org> 4.7.80-1
+- 4.7.80
+
 * Thu Jul 17 2014 Rex Dieter <rdieter at fedoraproject.org> 4.7.2-1.1
 - rebuild (for pulseaudio, bug #1117683)
 
diff --git a/sources b/sources
index 603a7e7..d0f3161 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a8b722a11a301fc2cda7ff8228209531  phonon-4.7.2.tar.xz
+ea03006981800afe62782d80e1a43bfe  phonon-4.7.80.tar.xz


More information about the scm-commits mailing list