SPECS (DEVEL): mythplugins.spec - finished mythweb update

[glen]

Author: glen                         Date: Fri Nov  4 00:58:38 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- finished mythweb update

---- Files affected:
SPECS:
   mythplugins.spec (1.12.2.4 -> 1.12.2.5) 

---- Diffs:

================================================================
Index: SPECS/mythplugins.spec
diff -u SPECS/mythplugins.spec:1.12.2.4 SPECS/mythplugins.spec:1.12.2.5
--- SPECS/mythplugins.spec:1.12.2.4	Fri Nov  4 01:04:14 2005
+++ SPECS/mythplugins.spec	Fri Nov  4 01:58:32 2005
@@ -9,7 +9,7 @@
 Name:		mythplugins
 Version:	0.18.1
 %define	_snap 20051104
-%define	_rel 0.1
+%define	_rel 0.5
 Release:	0.113.%{_snap}.%{_rel}
 License:	GPL v2
 Group:		Applications/Multimedia
@@ -17,8 +17,8 @@
 Source0:	%{name}-%{_snap}.tar.bz2
 # Source0-md5:	021633295bdcc34f31580239cb0b1074
 Source1:	mythweb.conf
-Patch0:		%{name}-configure.patch
-Patch1:		%{name}-libversion.patch
+#Patch0:		%{name}-configure.patch
+#Patch1:		%{name}-libversion.patch
 Patch2:		%{name}-lib64.patch
 Patch3:		%{name}-paths.patch
 Patch4:		mythweb-config.patch
@@ -62,6 +62,7 @@
 Requires:	mythphone
 Requires:	mythvideo
 Requires:	mythweather
+Requires:	mythweb
 ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -230,14 +231,18 @@
 
 %prep
 %setup -q %{?_snap:-n %{name}}
-%patch0 -p1
-%patch1 -p1
+#%patch0 -p1
+#%patch1 -p1
 %if %{_lib} != "lib"
 %patch2 -p1
 %endif
 %patch3 -p1
 %patch4 -p1
 
+# trash
+rm mythweb/themes/compact.tar.bz2
+rm mythweb/images/icons/.cvsignore
+
 %if %{with binary}
 # include mythtv build settings
 cp %{_datadir}/mythtv/build/config.mak .
@@ -297,14 +302,12 @@
 %endif
 
 # mythweb
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/mythweb,%{_datadir}/mythweb/languages,/var/cache/mythweb/{image_cache,php_sessions}}
-# trash
-rm -f mythweb/themes/compact.tar.bz2
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/mythweb,%{_datadir}/mythweb/{includes,languages},/var/cache/mythweb/{image_cache,php_sessions}}
 cp -a mythweb/*.{html,php} $RPM_BUILD_ROOT%{_datadir}/mythweb
 cp -a mythweb/languages/*.php $RPM_BUILD_ROOT%{_datadir}/mythweb/languages
-cp -a mythweb/{images,includes,js,themes,vxml} $RPM_BUILD_ROOT%{_datadir}/mythweb
-cp -a mythweb/{images,includes,js,languages,themes,vxml} $RPM_BUILD_ROOT%{_datadir}/mythweb
-cp -a mythweb/config/* $RPM_BUILD_ROOT%{_sysconfdir}/mythweb
+cp -a mythweb/includes/*.php $RPM_BUILD_ROOT%{_datadir}/mythweb/includes
+cp -a mythweb/{images,js,themes,templates,vxml} $RPM_BUILD_ROOT%{_datadir}/mythweb
+cp -a mythweb/config/*.{php,dat} $RPM_BUILD_ROOT%{_sysconfdir}/mythweb
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/mythweb/apache.conf
 touch $RPM_BUILD_ROOT%{_sysconfdir}/mythweb/htpasswd
 
@@ -313,19 +316,24 @@
 
 %triggerin -n mythweb -- apache1 >= 1.3.33-2
 %apache_config_install -v 1 -c %{_sysconfdir}/mythweb/apache.conf
+exit 0
 
 %triggerun -n mythweb -- apache1 >= 1.3.33-2
 %apache_config_uninstall -v 1
+exit 0
 
 %triggerin -n mythweb -- apache >= 2.0.0
 %apache_config_install -v 2 -c %{_sysconfdir}/mythweb/apache.conf
+exit 0
 
 %triggerun -n mythweb -- apache >= 2.0.0
 %apache_config_uninstall -v 2
+exit 0
 
 %files
 %defattr(644,root,root,755)
 
+%if %{with binary}
 %files -n mythmusic
 %defattr(644,root,root,755)
 %doc mythmusic/README mythmusic/UPGRADING mythmusic/AUTHORS mythmusic/musicdb
@@ -481,6 +489,7 @@
 %{_datadir}/mythtv/themes/default/mp_*.png
 %{_datadir}/mythtv/themes/default/phone.png
 %{_datadir}/mythtv/i18n/mythphone_*.qm
+%endif
 
 %files -n mythweb
 %defattr(644,root,root,755)
@@ -501,6 +510,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12.2.5  2005/11/04 00:58:32  glen
+- finished mythweb update
+
 Revision 1.12.2.4  2005/11/04 00:04:14  glen
 - merge mythweb from HEAD
 
================================================================

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