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

Modified Files:
        freevo.spec 
Added Files:
        freevo-runtime-0.1.patch freevo-runtime.spec 
        freevo-usrlocal.spec 
Removed Files:
        freevo-1.4-runtime.patch freevo-src.spec 
Log Message:
Revised spec files for new naming convention


--- NEW FILE: freevo-runtime-0.1.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

--- NEW FILE: freevo-runtime.spec ---
%define name freevo-runtime
%define runtimever 0.1
%define release 1

%define _prefix /usr/local/freevo/runtime

Summary: Libraries used by freevo nodeps executable. 
Name: %{name}
Version: %{runtimever}
Release: %{release}
Obsoletes: freevo_runtime
#Source0: %{name}-%{freevover}.tar.gz
Source0: %{name}-%{runtimever}.tgz
Patch0:  %{name}-%{runtimever}.patch

Copyright: gpl
Group: Applications/Multimedia
BuildRoot: %{_tmppath}/%{name}-buildroot
AutoReqProv: no
#BuildRequires: docbook-utils, wget
Prefix: %{_prefix}
URL:            http://freevo.sourceforge.net/

%description 
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.

External apps used by freevo (other than mplayer or xine) are also included
in the runtime.  Please read the website at http://freevo.sourceforge.net 
for information on where you can obtain these packages.

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.

%prep
rm -rf $RPM_BUILD_ROOT
%setup -n runtime

%patch0 -p1 

%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

mkdir -p %{buildroot}%{_prefix}
install -m 644 *.py %{buildroot}%{_prefix}
install -m 644 preloads %{buildroot}%{_prefix}
install -m 644 README %{buildroot}%{_prefix}
install -m 644 VERSION %{buildroot}%{_prefix}
install -m 755 runapp %{buildroot}%{_prefix}
cp -av apps dll lib %{buildroot}%{_prefix}


