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

Modified Files:
        freevo-core-suite.spec freevo-recording-suite.spec 
        freevo-src.spec freevo.spec 
Added Files:
        freevo-1.4-runtime.patch 
Log Message:
Updated spec files for dependency in suite metapackages, updated
spec file for binary package build, cleaned up source package build


--- NEW FILE: freevo-1.4-runtime.patch ---
diff -Naur runtime/lib/python2.2-orig/cgi.py runtime/lib/python2.2/cgi.py
--- runtime/lib/python2.2-orig/cgi.py   Fri Jan 10 12:08:05 2003
+++ runtime/lib/python2.2/cgi.py        Wed Feb  5 17:19:53 2003
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/local/freevo/runtime/apps/freevo_python
 
 # NOTE: the above "/usr/local/bin/python" is NOT a mistake.  It is
 # intentionally NOT "/usr/bin/env python".  On many systems

Index: freevo-core-suite.spec
===================================================================
RCS file: /cvsroot/freevo/freevo/contrib/rpm/freevo-core-suite.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** freevo-core-suite.spec      20 Sep 2003 04:47:37 -0000      1.4
--- freevo-core-suite.spec      15 Oct 2003 04:11:43 -0000      1.5
***************
*** 1,5 ****
  %define freevoname freevo-src
  %define freevover 1.4
! %define freevorel 1_freevo
  ##############################################################################
  Summary: Meta-package for Freevo core functionality
--- 1,5 ----
  %define freevoname freevo-src
  %define freevover 1.4
! %define freevorel 2_freevo
  ##############################################################################
  Summary: Meta-package for Freevo core functionality
***************
*** 15,18 ****
--- 15,19 ----
  Requires: mmpython, python-fchksum, python-mx-base >= 2.0.4, 
  Requires: aumix >= 2.8, libjpeg >= 6b, libexif >= 0.5.10
+ Requires: python-twisted >= 1.0.7
  #Requires: CDDB
  Requires: %{freevoname}
***************
*** 38,41 ****
--- 39,45 ----
  
  %changelog
+ * Wed Oct 15 2003 TC Wan <[EMAIL PROTECTED]>
+ - Moved twisted depedency to core
+ 
  * Sat Sep 20 2003 TC Wan <[EMAIL PROTECTED]>
  - Removed CDDB dependency since it's part of mmpython

Index: freevo-recording-suite.spec
===================================================================
RCS file: /cvsroot/freevo/freevo/contrib/rpm/freevo-recording-suite.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** freevo-recording-suite.spec 18 Sep 2003 08:54:32 -0000      1.2
--- freevo-recording-suite.spec 15 Oct 2003 04:11:43 -0000      1.3
***************
*** 1,5 ****
  %define freevoname freevo-src
  %define freevover 1.4
! %define freevorel 1_freevo
  ##############################################################################
  Summary: Meta-package for Freevo recording functionality
--- 1,5 ----
  %define freevoname freevo-src
  %define freevover 1.4
! %define freevorel 2_freevo
  ##############################################################################
  Summary: Meta-package for Freevo recording functionality
***************
*** 14,18 ****
  Requires: vorbis-tools, libvorbis, lame, cdparanoia
  Requires: mp1e >= 1.9.3
- Requires: pyogg, pyao, pyvorbis
  #Requires: ffmpeg >= 0.4.7
  Requires: %{freevoname}
--- 14,17 ----
***************
*** 38,41 ****
--- 37,44 ----
  
  %changelog
+ * Wed Oct 15 2003 TC Wan <[EMAIL PROTECTED]>
+ - Moved twisted dependency to core, removed pyao, pyogg, pyvorbis dependencies
+   since it's no longer needed
+ 
  * Thu Sep 18 2003 TC Wan <[EMAIL PROTECTED]>
  - Added pyao, pyogg, pyvorbis dependencies

