Author: duncan
Date: Tue Oct 31 04:52:05 2006
New Revision: 8519
Removed:
branches/rel-1-6/freevo/contrib/rpm/CDDB.spec
branches/rel-1-6/freevo/contrib/rpm/Imaging-1.1.4-Setup.in.patch
branches/rel-1-6/freevo/contrib/rpm/Imaging-1.1.4-setup.patch
branches/rel-1-6/freevo/contrib/rpm/Numeric.spec
branches/rel-1-6/freevo/contrib/rpm/PIL.spec
branches/rel-1-6/freevo/contrib/rpm/SDL-1.2.5-dxr3-ffmpeg.patch
branches/rel-1-6/freevo/contrib/rpm/SDL-1.2.5-nokeyboard.patch
branches/rel-1-6/freevo/contrib/rpm/SDL-1.2.6-dxr3-ffmpeg.patch
branches/rel-1-6/freevo/contrib/rpm/SDL-1.2.6-gcc3.patch
branches/rel-1-6/freevo/contrib/rpm/SDL-1.2.6-nokeyboard.patch
branches/rel-1-6/freevo/contrib/rpm/SDL.spec
branches/rel-1-6/freevo/contrib/rpm/SDL_ttf-2.0.6-freevo.patch
branches/rel-1-6/freevo/contrib/rpm/SDL_ttf.spec
branches/rel-1-6/freevo/contrib/rpm/freevo-1.4-xmms.patch
branches/rel-1-6/freevo/contrib/rpm/freevo-cvs.spec
branches/rel-1-6/freevo/contrib/rpm/freevo-runtime-0.1.patch
branches/rel-1-6/freevo/contrib/rpm/freevo-runtime.spec
branches/rel-1-6/freevo/contrib/rpm/freevo-usrlocal.spec
branches/rel-1-6/freevo/contrib/rpm/lsdvd.spec
branches/rel-1-6/freevo/contrib/rpm/pyao.spec
branches/rel-1-6/freevo/contrib/rpm/pylirc.spec
branches/rel-1-6/freevo/contrib/rpm/pyogg.spec
branches/rel-1-6/freevo/contrib/rpm/python-fchksum.spec
branches/rel-1-6/freevo/contrib/rpm/python-twisted.spec
branches/rel-1-6/freevo/contrib/rpm/pyvorbis.spec
Modified:
branches/rel-1-6/freevo/contrib/rpm/freevo.spec
branches/rel-1-6/freevo/contrib/rpm/lcdproc.spec
branches/rel-1-6/freevo/contrib/rpm/mmpython.spec
branches/rel-1-6/freevo/contrib/rpm/pygoom.spec
Log:
Updated specs sent by TC
Cleaned the rpms as requested by TC
Modified: branches/rel-1-6/freevo/contrib/rpm/freevo.spec
==============================================================================
--- branches/rel-1-6/freevo/contrib/rpm/freevo.spec (original)
+++ branches/rel-1-6/freevo/contrib/rpm/freevo.spec Tue Oct 31 04:52:05 2006
@@ -16,33 +16,35 @@
##########################################################################
%define name freevo
-%define version 1.5.0
-%define release 1_fc2
+%define version 1.6.0
+%define release 1.fc5
%define _cachedir /var/cache
%define _logdir /var/log
%define _contribdir /usr/share/freevo/contrib
-%define _docdir /usr/share/doc/%{name}-%{version}
-
+%define _freevosharedir /usr/share/freevo
+%define _localedir /usr/share/locale
Summary: Freevo
Name: %{name}
Version: %{version}
Release: %{release}
Source0: %{name}-%{version}.tar.gz
-#Source0: %{name}-%{version}%{release}.tar.gz
Source1: redhat-boot_config
-Copyright: gpl
+License: gpl
Group: Applications/Multimedia
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-buildroot
+# SVN version
#BuildRequires: docbook-utils, wget
+BuildRequires: pygame, mmpython, python-twisted, python-imaging
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.3, python-game >= 1.5.6, python-imaging >= 1.1.4, PyXML
-Requires: mmpython >= 0.4.5, mx >= 2.0.5, python-numeric >= 23.1,
-Requires: aumix >= 2.8, libjpeg >= 6b, libexif >= 0.5.10
-Requires: python-Twisted >= 1.1.0
-Requires: lsdvd
+Requires: python >= 2.4, pygame >= 1.6, python-imaging >= 1.1.4, PyXML
+Requires: mmpython >= 0.4.10, mx >= 2.0.5, python-numeric >= 23.1,
+Requires: libjpeg >= 6b, libexif >= 0.5.10
+Requires: python-twisted >= 1.3.0
+Requires: lsdvd >= 0.16
+Requires: python-elementtree
Prefix: %{_prefix}
URL: http://freevo.sourceforge.net/
@@ -55,13 +57,6 @@
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
@@ -77,18 +72,20 @@
%prep
rm -rf $RPM_BUILD_ROOT
-#%setup -n freevo-%{version}%{release}
%setup -n freevo-%{version}
%build
find . -name CVS | xargs rm -rf
+find . -name .svn | 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
+# Used for SVN version only
#./autogen.sh
+
env CFLAGS="$RPM_OPT_FLAGS" python setup.py build
mkdir -p %{buildroot}%{_sysconfdir}/freevo
@@ -106,7 +103,7 @@
install -m 755 boot/webserver_init %{buildroot}%{_bindir}/freevo_webserver_init
install -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/freevo/boot_config
-
+# cache and log directories
mkdir -p %{buildroot}%{_logdir}/freevo
mkdir -p %{buildroot}%{_cachedir}/freevo
mkdir -p %{buildroot}%{_cachedir}/freevo/{thumbnails,audio}
@@ -118,32 +115,16 @@
python setup.py install %{?_without_compile_obj:--no-compile} \
--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 %{_docdir}/installation
-%attr(755,root,root) %dir %{_docdir}/plugin_writing
-%attr(755,root,root) %dir %{_contribdir}/fbcon
-%attr(755,root,root) %dir %{_contribdir}/lirc
-%attr(644,root,root) %{_contribdir}/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
-
+# Restructure Docs subdirectories
+mv Docs/installation/html/* Docs/installation
+rm Docs/installation/howto.sgml
+rmdir Docs/installation/html
+mv Docs/plugin_writing/html/* Docs/plugin_writing
+rm Docs/plugin_writing/howto.sgml
+rmdir Docs/plugin_writing/html
%post
# Make backup of old freevo.conf here
@@ -168,8 +149,23 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%files -f INSTALLED_FILES
+%files
%defattr(-,root,root)
+%doc COPYING ChangeLog FAQ INSTALL README local_conf.py.example
+%doc Docs/CREDITS Docs/NOTES Docs/fxd_files.txt Docs/*.dtd Docs/TODO
Docs/plugins Docs/distribution
+%doc Docs/installation Docs/plugin_writing
+%attr(755,root,root) %{_bindir}/freevo
+%{_libdir}/*
+%{_freevosharedir}/*
+%{_localedir}/*
+%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
%files boot
%defattr(644,root,root,755)
@@ -203,43 +199,8 @@
fi
%changelog
-* Mon Jul 19 2004 TC Wan <[EMAIL PROTECTED]>
-- Built 1.5.0 final
-
-* Fri Jul 2 2004 TC Wan <[EMAIL PROTECTED]>
-- Added docs subdir for package cleanup, fixed contrib dir build warnings
-
-* Tue Jun 29 2004 TC Wan <[EMAIL PROTECTED]>
-- Added python-numeric dependency, backup freevo.conf
- just before creating new default copy
-
-* Fri Jun 18 2004 TC Wan <[EMAIL PROTECTED]>
-- Updated for 1.5
-
-* Fri Dec 19 2003 TC Wan <[EMAIL PROTECTED]>
-- Updated for 1.4.1
-
-* 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
-
-* Tue Nov 4 2003 TC Wan <[EMAIL PROTECTED]>
-- Updated for 1.4-rc3 (name change)
-
-* Sat Oct 25 2003 TC Wan <[EMAIL PROTECTED]>
-- Updated for 1.4-rc2
-
-* 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
+* Mon Oct 30 2006 TC Wan <[EMAIL PROTECTED]>
+- Built 1.6.0 for FC5
-* Fri Sep 5 2003 TC Wan <[EMAIL PROTECTED]>
-- Initial SPEC file for python site-packages installation
+* Tue May 2 2006 TC Wan <[EMAIL PROTECTED]>
+- Rebuilt 1.5.4 for FC5
Modified: branches/rel-1-6/freevo/contrib/rpm/lcdproc.spec
==============================================================================
--- branches/rel-1-6/freevo/contrib/rpm/lcdproc.spec (original)
+++ branches/rel-1-6/freevo/contrib/rpm/lcdproc.spec Tue Oct 31 04:52:05 2006
@@ -1,13 +1,13 @@
Summary: LCDproc displays real-time system information on a 20x4 backlit
LCD.
Name: lcdproc
-Version: 0.4.5
-Release: 1_fc2
+Version: 0.5.1
+Release: 1.fc5
License: GPL
Url: http://lcdproc.omnipotent.net
Group: Monitoring
Source: http://lcdproc.omnipotent.net.net/%{name}-%{version}.tar.gz
-Source1: LCDd.init
+#Source1: LCDd.init
BuildRoot: %{_tmppath}/%{name}-buildroot
BuildRequires: ncurses-devel
@@ -31,7 +31,9 @@
%setup -q
-%configure --enable-stat-nfs --enable-stat-smbfs
--enable-drivers=hd44780,lcdm001,mtxorb,cfontz,curses,text,lb216,bayrad,glk,joy,t6963
+##%%configure --enable-stat-nfs --enable-stat-smbfs
--enable-drivers=hd44780,lcdm001,mtxorb,cfontz,curses,text,lb216,bayrad,glk,joy,t6963
+
+%configure
%build
%{__make} CFLAGS="$RPM_OPT_FLAGS"
@@ -43,14 +45,16 @@
# init
install -d $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
-install %SOURCE1 $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/LCDd
+#install %SOURCE1 $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/LCDd
+install scripts/init-LCDd.rpm $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/LCDd
+install scripts/init-lcdproc.rpm
$RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/lcdproc
# conf files
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/lcdproc
-install LCDd.conf $RPM_BUILD_ROOT%{_sysconfdir}/lcdproc/LCDd.conf
-touch scripts/lcdproc.conf
$RPM_BUILD_ROOT%{_sysconfdir}/lcdproc/lcdproc.conf
-echo "-s localhost -p 13666 C M X U P S" > \
- $RPM_BUILD_ROOT%{_sysconfdir}/lcdproc/lcdproc.conf
+#install -d $RPM_BUILD_ROOT%{_sysconfdir}/lcdproc
+#install LCDd.conf $RPM_BUILD_ROOT%{_sysconfdir}/lcdproc/LCDd.conf
+#touch scripts/lcdproc.conf
$RPM_BUILD_ROOT%{_sysconfdir}/lcdproc/lcdproc.conf
+#echo "-s localhost -p 13666 C M X U P S" > \
+# $RPM_BUILD_ROOT%{_sysconfdir}/lcdproc/lcdproc.conf
%if %{?_with_metar:0}%{!?_with_metar:1}
@@ -78,13 +82,16 @@
%files
%defattr(-, root, root, 0755)
%{_bindir}/*
+%dir %{_libdir}/lcdproc
+%{_libdir}/lcdproc/*
%{_sbindir}/*
%{_mandir}/man?/*
-%dir %{_sysconfdir}/lcdproc
-%config(noreplace) %{_sysconfdir}/lcdproc/*
+%dir %{_sysconfdir}/
+%config(noreplace) %{_sysconfdir}/*.conf
%doc README* INSTALL COPYING TODO ChangeLog
%defattr(-, root, root, 0700)
-%config(noreplace) %{_sysconfdir}/rc.d/init.d/LCDd
+%{_sysconfdir}/rc.d/init.d/LCDd
+%{_sysconfdir}/rc.d/init.d/lcdproc
%changelog
Modified: branches/rel-1-6/freevo/contrib/rpm/mmpython.spec
==============================================================================
--- branches/rel-1-6/freevo/contrib/rpm/mmpython.spec (original)
+++ branches/rel-1-6/freevo/contrib/rpm/mmpython.spec Tue Oct 31 04:52:05 2006
@@ -1,33 +1,38 @@
%define name mmpython
-%define version 0.4.4
-%define release 1_fc2
+%define version 0.4.10
+%define release 1.fc5
Summary: Module for retrieving information about media files
Name: %{name}
Version: %{version}
Release: %{release}
Source0: %{name}-%{version}.tar.gz
-Copyright: UNKNOWN
+License: GPL
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-buildroot
+BuildRequires: glibc-devel
+Requires: lsdvd
Prefix: %{_prefix}
Vendor: Thomas Schueppel, Dirk Meyer <[email protected]>
Url: http://mmpython.sf.net
%description
-UNKNOWN
+Module for retrieving information about media files
%prep
%setup
%build
-env CFLAGS="$RPM_OPT_FLAGS" python setup.py build
+env CFLAGS="$RPM_OPT_FLAGS" python setup.py build
%install
-python setup.py install --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES
+python setup.py install --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES
%clean
rm -rf $RPM_BUILD_ROOT
-%files -f INSTALLED_FILES
+%files
%defattr(-,root,root)
+%{_bindir}/*
+%{_libdir}/*
+%doc README COPYING CREDITS
Modified: branches/rel-1-6/freevo/contrib/rpm/pygoom.spec
==============================================================================
--- branches/rel-1-6/freevo/contrib/rpm/pygoom.spec (original)
+++ branches/rel-1-6/freevo/contrib/rpm/pygoom.spec Tue Oct 31 04:52:05 2006
@@ -1,23 +1,26 @@
%define name pygoom
%define version 0.1
-%define release 1_fc2
+%define release 1_fc5
Summary: Goom Bindings for Python
Name: %{name}
Version: %{version}
Release: %{release}
Source0: %{name}.tgz
-Copyright: GPL
+Patch0: %{name}-setup.py.diff
+License: GPL
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-buildroot
Prefix: %{_prefix}
-Requires: SDL, glib
+Requires: SDL, glib, pygame
+BuildRequires: SDL-devel, glib-devel, pygame-devel
%description
Python bindings for Goom.
%prep
%setup -n %{name}
+%patch0 -p0
%configure
@@ -41,5 +44,8 @@
%defattr(-,root,root)
%changelog
+* Wed May 3 2006 TC Wan <[EMAIL PROTECTED]>
+- Rebuilt for FC5
+
* Fri Jun 18 2004 TC Wan <[EMAIL PROTECTED]>
- Initial SPEC file for FC 2
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
