SPECS (DEVEL): mythplugins.spec - fixed binary build, disabled one...

[glen]

Author: glen                         Date: Fri Nov  4 01:07:24 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- fixed binary build, disabled ones that failed

---- Files affected:
SPECS:
   mythplugins.spec (1.12.2.6 -> 1.12.2.7) 

---- Diffs:

================================================================
Index: SPECS/mythplugins.spec
diff -u SPECS/mythplugins.spec:1.12.2.6 SPECS/mythplugins.spec:1.12.2.7
--- SPECS/mythplugins.spec:1.12.2.6	Fri Nov  4 02:00:06 2005
+++ SPECS/mythplugins.spec	Fri Nov  4 02:07:19 2005
@@ -2,6 +2,10 @@
 #
 # Conditional build:
 %bcond_without	binary		# skip binary plugins (build only mythweb)
+%bcond_with	mythmusic	# mythmusic plugin (broken now)
+%bcond_with	mythgallery	# mythgallery plugin (broken now)
+%bcond_with	mythbrowser	# mythbrowser plugin (broken now)
+%bcond_with	mythcontrols	# mythcontrols plugin (not done)
 #
 %include	/usr/lib/rpm/macros.perl
 Summary:	Main MythTV plugins
@@ -53,11 +57,11 @@
 BuildRequires:	xvid-devel >= 1:0.9.1
 BuildRequires:	zlib-devel
 %endif
-Requires:	mythbrowser
+%{?with_mythbrowser:Requires:	mythbrowser}
 Requires:	mythdvd
-Requires:	mythgallery
+%{?with_mythgallery:Requires:	mythgallery}
 Requires:	mythgame
-Requires:	mythmusic
+%{?with_mythmysic:Requires:	mythmusic}
 Requires:	mythnews
 Requires:	mythphone
 Requires:	mythvideo
@@ -335,6 +339,7 @@
 %defattr(644,root,root,755)
 
 %if %{with binary}
+%if %{with mythmusic}
 %files -n mythmusic
 %defattr(644,root,root,755)
 %doc mythmusic/README mythmusic/UPGRADING mythmusic/AUTHORS mythmusic/musicdb
@@ -343,53 +348,8 @@
 %{_datadir}/mythtv/musicmenu.xml
 %{_datadir}/mythtv/music_settings.xml
 %{_datadir}/mythtv/i18n/mythmusic_*.qm