Index: freevo-src.spec
===================================================================
RCS file: /cvsroot/freevo/freevo/contrib/rpm/freevo-src.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** freevo-src.spec     14 Oct 2003 01:31:35 -0000      1.9
--- freevo-src.spec     15 Oct 2003 04:11:43 -0000      1.10
***************
*** 47,56 ****
  --without: us_defaults use_sysapps compile_obj
  
! Note: In order to build the source package, you must have an Internet connection.
! If you need to configure a proxy server, set the shell environmental variable 
'http_proxy'
! to the URL of the proxy server before rebuilding the package.
! 
! E.g. for bash:
! # export http_proxy=http://myproxy.server.net:3128
  
  %package boot
--- 47,56 ----
  --without: us_defaults use_sysapps compile_obj
  
! #Note: In order to build the source package, you must have an Internet connection.
! #If you need to configure a proxy server, set the shell environmental variable 
'http_proxy'
! #to the URL of the proxy server before rebuilding the package.
! #
! #E.g. for bash:
! ## export http_proxy=http://myproxy.server.net:3128
  
  %package boot
***************
*** 130,134 ****
  %post
  # Copy old local_conf.py to replace dummy file
! freevo setup --geometry=%{geometry} --display=%{display} \
          --tv=%{tv_norm} --chanlist=%{chanlist} \
        %{!?_without_use_sysapps:--sysfirst}
--- 130,134 ----
  %post
  # Copy old local_conf.py to replace dummy file
! %{_bindir}/freevo setup --geometry=%{geometry} --display=%{display} \
          --tv=%{tv_norm} --chanlist=%{chanlist} \
        %{!?_without_use_sysapps:--sysfirst}

Index: freevo.spec
===================================================================
RCS file: /cvsroot/freevo/freevo/contrib/rpm/freevo.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** freevo.spec 6 Aug 2003 03:00:49 -0000       1.4
--- freevo.spec 15 Oct 2003 04:11:43 -0000      1.5
***************
*** 1,21 ****
- %define _cvsdate %(date +%Y%m%d)
- 
  ##########################################################################
- # Set the following variables for each new build
- %define freevoname freevo
- %define sourceonly no
- %define freevover 1.3.4
- %define freevorel 1
- %define runtimever 8
- 
  # Set default freevo parameters
  %define geometry 800x600
  %define display  x11
! %define use_sysapps 0
! %define _us_defaults 1
  ##########################################################################
  
  
! %if %{_us_defaults}
  %define tv_norm  ntsc
  %define chanlist us-cable
--- 1,11 ----
  ##########################################################################
  # Set default freevo parameters
  %define geometry 800x600
  %define display  x11
! 
  ##########################################################################
  
  
! %if %{?_without_us_defaults:0}%{!?_without_us_defaults:1}
  %define tv_norm  ntsc
  %define chanlist us-cable
***************
*** 25,128 ****
  %endif
  
- # Use system provided (not binary runtime) apps
- %if %{use_sysapps}
- %define _sysfirst "--sysfirst"
- %else
- %define _sysfirst ""
- %endif
- 
- %define cvsrelease %(echo %{freevorel} | grep -c CVS)
- %define prerelease %(echo %{freevorel} | grep -c pre)
- 
- # The following is needed as I can't get nested if-else-endif macros to work
- %if %{cvsrelease}
- %define realrelease 0
- %else
- %define realrelease %(echo %{prerelease} | grep -cv 1)
- %endif
- 
- %define includeruntime %(echo %{sourceonly} | grep -cv yes)
- 
- %if %{includeruntime}
- %define _tgzname freevo
- %else
- %define _tgzname freevo-src
- %endif
  ##########################################################################
