Update of /cvsroot/freevo/freevo/contrib/rpm
In directory sc8-pr-cvs1:/tmp/cvs-serv25648
Modified Files:
freevo-core-suite.spec freevo-deps.txt
freevo-recording-suite.spec freevo.spec python-twisted.spec
Added Files:
freevo-1.4-xmms.patch
Log Message:
Updated files for 1.4 final release
--- NEW FILE: freevo-1.4-xmms.patch ---
--- freevo-1.4/src/audio/xmms.py 2003-11-17 01:41:04.000000000 +0800
+++ freevo/src/audio/xmms.py 2003-11-22 16:54:22.000000000 +0800
@@ -2,13 +2,16 @@
# -----------------------------------------------------------------------
# xmmsaudioplayer.py - Play music using XMMS
# -----------------------------------------------------------------------
-# $Id: freevo-1.4-xmms.patch,v 1.1 2003/11/22 10:04:37 tcwan Exp $
+# $Id: freevo-1.4-xmms.patch,v 1.1 2003/11/22 10:04:37 tcwan Exp $
#
# Notes: Not working right now
# Todo: Integrate xmms to the new clode layout
#
# -----------------------------------------------------------------------
# $Log: freevo-1.4-xmms.patch,v $
# Revision 1.1 2003/11/22 10:04:37 tcwan
# Updated files for 1.4 final release
#
+# Revision 1.6 2003/11/20 21:46:05 outlyer
+# Missing bracket, prevents this file from being loaded.
+#
# Revision 1.5 2003/11/16 17:41:04 dischi
# i18n patch from David Sagnol
#
@@ -324,7 +327,7 @@
self.mode = mode # setting global var to mode.
self.repeat = repeat # Repeat playlist setting
- globals.skin.PopupBox(_'Lanching xmms.'))
+ globals.skin.PopupBox(_('Lanching xmms.'))
self.set_mixer_levels()
self.thread.mode = constants.playmode
Index: freevo-core-suite.spec
===================================================================
RCS file: /cvsroot/freevo/freevo/contrib/rpm/freevo-core-suite.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** freevo-core-suite.spec 3 Nov 2003 08:09:26 -0000 1.6
--- freevo-core-suite.spec 22 Nov 2003 10:04:37 -0000 1.7
***************
*** 1,5 ****
%define freevoname freevo
%define freevover 1.4
! %define freevorel 3_freevo
##############################################################################
Summary: Meta-package for Freevo core functionality
--- 1,5 ----
%define freevoname freevo
%define freevover 1.4
! %define freevorel 4_freevo
##############################################################################
Summary: Meta-package for Freevo core functionality
***************
*** 13,20 ****
Requires: smpeg >= 0.4.4, freetype >= 2.1.4, util-linux
Requires: python >= 2.2, python-game >= 1.5.6, python-imaging >= 1.1.4, PyXML
! Requires: mmpython, python-mx-base >= 2.0.4,
Requires: aumix >= 2.8, libjpeg >= 6b, libexif >= 0.5.10
! Requires: python-twisted >= 1.0.7
Requires: %{freevoname}
--- 13,21 ----
Requires: smpeg >= 0.4.4, freetype >= 2.1.4, util-linux
Requires: python >= 2.2, python-game >= 1.5.6, python-imaging >= 1.1.4, PyXML
! Requires: mmpython >= 0.3, python-mx-base >= 2.0.4,
Requires: aumix >= 2.8, libjpeg >= 6b, libexif >= 0.5.10
! Requires: python-Twisted >= 1.1.0
Requires: %{freevoname}
+ BuildArch: noarch
Index: freevo-deps.txt
===================================================================
RCS file: /cvsroot/freevo/freevo/contrib/rpm/freevo-deps.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** freevo-deps.txt 3 Nov 2003 08:09:26 -0000 1.6
--- freevo-deps.txt 22 Nov 2003 10:04:37 -0000 1.7
***************
*** 88,92 ****
python-twisted http://twistedmatrix.com/products/download
! [1.0.7, RPMs available from freevo downloads]
libexif http://freshrpms.net/
--- 88,92 ----
python-twisted http://twistedmatrix.com/products/download
! [1.1.0, RPMs available from freevo downloads]
libexif http://freshrpms.net/
Index: freevo-recording-suite.spec
===================================================================
RCS file: /cvsroot/freevo/freevo/contrib/rpm/freevo-recording-suite.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** freevo-recording-suite.spec 3 Nov 2003 08:09:26 -0000 1.4
--- freevo-recording-suite.spec 22 Nov 2003 10:04:37 -0000 1.5
***************
*** 1,5 ****
%define freevoname freevo
%define freevover 1.4
! %define freevorel 3_freevo
##############################################################################
Summary: Meta-package for Freevo recording functionality
--- 1,5 ----
%define freevoname freevo
%define freevover 1.4
! %define freevorel 4_freevo
##############################################################################
Summary: Meta-package for Freevo recording functionality
***************
*** 11,19 ****
URL: http://freevo.sourceforge.net/
Requires: freevo-core-suite
! Requires: python-twisted >= 1.0.7
Requires: vorbis-tools, libvorbis, lame, cdparanoia
Requires: mp1e >= 1.9.3
#Requires: ffmpeg >= 0.4.7
Requires: %{freevoname}
--- 11,20 ----
URL: http://freevo.sourceforge.net/
Requires: freevo-core-suite
! Requires: python-Twisted >= 1.1.0
Requires: vorbis-tools, libvorbis, lame, cdparanoia
Requires: mp1e >= 1.9.3
#Requires: ffmpeg >= 0.4.7
Requires: %{freevoname}
+ BuildArch: noarch
Index: freevo.spec
===================================================================
RCS file: /cvsroot/freevo/freevo/contrib/rpm/freevo.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** freevo.spec 11 Nov 2003 05:38:00 -0000 1.9
--- freevo.spec 22 Nov 2003 10:04:37 -0000 1.10
***************
*** 18,24 ****
%define name freevo
%define version 1.4
! %define release rc4
%define _cachedir /var/cache
%define _logdir /var/log
--- 18,26 ----
%define name freevo
%define version 1.4
! %define release 1_rh9
%define _cachedir /var/cache
%define _logdir /var/log
+ %define _contribdir /usr/share/freevo/contrib
+ %define _docdir /usr/share/doc/%{name}-%{version}
***************
*** 27,38 ****
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/
--- 29,47 ----
Version: %{version}
Release: %{release}
! Source0: %{name}-%{version}.tar.gz
! #Source0: %{name}-%{version}%{release}.tar.gz
Source1: redhat-boot_config
! Patch0: freevo-%{version}-xmms.patch
Copyright: gpl
Group: Applications/Multimedia
+ BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-buildroot
#BuildRequires: docbook-utils, wget
+ Requires: SDL >= 1.2.6, SDL_image >= 1.2.3, SDL_ttf >= 2.0.6, SDL_mixer >= 1.2.5
+ Requires: smpeg >= 0.4.4, freetype >= 2.1.4, util-linux
+ Requires: python >= 2.2, python-game >= 1.5.6, python-imaging >= 1.1.4, PyXML
+ Requires: mmpython >= 0.3, python-mx-base >= 2.0.4,
+ Requires: aumix >= 2.8, libjpeg >= 6b, libexif >= 0.5.10
+ Requires: python-Twisted >= 1.1.0
Prefix: %{_prefix}
URL: http://freevo.sourceforge.net/
***************
*** 69,76 ****
%prep
rm -rf $RPM_BUILD_ROOT
! %setup -n freevo-%{version}%{release}
! #%setup -n freevo
! #%patch0 -p1
%build
--- 78,85 ----
%prep
rm -rf $RPM_BUILD_ROOT
! #%setup -n freevo-%{version}%{release}
! %setup -n freevo-%{version}
! %patch0 -p1
%build
***************
*** 112,118 ****
--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
%attr(755,root,root) %dir %{_sysconfdir}/freevo
%attr(777,root,root) %dir %{_logdir}/freevo
--- 121,135 ----
--root=$RPM_BUILD_ROOT --record=INSTALLED_FILES
+ install -m 644 local_conf.py.example %{buildroot}%{_docdir}
+
+ mkdir -p %{buildroot}%{_contribdir}/lirc
+ cp -av contrib/lirc %{buildroot}%{_contribdir}
+
cat >>INSTALLED_FILES <<EOF
! #%doc BUGS COPYING ChangeLog FAQ INSTALL README TODO Docs local_conf.py.example
! #%doc contrib/lirc
! %attr(644,root,root) %{_docdir}/local_conf.py.example
! %attr(755,root,root) %dir %{_contribdir}/lirc
! %attr(644,root,root) %{_contribdir}/*
%attr(755,root,root) %dir %{_sysconfdir}/freevo
%attr(777,root,root) %dir %{_logdir}/freevo
***************
*** 177,180 ****
--- 194,200 ----
%changelog
+ * Sat Nov 22 2003 TC Wan <[EMAIL PROTECTED]>
+ - Updated for 1.4 final
+
* Tue Nov 11 2003 TC Wan <[EMAIL PROTECTED]>
- Updated for 1.4-rc4
Index: python-twisted.spec
===================================================================
RCS file: /cvsroot/freevo/freevo/contrib/rpm/python-twisted.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** python-twisted.spec 17 Sep 2003 09:15:28 -0000 1.2
--- python-twisted.spec 22 Nov 2003 10:04:37 -0000 1.3
***************
*** 3,7 ****
Summary: Event-based framework for internet applications
Name: python-twisted
! Version: 1.0.7
Release: 1_freevo
Source0: Twisted-%{version}.tar.bz2
--- 3,7 ----
Summary: Event-based framework for internet applications
Name: python-twisted
! Version: 1.1.0
Release: 1_freevo
Source0: Twisted-%{version}.tar.bz2
***************
*** 10,13 ****
--- 10,14 ----
URL: http://www.twistedmatrix.com/
BuildRoot: %{_tmppath}/%{name}-buildroot
+ Provides: python-Twisted
Prefix: %{_prefix}
-------------------------------------------------------
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