-%{_datadir}/mythtv/themes/default/ff_button_off.png
-%{_datadir}/mythtv/themes/default/ff_button_on.png
-%{_datadir}/mythtv/themes/default/ff_button_pushed.png
-%{_datadir}/mythtv/themes/default/mm_blackhole_border.png
-%{_datadir}/mythtv/themes/default/mm_blankbutton_off.png
-%{_datadir}/mythtv/themes/default/mm_blankbutton_on.png
-%{_datadir}/mythtv/themes/default/mm_blankbutton_pushed.png
-%{_datadir}/mythtv/themes/default/mm_checked.png
-%{_datadir}/mythtv/themes/default/mm_checked_high.png
-%{_datadir}/mythtv/themes/default/mm_down_arrow.png
-%{_datadir}/mythtv/themes/default/mm_left_arrow.png
-%{_datadir}/mythtv/themes/default/mm_leftright_off.png
-%{_datadir}/mythtv/themes/default/mm_leftright_on.png
-%{_datadir}/mythtv/themes/default/mm_leftright_pushed.png
-%{_datadir}/mythtv/themes/default/mm_rating.png
-%{_datadir}/mythtv/themes/default/mm_right_arrow.png
-%{_datadir}/mythtv/themes/default/mm_unchecked.png
-%{_datadir}/mythtv/themes/default/mm_unchecked_high.png
-%{_datadir}/mythtv/themes/default/mm_up_arrow.png
-%{_datadir}/mythtv/themes/default/mm_volume_background.png
-%{_datadir}/mythtv/themes/default/mm_volume_tick.png
-%{_datadir}/mythtv/themes/default/mm_waiting.png
-%{_datadir}/mythtv/themes/default/music-sel-bg.png
-%{_datadir}/mythtv/themes/default/music-ui.xml
-%{_datadir}/mythtv/themes/default/next_button_off.png
-%{_datadir}/mythtv/themes/default/next_button_on.png
-%{_datadir}/mythtv/themes/default/next_button_pushed.png
-%{_datadir}/mythtv/themes/default/pause_button_off.png
-%{_datadir}/mythtv/themes/default/pause_button_on.png
-%{_datadir}/mythtv/themes/default/pause_button_pushed.png
-%{_datadir}/mythtv/themes/default/play_button_off.png
-%{_datadir}/mythtv/themes/default/play_button_on.png
-%{_datadir}/mythtv/themes/default/play_button_pushed.png
-%{_datadir}/mythtv/themes/default/prev_button_off.png
-%{_datadir}/mythtv/themes/default/prev_button_on.png
-%{_datadir}/mythtv/themes/default/prev_button_pushed.png
-%{_datadir}/mythtv/themes/default/rew_button_off.png
-%{_datadir}/mythtv/themes/default/rew_button_on.png
-%{_datadir}/mythtv/themes/default/rew_button_pushed.png
-%{_datadir}/mythtv/themes/default/selectionbar.png
-%{_datadir}/mythtv/themes/default/stop_button_off.png
-%{_datadir}/mythtv/themes/default/stop_button_on.png
-%{_datadir}/mythtv/themes/default/stop_button_pushed.png
-%{_datadir}/mythtv/themes/default/text_button_off.png
-%{_datadir}/mythtv/themes/default/text_button_on.png
-%{_datadir}/mythtv/themes/default/text_button_pushed.png
-%{_datadir}/mythtv/themes/default/track_info_background.png
+%{_datadir}/mythtv/themes
+%endif
 
 %files -n mythvideo
 %defattr(644,root,root,755)
@@ -432,6 +392,7 @@
 %{_datadir}/mythtv/themes/default/thunshowers.png
 %{_datadir}/mythtv/themes/default/unknown.png
 
+%if %{with mythgallery}
 %files -n mythgallery
 %defattr(644,root,root,755)
 %doc mythgallery/README mythgallery/UPGRADING
@@ -439,7 +400,9 @@
 %{_datadir}/mythtv/themes/default/gallery-ui.xml
 %{_datadir}/mythtv/themes/default/gallery-*.png
 %{_datadir}/mythtv/i18n/mythgallery_*.qm
+# FIXME: this is definately stupid path
 /var/lib/pictures
+%endif
 
 %files -n mythgame
 %defattr(644,root,root,755)
@@ -473,6 +436,7 @@
 %{_datadir}/mythtv/themes/default/news-info-bg.png
 %{_datadir}/mythtv/i18n/mythnews_*.qm
 
+%if %{with mythbrowser}
 %files -n mythbrowser
 %defattr(644,root,root,755)
 %doc mythbrowser/README mythbrowser/AUTHORS
@@ -480,6 +444,7 @@
 %attr(755,root,root) %{_libdir}/mythtv/plugins/libmythbookmarkmanager.so
 %{_datadir}/mythtv/themes/default/webpage.png
 %{_datadir}/mythtv/i18n/mythbrowser_*.qm
+%endif
 
 %files -n mythphone
 %defattr(644,root,root,755)
@@ -511,6 +476,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12.2.7  2005/11/04 01:07:19  glen
+- fixed binary build, disabled ones that failed
+
 Revision 1.12.2.6  2005/11/04 01:00:06  glen
 - use mod_env to (relatively) securely pass database connection info
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mythplugins.spec?r1=1.12.2.6&r2=1.12.2.7&f=u