! 
! Summary:      Freevo
! Name:         %{freevoname}
! Version:      %{freevover}
! Release:      %{freevorel}
! License:      GPL
! Group:                Applications/Multimedia
! %if %{cvsrelease}
! Source:               
http://freevo.sourceforge.net/%{_tgzname}-%{version}-%{_cvsdate}.tgz
! %endif
! %if %{prerelease}
! Source:               
http://freevo.sourceforge.net/%{_tgzname}-%{version}-%{freevorel}.tgz
! %endif
! %if %{realrelease}
! Source:               http://freevo.sourceforge.net/%{_tgzname}-%{version}.tgz
! %endif
! 
! URL:          http://freevo.sourceforge.net/
! Requires:     %{name}-runtime >= %{runtimever}
! Requires:     %{name}-apps
! %if %{includeruntime}
! Patch0:               %{name}-%{version}-runtime.patch
! Patch1:               %{name}-%{version}-Makefile.patch
! %else
! BuildRequires:        %{name}-runtime >= %{runtimever}
! %endif
! BuildRoot:    %{_tmppath}/%{name}-%{version}-root-%(id -u -n)
  
  %define _prefix /usr/local/freevo
  %define _cachedir /var/cache
  %define _logdir /var/log
! %define _optimize 2
  
  %description
  Freevo is a Linux application that turns a PC with a TV capture card
  and/or TV-out into a standalone multimedia jukebox/VCR. It builds on
! other applications such as xine, mplayer, tvtime and mencoder to play 
  and record video and audio.
  
! %prep
! %if %{cvsrelease}
! %setup  -n %{name}
! %endif
! %if %{prerelease}
! %setup  -n %{name}-%{version}-%{freevorel}
! %endif
! %if %{realrelease}
! %setup  -n %{name}-%{version}
! %endif
! 
! %if %{includeruntime}
! %patch0 -p0
! %patch1 -p0
! %else
! mv runtime runtime-src
! ln -s %{_prefix}/runtime .
! %endif
  
  
! %build
! find . -name CVS | xargs rm -rf
! find . -name ".cvsignore" |xargs rm -f
! find . -name "*.pyc" |xargs rm -f
! find . -name "*.pyo" |xargs rm -f
! find . -name "*.py" |xargs chmod 644
  
! make clean; make
  
! ./freevo setup --geometry=%{geometry} --display=%{display} \
!       --tv=%{tv_norm} --chanlist=%{chanlist} %{_sysfirst}
  
- %if %{includeruntime}
  %package runtime
  Summary: Libraries used by freevo executable. Must be installed for freevo to work.
! Version:      %{runtimever}
  Obsoletes: freevo_runtime
  Group: Applications/Multimedia
--- 15,80 ----
  %endif
  
  ##########################################################################
! %define name freevo
! %define freevover 1.4
! %define release rc1
! %define runtimever 8.01
  
  %define _prefix /usr/local/freevo
  %define _cachedir /var/cache
  %define _logdir /var/log
! %define _optimize 0
! 
! Summary:        Freevo
! Name: %{name}
! Version: %{freevover}
! Release: %{release}
! #Source0: %{name}-%{freevover}.tar.gz
! Source0: %{name}-%{freevover}-%{release}.tgz
! Source1: redhat-boot_config
! #Patch0: freevo-%{freevover}-%{release}-freevo_dep.patch
! Patch1:         %{name}-%{freevover}-runtime.patch
! 
! Copyright: gpl
! Group: Applications/Multimedia
! BuildRoot: %{_tmppath}/%{name}-buildroot
! Requires:       %{name}-runtime >= %{runtimever}
! %{?_without_use_sysapps:Requires:       %{name}-apps}
! BuildRequires: docbook-utils, wget
! Prefix: %{_prefix}
! URL:            http://freevo.sourceforge.net/
  
  %description
  Freevo is a Linux application that turns a PC with a TV capture card
  and/or TV-out into a standalone multimedia jukebox/VCR. It builds on
! other applications such as xine, mplayer, tvtime and mencoder to play
  and record video and audio.
  
! Available rpmbuild rebuild options :
! --without: us_defaults use_sysapps compile_obj 
  
