- output_buffering causes page to hung if there's instead php error to display, disab...

[packages/mythplugins.git] / mythplugins.spec

diff --git a/mythplugins.spec b/mythplugins.spec
index d479bb4b6678ada9a6cb2cdd8691fbf3ed49d4d7..a0ef8c18ab1c6c0f9376407471d5b0148bffa9bb 100644 (file)
--- a/mythplugins.spec
+++ b/mythplugins.spec
@@ -1,14 +1,9 @@
-#
-# disable mythmusic,mythphone due to https://bugs.pld-linux.org/?do=details&id=5687
-%bcond_without mythmusic
-%bcond_without mythphone
-#
 %include       /usr/lib/rpm/macros.perl
 Summary:       Main MythTV plugins
 Summary(pl):   G³ówne wtyczki MythTV
 Name:          mythplugins
 Version:       0.18.1
-Release:       0.112.9
+Release:       0.112.11
 License:       GPL v2
 Group:         Applications/Multimedia
 Source0:       http://www.mythtv.org/mc/%{name}-%{version}.tar.bz2
@@ -47,11 +42,12 @@ Requires:   mythbrowser
 Requires:      mythdvd
 Requires:      mythgallery
 Requires:      mythgame
-%{?with_mythmusic:Requires:    mythmusic}
+Requires:      mythmusic
 Requires:      mythnews
-%{?with_mythphone:Requires:    mythphone}
+Requires:      mythphone
 Requires:      mythvideo
 Requires:      mythweather
+ExclusiveArch: %{ix86} %{x8664}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                api_ver %(echo %{version} | cut -d. -f1,2)
@@ -211,7 +207,7 @@ Messengerem oraz dostawcami us
 find '(' -name '*.[ch]' -o -name '*.cpp' -o -name '*.pro' ')' | \
 xargs grep -l /lib/ . | xargs sed -i -e '
        s,/usr/lib/,/usr/%{_lib}/,g
-       s,{PREFIX}/lib,{PREFIX}/%{_lib}/,g
+       s,{PREFIX}/lib,{PREFIX}/%{_lib},g
 '
 
 sed -i -e 's|/mnt/store/music|/var/lib/mythmusic|' mythmusic/mythmusic/globalsettings.cpp
@@ -220,7 +216,7 @@ sed -i -e 's|/mnt/cdrom:/mnt/camera|/media/cdrom:/mnt/camera|' mythgallery/mythg
 
 # include mythtv build settings
 cp %{_datadir}/mythtv/build/config.mak .
-sed -i -e '1iinclude(config.mak)'  settings.pro
+sed -i -e "1iinclude(`pwd`/config.mak)"  settings.pro
 
 %ifarch %{x8664}
        # mmx asm isn't x86_64 compatible in mythmusic
@@ -232,9 +228,7 @@ export QTDIR="%{_prefix}"
 # Not gnu configure
 %configure \
        --enable-all \
-       --disable-festival \
-       %{!?with_mythmusic:--disable-mythmusic} \
-       %{!?with_mythphone:--disable-mythphone}
+       --disable-festival
 
 #      --enable-opengl          enable OpenGL (Music and Gallery) [default=no]
 #      --enable-transcode       enable DVD ripping and transcoding [default=no]
@@ -268,7 +262,6 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 
-%if %{with mythmusic}
 %files -n mythmusic
 %defattr(644,root,root,755)
 %doc mythmusic/README mythmusic/UPGRADING mythmusic/AUTHORS mythmusic/musicdb
@@ -324,7 +317,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/mythtv/themes/default/text_button_on.png
 %{_datadir}/mythtv/themes/default/text_button_pushed.png
 %{_datadir}/mythtv/themes/default/track_info_background.png
-%endif
 
 %files -n mythvideo
 %defattr(644,root,root,755)
@@ -416,7 +408,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/mythtv/themes/default/webpage.png
 %{_datadir}/mythtv/i18n/mythbrowser_*.qm
 
-%if %{with mythphone}
 %files -n mythphone
 %defattr(644,root,root,755)
 %doc mythphone/README mythphone/AUTHORS mythphone/TODO
@@ -426,4 +417,3 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/mythtv/themes/default/mp_*.png
 %{_datadir}/mythtv/themes/default/phone.png
 %{_datadir}/mythtv/i18n/mythphone_*.qm
-%endif