rdieter pushed to phonon (master). "%build: -DPHONON_INSTALL_QT_COMPAT_HEADERS (instead of our own symlink hack)"

[notifications at fedoraproject.org]

From 495e37fd655f7308f5ab15b45be25d54a0644ef4 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Thu, 7 May 2015 12:51:00 -0500
Subject: %build: -DPHONON_INSTALL_QT_COMPAT_HEADERS (instead of our own
 symlink hack)


diff --git a/phonon.spec b/phonon.spec
index 23e7f37..e1e37e4 100644
--- a/phonon.spec
+++ b/phonon.spec
@@ -11,7 +11,7 @@
 Summary: Multimedia framework api
 Name:    phonon
 Version: 4.8.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+
 URL:     http://phonon.kde.org/
 %if 0%{?snap}
@@ -99,6 +99,7 @@ mkdir %{_target_platform}
 pushd %{_target_platform}
 %{cmake} .. \
   -DCMAKE_BUILD_TYPE:STRING="Release" \
+  -DPHONON_INSTALL_QT_COMPAT_HEADERS:BOOL=ON \
   -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT:BOOL=ON
 popd
 
@@ -119,9 +120,6 @@ make %{?_smp_mflags} -C %{_target_platform}-Qt5
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}-Qt5
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-# symlink for qt/phonon compatibility
-ln -s ../KDE/Phonon %{buildroot}%{_includedir}/phonon/Phonon
-
 # own these dirs
 mkdir -p %{buildroot}%{_kde4_libdir}/kde4/plugins/phonon_backend/
 mkdir -p %{buildroot}%{_kde4_datadir}/kde4/services/phononbackends/
@@ -198,6 +196,9 @@ test "$(pkg-config --modversion phonon4qt5)" = "%{version}"
 
 
 %changelog
+* Thu May 07 2015 Rex Dieter <rdieter at fedoraproject.org> 4.8.3-4
+- %%build: -DPHONON_INSTALL_QT_COMPAT_HEADERS (instead of our own symlink hack)
+
 * Thu May 07 2015 Rex Dieter <rdieter at fedoraproject.org> 4.8.3-3
 - %%build: -DCMAKE_BUILD_TYPE="Release" (sets -DNDEBUG -DQT_NO_DEBUG)
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/phonon.git/commit/?h=master&id=495e37fd655f7308f5ab15b45be25d54a0644ef4