+ #Note: In order to build the source package, you must have an Internet connection.
+ #If you need to configure a proxy server, set the shell environmental variable 
'http_proxy'
+ #to the URL of the proxy server before rebuilding the package.
+ #
+ #E.g. for bash:
+ ## export http_proxy=http://myproxy.server.net:3128
  
! %package boot
! Summary: Files to enable a standalone Freevo system (started from initscript)
! Group: Applications/Multimedia
! Requires:       %{name}
  
! %description boot
! Freevo is a Linux application that turns a PC with a TV capture card
! and/or TV-out into a standalone multimedia jukebox/VCR. It builds on
! other applications such as mplayer and mencoder to play and record
! video and audio.
  
! Note: This installs the initscripts necessary for a standalone Freevo system.
  
  %package runtime
  Summary: Libraries used by freevo executable. Must be installed for freevo to work.
! Version:        %{runtimever}
  Obsoletes: freevo_runtime
  Group: Applications/Multimedia
***************
*** 132,136 ****
  This directory contains the Freevo runtime. It contains an executable,
  freevo_python, dynamic link libraries for running Freevo as well as a copy
! of the standard Python 2.2.2 libraries. 
  
  Python 2.2.2 modules:
--- 84,88 ----
  This directory contains the Freevo runtime. It contains an executable,
  freevo_python, dynamic link libraries for running Freevo as well as a copy
! of the standard Python 2.2.2 libraries.
  
  Python 2.2.2 modules:
***************
*** 138,142 ****
    ogg pygame pygphoto pylirc pyshift twisted
  
! Please see the website at http://freevo.sourceforge.net for more information 
  on how to use Freevo. The website also contains links to the source code
  for all software included here.
--- 90,94 ----
    ogg pygame pygphoto pylirc pyshift twisted
  
! Please see the website at http://freevo.sourceforge.net for more information
  on how to use Freevo. The website also contains links to the source code
  for all software included here.
***************
*** 151,289 ****
  %description apps
  This directory contains the following external applications used by Freevo:
!   oggenc mpe1 lame jpegtran cdparanoia aumix 
!   
  NOTICE: Binaries of Media Player programs such as Mplayer, Xine and TVTime
  are no longer included in the Apps package.
  Please read the website at http://freevo.sourceforge.net for information on
  where you can obtain these packages.
!       
  Note: This package is not manadatory if standalone versions of the external
! applications are installed, though configuration issues may be minimized if 
  it is used.
  
! %endif
! 
! %package boot
! Summary: Files to enable a standalone Freevo system (started from initscript)
! Group: Applications/Multimedia
! Requires:     %{name}
  
! %description boot
! Freevo is a Linux application that turns a PC with a TV capture card
! and/or TV-out into a standalone multimedia jukebox/VCR. It builds on
! other applications such as mplayer and mencoder to play and record 
! video and audio.
  
! Note: This installs the initscripts necessary for a standalone Freevo system.
  
! %package testfiles
! Summary: Sample multimedia files to test freevo
! Group: Applications/Multimedia
  
! %description testfiles
! Test files that came with freevo. Placed in %{_cachedir}/freevo
  
- %install
- rm -rf $RPM_BUILD_ROOT
- mkdir -p %{buildroot}%{_prefix}
- mkdir -p %{buildroot}%{_prefix}/fbcon/matroxset
- mkdir -p %{buildroot}%{_prefix}/{boot,contrib/lirc,helpers}
- %if %{includeruntime}
- mkdir -p %{buildroot}%{_prefix}/{runtime/apps,runtime/dll,runtime/lib}
- %endif
- mkdir -p %{buildroot}%{_prefix}/{src,skins}
  mkdir -p %{buildroot}%{_sysconfdir}/freevo
  mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d
! mkdir -p 
%{buildroot}%{_cachedir}/freevo/testfiles/{Images,Mame,Movies,Music,tv-show-images}
  
