Ticket #9452: 9452-build_myth_sh-mythtv_spec.patch

File 9452-build_myth_sh-mythtv_spec.patch, 24.4 KB (added by David Knight <dlknight@…>, 13 years ago)

Patch to update build_myth.sh and mythtv.spec to include fixes from 0.25 version and move to github.

  • rpm/build_myth.sh 

    From 7081f2da6dedbd2a4a08fa112861aaa57ee8a45e Mon Sep 17 00:00:00 2001
From: David Knight <dlknight@sdf.lonestar.org>
Date: Thu, 6 Jan 2011 23:06:28 +0000
Subject: [PATCH] Update of build_myth.sh and mythtv.spec for move to github see ticket #9452

---
 rpm/build_myth.sh |  175 ++++++++++++++++++++++++++++-------------------------
 rpm/mythtv.spec   |  176 +++++++++++++++++++++++------------------------------
 2 files changed, 170 insertions(+), 181 deletions(-)

diff --git a/rpm/build_myth.sh b/rpm/build_myth.sh
index b7e9134..9cf8a71 100755
    a b  
    55#
    66# by:   Chris Petersen <rpm@forevermore.net>
    77#
    8 # The latest version of this file can be found in mythtv svn:
     8# The latest version of this file can be found in mythtv git repository:
    99#
    10 # http://svn.mythtv.org/svn/trunk/packaging/rpm/build_myth.sh $
     10# https://github.com/MythTV/packaging/tree/fixes/0.24/rpm/build_myth.sh
    1111#
    1212# See --help for usage instructions.
    1313#
    … …  
    2828# Hard-code the version of MythTV
    2929    VERSION="0.24"
    3030
    31 # Branch should be "trunk" or "stable"
    32     BRANCH="trunk"
     31# Branch should be "master" or "stable"
     32    BRANCH="master"
    3333
    34 # Hard-code the svn checkout directory.  Leave blank to auto-detect based on
     34# Hard-code the git clone directory.  Leave blank to auto-detect based on
    3535# the location of this script
    36     SVNDIR=""
     36    GITDIR=""
    3737
    3838###############################################################################
    3939# Functions to be used by the program
    … … $PROG --revision REVISION 
    6666EOF
    6767    }
    6868
    69 # Update to the latest/requested SVN version
    70     function updatesvn {
    71         PKG="$1"
    72         REV="$2"
    73         if [ -z "$REV" -o 0"$REV" -lt 1 ]; then
    74             echo "Updating svn checkout for $PKG"
    75             REL=`svn up "$SVNDIR"/"$PKG" 2>/dev/null`
    76         else
    77             echo "Updating svn checkout for $PKG to r$REV"
    78             REL=`svn up -r "$REV" "$SVNDIR"/"$PKG" 2>/dev/null`
    79         fi
    80         if [ $? != 0 ]; then
    81             echo "Problem updating svn checkout"
    82             return $?
    83         fi
    84         REL=`echo "$REL" | grep -i revision | sed -e 's/[^0-9]\\+//g'`
    85         echo "Updated to SVN Revision $REL"
    86     }
    87 
    8869# Update the requested spec to the requested revision/branch/version
    8970    function updatespec {
    9071        R="$1"
    9172        SPEC="$2"
    92         echo "Updating $SPEC _svnver to r$R"
     73        echo "Updating $SPEC _gitver to r$R"
    9374        sed -i \
    94             -e "s,define _svnrev .\+,define _svnrev r$R," \
     75            -e "s,define _gitrev .\+,define _svnrev r$R," \
    9576            -e "s,define branch .\+,define branch $BRANCH,"  \
    9677            -e "s,Version:.\+,Version: $VERSION,"             \
    9778            $SPEC
    … … EOF 
    9980
    10081# Function to build mythtv packages
    10182    function buildmyth {
    102     # Update the SVN checkout
    103         updatesvn mythtv "$1"
    104         updatesvn mythplugins "$1"
    10583    # Remove the existing mythtv-devel so it doesn't confuse qmake
    10684    # (we can't override the order of the include file path)
    10785        PKG=`rpm -q mythtv-devel`
    … … EOF 
    10987            echo "Removing existing mythtv-devel package to avoid conflicts"
    11088            sudo rpm -e mythtv-devel.i386 mythtv-devel.x86_64 2>/dev/null
    11189        fi
    112     # Update the spec
    113         updatespec $REL "$ABSPATH/mythtv.spec"
    11490    # Clean up any old tarballs that might exist
    11591        rm -f "$ABSPATH"/mythtv/myth*.tar.bz2
    11692    # Create the appropriate tarballs
    117         echo "Creating tarballs from svn checkout at $SVNDIR"
    118         cd "$SVNDIR"
     93        echo "Creating tarballs from git clones at $GITDIR"
    11994        for file in mythtv mythplugins; do
    120             if [ -d "$file-$VERSION" ]; then
    121                 rm -rf "$file-$VERSION"
    122             fi
    123             echo -n "    "
    124             mv "$file" "$file-$VERSION"
    125             tar jcf "$ABSPATH/mythtv/$file-$VERSION.tar.bz2" --exclude .svn "$file-$VERSION"
    126             mv "$file-$VERSION" "$file"
    127             echo "$ABSPATH/mythtv/$file-$VERSION.tar.bz2"
     95            git archive --format tar --remote "$GITDIR"/ HEAD "$file"/ | bzip2 > "$ABSPATH/mythtv/$file-$GITVER.tar.bz2"
     96            echo "$ABSPATH/mythtv/$file-$GITVER.tar.bz2"
    12897        done
    12998    # Build MythTV
    130         rpmbuild -bb "$ABSPATH"/mythtv.spec \
     99        time rpmbuild -bb "$ABSPATH"/mythtv.spec \
    131100            --define "_sourcedir $ABSPATH/mythtv" \
    132101            --with debug            \
    133102            --without mytharchive   \
    … … EOF 
    141110            return
    142111        fi
    143112    # Install
    144         echo -n "Install r$REL? [n] "
     113        echo -n "Install $VSTRING? [n] "
    145114        read INST
    146115        if [ "$INST" = "y" -o "$INST" = "Y" -o "$INST" = "yes" ]; then
    147             installmyth "$REL"
     116            installmyth "$VSTRING"
    148117        else
    149             echo "If you wish to install later, just run: $PROG --install \"$REL\""
     118            echo "If you wish to install later, just run: $PROG --install \"$VSTRING\""
    150119        fi
    151120    }
    152121
    … … EOF 
    160129        rm -f "$ABSPATH"/mythtv-themes/*themes*.tar.bz2
    161130    # Create the appropriate tarballs
    162131        for file in myththemes themes; do
    163             if [ -d "$file-$VERSION" ]; then
    164                 rm -rf "$file-$VERSION"
     132            if [ -d "$file-$GITVER" ]; then
     133                rm -rf "$file-$GITVER"
    165134            fi
    166135            echo -n "    "
    167             mv "$file" "$file-$VERSION"
    168             tar jcf "$ABSPATH/mythtv-themes/$file-$VERSION.tar.bz2" --exclude .svn "$file-$VERSION"
    169             mv "$file-$VERSION" "$file"
    170             echo "$ABSPATH/mythtv-themes/$file-$VERSION.tar.bz2"
     136            mv "$file" "$file-$GITVER"
     137            tar jcf "$ABSPATH/mythtv-themes/$file-$GITVER.tar.bz2" --exclude .svn "$file-$GITVER"
     138            mv "$file-$GITVER" "$file"
     139            echo "$ABSPATH/mythtv-themes/$file-$GITVER.tar.bz2"
    171140        done
    172141    # Disabled until I can clean this up later -- themes now require mythtv-libs in
    173142    # order to compile.
    … … EOF 
    183152
    184153# A function to install mythtv packages
    185154    function installmyth {
    186         REL="$1"
    187155        sudo rpm -Uvh --force --nodeps                                                   \
    188             /usr/src/redhat/RPMS/x86_64/mythtv-docs-$VERSION-0.1.svn.r$REL.*.rpm         \
    189             /usr/src/redhat/RPMS/x86_64/mythtv-libs-$VERSION-0.1.svn.r$REL.*.rpm             \
    190             /usr/src/redhat/RPMS/x86_64/mythtv-devel-$VERSION-0.1.svn.r$REL.*.rpm       \
    191             /usr/src/redhat/RPMS/x86_64/mythtv-base-themes-$VERSION-0.1.svn.r$REL.*.rpm  \
    192             /usr/src/redhat/RPMS/x86_64/mythtv-frontend-$VERSION-0.1.svn.r$REL.*.rpm     \
    193             /usr/src/redhat/RPMS/x86_64/mythtv-backend-$VERSION-0.1.svn.r$REL.*.rpm      \
    194             /usr/src/redhat/RPMS/x86_64/mythtv-setup-$VERSION-0.1.svn.r$REL.*.rpm        \
    195             /usr/src/redhat/RPMS/x86_64/mythtv-common-$VERSION-0.1.svn.r$REL.*.rpm       \
    196             /usr/src/redhat/RPMS/x86_64/perl-MythTV-$VERSION-0.1.svn.r$REL.*.rpm         \
    197             /usr/src/redhat/RPMS/x86_64/python-MythTV-$VERSION-0.1.svn.r$REL.*.rpm       \
    198             /usr/src/redhat/RPMS/x86_64/mythmusic-$VERSION-0.1.svn.r$REL.*.rpm           \
    199             /usr/src/redhat/RPMS/x86_64/mythbrowser-$VERSION-0.1.svn.r$REL.*.rpm         \
    200             /usr/src/redhat/RPMS/x86_64/mythnetvision-$VERSION-0.1.svn.r$REL.*.rpm       \
    201             /usr/src/redhat/RPMS/x86_64/mythvideo-$VERSION-0.1.svn.r$REL.*.rpm           \
    202             /usr/src/redhat/RPMS/x86_64/mythweather-$VERSION-0.1.svn.r$REL.*.rpm         \
    203             /usr/src/redhat/RPMS/x86_64/mythtv-debuginfo-$VERSION-0.1.svn.r$REL.*.rpm
    204             #/usr/src/redhat/RPMS/x86_64/mythtv-themes-$VERSION-0.1.svn.r$REL.*.rpm  \
     156            /usr/src/redhat/RPMS/x86_64/mythtv-docs-$GITVER-0.1.git.$GITREV.*.rpm         \
     157            /usr/src/redhat/RPMS/x86_64/mythtv-libs-$GITVER-0.1.git.$GITREV.*.rpm             \
     158            /usr/src/redhat/RPMS/x86_64/mythtv-devel-$GITVER-0.1.git.$GITREV.*.rpm       \
     159            /usr/src/redhat/RPMS/x86_64/mythtv-base-themes-$GITVER-0.1.git.$GITREV.*.rpm  \
     160            /usr/src/redhat/RPMS/x86_64/mythtv-frontend-$GITVER-0.1.git.$GITREV.*.rpm     \
     161            /usr/src/redhat/RPMS/x86_64/mythtv-backend-$GITVER-0.1.git.$GITREV.*.rpm      \
     162            /usr/src/redhat/RPMS/x86_64/mythtv-setup-$GITVER-0.1.git.$GITREV.*.rpm        \
     163            /usr/src/redhat/RPMS/x86_64/mythtv-common-$GITVER-0.1.git.$GITREV.*.rpm       \
     164            /usr/src/redhat/RPMS/x86_64/perl-MythTV-$GITVER-0.1.git.$GITREV.*.rpm         \
     165            /usr/src/redhat/RPMS/x86_64/python-MythTV-$GITVER-0.1.git.$GITREV.*.rpm       \
     166            /usr/src/redhat/RPMS/x86_64/mythmusic-$GITVER-0.1.git.$GITREV.*.rpm           \
     167            /usr/src/redhat/RPMS/x86_64/mythbrowser-$GITVER-0.1.git.$GITREV.*.rpm         \
     168            /usr/src/redhat/RPMS/x86_64/mythnetvision-$GITVER-0.1.git.$GITREV.*.rpm       \
     169            /usr/src/redhat/RPMS/x86_64/mythvideo-$GITVER-0.1.git.$GITREV.*.rpm           \
     170            /usr/src/redhat/RPMS/x86_64/mythweather-$GITVER-0.1.git.$GITREV.*.rpm         \
     171            /usr/src/redhat/RPMS/x86_64/mythtv-debuginfo-$GITVER-0.1.git.$GITREV.*.rpm
     172            #/usr/src/redhat/RPMS/x86_64/mythtv-themes-$GITVER-0.1.git.$GITREV.*.rpm  \
    205173    }
    206174
    207175# And a function to install mythtv theme packages, since they need mythtv-libs
    … … EOF 
    236204    done
    237205
    238206# Auto-detect the source directory?
    239     if [ -z "$SVNDIR" ]; then
    240         SVNDIR=$(dirname $(dirname "$ABSPATH"))
    241     elif [ ! -d "$SVNDIR" ]; then
    242         echo "$SVNDIR does not exist.  Please check out using:"
    243         echo "    svn co http://svn.mythtv.org/svn/trunk/ $SVNDIR"
     207    if [ -z "$GITDIR" ]; then
     208        GITDIR=$(dirname $(dirname "$ABSPATH"))/mythtv
     209    fi
     210    if [ ! -d "$GITDIR" ]; then
     211        echo "$GITDIR does not exist.  Please check out using:"
     212        echo "    git clone -b fixes/0.24 https://github.com/MythTV/mythtv"
    244213        exit
    245214    fi
    246215
    … … EOF 
    264233            REV="$1"
    265234    esac
    266235
    267 # Sanity check
    268     if [ `expr "$REV" : "[^0-9]"` -ne 0 ]; then
    269         echo "Invalid revision:  $REV"
     236# Make sure our git clone is up to date
     237    echo "Fetching latest information from git repository."
     238    cd "$GITDIR"
     239    git fetch
     240    git fetch --tags
     241
     242# Get information about the latest/requested Git sha
     243    if [[ $REV ]]; then
     244        DESCRIBE=`git describe "$REV" -- 2>/dev/null`
     245    else
     246        DESCRIBE=`git describe -- 2>/dev/null`
     247    fi
     248    if [[ ! $DESCRIBE ]]; then
     249        echo "Unknown/Invalid revision:  $REV"
    270250        exit
    271251    fi
     252    GITVER=`echo "$DESCRIBE" | sed -e 's,^\([^-]\+\)-.\+$,\1,'`
     253    GITREV=`echo "$DESCRIBE" | sed -e 's,^[^-]\+-,,' -e 's,-,.,'`
     254    # do some magic here to detect v, b, or pre notations
     255    if [[ $GITVER =~ pre$ ]]; then
     256        GITVER=${GITVER#v}
     257        GITVER=${GITVER%pre}
     258    elif [[ $GITVER =~ ^v ]]; then
     259        GITVER=${GITVER#v}
     260        GITREV=1
     261    elif [[ $GITVER =~ ^b ]]; then
     262        GITVER=0.$((${GITVER#b0.}+1))
     263        GITREV="0.$GITREV"
     264    fi
     265    VSTRING="$GITVER.$GITREV"
     266
     267# Done doing that, now back to the working dir
     268    cd - >/dev/null
    272269
    273270# What to do now?
    274     if [ -z "$REV" ]; then
    275         echo "Building latest revision"
     271    if [[ ! $REV ]]; then
     272        echo "Building $VSTRING (latest revision)"
    276273    else
    277         echo "Building Revision:  $REV"
     274        echo "Building $VSTRING"
    278275    fi
    279     buildmyth "$REV"
     276
     277# Update the revision in the specfile
     278    echo "Updating mythtv.spec _gitver to $VSTRING"
     279    sed -i \
     280        -e "s,define _gitrev .\+,define _gitrev $GITREV," \
     281        -e "s,define branch .\+,define branch $BRANCH,"   \
     282        -e "s,define vers_string .\+,define vers_string $DESCRIBE,"   \
     283        -e "s,Version:.\+,Version: $GITVER,"              \
     284        mythtv.spec
     285
     286# Update the other spec files to the MythTV spec version
     287    # later...
     288
     289# Build MythTV
     290    buildmyth
    280291
    281292# Done
    282293    exit

  • rpm/mythtv.spec 

    diff --git a/rpm/mythtv.spec b/rpm/mythtv.spec
index 1dd2c72..a663cd1 100644
    a b  
    11#
    2 # Specfile for building MythTV and MythPlugins RPMs from a subversion checkout.
     2# Specfile for building MythTV and MythPlugins RPMs from a git checkout.
    33#
    44# by:   Chris Petersen <rpm@forevermore.net>
    55#       Jarod Wilson <jarod@wilsonet.com>
    … …  
    1111#
    1212# The latest canonical upstream version of this file can be found at:
    1313#
    14 #     http://svn.mythtv.org/svn/trunk/packaging/rpm/mythtv.spec
     14#     https://github.com/MythTV/packaging/tree/fixes/0.24/rpm
    1515#
    1616# The latest RPM Fusion version can be found at:
    1717#
    … …  
    5353# --without mythvideo
    5454# --without mythweather
    5555# --without mythzoneminder
    56 # --without mythweb
    5756#
    5857
    5958################################################################################
    … …  
    6463# The vendor name we should attribute the aforementioned entries to
    6564%define desktop_vendor  xris
    6665
    67 # SVN Revision number and branch ID
    68 %define _svnrev r25992
    69 %define branch trunk
     66# MythTV Version string -- preferably the output from git --describe
     67%define vers_string v0.24-93-g2f3a2f8
     68
     69# Git Revision number and branch ID
     70%define _gitrev 1
     71%define branch master
    7072
    7173#
    7274# Basic descriptive tags for this package:
    … … Group: Applications/Multimedia 
    7880
    7981# Version/Release info
    8082Version: 0.24
    81 %if "%{branch}" == "trunk"
    82 Release: 0.1.svn.%{_svnrev}%{?dist}
     83%if "%{branch}" == "master"
     84Release: 0.1.git.%{_gitrev}%{?dist}
    8385%else
    8486Release: 1%{?dist}
    8587%endif
    … … License: GPLv2+ and LGPLv2+ and LGPLv2 and (GPLv2 or QPL) and (GPLv2+ or LGPLv2+ 
    120122%define with_mythnews       %{?_without_mythnews:       0} %{!?_without_mythnews:        1}
    121123%define with_mythvideo      %{?_without_mythvideo:      0} %{!?_without_mythvideo:       1}
    122124%define with_mythweather    %{?_without_mythweather:    0} %{!?_without_mythweather:     1}
    123 %define with_mythweb        %{?_without_mythweb:        0} %{!?_without_mythweb:         1}
    124125%define with_mythzoneminder %{?_without_mythzoneminder: 0} %{!?_without_mythzoneminder:  1}
    125126%define with_mythnetvision  %{?_without_mythnetvision:  0} %{!?_without_mythnetvision:   1}
    126127
    … … Source107: mythfrontend.desktop 
    137138Source108: mythtv-setup.png
    138139Source109: mythtv-setup.desktop
    139140Source110: mysql.txt
    140 Source401: mythweb.conf
    141141
    142142BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
    143143
    … … This package contains components needed by multiple other MythTV components. 
    559559
    560560################################################################################
    561561
     562%package -n mythffmpeg
     563Summary: MythTV build of FFmpeg
     564Group: Applications/Multimedia
     565
     566%description -n mythffmpeg
     567Several MythTV utilities interact with FFmpeg, which changes its parameters
     568often enough to make it a hassle to support the variety of versions used by
     569MythTV users.  This is a snapshot of the FFmpeg code so that MythTV utilities
     570can interact with a known verion.
     571
     572################################################################################
     573
    562574%if %{with_perl}
    563575
    564576%package -n perl-MythTV
    … … Requires: mythnews = %{version}-%{release} 
    613625Requires:  mythbrowser    = %{version}-%{release}
    614626Requires:  mytharchive    = %{version}-%{release}
    615627Requires:  mythzoneminder = %{version}-%{release}
    616 Requires:  mythweb        = %{version}-%{release}
    617628Requires:  mythnetvision  = %{version}-%{release}
    618629
    619630%description -n mythplugins
    … … A MythTV module that displays a weather forecast. 
    771782
    772783%endif
    773784################################################################################
    774 %if %{with_mythweb}
    775 
    776 %package -n mythweb
    777 Summary:   The web interface to MythTV
    778 Group:     Applications/Multimedia
    779 Requires:  httpd >= 1.3.26
    780 Requires:  php >= 5.1
    781 Requires:  php-mysql
    782 # php-process is broken out from main php package in Fedora 11 and later
    783 %if 0%{?fedora} >= 11
    784 Requires:  php-process
    785 %endif
    786 
    787 %description -n mythweb
    788 The web interface to MythTV.
    789 
    790 %endif
    791 ################################################################################
    792785%if %{with_mythzoneminder}
    793786
    794787%package -n mythzoneminder
    … … on demand content. 
    842835
    843836##### MythTV
    844837
    845 cd mythtv-%{version}
     838cd mythtv
     839
     840# Set the mythtv --version string
     841    cat > VERSION <<EOF
     842SOURCE_VERSION=%{vers_string}
     843BRANCH=%{branch}
     844EOF
    846845
    847846# Drop execute permissions on contrib bits, since they'll be %doc
    848847    find contrib/ -type f -exec chmod -x "{}" \;
    … … cd .. 
    874873##### MythPlugins
    875874%if %{with_plugins}
    876875
    877 cd mythplugins-%{version}
     876cd mythplugins
    878877
    879878# Fix /mnt/store -> /var/lib/mythmusic
    880879    cd mythmusic
    … … cd mythplugins-%{version} 
    886885    sed -i -e 's,/share/Movies/dvd,%{_localstatedir}/lib/mythvideo,' mythvideo/globalsettings.cpp
    887886    cd ..
    888887
    889 # Fix up permissions for MythWeb
    890     cd mythweb
    891     chmod -R g-w ./*
    892     cd ..
    893 
    894888# Add execute bits to mythvideo python helper scripts
    895889    find mythvideo/mythvideo/scripts/ -name '*.py' -exec chmod +x "{}" \;
    896890
    897 # Remove unwanted execute bits from php mythweb files
    898     find mythweb/ -name '*.php' -exec chmod -x "{}" \;
    899 
    900891# And back to the compile root
    901892cd ..
    902893
    … … cd .. 
    907898%build
    908899
    909900# First, we build MythTV
    910 cd mythtv-%{version}
     901cd mythtv
    911902
    912903# Similar to 'percent' configure, but without {_target_platform} and
    913904# {_exec_prefix} etc... MythTV no longer accepts the parameters that the
    … … cd mythtv-%{version} 
    978969    --enable-debug
    979970
    980971# Insert rpm version-release for mythbackend --version output
    981     sed -i -e 's,###SOURCE_VERSION###,%{version}-%{release} (%_svnrev),' version.sh
     972    sed -i -e 's,###SOURCE_VERSION###,%{version}-%{release} (%_gitrev),' version.sh
    982973
    983974# Make
    984975    make %{?_smp_mflags}
    … … cd mythtv-%{version} 
    987978    cd ..
    988979    mkdir temp
    989980    temp=`pwd`/temp
    990     make -C mythtv-%{version} install INSTALL_ROOT=$temp
     981    make -C mythtv install INSTALL_ROOT=$temp
    991982    export LD_LIBRARY_PATH=$temp%{_libdir}:$LD_LIBRARY_PATH
    992983
    993984# Next, we build the plugins
    994985%if %{with_plugins}
    995 cd mythplugins-%{version}
     986cd mythplugins
    996987
    997988# Fix things up so they can find our "temp" install location for mythtv-libs
    998989    echo "QMAKE_PROJECT_DEPTH = 0" >> settings.pro
    … … cd mythplugins-%{version} 
    10811072    rm -rf %{buildroot}
    10821073
    10831074# First, install MythTV
    1084 cd mythtv-%{version}
     1075cd mythtv
    10851076
    10861077    make install INSTALL_ROOT=%{buildroot}
    10871078
    … … cd mythtv-%{version} 
    11261117
    11271118# MythPlugins
    11281119%if %{with_plugins}
    1129 cd mythplugins-%{version}
     1120cd mythplugins
    11301121
    11311122    make install INSTALL_ROOT=%{buildroot}
    11321123
    … … cd mythplugins-%{version} 
    11541145        %{buildroot}%{_datadir}/mythtv/games/PC/gamelist.xml
    11551146%endif
    11561147
    1157 %if %{with_mythweb}
    1158     cd mythweb
    1159     mkdir -p %{buildroot}%{_datadir}/mythweb
    1160     cp -a * %{buildroot}%{_datadir}/mythweb/
    1161     mkdir -p %{buildroot}%{_datadir}/mythweb/{image_cache,php_sessions}
    1162 
    1163     mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
    1164     cp %{SOURCE401} %{buildroot}%{_sysconfdir}/httpd/conf.d/
    1165 # drop .htaccess file, settings handled in the above
    1166     rm -f %{buildroot}%{_datadir}/mythweb/data/.htaccess
    1167     cd ..
    1168 %endif
    1169 
    11701148# And back to the build/install root
    11711149    cd ..
    11721150%endif
    … … fi 
    12031181
    12041182%files docs
    12051183%defattr(-,root,root,-)
    1206 %doc mythtv-%{version}/README* mythtv-%{version}/UPGRADING
    1207 %doc mythtv-%{version}/AUTHORS mythtv-%{version}/COPYING mythtv-%{version}/FAQ
    1208 %doc mythtv-%{version}/database mythtv-%{version}/keys.txt
    1209 %doc mythtv-%{version}/docs/*.html mythtv-%{version}/docs/*.png
    1210 %doc mythtv-%{version}/docs/*.txt mythtv-%{version}/contrib
    1211 %doc mythtv-%{version}/PACKAGE-LICENSING
     1184%doc mythtv/README* mythtv/UPGRADING
     1185%doc mythtv/AUTHORS mythtv/COPYING mythtv/FAQ
     1186%doc mythtv/database mythtv/keys.txt
     1187%doc mythtv/docs/*.html mythtv/docs/*.png
     1188%doc mythtv/docs/*.txt mythtv/contrib
     1189%doc %{_datadir}/mythtv/fonts/*.txt
     1190%doc mythtv/PACKAGE-LICENSING
    12121191
    12131192%files common
    12141193%defattr(-,root,root,-)
    … … fi 
    12921271%dir %{_datadir}/mythtv/build
    12931272%{_datadir}/mythtv/build/settings.pro
    12941273
     1274%files -n mythffmpeg
     1275%defattr(-,root,root,-)
     1276%{_bindir}/mythffmpeg
     1277%{_bindir}/mythffplay
     1278
    12951279%if %{with_perl}
    12961280%files -n perl-MythTV
    12971281%defattr(-,root,root,-)
    … … fi 
    13161300%if %{with_plugins}
    13171301%files -n mythplugins
    13181302%defattr(-,root,root,-)
    1319 %doc mythplugins-%{version}/COPYING
     1303%doc mythplugins/COPYING
    13201304
    13211305%if %{with_mytharchive}
    13221306%files -n mytharchive
    13231307%defattr(-,root,root,-)
    1324 %doc mythplugins-%{version}/mytharchive/AUTHORS
    1325 %doc mythplugins-%{version}/mytharchive/COPYING
    1326 %doc mythplugins-%{version}/mytharchive/README
    1327 %doc mythplugins-%{version}/mytharchive/TODO
     1308%doc mythplugins/mytharchive/AUTHORS
     1309%doc mythplugins/mytharchive/COPYING
     1310%doc mythplugins/mytharchive/README
     1311%doc mythplugins/mytharchive/TODO
    13281312%{_bindir}/mytharchivehelper
    13291313%{_libdir}/mythtv/plugins/libmytharchive.so
    13301314%{_datadir}/mythtv/archivemenu.xml
    … … fi 
    13361320%if %{with_mythbrowser}
    13371321%files -n mythbrowser
    13381322%defattr(-,root,root,-)
    1339 %doc mythplugins-%{version}/mythbrowser/AUTHORS
    1340 %doc mythplugins-%{version}/mythbrowser/COPYING
    1341 %doc mythplugins-%{version}/mythbrowser/README
     1323%doc mythplugins/mythbrowser/AUTHORS
     1324%doc mythplugins/mythbrowser/COPYING
     1325%doc mythplugins/mythbrowser/README
    13421326%{_libdir}/mythtv/plugins/libmythbrowser.so
    13431327%{_datadir}/mythtv/i18n/mythbrowser_*.qm
    13441328%endif
    … … fi 
    13461330%if %{with_mythgallery}
    13471331%files -n mythgallery
    13481332%defattr(-,root,root,-)
    1349 %doc mythplugins-%{version}/mythgallery/AUTHORS
    1350 %doc mythplugins-%{version}/mythgallery/COPYING
    1351 %doc mythplugins-%{version}/mythgallery/README
     1333%doc mythplugins/mythgallery/AUTHORS
     1334%doc mythplugins/mythgallery/COPYING
     1335%doc mythplugins/mythgallery/README
    13521336%{_libdir}/mythtv/plugins/libmythgallery.so
    13531337%{_datadir}/mythtv/i18n/mythgallery_*.qm
    13541338%{_localstatedir}/lib/pictures
    … … fi 
    13771361%if %{with_mythmusic}
    13781362%files -n mythmusic
    13791363%defattr(-,root,root,-)
    1380 %doc mythplugins-%{version}/mythmusic/AUTHORS
    1381 %doc mythplugins-%{version}/mythmusic/COPYING
    1382 %doc mythplugins-%{version}/mythmusic/README
     1364%doc mythplugins/mythmusic/AUTHORS
     1365%doc mythplugins/mythmusic/COPYING
     1366%doc mythplugins/mythmusic/README
    13831367%{_libdir}/mythtv/plugins/libmythmusic.so
    13841368%{_localstatedir}/lib/mythmusic
    13851369%{_datadir}/mythtv/musicmenu.xml
    … … fi 
    13901374%if %{with_mythnews}
    13911375%files -n mythnews
    13921376%defattr(-,root,root,-)
    1393 %doc mythplugins-%{version}/mythnews/AUTHORS
    1394 %doc mythplugins-%{version}/mythnews/COPYING
    1395 %doc mythplugins-%{version}/mythnews/README
     1377%doc mythplugins/mythnews/AUTHORS
     1378%doc mythplugins/mythnews/COPYING
     1379%doc mythplugins/mythnews/README
    13961380%{_libdir}/mythtv/plugins/libmythnews.so
    13971381%{_datadir}/mythtv/mythnews
    13981382%{_datadir}/mythtv/i18n/mythnews_*.qm
    … … fi 
    14011385%if %{with_mythvideo}
    14021386%files -n mythvideo
    14031387%defattr(-,root,root,-)
    1404 %doc mythplugins-%{version}/mythvideo/COPYING
    1405 %doc mythplugins-%{version}/mythvideo/README*
     1388%doc mythplugins/mythvideo/COPYING
     1389%doc mythplugins/mythvideo/README*
    14061390%{_libdir}/mythtv/plugins/libmythvideo.so
    14071391%{_datadir}/mythtv/mythvideo
    14081392%{_datadir}/mythtv/i18n/mythvideo_*.qm
    … … fi 
    14141398%if %{with_mythweather}
    14151399%files -n mythweather
    14161400%defattr(-,root,root,-)
    1417 %doc mythplugins-%{version}/mythweather/AUTHORS
    1418 %doc mythplugins-%{version}/mythweather/COPYING
    1419 %doc mythplugins-%{version}/mythweather/README
     1401%doc mythplugins/mythweather/AUTHORS
     1402%doc mythplugins/mythweather/COPYING
     1403%doc mythplugins/mythweather/README
    14201404%{_libdir}/mythtv/plugins/libmythweather.so
    14211405%{_datadir}/mythtv/i18n/mythweather_*.qm
    14221406%{_datadir}/mythtv/weather_settings.xml
    … … fi 
    14241408%{_datadir}/mythtv/mythweather/*
    14251409%endif
    14261410
    1427 %if %{with_mythweb}
    1428 %files -n mythweb
    1429 %defattr(-,root,root,-)
    1430 %doc mythplugins-%{version}/mythweb/README
    1431 %config(noreplace) %{_sysconfdir}/httpd/conf.d/mythweb.conf
    1432 %defattr(-,apache,apache,0775)
    1433 %dir %{_datadir}/mythweb
    1434 %{_datadir}/mythweb/*
    1435 %endif
    1436 
    14371411%if %{with_mythzoneminder}
    14381412%files -n mythzoneminder
    14391413%defattr(-,root,root,-)
    … … fi 
    14461420%if %{with_mythnetvision}
    14471421%files -n mythnetvision
    14481422%defattr(-,root,root,-)
    1449 %doc mythplugins-%{version}/mythnetvision/AUTHORS
    1450 %doc mythplugins-%{version}/mythnetvision/ChangeLog
    1451 %doc mythplugins-%{version}/mythnetvision/README
     1423%doc mythplugins/mythnetvision/AUTHORS
     1424%doc mythplugins/mythnetvision/ChangeLog
     1425%doc mythplugins/mythnetvision/README
    14521426%{_bindir}/mythfillnetvision
    14531427%{_libdir}/mythtv/plugins/libmythnetvision.so
    14541428%{_datadir}/mythtv/mythnetvision
    … … fi 
    14611435################################################################################
    14621436
    14631437%changelog
     1438* Thu Jan 06 2011 David Knight <dlknight@sdf.lonestar.org> 0.24-0.1.git
     1439- Split out mythweb
     1440- Update for Git
     1441
    14641442* Sat Aug 28 2010 Jarod Wilson <jarod@wilsonet.com> 0.24-0.1.svn
    14651443- Fix up perl bindings
    14661444- Enable crystalhd support