Update of /cvsroot/freevo/freevo/contrib/rpm
In directory sc8-pr-cvs1:/tmp/cvs-serv21873

Modified Files:
        freevo-src.spec 
Added Files:
        redhat-boot_config 
Log Message:
Updated build scripts for freevo-src-1.4-rc1


--- NEW FILE: redhat-boot_config ---
# $Id: redhat-boot_config,v 1.1 2003/10/14 01:31:35 tcwan Exp $

FREEVO_HOME="/usr/bin"
FBSET="/usr/sbin/fbset"
MATROXSET=""
FBSETDB="/usr/share/freevo/contrib/fbcon/fbset.db"
FREEVO_LOG="/var/log/freevo/main-0.log"
FREEVO_RES="main.py remote.py"
VTRELEASE=""

Index: freevo-src.spec
===================================================================
RCS file: /cvsroot/freevo/freevo/contrib/rpm/freevo-src.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** freevo-src.spec     26 Sep 2003 08:17:32 -0000      1.8
--- freevo-src.spec     14 Oct 2003 01:31:35 -0000      1.9
***************
*** 17,22 ****
  ##########################################################################
  %define name freevo-src
! %define version 1.4.0
! %define release 4_freevo
  %define _cachedir /var/cache
  %define _logdir /var/log
--- 17,22 ----
  ##########################################################################
  %define name freevo-src
! %define version 1.4
! %define release rc1
  %define _cachedir /var/cache
  %define _logdir /var/log
***************
*** 27,31 ****
  Version: %{version}
  Release: %{release}
! Source0: %{name}-%{version}.tar.gz
  Copyright: gpl
  Group: Applications/Multimedia
--- 27,34 ----
  Version: %{version}
  Release: %{release}
! #Source0: %{name}-%{version}.tar.gz
! Source0: %{name}-%{version}-%{release}.tgz
! Source1: redhat-boot_config
! #Patch0: freevo-%{version}-%{release}-freevo_dep.patch
  Copyright: gpl
  Group: Applications/Multimedia
***************
*** 66,71 ****
  %prep
  rm -rf $RPM_BUILD_ROOT
! #%setup -n %{name}_%{version}
! %setup -n freevo
  
  %build
--- 69,76 ----
  %prep
  rm -rf $RPM_BUILD_ROOT
! %setup -n freevo-%{version}-%{release}
! #%setup -n freevo
! 
! #%patch0 -p1 
  
  %build
***************
*** 76,80 ****
  find . -name "*.py" |xargs chmod 644
  
! ./autogen.sh
  
  env CFLAGS="$RPM_OPT_FLAGS" python setup.py build
--- 81,85 ----
  find . -name "*.py" |xargs chmod 644
  
! #./autogen.sh
  
  env CFLAGS="$RPM_OPT_FLAGS" python setup.py build
***************
*** 88,97 ****
  mkdir -p %{buildroot}%{_bindir}
  install -m 755 boot/freevo %{buildroot}%{_sysconfdir}/rc.d/init.d
! install -m 755 boot/freevo_dep %{buildroot}%{_sysconfdir}/rc.d/init.d
  install -m 755 boot/record_server 
%{buildroot}%{_sysconfdir}/rc.d/init.d/freevo_recordserver
  install -m 755 boot/webserver %{buildroot}%{_sysconfdir}/rc.d/init.d/freevo_webserver
  install -m 755 boot/record_server_init 
%{buildroot}%{_bindir}/freevo_recordserver_init
  install -m 755 boot/webserver_init %{buildroot}%{_bindir}/freevo_webserver_init
! install -m 644 boot/boot_config %{buildroot}%{_sysconfdir}/freevo/
  
  
--- 93,102 ----
  mkdir -p %{buildroot}%{_bindir}
  install -m 755 boot/freevo %{buildroot}%{_sysconfdir}/rc.d/init.d
! #install -m 755 boot/freevo_dep %{buildroot}%{_sysconfdir}/rc.d/init.d
  install -m 755 boot/record_server 
%{buildroot}%{_sysconfdir}/rc.d/init.d/freevo_recordserver
  install -m 755 boot/webserver %{buildroot}%{_sysconfdir}/rc.d/init.d/freevo_webserver
  install -m 755 boot/record_server_init 
%{buildroot}%{_bindir}/freevo_recordserver_init
  install -m 755 boot/webserver_init %{buildroot}%{_bindir}/freevo_webserver_init
! install -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/freevo/boot_config
  
  
***************
*** 109,112 ****
--- 114,118 ----
  cat >>INSTALLED_FILES <<EOF
  %doc BUGS COPYING ChangeLog FAQ INSTALL README TODO Docs local_conf.py.example
+ %doc contrib/lirc 
  %attr(755,root,root) %dir %{_sysconfdir}/freevo
  %attr(777,root,root) %dir %{_logdir}/freevo
***************
*** 147,155 ****
  
  %post boot
  if [ -x /sbin/chkconfig ]; then
       chkconfig --add freevo
!      chkconfig --add freevo_dep
       chkconfig --add freevo_recordserver
       chkconfig --add freevo_webserver
  fi
  depmod -a
--- 153,166 ----
  
  %post boot
+ # Add the service, but don't automatically invoke it
+ # user has to enable it via ntsysv
  if [ -x /sbin/chkconfig ]; then
       chkconfig --add freevo
!      chkconfig --levels 234 freevo off
! #     chkconfig --add freevo_dep
       chkconfig --add freevo_recordserver
+      chkconfig --levels 234 freevo_recordserver off
       chkconfig --add freevo_webserver
+      chkconfig --levels 234 freevo_webserver off
  fi
  depmod -a
***************
*** 159,163 ****
    if [ -x /sbin/chkconfig ]; then
       chkconfig --del freevo
!      chkconfig --del freevo_dep
       chkconfig --del freevo_recordserver
       chkconfig --del freevo_webserver
--- 170,174 ----
    if [ -x /sbin/chkconfig ]; then
       chkconfig --del freevo
! #     chkconfig --del freevo_dep
       chkconfig --del freevo_recordserver
       chkconfig --del freevo_webserver
***************
*** 166,169 ****
--- 177,183 ----
  
  %changelog
+ * Wed Oct  8 2003 TC Wan <[EMAIL PROTECTED]>
+ - Fixed boot scripts for RH 9, disabled freevo_dep since it's obsolete (?)
+ 
  * Fri Sep 26 2003 TC Wan <[EMAIL PROTECTED]>
  - Removed testfiles from build since it's no longer part of the package




-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
SourceForge.net hosts over 70,000 Open Source Projects.
See the people who have HELPED US provide better services:
Click here: http://sourceforge.net/supporters.php
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog

Reply via email to