Author: jarod Update of /cvs/free/rpms/mythtv/F-13 In directory se02.es.rpmfusion.net:/tmp/cvs-serv32761 Modified Files: mythtv.spec Added Files: mythbackend.init mythbackend.logrotate mythbackend.sysconfig Removed Files: mythbackend.init.in mythbackend.logrotate.in mythbackend.sysconfig.in Log Message: * Tue Apr 13 2010 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.23-0.6.rc2 - Update to post-rc2 svn snapshot, revision 24129 - Assorted spec file resyncs w/mythtv svn spec --- NEW FILE mythbackend.init --- #!/bin/bash # # Startup script for mythbackend # # chkconfig: - 86 14 # description: mythbackend. # processname: mythbackend # pidfile: /var/run/mythbackend.pid # config: # Source function library. . /etc/init.d/functions if [ -f /etc/sysconfig/mythbackend ]; then . /etc/sysconfig/mythbackend fi ## Defaults, override them in /etc/sysconfig/mythbackend : ${MYTHTV_HOME=/etc/mythtv} binary=/usr/bin/mythbackend prog=mythbackend RETVAL=0 OPTIONS="$OPTIONS --daemon --logfile /var/log/mythtv/$prog.log --pidfile /var/run/$prog.pid" # Would be nice to run as non-root, but it doesn't work -- dvb/v4l devices owned by root become unusable #OPTIONS="$OPTIONS --daemon --user mythtv --logfile /var/log/mythtv/$prog.log --pidfile /var/run/$prog.pid" start() { echo -n $"Starting $prog: " touch /var/run/mythbackend.pid; chown mythtv:mythtv /var/run/mythbackend.pid export MYTHCONFDIR="$MYTHTV_HOME" export HOME="$MYTHTV_HOME" daemon $binary $OPTIONS RETVAL=$? echo [ $RETVAL = 0 ] && touch /var/lock/subsys/$prog return $RETVAL } stop() { echo -n $"Stopping $prog: " killproc $binary RETVAL=$? echo [ $RETVAL = 0 ] && rm -f /var/lock/subsys/$prog /var/run/$prog.pid } # See how we were called. case "$1" in start) start ;; stop) stop ;; reload|restart) stop start ;; status) status $prog RETVAL=$? ;; *) echo $"Usage: $prog {start|stop|status|restart}" exit 1 esac exit $RETVAL --- NEW FILE mythbackend.logrotate --- /var/log/mythtv/mythbackend.log { notifempty missingok compress compresscmd /usr/bin/bzip2 uncompresscmd /usr/bin/bunzip2 compressext .bz2 weekly rotate 4 size 10M postrotate /bin/kill -HUP `cat /var/run/mythbackend.pid 2>/dev/null` 2> /dev/null || true endscript } --- NEW FILE mythbackend.sysconfig --- #MYTHTV_HOME=/etc/mythtv #OPTIONS= Index: mythtv.spec =================================================================== RCS file: /cvs/free/rpms/mythtv/F-13/mythtv.spec,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- mythtv.spec 14 Apr 2010 04:00:03 -0000 1.74 +++ mythtv.spec 14 Apr 2010 04:03:52 -0000 1.75 @@ -65,7 +65,7 @@ %define desktop_vendor RPMFusion # SVN Revision number and branch ID -%define _svnrev r24030 +%define _svnrev r24129 %define branch trunk # @@ -80,7 +80,7 @@ Version: 0.23 %if "%{branch}" == "trunk" #Release: 0.1.svn.%{_svnrev}%{?dist} -Release: 0.5.rc2%{?dist} +Release: 0.6.rc2%{?dist} %else Release: 1%{?dist} %endif @@ -135,9 +135,9 @@ #Patch1: mythplugins-%{version}-svnfixes.patch Patch2: mythtv-version.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 @@ -857,25 +857,9 @@ sed -i -e 's#perl Makefile.PL#%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"#' \ bindings/perl/perl.pro -# 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&#39;s|@initdir(a)|%{_sysconfdir}/init.d|g&#39; \ - -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&#39;s|@logrotatedir(a)|%{_sysconfdir}/logrotate.d|g&#39; \ - < $file.in > $file - done # Prevent all of those nasty installs to ../../../../../bin/whatever # echo "QMAKE_PROJECT_DEPTH = 0" >> mythtv.pro @@ -957,7 +941,10 @@ --enable-libtheora --enable-libvorbis \ --enable-libxvid \ %if %{with_vdpau} - --enable-vdpau \ + --enable-vdpau \ +%endif +%if !%{with_xvmc} + --disable-xvmcw \ %endif %if !%{with_xvmc} --disable-xvmcw \ @@ -1493,6 +1480,10 @@ ################################################################################ %changelog +* Tue Apr 13 2010 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.23-0.6.rc2 +- Update to post-rc2 svn snapshot, revision 24129 +- Assorted spec file resyncs w/mythtv svn spec + * Thu Apr 08 2010 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.23-0.5.rc2 - Update to post-rc2 svn snapshot, revision 24030 - Should fix some recording issues when using both inputs --- mythbackend.init.in DELETED --- --- mythbackend.logrotate.in DELETED --- --- mythbackend.sysconfig.in DELETED ---