[phonon] fix syntax in *.pri file
Than Ngo
than at fedoraproject.org
Wed Mar 28 16:25:20 UTC 2012
commit aa842645a9104e1c290cbdab0342a1a79a29466e
Author: Than Ngo <than at redhat.com>
Date: Wed Mar 28 18:25:12 2012 +0200
fix syntax in *.pri file
phonon-4.6.0-syntax.patch | 12 ++++++++++++
phonon.spec | 8 ++++++--
2 files changed, 18 insertions(+), 2 deletions(-)
---
diff --git a/phonon-4.6.0-syntax.patch b/phonon-4.6.0-syntax.patch
new file mode 100644
index 0000000..98d59a7
--- /dev/null
+++ b/phonon-4.6.0-syntax.patch
@@ -0,0 +1,12 @@
+diff -up phonon-4.6.0/qt_phonon.pri.me phonon-4.6.0/qt_phonon.pri
+--- phonon-4.6.0/qt_phonon.pri.me 2012-03-28 18:22:06.623520519 +0200
++++ phonon-4.6.0/qt_phonon.pri 2012-03-28 18:22:15.886519552 +0200
+@@ -3,6 +3,6 @@
+ # the next build of Qt. So pretend we're not there in this case.
+ # This file is loaded by qt_config.prf, before .qmake.cache has been loaded.
+ # Consequently, we have to do some stunts to get values out of the cache.
+-if(!exists($$_QMAKE_CACHE_)| \
+- !contains($$list($$fromfile($$_QMAKE_CACHE_, CONFIG)), QTDIR_build)): \
++!exists($$_QMAKE_CACHE_)| \
++ !contains($$list($$fromfile($$_QMAKE_CACHE_, CONFIG)), QTDIR_build): \
+ QT_CONFIG += phonon
diff --git a/phonon.spec b/phonon.spec
index 1da0579..7cf8066 100644
--- a/phonon.spec
+++ b/phonon.spec
@@ -9,7 +9,7 @@
Summary: Multimedia framework api
Name: phonon
Version: 4.6.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Group: System Environment/Libraries
License: LGPLv2+
URL: http://phonon.kde.org/
@@ -26,6 +26,7 @@ Patch1: phonon-4.4.4-no_rpath.patch
# phonon_backend ... could not be loaded
# http://bugzilla.redhat.com/760039
Patch50: phonon-4.5.57-plugindir.patch
+Patch51: phonon-4.6.0-syntax.patch
## Upstream patches
@@ -94,7 +95,7 @@ Includes experimental and unstable apis.
%patch1 -p1 -b .no_rpath
%patch50 -p1 -b .plugindir
-
+%patch51 -p1 -b .syntax
%build
mkdir -p %{_target_platform}
@@ -180,6 +181,9 @@ rm -rf %{buildroot}
%changelog
+* Wed Mar 28 2012 Than Ngo <than at redhat.com> - 4.6.0-3
+- fix syntax in *.pri file
+
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.6.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list