From 7081f2da6dedbd2a4a08fa112861aaa57ee8a45e Mon Sep 17 00:00:00 2001 From: David Knight 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/rpm/build_myth.sh +++ b/rpm/build_myth.sh @@ -5,9 +5,9 @@ # # by: Chris Petersen # -# The latest version of this file can be found in mythtv svn: +# The latest version of this file can be found in mythtv git repository: # -# http://svn.mythtv.org/svn/trunk/packaging/rpm/build_myth.sh $ +# https://github.com/MythTV/packaging/tree/fixes/0.24/rpm/build_myth.sh # # See --help for usage instructions. # @@ -28,12 +28,12 @@ # Hard-code the version of MythTV VERSION="0.24" -# Branch should be "trunk" or "stable" - BRANCH="trunk" +# Branch should be "master" or "stable" + BRANCH="master" -# Hard-code the svn checkout directory. Leave blank to auto-detect based on +# Hard-code the git clone directory. Leave blank to auto-detect based on # the location of this script - SVNDIR="" + GITDIR="" ############################################################################### # Functions to be used by the program @@ -66,32 +66,13 @@ $PROG --revision REVISION EOF } -# Update to the latest/requested SVN version - function updatesvn { - PKG="$1" - REV="$2" - if [ -z "$REV" -o 0"$REV" -lt 1 ]; then - echo "Updating svn checkout for $PKG" - REL=`svn up "$SVNDIR"/"$PKG" 2>/dev/null` - else - echo "Updating svn checkout for $PKG to r$REV" - REL=`svn up -r "$REV" "$SVNDIR"/"$PKG" 2>/dev/null` - fi - if [ $? != 0 ]; then - echo "Problem updating svn checkout" - return $? - fi - REL=`echo "$REL" | grep -i revision | sed -e 's/[^0-9]\\+//g'` - echo "Updated to SVN Revision $REL" - } - # Update the requested spec to the requested revision/branch/version function updatespec { R="$1" SPEC="$2" - echo "Updating $SPEC _svnver to r$R" + echo "Updating $SPEC _gitver to r$R" sed -i \ - -e "s,define _svnrev .\+,define _svnrev r$R," \ + -e "s,define _gitrev .\+,define _svnrev r$R," \ -e "s,define branch .\+,define branch $BRANCH," \ -e "s,Version:.\+,Version: $VERSION," \ $SPEC @@ -99,9 +80,6 @@ EOF # Function to build mythtv packages function buildmyth { - # Update the SVN checkout - updatesvn mythtv "$1" - updatesvn mythplugins "$1" # Remove the existing mythtv-devel so it doesn't confuse qmake # (we can't override the order of the include file path) PKG=`rpm -q mythtv-devel` @@ -109,25 +87,16 @@ EOF echo "Removing existing mythtv-devel package to avoid conflicts" sudo rpm -e mythtv-devel.i386 mythtv-devel.x86_64 2>/dev/null fi - # Update the spec - updatespec $REL "$ABSPATH/mythtv.spec" # Clean up any old tarballs that might exist rm -f "$ABSPATH"/mythtv/myth*.tar.bz2 # Create the appropriate tarballs - echo "Creating tarballs from svn checkout at $SVNDIR" - cd "$SVNDIR" + echo "Creating tarballs from git clones at $GITDIR" for file in mythtv mythplugins; do - if [ -d "$file-$VERSION" ]; then - rm -rf "$file-$VERSION" - fi - echo -n " " - mv "$file" "$file-$VERSION" - tar jcf "$ABSPATH/mythtv/$file-$VERSION.tar.bz2" --exclude .svn "$file-$VERSION" - mv "$file-$VERSION" "$file" - echo "$ABSPATH/mythtv/$file-$VERSION.tar.bz2" + git archive --format tar --remote "$GITDIR"/ HEAD "$file"/ | bzip2 > "$ABSPATH/mythtv/$file-$GITVER.tar.bz2" + echo "$ABSPATH/mythtv/$file-$GITVER.tar.bz2" done # Build MythTV - rpmbuild -bb "$ABSPATH"/mythtv.spec \ + time rpmbuild -bb "$ABSPATH"/mythtv.spec \ --define "_sourcedir $ABSPATH/mythtv" \ --with debug \ --without mytharchive \ @@ -141,12 +110,12 @@ EOF return fi # Install - echo -n "Install r$REL? [n] " + echo -n "Install $VSTRING? [n] " read INST if [ "$INST" = "y" -o "$INST" = "Y" -o "$INST" = "yes" ]; then - installmyth "$REL" + installmyth "$VSTRING" else - echo "If you wish to install later, just run: $PROG --install \"$REL\"" + echo "If you wish to install later, just run: $PROG --install \"$VSTRING\"" fi } @@ -160,14 +129,14 @@ EOF rm -f "$ABSPATH"/mythtv-themes/*themes*.tar.bz2 # Create the appropriate tarballs for file in myththemes themes; do - if [ -d "$file-$VERSION" ]; then - rm -rf "$file-$VERSION" + if [ -d "$file-$GITVER" ]; then + rm -rf "$file-$GITVER" fi echo -n " " - mv "$file" "$file-$VERSION" - tar jcf "$ABSPATH/mythtv-themes/$file-$VERSION.tar.bz2" --exclude .svn "$file-$VERSION" - mv "$file-$VERSION" "$file" - echo "$ABSPATH/mythtv-themes/$file-$VERSION.tar.bz2" + mv "$file" "$file-$GITVER" + tar jcf "$ABSPATH/mythtv-themes/$file-$GITVER.tar.bz2" --exclude .svn "$file-$GITVER" + mv "$file-$GITVER" "$file" + echo "$ABSPATH/mythtv-themes/$file-$GITVER.tar.bz2" done # Disabled until I can clean this up later -- themes now require mythtv-libs in # order to compile. @@ -183,25 +152,24 @@ EOF # A function to install mythtv packages function installmyth { - REL="$1" sudo rpm -Uvh --force --nodeps \ - /usr/src/redhat/RPMS/x86_64/mythtv-docs-$VERSION-0.1.svn.r$REL.*.rpm \ - /usr/src/redhat/RPMS/x86_64/mythtv-libs-$VERSION-0.1.svn.r$REL.*.rpm \ - /usr/src/redhat/RPMS/x86_64/mythtv-devel-$VERSION-0.1.svn.r$REL.*.rpm \ - /usr/src/redhat/RPMS/x86_64/mythtv-base-themes-$VERSION-0.1.svn.r$REL.*.rpm \ - /usr/src/redhat/RPMS/x86_64/mythtv-frontend-$VERSION-0.1.svn.r$REL.*.rpm \ - /usr/src/redhat/RPMS/x86_64/mythtv-backend-$VERSION-0.1.svn.r$REL.*.rpm \ - /usr/src/redhat/RPMS/x86_64/mythtv-setup-$VERSION-0.1.svn.r$REL.*.rpm \ - /usr/src/redhat/RPMS/x86_64/mythtv-common-$VERSION-0.1.svn.r$REL.*.rpm \ - /usr/src/redhat/RPMS/x86_64/perl-MythTV-$VERSION-0.1.svn.r$REL.*.rpm \ - /usr/src/redhat/RPMS/x86_64/python-MythTV-$VERSION-0.1.svn.r$REL.*.rpm \ - /usr/src/redhat/RPMS/x86_64/mythmusic-$VERSION-0.1.svn.r$REL.*.rpm \ - /usr/src/redhat/RPMS/x86_64/mythbrowser-$VERSION-0.1.svn.r$REL.*.rpm \ - /usr/src/redhat/RPMS/x86_64/mythnetvision-$VERSION-0.1.svn.r$REL.*.rpm \ - /usr/src/redhat/RPMS/x86_64/mythvideo-$VERSION-0.1.svn.r$REL.*.rpm \ - /usr/src/redhat/RPMS/x86_64/mythweather-$VERSION-0.1.svn.r$REL.*.rpm \ - /usr/src/redhat/RPMS/x86_64/mythtv-debuginfo-$VERSION-0.1.svn.r$REL.*.rpm - #/usr/src/redhat/RPMS/x86_64/mythtv-themes-$VERSION-0.1.svn.r$REL.*.rpm \ + /usr/src/redhat/RPMS/x86_64/mythtv-docs-$GITVER-0.1.git.$GITREV.*.rpm \ + /usr/src/redhat/RPMS/x86_64/mythtv-libs-$GITVER-0.1.git.$GITREV.*.rpm \ + /usr/src/redhat/RPMS/x86_64/mythtv-devel-$GITVER-0.1.git.$GITREV.*.rpm \ + /usr/src/redhat/RPMS/x86_64/mythtv-base-themes-$GITVER-0.1.git.$GITREV.*.rpm \ + /usr/src/redhat/RPMS/x86_64/mythtv-frontend-$GITVER-0.1.git.$GITREV.*.rpm \ + /usr/src/redhat/RPMS/x86_64/mythtv-backend-$GITVER-0.1.git.$GITREV.*.rpm \ + /usr/src/redhat/RPMS/x86_64/mythtv-setup-$GITVER-0.1.git.$GITREV.*.rpm \ + /usr/src/redhat/RPMS/x86_64/mythtv-common-$GITVER-0.1.git.$GITREV.*.rpm \ + /usr/src/redhat/RPMS/x86_64/perl-MythTV-$GITVER-0.1.git.$GITREV.*.rpm \ + /usr/src/redhat/RPMS/x86_64/python-MythTV-$GITVER-0.1.git.$GITREV.*.rpm \ + /usr/src/redhat/RPMS/x86_64/mythmusic-$GITVER-0.1.git.$GITREV.*.rpm \ + /usr/src/redhat/RPMS/x86_64/mythbrowser-$GITVER-0.1.git.$GITREV.*.rpm \ + /usr/src/redhat/RPMS/x86_64/mythnetvision-$GITVER-0.1.git.$GITREV.*.rpm \ + /usr/src/redhat/RPMS/x86_64/mythvideo-$GITVER-0.1.git.$GITREV.*.rpm \ + /usr/src/redhat/RPMS/x86_64/mythweather-$GITVER-0.1.git.$GITREV.*.rpm \ + /usr/src/redhat/RPMS/x86_64/mythtv-debuginfo-$GITVER-0.1.git.$GITREV.*.rpm + #/usr/src/redhat/RPMS/x86_64/mythtv-themes-$GITVER-0.1.git.$GITREV.*.rpm \ } # And a function to install mythtv theme packages, since they need mythtv-libs @@ -236,11 +204,12 @@ EOF done # Auto-detect the source directory? - if [ -z "$SVNDIR" ]; then - SVNDIR=$(dirname $(dirname "$ABSPATH")) - elif [ ! -d "$SVNDIR" ]; then - echo "$SVNDIR does not exist. Please check out using:" - echo " svn co http://svn.mythtv.org/svn/trunk/ $SVNDIR" + if [ -z "$GITDIR" ]; then + GITDIR=$(dirname $(dirname "$ABSPATH"))/mythtv + fi + if [ ! -d "$GITDIR" ]; then + echo "$GITDIR does not exist. Please check out using:" + echo " git clone -b fixes/0.24 https://github.com/MythTV/mythtv" exit fi @@ -264,19 +233,61 @@ EOF REV="$1" esac -# Sanity check - if [ `expr "$REV" : "[^0-9]"` -ne 0 ]; then - echo "Invalid revision: $REV" +# Make sure our git clone is up to date + echo "Fetching latest information from git repository." + cd "$GITDIR" + git fetch + git fetch --tags + +# Get information about the latest/requested Git sha + if [[ $REV ]]; then + DESCRIBE=`git describe "$REV" -- 2>/dev/null` + else + DESCRIBE=`git describe -- 2>/dev/null` + fi + if [[ ! $DESCRIBE ]]; then + echo "Unknown/Invalid revision: $REV" exit fi + GITVER=`echo "$DESCRIBE" | sed -e 's,^\([^-]\+\)-.\+$,\1,'` + GITREV=`echo "$DESCRIBE" | sed -e 's,^[^-]\+-,,' -e 's,-,.,'` + # do some magic here to detect v, b, or pre notations + if [[ $GITVER =~ pre$ ]]; then + GITVER=${GITVER#v} + GITVER=${GITVER%pre} + elif [[ $GITVER =~ ^v ]]; then + GITVER=${GITVER#v} + GITREV=1 + elif [[ $GITVER =~ ^b ]]; then + GITVER=0.$((${GITVER#b0.}+1)) + GITREV="0.$GITREV" + fi + VSTRING="$GITVER.$GITREV" + +# Done doing that, now back to the working dir + cd - >/dev/null # What to do now? - if [ -z "$REV" ]; then - echo "Building latest revision" + if [[ ! $REV ]]; then + echo "Building $VSTRING (latest revision)" else - echo "Building Revision: $REV" + echo "Building $VSTRING" fi - buildmyth "$REV" + +# Update the revision in the specfile + echo "Updating mythtv.spec _gitver to $VSTRING" + sed -i \ + -e "s,define _gitrev .\+,define _gitrev $GITREV," \ + -e "s,define branch .\+,define branch $BRANCH," \ + -e "s,define vers_string .\+,define vers_string $DESCRIBE," \ + -e "s,Version:.\+,Version: $GITVER," \ + mythtv.spec + +# Update the other spec files to the MythTV spec version + # later... + +# Build MythTV + buildmyth # Done exit diff --git a/rpm/mythtv.spec b/rpm/mythtv.spec index 1dd2c72..a663cd1 100644 --- a/rpm/mythtv.spec +++ b/rpm/mythtv.spec @@ -1,5 +1,5 @@ # -# Specfile for building MythTV and MythPlugins RPMs from a subversion checkout. +# Specfile for building MythTV and MythPlugins RPMs from a git checkout. # # by: Chris Petersen # Jarod Wilson @@ -11,7 +11,7 @@ # # The latest canonical upstream version of this file can be found at: # -# http://svn.mythtv.org/svn/trunk/packaging/rpm/mythtv.spec +# https://github.com/MythTV/packaging/tree/fixes/0.24/rpm # # The latest RPM Fusion version can be found at: # @@ -53,7 +53,6 @@ # --without mythvideo # --without mythweather # --without mythzoneminder -# --without mythweb # ################################################################################ @@ -64,9 +63,12 @@ # The vendor name we should attribute the aforementioned entries to %define desktop_vendor xris -# SVN Revision number and branch ID -%define _svnrev r25992 -%define branch trunk +# MythTV Version string -- preferably the output from git --describe +%define vers_string v0.24-93-g2f3a2f8 + +# Git Revision number and branch ID +%define _gitrev 1 +%define branch master # # Basic descriptive tags for this package: @@ -78,8 +80,8 @@ Group: Applications/Multimedia # Version/Release info Version: 0.24 -%if "%{branch}" == "trunk" -Release: 0.1.svn.%{_svnrev}%{?dist} +%if "%{branch}" == "master" +Release: 0.1.git.%{_gitrev}%{?dist} %else Release: 1%{?dist} %endif @@ -120,7 +122,6 @@ License: GPLv2+ and LGPLv2+ and LGPLv2 and (GPLv2 or QPL) and (GPLv2+ or LGPLv2+ %define with_mythnews %{?_without_mythnews: 0} %{!?_without_mythnews: 1} %define with_mythvideo %{?_without_mythvideo: 0} %{!?_without_mythvideo: 1} %define with_mythweather %{?_without_mythweather: 0} %{!?_without_mythweather: 1} -%define with_mythweb %{?_without_mythweb: 0} %{!?_without_mythweb: 1} %define with_mythzoneminder %{?_without_mythzoneminder: 0} %{!?_without_mythzoneminder: 1} %define with_mythnetvision %{?_without_mythnetvision: 0} %{!?_without_mythnetvision: 1} @@ -137,7 +138,6 @@ Source107: mythfrontend.desktop Source108: mythtv-setup.png Source109: mythtv-setup.desktop Source110: mysql.txt -Source401: mythweb.conf BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -559,6 +559,18 @@ This package contains components needed by multiple other MythTV components. ################################################################################ +%package -n mythffmpeg +Summary: MythTV build of FFmpeg +Group: Applications/Multimedia + +%description -n mythffmpeg +Several MythTV utilities interact with FFmpeg, which changes its parameters +often enough to make it a hassle to support the variety of versions used by +MythTV users. This is a snapshot of the FFmpeg code so that MythTV utilities +can interact with a known verion. + +################################################################################ + %if %{with_perl} %package -n perl-MythTV @@ -613,7 +625,6 @@ Requires: mythnews = %{version}-%{release} Requires: mythbrowser = %{version}-%{release} Requires: mytharchive = %{version}-%{release} Requires: mythzoneminder = %{version}-%{release} -Requires: mythweb = %{version}-%{release} Requires: mythnetvision = %{version}-%{release} %description -n mythplugins @@ -771,24 +782,6 @@ A MythTV module that displays a weather forecast. %endif ################################################################################ -%if %{with_mythweb} - -%package -n mythweb -Summary: The web interface to MythTV -Group: Applications/Multimedia -Requires: httpd >= 1.3.26 -Requires: php >= 5.1 -Requires: php-mysql -# php-process is broken out from main php package in Fedora 11 and later -%if 0%{?fedora} >= 11 -Requires: php-process -%endif - -%description -n mythweb -The web interface to MythTV. - -%endif -################################################################################ %if %{with_mythzoneminder} %package -n mythzoneminder @@ -842,7 +835,13 @@ on demand content. ##### MythTV -cd mythtv-%{version} +cd mythtv + +# Set the mythtv --version string + cat > VERSION < /var/lib/mythmusic cd mythmusic @@ -886,17 +885,9 @@ cd mythplugins-%{version} sed -i -e 's,/share/Movies/dvd,%{_localstatedir}/lib/mythvideo,' mythvideo/globalsettings.cpp cd .. -# Fix up permissions for MythWeb - cd mythweb - chmod -R g-w ./* - cd .. - # Add execute bits to mythvideo python helper scripts find mythvideo/mythvideo/scripts/ -name '*.py' -exec chmod +x "{}" \; -# Remove unwanted execute bits from php mythweb files - find mythweb/ -name '*.php' -exec chmod -x "{}" \; - # And back to the compile root cd .. @@ -907,7 +898,7 @@ cd .. %build # First, we build MythTV -cd mythtv-%{version} +cd mythtv # Similar to 'percent' configure, but without {_target_platform} and # {_exec_prefix} etc... MythTV no longer accepts the parameters that the @@ -978,7 +969,7 @@ cd mythtv-%{version} --enable-debug # Insert rpm version-release for mythbackend --version output - sed -i -e 's,###SOURCE_VERSION###,%{version}-%{release} (%_svnrev),' version.sh + sed -i -e 's,###SOURCE_VERSION###,%{version}-%{release} (%_gitrev),' version.sh # Make make %{?_smp_mflags} @@ -987,12 +978,12 @@ cd mythtv-%{version} cd .. mkdir temp temp=`pwd`/temp - make -C mythtv-%{version} install INSTALL_ROOT=$temp + make -C mythtv install INSTALL_ROOT=$temp export LD_LIBRARY_PATH=$temp%{_libdir}:$LD_LIBRARY_PATH # Next, we build the plugins %if %{with_plugins} -cd mythplugins-%{version} +cd mythplugins # Fix things up so they can find our "temp" install location for mythtv-libs echo "QMAKE_PROJECT_DEPTH = 0" >> settings.pro @@ -1081,7 +1072,7 @@ cd mythplugins-%{version} rm -rf %{buildroot} # First, install MythTV -cd mythtv-%{version} +cd mythtv make install INSTALL_ROOT=%{buildroot} @@ -1126,7 +1117,7 @@ cd mythtv-%{version} # MythPlugins %if %{with_plugins} -cd mythplugins-%{version} +cd mythplugins make install INSTALL_ROOT=%{buildroot} @@ -1154,19 +1145,6 @@ cd mythplugins-%{version} %{buildroot}%{_datadir}/mythtv/games/PC/gamelist.xml %endif -%if %{with_mythweb} - cd mythweb - mkdir -p %{buildroot}%{_datadir}/mythweb - cp -a * %{buildroot}%{_datadir}/mythweb/ - mkdir -p %{buildroot}%{_datadir}/mythweb/{image_cache,php_sessions} - - mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d - cp %{SOURCE401} %{buildroot}%{_sysconfdir}/httpd/conf.d/ -# drop .htaccess file, settings handled in the above - rm -f %{buildroot}%{_datadir}/mythweb/data/.htaccess - cd .. -%endif - # And back to the build/install root cd .. %endif @@ -1203,12 +1181,13 @@ fi %files docs %defattr(-,root,root,-) -%doc mythtv-%{version}/README* mythtv-%{version}/UPGRADING -%doc mythtv-%{version}/AUTHORS mythtv-%{version}/COPYING mythtv-%{version}/FAQ -%doc mythtv-%{version}/database mythtv-%{version}/keys.txt -%doc mythtv-%{version}/docs/*.html mythtv-%{version}/docs/*.png -%doc mythtv-%{version}/docs/*.txt mythtv-%{version}/contrib -%doc mythtv-%{version}/PACKAGE-LICENSING +%doc mythtv/README* mythtv/UPGRADING +%doc mythtv/AUTHORS mythtv/COPYING mythtv/FAQ +%doc mythtv/database mythtv/keys.txt +%doc mythtv/docs/*.html mythtv/docs/*.png +%doc mythtv/docs/*.txt mythtv/contrib +%doc %{_datadir}/mythtv/fonts/*.txt +%doc mythtv/PACKAGE-LICENSING %files common %defattr(-,root,root,-) @@ -1292,6 +1271,11 @@ fi %dir %{_datadir}/mythtv/build %{_datadir}/mythtv/build/settings.pro +%files -n mythffmpeg +%defattr(-,root,root,-) +%{_bindir}/mythffmpeg +%{_bindir}/mythffplay + %if %{with_perl} %files -n perl-MythTV %defattr(-,root,root,-) @@ -1316,15 +1300,15 @@ fi %if %{with_plugins} %files -n mythplugins %defattr(-,root,root,-) -%doc mythplugins-%{version}/COPYING +%doc mythplugins/COPYING %if %{with_mytharchive} %files -n mytharchive %defattr(-,root,root,-) -%doc mythplugins-%{version}/mytharchive/AUTHORS -%doc mythplugins-%{version}/mytharchive/COPYING -%doc mythplugins-%{version}/mytharchive/README -%doc mythplugins-%{version}/mytharchive/TODO +%doc mythplugins/mytharchive/AUTHORS +%doc mythplugins/mytharchive/COPYING +%doc mythplugins/mytharchive/README +%doc mythplugins/mytharchive/TODO %{_bindir}/mytharchivehelper %{_libdir}/mythtv/plugins/libmytharchive.so %{_datadir}/mythtv/archivemenu.xml @@ -1336,9 +1320,9 @@ fi %if %{with_mythbrowser} %files -n mythbrowser %defattr(-,root,root,-) -%doc mythplugins-%{version}/mythbrowser/AUTHORS -%doc mythplugins-%{version}/mythbrowser/COPYING -%doc mythplugins-%{version}/mythbrowser/README +%doc mythplugins/mythbrowser/AUTHORS +%doc mythplugins/mythbrowser/COPYING +%doc mythplugins/mythbrowser/README %{_libdir}/mythtv/plugins/libmythbrowser.so %{_datadir}/mythtv/i18n/mythbrowser_*.qm %endif @@ -1346,9 +1330,9 @@ fi %if %{with_mythgallery} %files -n mythgallery %defattr(-,root,root,-) -%doc mythplugins-%{version}/mythgallery/AUTHORS -%doc mythplugins-%{version}/mythgallery/COPYING -%doc mythplugins-%{version}/mythgallery/README +%doc mythplugins/mythgallery/AUTHORS +%doc mythplugins/mythgallery/COPYING +%doc mythplugins/mythgallery/README %{_libdir}/mythtv/plugins/libmythgallery.so %{_datadir}/mythtv/i18n/mythgallery_*.qm %{_localstatedir}/lib/pictures @@ -1377,9 +1361,9 @@ fi %if %{with_mythmusic} %files -n mythmusic %defattr(-,root,root,-) -%doc mythplugins-%{version}/mythmusic/AUTHORS -%doc mythplugins-%{version}/mythmusic/COPYING -%doc mythplugins-%{version}/mythmusic/README +%doc mythplugins/mythmusic/AUTHORS +%doc mythplugins/mythmusic/COPYING +%doc mythplugins/mythmusic/README %{_libdir}/mythtv/plugins/libmythmusic.so %{_localstatedir}/lib/mythmusic %{_datadir}/mythtv/musicmenu.xml @@ -1390,9 +1374,9 @@ fi %if %{with_mythnews} %files -n mythnews %defattr(-,root,root,-) -%doc mythplugins-%{version}/mythnews/AUTHORS -%doc mythplugins-%{version}/mythnews/COPYING -%doc mythplugins-%{version}/mythnews/README +%doc mythplugins/mythnews/AUTHORS +%doc mythplugins/mythnews/COPYING +%doc mythplugins/mythnews/README %{_libdir}/mythtv/plugins/libmythnews.so %{_datadir}/mythtv/mythnews %{_datadir}/mythtv/i18n/mythnews_*.qm @@ -1401,8 +1385,8 @@ fi %if %{with_mythvideo} %files -n mythvideo %defattr(-,root,root,-) -%doc mythplugins-%{version}/mythvideo/COPYING -%doc mythplugins-%{version}/mythvideo/README* +%doc mythplugins/mythvideo/COPYING +%doc mythplugins/mythvideo/README* %{_libdir}/mythtv/plugins/libmythvideo.so %{_datadir}/mythtv/mythvideo %{_datadir}/mythtv/i18n/mythvideo_*.qm @@ -1414,9 +1398,9 @@ fi %if %{with_mythweather} %files -n mythweather %defattr(-,root,root,-) -%doc mythplugins-%{version}/mythweather/AUTHORS -%doc mythplugins-%{version}/mythweather/COPYING -%doc mythplugins-%{version}/mythweather/README +%doc mythplugins/mythweather/AUTHORS +%doc mythplugins/mythweather/COPYING +%doc mythplugins/mythweather/README %{_libdir}/mythtv/plugins/libmythweather.so %{_datadir}/mythtv/i18n/mythweather_*.qm %{_datadir}/mythtv/weather_settings.xml @@ -1424,16 +1408,6 @@ fi %{_datadir}/mythtv/mythweather/* %endif -%if %{with_mythweb} -%files -n mythweb -%defattr(-,root,root,-) -%doc mythplugins-%{version}/mythweb/README -%config(noreplace) %{_sysconfdir}/httpd/conf.d/mythweb.conf -%defattr(-,apache,apache,0775) -%dir %{_datadir}/mythweb -%{_datadir}/mythweb/* -%endif - %if %{with_mythzoneminder} %files -n mythzoneminder %defattr(-,root,root,-) @@ -1446,9 +1420,9 @@ fi %if %{with_mythnetvision} %files -n mythnetvision %defattr(-,root,root,-) -%doc mythplugins-%{version}/mythnetvision/AUTHORS -%doc mythplugins-%{version}/mythnetvision/ChangeLog -%doc mythplugins-%{version}/mythnetvision/README +%doc mythplugins/mythnetvision/AUTHORS +%doc mythplugins/mythnetvision/ChangeLog +%doc mythplugins/mythnetvision/README %{_bindir}/mythfillnetvision %{_libdir}/mythtv/plugins/libmythnetvision.so %{_datadir}/mythtv/mythnetvision @@ -1461,6 +1435,10 @@ fi ################################################################################ %changelog +* Thu Jan 06 2011 David Knight 0.24-0.1.git +- Split out mythweb +- Update for Git + * Sat Aug 28 2010 Jarod Wilson 0.24-0.1.svn - Fix up perl bindings - Enable crystalhd support -- 1.7.2.3