- install -m 755 freevo freevo_xwin runapp %{buildroot}%{_prefix}
- install -m 644 freevo_config.py %{buildroot}%{_prefix}
- install -m 644 fbcon/fbset.db %{buildroot}%{_prefix}/fbcon
- install -m 755 fbcon/vtrelease fbcon/*.sh %{buildroot}%{_prefix}/fbcon
- install -m 755 fbcon/matroxset/matroxset %{buildroot}%{_prefix}/fbcon/matroxset
  
! cp -av helpers/* %{buildroot}%{_prefix}/helpers
  
! %if %{includeruntime}
  install -m 644 runtime/*.py %{buildroot}%{_prefix}/runtime
  install -m 644 runtime/preloads %{buildroot}%{_prefix}/runtime
! #install -m 644 runtime/README %{buildroot}%{_prefix}/runtime
  install -m 644 runtime/VERSION %{buildroot}%{_prefix}/runtime
  cp -av runtime/apps/* %{buildroot}%{_prefix}/runtime/apps
  cp -av runtime/dll/* %{buildroot}%{_prefix}/runtime/dll
  cp -av runtime/lib/* %{buildroot}%{_prefix}/runtime/lib
- %endif
- 
- cp -av src %{buildroot}%{_prefix}
- 
- cp -av skins %{buildroot}%{_prefix}
- 
- install -m 644 freevo.conf local_conf.py record_config.py boot/boot_config 
%{buildroot}%{_sysconfdir}/freevo
- install -m 644 boot/URC-7201B00 %{buildroot}%{_prefix}/boot
- 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 contrib/*.py %{buildroot}%{_prefix}/contrib/
- install -m 755 contrib/lirc/* %{buildroot}%{_prefix}/contrib/lirc
  
- cp -av testfiles/* %{buildroot}%{_cachedir}/freevo/testfiles
  
! %clean
! rm -rf $RPM_BUILD_ROOT
  
! %post
! #cd %{_prefix}; ./freevo setup --compile=%{_optimize},%{_prefix}
! cd %{_prefix}
! if [ -x /usr/bin/python2 ]; then
! /usr/bin/python2 src/setup_freevo.py --compile=%{_optimize},%{_prefix}
! else
! /usr/bin/python src/setup_freevo.py --compile=%{_optimize},%{_prefix}
! fi
! mkdir -p %{_cachedir}/freevo
! mkdir -p %{_cachedir}/freevo/{thumbnails,audio}
! mkdir -p %{_cachedir}/xmltv/logos
! mkdir -p %{_logdir}/freevo
! chmod 777 %{_cachedir}/{freevo,freevo/thumbnails,freevo/audio,xmltv,xmltv/logos}
! chmod 777 %{_logdir}/freevo
  
! %preun 
! rm -rf %{_logdir}/freevo
! find %{_prefix} -name "*.pyc" |xargs rm -f
! find %{_prefix} -name "*.pyo" |xargs rm -f
  
! %files
! %defattr(-,root,root,755)
  %{_prefix}/freevo
- %{_prefix}/freevo_xwin
- %{_prefix}/runapp
- %{_prefix}/fbcon
- %{_prefix}/helpers
- %{_prefix}/src
  %{_prefix}/freevo_config.py
- %defattr(644,root,root,755)
  %{_prefix}/contrib
! %{_prefix}/skins
! 
  %attr(755,root,root) %dir %{_sysconfdir}/freevo
  %attr(644,root,root) %config %{_sysconfdir}/freevo/freevo.conf
! %attr(644,root,root) %config %{_sysconfdir}/freevo/local_conf.py
! %attr(644,root,root) %config %{_sysconfdir}/freevo/record_config.py
! %doc BUGS ChangeLog COPYING FAQ INSTALL README TODO Docs 
  
- %if %{includeruntime}
  %files runtime
  %defattr(644,root,root,755)
  %{_prefix}/runtime/*.py
! #%{_prefix}/runtime/README
  %{_prefix}/runtime/VERSION
  %{_prefix}/runtime/preloads
  %defattr(755,root,root,755)
  %{_prefix}/runtime/apps/freevo_python
  %{_prefix}/runtime/dll
  %{_prefix}/runtime/lib
  
- %preun runtime
- find %{_prefix}/runtime -name "*.pyc" |xargs rm -f
- find %{_prefix}/runtime -name "*.pyo" |xargs rm -f
- 
  %files apps
  %defattr(755,root,root,755)
--- 103,215 ----
  %description apps
  This directory contains the following external applications used by Freevo:
!   oggenc mpe1 lame jpegtran cdparanoia aumix
! 
  NOTICE: Binaries of Media Player programs such as Mplayer, Xine and TVTime
  are no longer included in the Apps package.
  Please read the website at http://freevo.sourceforge.net for information on
  where you can obtain these packages.
! 
  Note: This package is not manadatory if standalone versions of the external
! applications are installed, though configuration issues may be minimized if
  it is used.
  
! %prep
! rm -rf $RPM_BUILD_ROOT
! %setup -n freevo-%{freevover}-%{release}
! #%setup -n freevo
  
! #%patch0 -p1 
! %patch1 -p0 
  
! %build
! find . -name CVS | xargs rm -rf
! find . -name ".cvsignore" |xargs rm -f
! find . -name "*.pyc" |xargs rm -f
! find . -name "*.pyo" |xargs rm -f
! find . -name "*.py" |xargs chmod 644
  
! #./autogen.sh
  
! env CFLAGS="$RPM_OPT_FLAGS" python setup.py build
  
  mkdir -p %{buildroot}%{_sysconfdir}/freevo
+ # The following is needed to let RPM know that the files should be backed up
+ touch %{buildroot}%{_sysconfdir}/freevo/freevo.conf
+ 
+ # boot scripts
  mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d
! 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
  
  
! mkdir -p %{buildroot}%{_logdir}/freevo
! mkdir -p %{buildroot}%{_cachedir}/freevo
! mkdir -p %{buildroot}%{_cachedir}/freevo/{thumbnails,audio}
! mkdir -p %{buildroot}%{_cachedir}/xmltv/logos
! chmod 777 
%{buildroot}%{_cachedir}/{freevo,freevo/thumbnails,freevo/audio,xmltv,xmltv/logos}
! chmod 777 %{buildroot}%{_logdir}/freevo
  
! mkdir -p %{buildroot}%{_prefix}/{runtime/apps,runtime/dll,runtime/lib}
  install -m 644 runtime/*.py %{buildroot}%{_prefix}/runtime
  install -m 644 runtime/preloads %{buildroot}%{_prefix}/runtime
! install -m 644 runtime/README %{buildroot}%{_prefix}/runtime
  install -m 644 runtime/VERSION %{buildroot}%{_prefix}/runtime
+ install -m 755 runtime/runapp %{buildroot}%{_prefix}/runtime
  cp -av runtime/apps/* %{buildroot}%{_prefix}/runtime/apps
  cp -av runtime/dll/* %{buildroot}%{_prefix}/runtime/dll
  cp -av runtime/lib/* %{buildroot}%{_prefix}/runtime/lib
  
  
! %install
! #python setup.py install %{?_without_compile_obj:--no-compile} \
! #             --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES
  
! mkdir -p %{buildroot}%{_prefix}/contrib
! cp -av i18n share src %{buildroot}%{_prefix}
! cp -av contrib/examples contrib/fbcon contrib/xmltv %{buildroot}%{_prefix}/contrib
! install -m 755 freevo %{buildroot}%{_prefix}
! install -m 755 freevo_config.py %{buildroot}%{_prefix}
  
! rm -f INSTALLED_FILES
  
! cat >>INSTALLED_FILES <<EOF
  %{_prefix}/freevo
  %{_prefix}/freevo_config.py
  %{_prefix}/contrib
! %{_prefix}/i18n
! %{_prefix}/share
! %{_prefix}/src
! %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
+ %attr(777,root,root) %dir %{_cachedir}/freevo
+ %attr(777,root,root) %dir %{_cachedir}/freevo/audio
+ %attr(777,root,root) %dir %{_cachedir}/freevo/thumbnails
+ %attr(777,root,root) %dir %{_cachedir}/xmltv
+ %attr(777,root,root) %dir %{_cachedir}/xmltv/logos
  %attr(644,root,root) %config %{_sysconfdir}/freevo/freevo.conf
! #%attr(644,root,root) %config %{_sysconfdir}/freevo/record_config.py
! 
! EOF
  
  %files runtime
  %defattr(644,root,root,755)
  %{_prefix}/runtime/*.py
! %{_prefix}/runtime/README
  %{_prefix}/runtime/VERSION
  %{_prefix}/runtime/preloads
  %defattr(755,root,root,755)
  %{_prefix}/runtime/apps/freevo_python
+ %{_prefix}/runtime/runapp
  %{_prefix}/runtime/dll
  %{_prefix}/runtime/lib
  
  %files apps
  %defattr(755,root,root,755)
***************
*** 292,385 ****
  %{_prefix}/runtime/apps/jpegtran
  %{_prefix}/runtime/apps/lame
  %{_prefix}/runtime/apps/mp1e
  %{_prefix}/runtime/apps/oggenc
- %endif
- 
- %files boot
- %defattr(644,root,root,755)
- %attr(755,root,root) %dir %{_sysconfdir}/freevo
- %attr(755,root,root) %{_sysconfdir}/rc.d/init.d/freevo
- %attr(755,root,root) %{_sysconfdir}/rc.d/init.d/freevo_dep
- %attr(755,root,root) %{_prefix}/boot/URC-7201B00
- %config %{_sysconfdir}/freevo/boot_config
- 
- %files testfiles
- %defattr(644,root,root,755)
- %{_cachedir}/freevo/testfiles
- 
- #
- # The boot scripts were not chkconfig enabled
- #
- #%post boot
- #if [ -x /sbin/chkconfig ]; then
- #  chkconfig --add freevo
- #fi
- #depmod -a
- #
- #%preun boot
- #if [ "$1" = 0 ] ; then
- #  if [ -x /sbin/chkconfig ]; then
- #    chkconfig --del freevo
- #  fi
- #fi
- 
- %post testfiles
- mkdir -p %{_cachedir}/freevo/testfiles/Movies/Recorded
- ln -sf %{_cachedir}/freevo/testfiles %{_prefix}
- 
- %preun testfiles
- rm -f %{_prefix}/testfiles
- 
- %changelog
- * Wed Aug  6 2003 TC Wan <[EMAIL PROTECTED]>
- - Fixed python compile error on RH systems, disabled chkconfig for freevo-boot
  
! * Mon Aug  4 2003 TC Wan <[EMAIL PROTECTED]>
! - 1.3.4 release cleanup
! 
! * Mon Jun 30 2003 TC Wan <[EMAIL PROTECTED]>
! - 1.3.2 release cleanup
  
! * Tue Jun 24 2003 TC Wan <[EMAIL PROTECTED]>
! - 1.3.2-preX and runtime v.7 cleanup
  
! * Mon Apr 28 2003 TC Wan <[EMAIL PROTECTED]>
! - Rewrite build installation commands to recursively copy folder contents
  
! * Mon Apr 14 2003 TC Wan <[EMAIL PROTECTED]>
! - Fixed SPEC file for source only builds, minor cleanups
  
! * Tue Feb 25 2003 TC Wan <[EMAIL PROTECTED]>
! - Updated for 1.3.2 builds, automatically detect -pre and CVS builds
  
! * Tue Feb 18 2003 TC Wan <[EMAIL PROTECTED]>
! - Updated for 1.3.2 cvs build
  
! * Thu Feb 13 2003 TC Wan <[EMAIL PROTECTED]>
! - Updated for 1.3.1 cvs build
! - Requires freevo-runtime for build as setup_build.py needs it
!   to execute
  
! * Fri Feb  7 2003 TC Wan <[EMAIL PROTECTED]>
! - Moved *.py bytecompilation to post-install to reduce RPM size
! - Disabled automatic requires checking for runtime and apps
!   (since we provide all the necessary libraries) to avoid
!   rpm installation issues
  
! * Tue Feb  4 2003 TC Wan <[EMAIL PROTECTED]>
! - Merged 1.3.1 runtime release
  
! * Thu Jan 30 2003 TC Wan <[EMAIL PROTECTED]>
! - Added www subdir to specfile
  
! * Wed Jan 29 2003 TC Wan <[EMAIL PROTECTED]>
! - Minor tweak to helpers subdirectory install
  
! * Tue Dec 31 2002 TC Wan <[EMAIL PROTECTED]>
! - Automate CVS date generation
  
! * Fri Dec 13 2002 TC Wan <[EMAIL PROTECTED]>
! - Update dir structure to Dec 13 CVS
  
! * Fri Nov 29 2002 TC Wan <[EMAIL PROTECTED]>
! - Complete revamp for new directory structure
--- 218,295 ----
  %{_prefix}/runtime/apps/jpegtran
  %{_prefix}/runtime/apps/lame
+ %{_prefix}/runtime/apps/matroxset
  %{_prefix}/runtime/apps/mp1e
  %{_prefix}/runtime/apps/oggenc
  
! %post
! # Copy old local_conf.py to replace dummy file
! cd %{_prefix}
! ./freevo setup --geometry=%{geometry} --display=%{display} \
!         --tv=%{tv_norm} --chanlist=%{chanlist} \
!       %{!?_without_use_sysapps:--sysfirst} 
  
! %if %{!?_without_compile_obj:1}%{?_without_compile_obj:0}
! ./freevo setup --compile=%{_optimize},%{_prefix}
! %endif
  
! %preun
! if [ -s %{_sysconfdir}/freevo/local_conf.py ]; then
!    cp %{_sysconfdir}/freevo/local_conf.py %{_sysconfdir}/freevo/local_conf.py.rpmsave
! fi
  
! find %{_prefix} -name "*.pyc" |xargs rm -f
! find %{_prefix} -name "*.pyo" |xargs rm -f
  
! %clean
! rm -rf $RPM_BUILD_ROOT
  
! %files -f INSTALLED_FILES
! %defattr(-,root,root)
  
! %files boot
! %defattr(644,root,root,755)
! %attr(755,root,root) %{_sysconfdir}/rc.d/init.d
! %attr(755,root,root) %{_bindir}/freevo_*
! %attr(755,root,root) %dir %{_sysconfdir}/freevo
! %attr(644,root,root) %config %{_sysconfdir}/freevo/boot_config
  
! %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
  
! %preun boot
! if [ "$1" = 0 ] ; then
!   if [ -x /sbin/chkconfig ]; then
!      chkconfig --del freevo
! #     chkconfig --del freevo_dep
!      chkconfig --del freevo_recordserver
!      chkconfig --del freevo_webserver
!   fi
! fi
  
! %changelog
! * Wed Oct 15 2003 TC Wan <[EMAIL PROTECTED]>
! - Revised for binary package
  
! * 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
!   Cleaned up conditional flags
  
! * Thu Sep 18 2003 TC Wan <[EMAIL PROTECTED]>
! - Added supporting directories and files to package
  
! * Fri Sep  5 2003 TC Wan <[EMAIL PROTECTED]>
! - Initial SPEC file for python site-packages installation




-------------------------------------------------------
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