%files 
%defattr(644,root,root,755)
%{_prefix}/*.py
%{_prefix}/README
%{_prefix}/VERSION
%{_prefix}/preloads
%defattr(755,root,root,755)
%{_prefix}/apps
%{_prefix}/runapp
%{_prefix}/dll
%{_prefix}/lib

%clean
rm -rf $RPM_BUILD_ROOT

%changelog
* Mon Nov  3 2003 TC Wan <[EMAIL PROTECTED]>
- Stripped out non-runtime related stuff from freevo.spec to create freevo-runtime.spec

* Sat Oct 25 2003 TC Wan <[EMAIL PROTECTED]>
- Updated for 1.4-rc2

* 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

--- NEW FILE: freevo-usrlocal.spec ---
##########################################################################
# 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
%else
%define tv_norm  pal
%define chanlist europe-west
%endif

##########################################################################
%define name freevo-usrlocal
%define freevoname freevo
%define freevover 1.4
%define release rc2
%define runtimever 0.1

%define _prefix /usr/local/freevo
%define _cachedir /var/cache
%define _logdir /var/log
%define _optimize 0

Summary: Freevo no dependency package
Name: %{name}
Version: %{freevover}
Release: %{release}
#Source0: %{freevoname}-%{freevover}.tar.gz
Source0: %{freevoname}-%{freevover}%{release}.tar.gz
#Source1: redhat-boot_config.fullbinary

Copyright: gpl
Group: Applications/Multimedia
BuildRoot: %{_tmppath}/%{name}-buildroot
Requires:       %{freevoname}-runtime = %{runtimever}
%{?_without_use_sysapps:Requires:       %{name}-apps}
Prefix: %{_prefix}
URL:            http://freevo.sourceforge.net/

%description 
This is the no-dependency (other than freevo-runtime and mplayer/xine) 
freevo package for casual users interested in trying out freevo. 
The freevo package is installed in /usr/local/freevo.

Boot scripts to automatically startup freevo on a dedicated machine are 
not included in this package. To setup a dedicated freevo machine,
please install the respective required dependency packages and use the
normal freevo RPM package.

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.

NOTICE: Binaries of Media Player programs such as Mplayer, Xine and TVTime
are no longer included in the freevo package due to legal issues.
Please read the website at http://freevo.sourceforge.net for information on
where you can obtain these packages.

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

%prep
rm -rf $RPM_BUILD_ROOT
%setup -n freevo-%{freevover}%{release}
#%setup -n freevo

%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

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

%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

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

%changelog
* Mon Nov  3 2003 TC Wan <[EMAIL PROTECTED]>
- 1.4-rc2 usrlocal (no-dependency) package

* Sat Oct 25 2003 TC Wan <[EMAIL PROTECTED]>
- Updated for 1.4-rc2

* 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

Index: freevo.spec
===================================================================
RCS file: /cvsroot/freevo/freevo/contrib/rpm/freevo.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** freevo.spec 25 Oct 2003 04:27:16 -0000      1.6
--- freevo.spec 3 Nov 2003 09:37:28 -0000       1.7
***************
*** 17,45 ****
  ##########################################################################
  %define name freevo
! %define freevover 1.4
  %define release rc2
- %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.fullbinary
! #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/
--- 17,38 ----
  ##########################################################################
  %define name freevo
! %define version 1.4
  %define release rc2
  %define _cachedir /var/cache
  %define _logdir /var/log
! 
  
  Summary:        Freevo
  Name: %{name}
! Version: %{version}
  Release: %{release}
! #Source0: %{name}-%{version}.tar.gz
! Source0: %{name}-%{version}%{release}.tar.gz
! Source1: redhat-boot_config
! #Patch0: freevo-%{version}-%{release}-freevo_dep.patch
  Copyright: gpl
  Group: Applications/Multimedia
  BuildRoot: %{_tmppath}/%{name}-buildroot
! #BuildRequires: docbook-utils, wget
  Prefix: %{_prefix}
  URL:            http://freevo.sourceforge.net/
***************
*** 52,56 ****
  
  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.
--- 45,49 ----
  
  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.
***************
*** 74,124 ****
  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
- AutoReqProv: no
- 
- %description runtime
- 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:
-   CDDB DiscID Numeric PIL xmlplus xmms aomodule cdrom fchksum mmpython mx
-   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.
- 
- %package apps
- Summary: External applications used by freevo executable.
- Obsoletes: freevo_apps
- Group: Applications/Multimedia
- Requires: %{name}-runtime >= %{runtimever}
- AutoReqProv: no
- 
- %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
--- 67,76 ----
  Note: This installs the initscripts necessary for a standalone Freevo system.
  
  %prep
  rm -rf $RPM_BUILD_ROOT
! %setup -n freevo-%{version}%{release}
  #%setup -n freevo
  
  #%patch0 -p1 
  
  %build
***************
*** 156,189 ****
  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 
--- 108,116 ----
  chmod 777 %{buildroot}%{_logdir}/freevo
  
  %install
! python setup.py install %{?_without_compile_obj:--no-compile} \
!               --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES
  
  cat >>INSTALLED_FILES <<EOF
  %doc BUGS COPYING ChangeLog FAQ INSTALL README TODO Docs local_conf.py.example
  %doc contrib/lirc 
***************
*** 200,235 ****
  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)
- %{_prefix}/runtime/apps/aumix
- %{_prefix}/runtime/apps/cdparanoia
- %{_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
--- 127,136 ----
  EOF
  
  
  %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}
  
  %preun
***************
*** 238,244 ****
  fi
  
- find %{_prefix} -name "*.pyc" |xargs rm -f
- find %{_prefix} -name "*.pyo" |xargs rm -f
- 
  %clean
  rm -rf $RPM_BUILD_ROOT
--- 139,142 ----
***************
*** 279,287 ****
  
  %changelog
  * Sat Oct 25 2003 TC Wan <[EMAIL PROTECTED]>
  - Updated for 1.4-rc2
- 
- * Wed Oct 15 2003 TC Wan <[EMAIL PROTECTED]>
- - Revised for binary package
  
  * Wed Oct  8 2003 TC Wan <[EMAIL PROTECTED]>
--- 177,185 ----
  
  %changelog
+ * Mon Nov  3 2003 TC Wan <[EMAIL PROTECTED]>
+ - Updated for 1.4-rc2 (name change)
+ 
  * Sat Oct 25 2003 TC Wan <[EMAIL PROTECTED]>
  - Updated for 1.4-rc2
  
  * Wed Oct  8 2003 TC Wan <[EMAIL PROTECTED]>

--- freevo-1.4-runtime.patch DELETED ---

--- freevo-src.spec DELETED ---




-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?   SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog

Reply via email to