Update of /cvsroot/freevo/freevo/contrib/TatChee_RPM_Specs
In directory sc8-pr-cvs1:/tmp/cvs-serv5597
Modified Files:
freevo-cvs.spec
Log Message:
Merged release and CVS spec files into a single file
Index: freevo-cvs.spec
===================================================================
RCS file: /cvsroot/freevo/freevo/contrib/TatChee_RPM_Specs/freevo-cvs.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** freevo-cvs.spec 18 Feb 2003 03:16:54 -0000 1.11
--- freevo-cvs.spec 25 Feb 2003 07:22:01 -0000 1.12
***************
*** 1,22 ****
%define geometry 800x600
%define display x11
%define tv_norm pal
%define chanlist europe-west
! %define runtimever 4
! %define _cvsdate %(date +%Y%m%d)
Summary: Freevo
Name: freevo
! Version: 1.3.2
! Release: CVS%{_cvsdate}
License: GPL
Group: Applications/Multimedia
Source:
http://freevo.sourceforge.net/%{name}-%{version}-%{_cvsdate}.tar.gz
! #Patch0: %{name}-%{version}-runtime.patch
! #Patch1: %{name}-%{version}-Makefile.patch
URL: http://freevo.sourceforge.net/
Requires: freevo-runtime >= %{runtimever}
Requires: freevo-apps
! Requires: libjpeg
BuildRequires: freevo-runtime >= %{runtimever}
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(id -u -n)
--- 1,62 ----
+ %define _cvsdate %(date +%Y%m%d)
+
+ ##########################################################################
+ # Set the following variables for each new build
+ %define freevover 1.3.2
+ %define freevorel CVS%{_cvsdate}
+ %define runtimever 4.01
+
+ # Set default freevo parameters
%define geometry 800x600
%define display x11
+ %define _us_defaults 0
+ ##########################################################################
+
+ %if %{_us_defaults}
+ %define tv_norm ntsc
+ %define chanlist us-cable
+ %else
%define tv_norm pal
%define chanlist europe-west
! %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 %{cvsrelease} | grep -cv 1)
!
Summary: Freevo
Name: freevo
! Version: %{freevover}
! Release: %{freevorel}
License: GPL
Group: Applications/Multimedia
+ %if %{cvsrelease}
Source:
http://freevo.sourceforge.net/%{name}-%{version}-%{_cvsdate}.tar.gz
! %endif
! %if %{prerelease}
! Source:
http://freevo.sourceforge.net/%{name}-%{version}-%{freevorel}.tar.gz
! %endif
! %if %{realrelease}
! Source: http://freevo.sourceforge.net/%{name}-%{version}.tar.gz
! %endif
!
URL: http://freevo.sourceforge.net/
Requires: freevo-runtime >= %{runtimever}
Requires: freevo-apps
! #Requires: libjpeg
! %if %{includeruntime}
! Patch0: %{name}-%{version}-runtime.patch
! Patch1: %{name}-%{version}-Makefile.patch
! %else
BuildRequires: freevo-runtime >= %{runtimever}
+ %endif
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(id -u -n)
***************
*** 33,50 ****
%prep
%setup -n %{name}
! #%setup -n %{name}-%{version}
! #%patch0 -p0
! #%patch1 -p0
%build
find . -name CVS | xargs rm -rf
! mv runtime runtime-src
! ln -s %{_prefix}/runtime .
make clean; make
- #pushd plugins/cddb
- # make
- #popd
pushd src/games/rominfo
make
--- 73,99 ----
%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
!
make clean; make
pushd src/games/rominfo
make
***************
*** 54,88 ****
--tv=%{tv_norm} --chanlist=%{chanlist}
! #%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 libraries. It also contains the Freevo external
! #applications. Right now that is MPlayer, cdparanoia and lame.
! #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: freevo-runtime >= %{runtimever}
! #AutoReqProv: no
! #%description apps
! #This directory contains the Freevo external applications.
! #Right now that is MPlayer, cdparanoia and lame.
! #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.
%package boot
--- 103,138 ----
--tv=%{tv_norm} --chanlist=%{chanlist}
! %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
! 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 libraries. It also contains the Freevo external
! applications. Right now that is MPlayer, cdparanoia and lame.
! 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: freevo-runtime >= %{runtimever}
! AutoReqProv: no
! %description apps
! This directory contains the Freevo external applications.
! Right now that is MPlayer, cdparanoia and lame.
! 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
***************
*** 110,120 ****
mkdir -p %{buildroot}%{_prefix}
mkdir -p %{buildroot}%{_prefix}/fbcon/matroxset
! mkdir -p %{buildroot}%{_prefix}/{boot,helpers,rc_client}
! #mkdir -p %{buildroot}%{_prefix}/{runtime/apps,runtime/dll,runtime/lib}
mkdir -p
%{buildroot}%{_prefix}/src/{audio/eyed3,games/rominfo,gui,image,tv,video/plugins,www/bin,www/htdocs/images,www/htdocs/scripts,www/htdocs/styles}
mkdir -p %{buildroot}%{_prefix}/plugins/weather/icons
! mkdir -p %{buildroot}%{_prefix}/skins/{fonts,icons,images/aubin,main1,xml/type1}
mkdir -p %{buildroot}%{_prefix}/skins/{aubin1,barbieri,dischi1,krister1,malt1}
! mkdir -p %{buildroot}%{_prefix}/skins/icons/{AquaFusion,gnome,misc,old}
mkdir -p %{buildroot}%{_sysconfdir}/freevo
mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d
--- 160,173 ----
mkdir -p %{buildroot}%{_prefix}
mkdir -p %{buildroot}%{_prefix}/fbcon/matroxset
! mkdir -p %{buildroot}%{_prefix}/{boot,contrib/lirc,helpers,rc_client}
! %if %{includeruntime}
! mkdir -p %{buildroot}%{_prefix}/{runtime/apps,runtime/dll,runtime/lib}
! %endif
mkdir -p
%{buildroot}%{_prefix}/src/{audio/eyed3,games/rominfo,gui,image,tv,video/plugins,www/bin,www/htdocs/images,www/htdocs/scripts,www/htdocs/styles}
mkdir -p %{buildroot}%{_prefix}/plugins/weather/icons
! mkdir -p %{buildroot}%{_prefix}/skins/{fonts,icons,images,main1,xml/type1}
! mkdir -p %{buildroot}%{_prefix}/skins/images/{aubin,status}
mkdir -p %{buildroot}%{_prefix}/skins/{aubin1,barbieri,dischi1,krister1,malt1}
! mkdir -p %{buildroot}%{_prefix}/skins/icons/{AquaFusion/mimetypes,gnome,misc,old}
mkdir -p %{buildroot}%{_sysconfdir}/freevo
mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d
***************
*** 129,144 ****
install -m 755 helpers/*.pl %{buildroot}%{_prefix}/helpers
install -m 755 helpers/*.py %{buildroot}%{_prefix}/helpers
- #install -m 755 plugins/cddb/*.py plugins/cddb/cdrom.so
%{buildroot}%{_prefix}/plugins/cddb
install -m 644 plugins/weather/*.py plugins/weather/librarydoc.txt
%{buildroot}%{_prefix}/plugins/weather
install -m 644 plugins/weather/icons/*.png
%{buildroot}%{_prefix}/plugins/weather/icons
install -m 644 rc_client/*.py %{buildroot}%{_prefix}/rc_client
! #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
install -m 644 src/*.py %{buildroot}%{_prefix}/src
--- 182,198 ----
install -m 755 helpers/*.pl %{buildroot}%{_prefix}/helpers
install -m 755 helpers/*.py %{buildroot}%{_prefix}/helpers
install -m 644 plugins/weather/*.py plugins/weather/librarydoc.txt
%{buildroot}%{_prefix}/plugins/weather
install -m 644 plugins/weather/icons/*.png
%{buildroot}%{_prefix}/plugins/weather/icons
install -m 644 rc_client/*.py %{buildroot}%{_prefix}/rc_client
! %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
install -m 644 src/*.py %{buildroot}%{_prefix}/src
***************
*** 161,180 ****
install -m 644 skins/fonts/* %{buildroot}%{_prefix}/skins/fonts
! install -m 644 skins/icons/AquaFusion/* %{buildroot}%{_prefix}/skins/icons/AquaFusion
install -m 644 skins/icons/misc/* %{buildroot}%{_prefix}/skins/icons/misc
install -m 644 skins/icons/gnome/* %{buildroot}%{_prefix}/skins/icons/gnome
install -m 644 skins/icons/old/* %{buildroot}%{_prefix}/skins/icons/old
! install -m 644 skins/images/*.png skins/images/*.jpg
%{buildroot}%{_prefix}/skins/images
install -m 644 skins/images/aubin/* %{buildroot}%{_prefix}/skins/images/aubin
install -m 644 skins/main1/* %{buildroot}%{_prefix}/skins/main1
install -m 644 skins/xml/type1/* %{buildroot}%{_prefix}/skins/xml/type1
install -m 644 skins/aubin1/* %{buildroot}%{_prefix}/skins/aubin1
install -m 644 skins/barbieri/* %{buildroot}%{_prefix}/skins/barbieri
install -m 644 skins/malt1/* %{buildroot}%{_prefix}/skins/malt1
install -m 644 freevo.conf local_conf.py boot/boot_config
%{buildroot}%{_sysconfdir}/freevo
install -m 644 boot/URC-7201B00 %{buildroot}%{_prefix}/boot
! install -m755 boot/freevo %{buildroot}%{_sysconfdir}/rc.d/init.d
! install -m755 boot/freevo_dep %{buildroot}%{_sysconfdir}/rc.d/init.d
--- 215,238 ----
install -m 644 skins/fonts/* %{buildroot}%{_prefix}/skins/fonts
! install -m 644 skins/icons/AquaFusion/*.png skins/icons/AquaFusion/AquaFusion_Icons*
%{buildroot}%{_prefix}/skins/icons/AquaFusion
! install -m 644 skins/icons/AquaFusion/mimetypes/*
%{buildroot}%{_prefix}/skins/icons/AquaFusion/mimetypes
install -m 644 skins/icons/misc/* %{buildroot}%{_prefix}/skins/icons/misc
install -m 644 skins/icons/gnome/* %{buildroot}%{_prefix}/skins/icons/gnome
install -m 644 skins/icons/old/* %{buildroot}%{_prefix}/skins/icons/old
! install -m 644 skins/images/*.png %{buildroot}%{_prefix}/skins/images
install -m 644 skins/images/aubin/* %{buildroot}%{_prefix}/skins/images/aubin
+ install -m 644 skins/images/status/* %{buildroot}%{_prefix}/skins/images/status
install -m 644 skins/main1/* %{buildroot}%{_prefix}/skins/main1
install -m 644 skins/xml/type1/* %{buildroot}%{_prefix}/skins/xml/type1
install -m 644 skins/aubin1/* %{buildroot}%{_prefix}/skins/aubin1
install -m 644 skins/barbieri/* %{buildroot}%{_prefix}/skins/barbieri
+ install -m 644 skins/dischi1/* %{buildroot}%{_prefix}/skins/dischi1
install -m 644 skins/malt1/* %{buildroot}%{_prefix}/skins/malt1
install -m 644 freevo.conf local_conf.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/lirc/* %{buildroot}%{_prefix}/contrib/lirc
***************
*** 216,238 ****
%attr(644,root,root) %doc BUGS ChangeLog COPYING FAQ INSTALL README TODO Docs/*
! #%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
! #%files apps
! #%defattr(755,root,root,755)
! #%{_prefix}/runtime/apps/cdparanoia
! #%{_prefix}/runtime/apps/lame
! #%{_prefix}/runtime/apps/mplayer
%files boot
--- 274,300 ----
%attr(644,root,root) %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
! %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/mplayer
! %endif
%files boot
***************
*** 269,272 ****
--- 331,337 ----
%changelog
+ * 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
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
