rpms/mythtv/F-14 mythtv.spec,1.78,1.79 sources,1.50,1.51

[Jarod Wilson]

Author: jarod

Update of /cvs/free/rpms/mythtv/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv32208

Modified Files:
	mythtv.spec sources 
Log Message:
* Wed Nov 03 2010 Jarod Wilson <jarod at redhat.com> 0.24-0.2.rc2
- Update to svn trunk, revision 27095 (post-rc2)
- Add Obsoletes/Provides for nuked mythmovies
- Restore run-with-non-root-backend-capable initscript from F13 branch



Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-14/mythtv.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- mythtv.spec	27 Oct 2010 01:42:32 -0000	1.78
+++ mythtv.spec	4 Nov 2010 03:55:21 -0000	1.79
@@ -80,7 +80,7 @@
 Version: 0.24
 %if "%{branch}" == "trunk"
 #Release: 0.1.svn.%{_svnrev}%{?dist}
-Release: 0.2.rc1%{?dist}
+Release: 0.2.rc2%{?dist}
 %else
 Release: 1%{?dist}
 %endif
@@ -134,9 +134,9 @@
 #Patch0:    mythtv-%{version}-svnfixes.patch
 #Patch1:    mythplugins-%{version}-svnfixes.patch
 Source10:  PACKAGE-LICENSING
-Source101: mythbackend.sysconfig.in
-Source102: mythbackend.init.in
-Source103: mythbackend.logrotate.in
+Source101: mythbackend.sysconfig
+Source102: mythbackend.init
+Source103: mythbackend.logrotate
 Source106: mythfrontend.png
 Source107: mythfrontend.desktop
 Source108: mythtv-setup.png
@@ -559,6 +559,9 @@
 # same deal for mythflix
 Provides: mythflix = %{version}-%{release}
 Obsoletes: mythflix < %{version}-%{release}
+# and now mythmovies
+Provides: mythmovies = %{version}-%{release}
+Obsoletes: mythmovies < %{version}-%{release}
 
 %description common
 MythTV provides a unified graphical interface for recording and viewing
@@ -597,6 +600,7 @@
 #BuildArch:      noarch
 
 Requires:       MySQL-python
+Requires:       PyXML
 
 %description -n python-MythTV
 Provides a python-based interface to interacting with MythTV.
@@ -695,29 +699,6 @@
 %description -n mythgame
 A game frontend (xmame, nes, snes, pc) for MythTV.
 
-################################################################################
-#package -n mythgame-emulators
-#Summary:   Meta-package requiring emulators for game types mythgame knows about
-#Group:     Applications/Multimedia
-#Requires:  mythgame = %{version}-%{release}
-# Multi Arcade Machine Emulator, Amiga, Atari 2600
-#Requires:  sdlmame
-#Requires:  e-uae
-#Requires:  stella
-# Nintendo, Super Nintendo, Nintendo 64
-#Requires:  fceultra
-#Requires:  zsnes
-#Requires:  mupen64, mupen64-ricevideo
-# Sega Genesis, Sega Master System, Game Gear
-#Requires:  gens
-#Requires:  dega-sdl
-#Requires:  osmose
-# TurboGraphx 16 (and others)
-#Requires:  mednafen
-
-#description -n mythgame-emulators
-#Meta-package requiring emulators for game types mythgame knows about.
-
 %endif
 ################################################################################
 %if %{with_mythmusic}
@@ -826,7 +807,7 @@
 Requires:  python-MythTV = %{version}-%{release}
 Requires:  python-pycurl
 Requires:  python >= 2.5
-# Technically, it *does* require this... But its not in the RPM Fusion repos.
+# This is packaged in adobe's yum repo
 #Requires:  flash-plugin
 
 %description -n mythnetvision
@@ -868,25 +849,9 @@
     sed -i -e 's#perl Makefile.PL#%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"#' \
         bindings/perl/Makefile
 
-# Install other source files, and fix pathnames
+# Install other source files
     cp -a %{SOURCE10} %{SOURCE101} %{SOURCE102} %{SOURCE103} .
     cp -a %{SOURCE106} %{SOURCE107} %{SOURCE108} %{SOURCE109} .
-    for file in mythbackend.init \
-                mythbackend.sysconfig \
-                mythbackend.logrotate; do
-        sed -e's|@logdir@|%{_localstatedir}/log|g' \
-            -e's|@rundir@|%{_localstatedir}/run|g' \
-            -e's|@sysconfdir@|%{_sysconfdir}|g' \
-            -e's|@sysconfigdir@|%{_sysconfdir}/sysconfig|g' \
-            -e's|@initdir@|%{_sysconfdir}/init.d|g' \
-            -e's|@bindir@|%{_bindir}|g' \
-            -e's|@sbindir@|%{_sbindir}|g' \
-            -e's|@subsysdir@|%{_localstatedir}/lock/subsys|g' \
-            -e's|@varlibdir@|%{_localstatedir}/lib|g' \
-            -e's|@varcachedir@|%{_localstatedir}/cache|g' \
-            -e's|@logrotatedir@|%{_sysconfdir}/logrotate.d|g' \
-            < $file.in > $file
-    done
 
 # Prevent all of those nasty installs to ../../../../../bin/whatever
 #    echo "QMAKE_PROJECT_DEPTH = 0" >> mythtv.pro
@@ -1397,12 +1362,6 @@
 %dir %{_datadir}/mame/flyers
 %{_datadir}/mythtv/game_settings.xml
 %{_datadir}/mythtv/i18n/mythgame_*.qm
-
-#files -n mythgame-emulators
-#defattr(-,root,root,-)
-#{_datadir}/mythtv/games/xmame
-#{_datadir}/mame/screens
-#{_datadir}/mame/flyers
 %endif
 
 %if %{with_mythmusic}
@@ -1492,6 +1451,11 @@
 ################################################################################
 
 %changelog
+* Wed Nov 03 2010 Jarod Wilson <jarod at redhat.com> 0.24-0.2.rc2
+- Update to svn trunk, revision 27095 (post-rc2)
+- Add Obsoletes/Provides for nuked mythmovies
+- Restore run-with-non-root-backend-capable initscript from F13 branch
+
 * Tue Oct 26 2010 Jarod Wilson <jarod at wilsonet.com> 0.24-0.2.rc1
 - Update to svn trunk, revision 26998 (which is actually post-0.24-rc1)
 


Index: sources
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-14/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sources	27 Oct 2010 01:27:13 -0000	1.50
+++ sources	4 Nov 2010 03:55:21 -0000	1.51
@@ -1,4 +1,4 @@
 be3ab99952c2a3a135a7c4af90b08f15  mythfrontend.png
 be3ab99952c2a3a135a7c4af90b08f15  mythtv-setup.png
-375117962689570c64f43cab37169217  mythplugins-0.24.tar.bz2
-1dc75cd41a7a4ecf6a7e91eff6c60294  mythtv-0.24.tar.bz2
+20588aecd7733500e0a5e33150f1df77  mythtv-0.24.tar.bz2
+4770732400ffa75bb64176c9aa7097fa  mythplugins-0.24.tar.bz2