Author: jarod Update of /cvs/free/rpms/mythtv/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv29700 Modified Files: mythtv.spec sources Added Files: mythtv-version.patch Removed Files: mythplugins-0.22-svnfixes.patch myththemes-0.22-svnfixes.patch mythtv-0.20-mythstreammenu.diff Log Message: * Mon Mar 01 2010 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.23-0.1.svn.r23630 - Update to svn trunk, revision 23630 - Make mythbackend --version actually print useful stuff now (like pkg ver) mythtv-version.patch: version.sh | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) --- NEW FILE mythtv-version.patch --- Index: mythtv/version.sh =================================================================== --- mythtv/version.sh (revision 23627) +++ mythtv/version.sh (working copy) @@ -23,29 +23,14 @@ SVNREPOPATH=$(echo $2 | sed -e 's,.*/svn/,,' \ -e 's,/mythtv/version\.pro.*,,' \ -e 's,/version\.pro.*,,') -SOURCE_VERSION=$(svnversion ${SVNTREEDIR} 2>/dev/null || echo Unknown) +SOURCE_VERSION="###SOURCE_VERSION###" -case "${SOURCE_VERSION}" in - exported|Unknown) - if test -e $SVNTREEDIR/VERSION ; then - . $SVNTREEDIR/VERSION - fi - ;; -esac - # Get a string like "0.21.20071125-1" BINARY_VERSION=$(grep MYTH_BINARY_VERSION \ - "${SVNTREEDIR}/libs/libmythdb/mythversion.h" \ + "${SVNTREEDIR}/libs/libmythdb/mythversion.h" \ | sed -e 's/.*MYTH_BINARY_VERSION //') -echo "#include \"mythexp.h\"" > .vers.new -echo "const MPUBLIC char *myth_source_version = \"${SOURCE_VERSION}\";" >> .vers.new -echo "const MPUBLIC char *myth_source_path = \"${SVNREPOPATH}\";" >> .vers.new -echo "const MPUBLIC char *myth_binary_version = ${BINARY_VERSION};" >> .vers.new - -# check if the version strings are changed and update version.pro if necessary -diff .vers.new version.cpp > .vers.diff 2>&1 -if test -s .vers.diff ; then - mv -f .vers.new version.cpp -fi -rm -f .vers.new .vers.diff +echo "#include \"mythexp.h\"" > version.cpp +echo "const MPUBLIC char *myth_source_version = \"${SOURCE_VERSION}\";" >> version.cpp +echo "const MPUBLIC char *myth_source_path = \"${SVNREPOPATH}\";" >> version.cpp +echo "const MPUBLIC char *myth_binary_version = ${BINARY_VERSION};" >> version.cpp Index: mythtv.spec =================================================================== RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- mythtv.spec 22 Feb 2010 21:45:30 -0000 1.67 +++ mythtv.spec 1 Mar 2010 20:46:28 -0000 1.68 @@ -65,7 +65,7 @@ %define desktop_vendor RPMFusion # SVN Revision number and branch ID -%define _svnrev r23586 +%define _svnrev r23630 %define branch trunk # @@ -133,6 +133,7 @@ #Patch0: mythtv-%{version}-svnfixes.patch Source1: http://www.mythtv.org/mc/mythplugins-%{version}.tar.bz2 #Patch1: mythplugins-%{version}-svnfixes.patch +Patch2: mythtv-version.patch Source10: PACKAGE-LICENSING Source101: mythbackend.sysconfig.in Source102: mythbackend.init.in @@ -836,6 +837,7 @@ cd mythtv-%{version} #patch0 -p1 +%patch2 -p1 # Drop execute permissions on contrib bits, since they'll be %doc find contrib/ -type f -exec chmod -x "{}" \; @@ -983,8 +985,7 @@ --enable-debug # Insert rpm version-release for mythbackend --version output - find . -name version.pro -exec sed -i -e 's,myth_binary_version = \$\${BINARY_VERSION},myth_binary_version = %{version}-%{release} (%{_svnrev}),g' {} \; - find . -name version.pro -exec sed -i -e 's,svnversion \$\${SVNTREEDIR},echo "%{version}-%{release}",g' {} \; + sed -i -e 's,###SOURCE_VERSION###,%{version}-%{release} (%_svnrev),' version.sh # Make make %{?_smp_mflags} @@ -1481,6 +1482,10 @@ ################################################################################ %changelog +* Mon Mar 01 2010 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.23-0.1.svn.r23630 +- Update to svn trunk, revision 23630 +- Make mythbackend --version actually print useful stuff now (like pkg ver) + * Mon Feb 22 2010 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.23-0.1.svn.r23586 - Update to svn trunk, revision 23586 - Attempt to fix implicit link issue w/XvMCW Index: sources =================================================================== RCS file: /cvs/free/rpms/mythtv/devel/sources,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- sources 22 Feb 2010 21:45:30 -0000 1.41 +++ sources 1 Mar 2010 20:46:28 -0000 1.42 @@ -1,4 +1,4 @@ be3ab99952c2a3a135a7c4af90b08f15 mythfrontend.png be3ab99952c2a3a135a7c4af90b08f15 mythtv-setup.png -8872e80c1424c7cca49662f0f254d6ad mythplugins-0.23.tar.bz2 -6586ee47c3ab4bf7076e753b607d3521 mythtv-0.23.tar.bz2 +37550a0d0a40debb015b1983a8b5f1a2 mythtv-0.23.tar.bz2 +a1a18200cfd4fb1c37187255f3c9f5c4 mythplugins-0.23.tar.bz2 --- mythplugins-0.22-svnfixes.patch DELETED --- --- myththemes-0.22-svnfixes.patch DELETED --- --- mythtv-0.20-mythstreammenu.diff DELETED ---