- based on original spec, it builds now, still needs work

Changed files:
    freevo.spec -> 1.2

diff --git a/freevo.spec b/freevo.spec
index a43aca261458a269c5c73fdcd38aec84943f569a..071588915f86bdc5ca1f015e835c9f13173121d1 100644 (file)
--- a/freevo.spec
+++ b/freevo.spec
@@ -2,34 +2,33 @@
 %define display  x11
 %define tv_norm  pal
 %define chanlist europe-west
-Summary:        Freevo
-Name:          freevo
-Version:       1.5.0
-Release:       1
-Source0:       http://dl.sourceforge.net/freevo/freevo-1.5.0.tar.gz
-Source1:       freevo-boot_config
-License:       GPL
-Group:                 Applications/Multimedia
-BuildArch:     noarch
-BuildRequires:  docbook-utils
-Requires:      SDL_image >= 1.2.3
-Requires:      SDL_ttf >= 2.0.6
-Requires:      SDL_mixer >= 1.2.5
-Requires:      smpeg >= 0.4.4
-Requires:      util-linux
-Requires:      python-game >= 1.5.6
-Requires:      python-imaging >= 1.1.4
+
+Summary:       Freevo
+Name:          freevo
+Version:       1.5.0
+Release:       1
+Source0:       http://dl.sourceforge.net/freevo/%{name}-%{version}.tar.gz
+Source1:       %{name}-boot_config
+License:       GPL
+Group:         Applications/Multimedia
+BuildArch:     noarch
+Requires:      aumix >= 2.8
+Requires:      lsdvd
+BuildRequires: docbook-utils
+BuildRequires: SDL_image >= 1.2.3
+BuildRequires: SDL_ttf >= 2.0.6
+BuildRequires: SDL_mixer >= 1.2.5
+BuildRequires: python-pygame >= 1.5.6
+BuildRequires: python-Imaging >= 1.1.4
 BuildRequires: python-PyXML
-BuildRequires:         python-mmpython >= 0.4.4
-Requires:      mx >= 2.0.5
-Requires:      python-numeric >= 23.1
-Requires:      aumix >= 2.8 
-Requires:      libjpeg >= 6b
-Requires:      libexif >= 0.5.10
-Requires:      python-Twisted >= 1.1.0
-Requires:      lsdvd
-URL:            http://freevo.sourceforge.net/
-BuildRoot:      %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+BuildRequires: python-mmpython >= 0.4.4
+BuildRequires: python-mx-Tools >= 2.0.5
+BuildRequires: python-numpy >= 23.1
+BuildRequires: libjpeg-devel >= 6b
+BuildRequires: libexif-devel >= 0.5.10
+BuildRequires: python-Twisted >= 1.1.0
+URL:           http://freevo.sourceforge.net/
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 Freevo is a Linux application that turns a PC with a TV capture card
@@ -38,9 +37,9 @@ other applications such as xine, mplayer, tvtime and mencoder to play
 and record video and audio.
 
 %package boot
-Summary: Files to enable a standalone Freevo system (started from initscript)
-Group: Applications/Multimedia
-Requires:       %{name}
+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
@@ -48,11 +47,12 @@ 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.
+Note: This installs the initscripts necessary for a standalone Freevo
+system.
 
 %prep
 rm -rf $RPM_BUILD_ROOT
-%setup -q 
+%setup -q
 
 %build
 find . -name CVS | xargs rm -rf
@@ -63,7 +63,7 @@ find . -name "*.py" |xargs chmod 644
 
 #./autogen.sh
 
-env CFLAGS="$RPM_OPT_FLAGS" python setup.py build
+env CFLAGS="%{rpmcflags}" python setup.py build
 
 mkdir -p %{buildroot}%{_sysconfdir}/freevo
 # The following is needed to let RPM know that the files should be backed up
@@ -81,69 +81,58 @@ 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}/var/log/freevo
+mkdir -p %{buildroot}/var/cache/freevo
+mkdir -p %{buildroot}/var/cache/freevo/{thumbnails,audio}
+mkdir -p %{buildroot}/var/cache/xmltv/logos
+chmod 777 %{buildroot}/var/cache/{freevo,freevo/thumbnails,freevo/audio,xmltv,xmltv/logos}
+chmod 777 %{buildroot}/var/log/freevo
 
 %install
+rm -rf $RPM_BUILD_ROOT
 python setup.py install \
                --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES
 
-install -m 644 local_conf.py.example %{buildroot}%{_docdir}
+install local_conf.py.example %{buildroot}%{_docdir}
 
-mkdir -p %{buildroot}%{_contribdir}/lirc
-cp -av contrib/lirc %{buildroot}%{_contribdir}
-
-#%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
+install -d %{buildroot}%{_datadir}/freevo/contrib/lirc
+cp -av contrib/lirc %{buildroot}%{_datadir}/freevo/contrib
+%find_lang %{name}
 
 %post
 
 # Copy old local_conf.py to replace dummy file
 %{_bindir}/freevo setup --geometry=%{geometry} --display=%{display} \
-        --tv=%{tv_norm} --chanlist=%{chanlist} 
+        --tv=%{tv_norm} --chanlist=%{chanlist}
 
-%preun
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files 
+%files -f %{name}.lang
+%defattr(644,root,root,755)
 %doc BUGS COPYING ChangeLog FAQ INSTALL README TODO Docs local_conf.py.example
-%doc contrib/lirc 
+%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 %{_docdir}/installation
+#%attr(755,root,root) %dir %{_docdir}/plugin_writing
+%attr(755,root,root) %dir %{_datadir}/freevo/contrib/fbcon
+%attr(755,root,root) %dir %{_datadir}/freevo/contrib/lirc
+%attr(644,root,root) %{_datadir}/freevo/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(777,root,root) %dir /var/log/freevo
+%attr(777,root,root) %dir /var/cache/freevo
+%attr(777,root,root) %dir /var/cache/freevo/audio
+%attr(777,root,root) %dir /var/cache/freevo/thumbnails
+%attr(777,root,root) %dir /var/cache/xmltv
+%attr(777,root,root) %dir /var/cache/xmltv/logos
 %attr(644,root,root) %config(noreplace) %{_sysconfdir}/freevo/freevo.conf
 #%attr(644,root,root) %config(noreplace) %{_sysconfdir}/freevo/record_config.py
+%attr(644,root,root) %{py_scriptdir}/site-packages/freevo/
+%attr(755,root,root) %{_bindir}/*
+%attr(644,root,root) %{_datadir}/freevo
+%attr(644,root,root) %{_datadir}/fxd/webradio.fxd
+
 
 %files boot
 %defattr(644,root,root,755)