- rel 5; remove patch and add symlink - qmake will find now phonon

Changed files:
    phonon-pkgconfig.patch -> 1.2
    phonon.spec -> 1.22

diff --git a/phonon-pkgconfig.patch b/phonon-pkgconfig.patch
deleted file mode 100644 (file)
index 7d1f227..0000000
--- a/phonon-pkgconfig.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- phonon-4.3.1/phonon.pc.cmake.orig  2008-11-24 18:12:03.000000000 +0100
-+++ phonon-4.3.1/phonon.pc.cmake       2009-09-10 12:36:43.000000000 +0200
-@@ -8,4 +8,4 @@
- Version: @PHONON_LIB_MAJOR_VERSION@.@PHONON_LIB_MINOR_VERSION@.@PHONON_LIB_PATCH_VERSION@
- Requires: QtCore QtGui QtDBus
- Libs: -L${libdir} -lphonon
--Cflags: -I${includedir}
-+Cflags: -I${includedir} -I${includedir}/KDE

diff --git a/phonon.spec b/phonon.spec
index 47d9e8515d1dcb2dad6871189a75583c5c24c71e..1ddd7f611b58e1424c4ffdeef1ded7018a31fde4 100644 (file)
--- a/phonon.spec
+++ b/phonon.spec
@@ -3,12 +3,11 @@ Summary:      Multimedia API for KDE 4
 Summary(pl.UTF-8):     Biblioteka Phonon
 Name:          phonon
 Version:       4.3.1
-Release:       4
+Release:       5
 License:       LGPL v2.1
 Group:         X11/Libraries
 Source0:       ftp://ftp.kde.org/pub/kde/stable/4.3.1/src/%{name}-%{version}.tar.bz2
 # Source0-md5: 767cb68052c108e95f293f30acdef3fb
-Patch0:                %{name}-pkgconfig.patch
 URL:           http://phonon.kde.org/
 BuildRequires: QtCore-devel >= %{qtver}
 BuildRequires: QtDBus-devel >= %{qtver}
@@ -77,6 +76,10 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} -C build install \
        DESTDIR=$RPM_BUILD_ROOT
 
+mkdir -p $RPM_BUILD_ROOT%{_includedir}/qt4
+ln -s ../phonon $RPM_BUILD_ROOT/%{_includedir}/qt4/phonon
+ln -s ../KDE/Phonon $RPM_BUILD_ROOT/%{_includedir}/phonon/Phonon
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -109,4 +112,5 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/phonon
 %dir %{_includedir}/KDE
 %{_includedir}/KDE/Phonon
+%{_includedir}/qt4/phonon
 %{_pkgconfigdir}/phonon.pc