[phonon] - re-instate allow-stop-empty-source match from mdv
Rex Dieter
rdieter at fedoraproject.org
Fri Jan 21 14:46:18 UTC 2011
commit 6307a0f5ddc536068362a28acae0921c788b23d5
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Fri Jan 21 08:45:39 2011 -0600
- re-instate allow-stop-empty-source match from mdv
phonon.spec | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/phonon.spec b/phonon.spec
index cf246a8..1f0e685 100644
--- a/phonon.spec
+++ b/phonon.spec
@@ -9,7 +9,7 @@
Summary: Multimedia framework api
Name: phonon
Version: 4.4.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: System Environment/Libraries
License: LGPLv2+
URL: http://phonon.kde.org/
@@ -24,6 +24,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch1: phonon-4.4.4-no_rpath.patch
## Mandriva/upstreamable patches
+# https://qa.mandriva.com/show_bug.cgi?id=49814#c40
Patch53: phonon-4.3.50-phonon-allow-stop-empty-source.patch
## Ubuntu/upstreamable patches
@@ -93,9 +94,7 @@ Includes experimental and unstable apis.
%setup -q
%patch1 -p1 -b .no_rpath
-# gonna hold this one, pending feedback from coling why this
-# isn't upstreamed
-#patch53 -p1 -b .phonon-allow-stop-empty-source
+%patch53 -p1 -b .phonon-allow-stop-empty-source
%build
@@ -182,6 +181,9 @@ rm -rf %{buildroot}
%changelog
+* Fri Jan 21 2011 Rex Dieter <rdieter at fedoraproject.org> 4.4.4-2
+- re-instate allow-stop-empty-source match from mdv
+
* Fri Jan 21 2011 Rex Dieter <rdieter at fedoraproject.org> 4.4.4-1
- phonon-4.4.4
More information about the scm-commits
mailing list