Ticket #7090: rpmpatch.2.diff

File rpmpatch.2.diff, 22.6 KB (added by jtwyford@…, 16 years ago)

Fixed svn diff against head. >.<

  • packaging/rpm/mythtv.spec

     
    33#
    44# by:   Chris Petersen <rpm@forevermore.net>
    55#       Jarod Wilson <jarod@wilsonet.com>
     6#       James Twyford <jtwyford@gmail.com>
    67#
    78#  Modified/Extended from the great (non-svn based) work of:
    89#     Axel Thimm <Axel.Thimm@ATrpms.net>
    … …  
    1112#
    1213# The latest version of this file can be found at:
    1314#
    14 #     http://www.mythtv.org/wiki/index.php/Mythtv-svn-rpmbuild.spec
     15#     http://svn.mythtv.org/svn/trunk/packaging/rpm/mythtv.spec
    1516#
    1617# Note:
    1718#
    … …  
    6061%define desktop_vendor  xris
    6162
    6263# SVN Revision number and branch ID
    63 %define _svnrev r21243
     64%define _svnrev r21924
    6465%define branch trunk
    6566
    6667#
    6768# Basic descriptive tags for this package:
    6869#
    6970Name:           mythtv
    70 Summary:        A digital video recorder (DVR) application.
     71Summary:        A digital video recorder (DVR) application
    7172URL:            http://www.mythtv.org/
    7273Group:          Applications/Multimedia
    7374
    … …  
    119120
    120121################################################################################
    121122
    122 Source0:   http://www.mythtv.org/mc/mythtv-%{version}.tar.bz2
    123 Source1:   http://www.mythtv.org/mc/mythplugins-%{version}.tar.bz2
     123Source0:   mythtv-%{version}.tar.bz2
     124Source1:   mythplugins-%{version}.tar.bz2
     125Source2:   themes-%{version}.tar.bz2
    124126Source10:  PACKAGE-LICENSING
    125127Source101: mythbackend.sysconfig.in
    126128Source102: mythbackend.init.in
    … …  
    163165BuildRequires:  libXxf86vm-devel
    164166BuildRequires:  mesa-libGLU-devel
    165167BuildRequires:  xorg-x11-proto-devel
    166 %ifarch %{ix86} x86_64
    167 BuildRequires:  xorg-x11-drv-i810-devel
    168 BuildRequires:  xorg-x11-drv-openchrome-devel
    169 %endif
    170168
    171169# OpenGL video output and vsync support
    172170BuildRequires:  libGL-devel, libGLU-devel
    … …  
    179177BuildRequires:  gsm-devel
    180178BuildRequires:  lame-devel
    181179BuildRequires:  libdca-devel
    182 # libdvdcss will be dynamically loaded if installed
    183 #BuildRequires:  libdvdcss-devel >= 1.2.7
    184180BuildRequires:  libdvdnav-devel
    185181BuildRequires:  libdvdread-devel >= 0.9.4
    186182BuildRequires:  libfame-devel >= 0.9.0
    … …  
    193189BuildRequires:  transcode >= 0.6.8
    194190BuildRequires:  x264-devel
    195191BuildRequires:  xvidcore-devel >= 0.9.1
    196 BuildRequires:  pulseaudio-libs-devel
    197192
    198193# Audio framework support
    199194BuildRequires:  alsa-lib-devel
    200 BuildRequires:  arts-devel
    201195BuildRequires:  jack-audio-connection-kit-devel
     196BuildRequires:  pulseaudio-libs-devel
    202197
    203198# Need dvb headers to build in dvb support
    204199BuildRequires: kernel-headers
    … …  
    276271
    277272Requires:  libmyth            = %{version}-%{release}
    278273Requires:  mythtv-backend     = %{version}-%{release}
    279 Requires:  mythtv-base-themes = %{version}-%{release}
    280274Requires:  mythtv-common      = %{version}-%{release}
    281275Requires:  mythtv-docs        = %{version}-%{release}
    282276Requires:  mythtv-frontend    = %{version}-%{release}
    … …  
    285279Requires:  python-MythTV      = %{version}-%{release}
    286280
    287281Requires:  mythplugins        = %{version}-%{release}
    288 Requires:  mythtv-themes      = %{version}
     282Requires:  mythtv-themes      = %{version}-%{release}
    289283
    290284Requires:  mysql-server >= 5, mysql >= 5
    291285# XMLTV is not yet packaged for rpmfusion
    … …  
    328322Summary: MythTV documentation
    329323Group:   Documentation
    330324
     325Requires:  mythtv-common       = %{version}
     326
    331327%description docs
    332328The MythTV documentation, contrib files, database initialization file
    333329and miscellaneous other bits and pieces.
    … …  
    335331################################################################################
    336332
    337333%package -n libmyth
    338 Summary:   Library providing mythtv support.
     334Summary:   Library providing mythtv support
    339335Group:     System Environment/Libraries
    340336
    341337Requires:  freetype >= 2
    … …  
    351347################################################################################
    352348
    353349%package -n libmyth-devel
    354 Summary:   Development files for libmyth.
     350Summary:   Development files for libmyth
    355351Group:     Development/Libraries
    356352
    357353Requires:  libmyth = %{version}-%{release}
    … …  
    369365Requires:  libXxf86vm-devel
    370366Requires:  mesa-libGLU-devel
    371367Requires:  xorg-x11-proto-devel
    372 %ifarch %{ix86} x86_64
    373 Requires:  xorg-x11-drv-i810-devel
    374 Requires:  xorg-x11-drv-openchrome-devel
    375 %endif
    376368
    377369# OpenGL video output and vsync support
    378370Requires:  libGL-devel, libGLU-devel
    … …  
    385377Requires:  gsm-devel
    386378Requires:  lame-devel
    387379Requires:  libdca-devel
    388 #Requires:  libdvdcss-devel >= 1.2.7
    389380Requires:  libdvdnav-devel
    390381Requires:  libdvdread-devel >= 0.9.4
    391382Requires:  libfame-devel >= 0.9.0
    … …  
    401392
    402393# Audio framework support
    403394Requires:  alsa-lib-devel
    404 Requires:  arts-devel
    405395Requires:  jack-audio-connection-kit-devel
     396Requires:  pulseaudio-libs-devel
    406397
    407398# Need dvb headers for dvb support
    408399Requires:  kernel-headers
    … …  
    426417
    427418################################################################################
    428419
    429 %package base-themes
    430 Summary: Core user interface themes for mythtv
    431 Group:   Applications/Multimedia
    432 
    433 # Replace an old ATRMS package
    434 Provides:   mythtv-theme-gant
    435 Obsoletes:  mythtv-theme-gant
    436 
    437 %description base-themes
    438 MythTV provides a unified graphical interface for recording and viewing
    439 television programs.  Refer to the mythtv-docs package for more information.
    440 
    441 This package contains the base themes for the mythtv user interface.
    442 
    443 ################################################################################
    444 
    445420%package frontend
    446421Summary:   Client component of mythtv (a DVR)
    447422Group:     Applications/Multimedia
    448423Requires:  freetype, lame
     424Requires:  mythtv-themes       = %{version}-%{release}
    449425Requires:  mythtv-common       = %{version}-%{release}
    450 Requires:  mythtv-base-themes  = %{version}
    451426Provides:  mythtv-frontend-api = %{mythfeapiver}
    452427Obsoletes: mythcontrols < %{version}-%{release}
    453428Provides:  mythcontrols = %{version}-%{release}
    … …  
    486461Group:     Applications/Multimedia
    487462Requires:  freetype
    488463Requires:  mythtv-backend = %{version}-%{release}
    489 Requires:  mythtv-base-themes = %{version}
    490464
    491465%description setup
    492466MythTV provides a unified graphical interface for recording and viewing
    … …  
    517491# Wish we could do this:
    518492#BuildArch:      noarch
    519493
     494Requires:  mythtv-common       = %{version}
    520495Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
    521496Requires:       perl(DBD::mysql)
    522 # Disabled because there are no RPM packages for these yet,
    523 # and RPM doesn't seem to be picking up on CPAN versions
    524 #Requires:       perl(Net::UPnP)
    525 #Requires:       perl(Net::UPnP::ControlPoint)
     497Requires:       perl(Net::UPnP)
     498Requires:       perl(Net::UPnP::ControlPoint)
    526499
    527500%description -n perl-MythTV
    528501Provides a perl-based interface to interacting with MythTV.
    … …  
    539512# Wish we could do this:
    540513#BuildArch:      noarch
    541514
     515Requires:  mythtv-common       = %{version}
    542516Requires:       MySQL-python
    543517
    544518%description -n python-MythTV
    … …  
    548522
    549523################################################################################
    550524
     525%package themes
     526Summary:    Additional themes for mythtv's frontend
     527Group:      Applications/Multimedia
     528Requires:       mythtv-common
     529BuildArch:      noarch
     530
     531%description themes
     532MythTV provides a unified graphical interface for recording and viewing
     533television programs.  Refer to the mythtv-docs package for more information.
     534
     535This package contains themes for the mythtv user interface.
     536
     537################################################################################
     538
    551539%if %{with_plugins}
    552540
    553541# Meta package for all mythtv plugins
    … …  
    651639%description -n mythgame
    652640A game frontend (xmame, nes, snes, pc) for MythTV.
    653641
    654 ################################################################################
    655 #package -n mythgame-emulators
    656 #Summary:   Meta-package requiring emulators for game types mythgame knows about
    657 #Group:     Applications/Multimedia
    658 #Requires:  mythgame = %{version}-%{release}
    659 # Multi Arcade Machine Emulator, Amiga, Atari 2600
    660 #Requires:  sdlmame
    661 #Requires:  e-uae
    662 #Requires:  stella
    663 # Nintendo, Super Nintendo, Nintendo 64
    664 #Requires:  fceultra
    665 #Requires:  zsnes
    666 #Requires:  mupen64, mupen64-ricevideo
    667 # Sega Genesis, Sega Master System, Game Gear
    668 #Requires:  gens
    669 #Requires:  dega-sdl
    670 #Requires:  osmose
    671 # TurboGraphx 16 (and others)
    672 #Requires:  mednafen
    673 
    674 #description -n mythgame-emulators
    675 #Meta-package requiring emulators for game types mythgame knows about.
    676 
    677642%endif
    678643################################################################################
    679644%if %{with_mythmovies}
    … …  
    759724%package -n mythweb
    760725Summary:   The web interface to MythTV
    761726Group:     Applications/Multimedia
     727Requires:  mythtv-frontend-api = %{mythfeapiver}
    762728Requires:  httpd >= 1.3.26
    763729Requires:  php >= 5.1
    764730Requires:  php-mysql
    … …  
    792758
    793759%prep
    794760%setup -q -c -a 1
    795 
     761%setup -q -T -D -c -a 2
    796762# Replace static lib paths with %{_lib} so we build properly on x86_64
    797763# systems, where the libs are actually in lib64.
    798764    if [ "%{_lib}" != "lib" ]; then
    799         grep -rlZ /lib/  . | xargs -r0 sed -i -e 's,/lib/,/%{_lib}/,g'
    800         grep -rlZ /lib$  . | xargs -r0 sed -i -e 's,/lib$,/%{_lib},'
     765        grep -rlZ '/lib/' . | xargs -r0 sed -i -e 's,/lib/,/%{_lib}/,g'
     766        grep -rlZ '/lib$' . | xargs -r0 sed -i -e 's,/lib$,/%{_lib},'
    801767        grep -rlZ '/lib ' . | xargs -r0 sed -i -e 's,/lib ,/%{_lib} ,g'
    802768    fi
    803769
    … …  
    891857    --libdir=%{_libdir}                         \
    892858    --libdir-name=%{_lib}                       \
    893859    --mandir=%{_mandir}                         \
    894     --enable-iptv                               \
     860    --enable-iptv                               \
    895861    --enable-pthreads                           \
    896862    --enable-ffmpeg-pthreads                    \
    897863    --enable-joystick-menu                      \
    898     --enable-audio-arts                         \
    899864    --enable-audio-alsa                         \
    900865    --enable-audio-oss                          \
    901866    --enable-audio-jack                         \
    … …  
    947912    --compile-type=release                      \
    948913%endif
    949914    --enable-debug
    950 ###    --enable-libx264                            \
    951915
    952916# Insert rpm version-release for mythbackend --version output
    953917    find . -name version.pro -exec sed -i -e 's,svnversion \$\${SVNTREEDIR},echo "%{version}-%{release}",g' {} \;
    … …  
    962926    make -C mythtv-%{version} install INSTALL_ROOT=$temp
    963927    export LD_LIBRARY_PATH=$temp%{_libdir}:$LD_LIBRARY_PATH
    964928
    965 # Next, we build the plugins
     929#next we build myththemes
     930cd themes-%{version}
     931    find . -name \*.pro \
     932        -exec sed -i -e "s,INCLUDEPATH += .\+/include/mythtv,INCLUDEPATH += $temp%{_includedir}/mythtv," {} \; \
     933        -exec sed -i -e "s,DEPLIBS = \$\${LIBDIR},DEPLIBS = $temp%{_libdir}," {} \; \
     934        -exec sed -i -e "s,\$\${PREFIX}/include/mythtv,$temp%{_includedir}/mythtv," {} \;
     935    sed -i -e "s|\$prefix/include/mythtv|$temp%{_includedir}/mythtv|" configure
     936    ./configure \
     937        --prefix=${temp}%{_prefix} \
     938        --libdir=%{_libdir} \
     939        --libdir-name=%{_lib}
     940cd ..
     941
     942# Finally, we build the plugins
    966943%if %{with_plugins}
    967944cd mythplugins-%{version}
    968945
    … …  
    11111088
    11121089    cd ..
    11131090
     1091#install themes
     1092cd themes-%{version}
     1093make install INSTALL_ROOT=%{buildroot}
     1094chmod a-x %{buildroot}%{_datadir}/mythtv/themes/default/htmls/*.html
     1095cd ..
     1096
    11141097# MythPlugins
    11151098%if %{with_plugins}
    11161099cd mythplugins-%{version}
    … …  
    11221105%endif
    11231106%if %{with_mythvideo}
    11241107    mkdir -p %{buildroot}%{_localstatedir}/lib/mythvideo
     1108    chmod a+x %{buildroot}%{_datadir}/mythtv/mythvideo/scripts/ttvdb/{tvdb*,cache}.py
    11251109%endif
    11261110%if %{with_mythgallery}
    11271111    mkdir -p %{buildroot}%{_localstatedir}/lib/pictures
    … …  
    11291113%if %{with_mythgame}
    11301114    mkdir -p %{buildroot}%{_datadir}/mythtv/games/nes/{roms,screens}
    11311115    mkdir -p %{buildroot}%{_datadir}/mythtv/games/snes/{roms,screens}
    1132 #   mkdir -p %{buildroot}%{_datadir}/mythtv/games/mame/{roms,screens,flyers,cabs}
    11331116    mkdir -p %{buildroot}%{_datadir}/mythtv/games/PC/screens
    11341117    mkdir -p %{buildroot}%{_datadir}/mame
    11351118    ln -s ../../mame %{buildroot}%{_datadir}/mythtv/games/xmame
    … …  
    11461129    mkdir -p %{buildroot}%{_datadir}/mythweb
    11471130    cp -a * %{buildroot}%{_datadir}/mythweb/
    11481131    mkdir -p %{buildroot}%{_datadir}/mythweb/{image_cache,php_sessions}
    1149 # fix up permissions
    1150     chmod -R g-x %{buildroot}%{_datadir}/mythweb
    1151 
     1132    chmod a-x %{buildroot}%{_datadir}/mythweb/classes/*.php
    11521133    mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
    11531134    cp %{SOURCE401} %{buildroot}%{_sysconfdir}/httpd/conf.d/
    1154 # drop .htaccess file, settings handled in the above
    11551135    rm -f %{buildroot}%{_datadir}/mythweb/data/.htaccess
    11561136    cd ..
    11571137%endif
    … …  
    11601140    cd ..
    11611141%endif
    11621142
     1143
    11631144################################################################################
    11641145
    11651146%clean
    … …  
    11751156# Add the "mythtv" user
    11761157/usr/sbin/useradd -c "mythtvbackend User" \
    11771158    -s /sbin/nologin -r -d %{_varlibdir}/mythtv mythtv 2> /dev/null || :
     1159/usr/sbin/usermod -a -G video mythtv
    11781160
    11791161%post backend
    11801162/sbin/chkconfig --add mythbackend
    … …  
    12391221%{_datadir}/mythtv/devicemaster.xml
    12401222%{_datadir}/mythtv/deviceslave.xml
    12411223%{_datadir}/mythtv/setup.xml
     1224%{_bindir}/mythavtest
    12421225%{_bindir}/mythfrontend
    1243 %{_bindir}/mythtv
    12441226%{_bindir}/mythtvosd
    12451227%{_bindir}/mythlcdserver
    12461228%{_bindir}/mythshutdown
    … …  
    12551237%{_datadir}/applications/*mythfrontend.desktop
    12561238%{_datadir}/pixmaps/myth*.png
    12571239
    1258 %files base-themes
     1240%files themes
    12591241%defattr(-,root,root,-)
    12601242%dir %{_datadir}/mythtv/themes
    12611243%{_datadir}/mythtv/themes/*
    … …  
    13201302%doc mythplugins-%{version}/mythbrowser/AUTHORS
    13211303%doc mythplugins-%{version}/mythbrowser/COPYING
    13221304%doc mythplugins-%{version}/mythbrowser/README
    1323 %{_bindir}/mythbrowser
    1324 %{_libdir}/mythtv/plugins/libmythbookmarkmanager.so
     1305%{_libdir}/mythtv/plugins/libmythbrowser.so
    13251306%{_datadir}/mythtv/i18n/mythbrowser_*.qm
    13261307%endif
    13271308
    … …  
    13611342%dir %{_datadir}/mame/flyers
    13621343%{_datadir}/mythtv/game_settings.xml
    13631344%{_datadir}/mythtv/i18n/mythgame_*.qm
    1364 
    1365 #files -n mythgame-emulators
    1366 #defattr(-,root,root,-)
    1367 #{_datadir}/mythtv/games/xmame
    1368 #{_datadir}/mame/screens
    1369 #{_datadir}/mame/flyers
    13701345%endif
    13711346
    13721347%if %{with_mythmovies}
    … …  
    14351410%defattr(-,root,root,-)
    14361411%doc mythplugins-%{version}/mythweb/README
    14371412%config(noreplace) %{_sysconfdir}/httpd/conf.d/mythweb.conf
    1438 %defattr(-,apache,apache,0775)
     1413%defattr(-,apache,apache,-)
    14391414%dir %{_datadir}/mythweb
    14401415%{_datadir}/mythweb/*
    14411416%endif
    … …  
    14531428################################################################################
    14541429
    14551430%changelog
     1431* Thu Sep 17 2009 James Twyford <jtwyford@gmail.com> 0.22-0.2.svn
     1432- Merger of mythtv-themes into this spec
     1433- Updates to compile with trunk and other cleanups as suggested by rpmlint
    14561434
    1457 * Thu Aug 13 2009 Chris Petersen <rpm@forevermore.net> 0.22-01.svn
     1435* Thu Aug 13 2009 Chris Petersen <rpm@forevermore.net> 0.22-0.1.svn
    14581436- Add XML::Simple requirement for mythvideo (for tmdb.pl)
    14591437- Remove now-deprecated call for XvMCNVIDIA_dynamic
    14601438
    1461 * Mon Jul 27 2009 Chris Petersen <rpm@forevermore.net> 0.22-01.svn
     1439* Mon Jul 27 2009 Chris Petersen <rpm@forevermore.net> 0.22-0.1.svn
    14621440- Rename xvmcnvidia stuff to just nvidia, and add vdpau options to it
    14631441
    1464 * Sat Jul 25 2009 Chris Petersen <rpm@forevermore.net> 0.22-01.svn
     1442* Sat Jul 25 2009 Chris Petersen <rpm@forevermore.net> 0.22-0.1.svn
    14651443- Remove all a52 references because ./configure no longer accepts even "disable"
    14661444- Remove non-GPL libfaac options (not really used by MythTV anyway)
    14671445
    1468 * Sun Jun 28 2009 Chris Petersen <rpm@forevermore.net> 0.22-01.svn
     1446* Sun Jun 28 2009 Chris Petersen <rpm@forevermore.net> 0.22-0.1.svn
    14691447- Remove xvmc-opengl references that were removed in r20723
    14701448- Add requirement for pulseaudio-libs-devel now that some distros are requiring it
    14711449

  • packaging/rpm/build_myth.sh

     
    102102    # Update the SVN checkout
    103103        updatesvn mythtv "$1"
    104104        updatesvn mythplugins "$1"
     105        updatesvn themes "$1"
    105106    # Remove the existing libmyth-devel so it doesn't confuse qmake
    106107    # (we can't override the order of the include file path)
    107108        PKG=`rpm -q libmyth-devel`
    108109        if [ `expr match "$PKG" 'libmyth.*'` -gt 0 ]; then
    109             echo "Removing existing libmyth-devel package to avoid conflicts"
    110             sudo rpm -e libmyth-devel.i386 libmyth-devel.x86_64 2>/dev/null
     110            echo "Removing existing libmyth-devel package to avoid conflicts. Please enter root password."
     111            su -c "rpm -e libmyth-devel"
    111112        fi
    112113    # Update the spec
    113114        updatespec $REL "$ABSPATH/mythtv.spec"
    114115    # Clean up any old tarballs that might exist
    115         rm -f "$ABSPATH"/mythtv/myth*.tar.bz2
     116        rm -f "$ABSPATH"/mythtv/*.tar.bz2
    116117    # Create the appropriate tarballs
    117118        echo "Creating tarballs from svn checkout at $SVNDIR"
    118119        cd "$SVNDIR"
    119         for file in mythtv mythplugins; do
     120        for file in mythtv mythplugins themes; do
    120121            if [ -d "$file-$VERSION" ]; then
    121122                rm -rf "$file-$VERSION"
    122123            fi
    … …  
    128129        done
    129130    # Build MythTV
    130131        rpmbuild -bb "$ABSPATH"/mythtv.spec \
    131             --define "_sourcedir $ABSPATH/mythtv" \
    132             --with debug            \
    133             --without mytharchive   \
    134             --without mythgallery   \
    135             --without mythgame      \
    136             --without mythbrowser   \
    137             --without mythmovies    \
    138             --without mythnews      \
    139             --without mythzoneminder
     132            --define "_sourcedir $ABSPATH/mythtv"
    140133    # Error?
    141134        if [ "$?" -ne 0 ]; then
    142135            echo "MythTV build error."
    … …  
    152145        fi
    153146    }
    154147
    155 # Function to build mythtv themes packages
    156     function buildthemes {
    157     # Update the SVN checkout -- make sure not to
    158         svnupdate mythtv-themes "$1"
    159     # Update the spec
    160         updatespec $REL "$ABSPATH/mythtv-themes.spec"
    161     # Clean up any old tarballs that might exist
    162         rm -f "$ABSPATH"/mythtv-themes/*themes*.tar.bz2
    163     # Create the appropriate tarballs
    164         for file in myththemes themes; do
    165             if [ -d "$file-$VERSION" ]; then
    166                 rm -rf "$file-$VERSION"
    167             fi
    168             echo -n "    "
    169             mv "$file" "$file-$VERSION"
    170             tar jcf "$ABSPATH/mythtv-themes/$file-$VERSION.tar.bz2" --exclude .svn "$file-$VERSION"
    171             mv "$file-$VERSION" "$file"
    172             echo "$ABSPATH/mythtv-themes/$file-$VERSION.tar.bz2"
    173         done
    174     # Disabled until I can clean this up later -- themes now require libmyth in
    175     # order to compile.
    176     #
    177     ## Build MythTV Themes
    178     #    rpmbuild -bb /usr/src/redhat/SPECS/mythtv-themes.spec
    179     ## Error?
    180     #    if [ "$?" -ne 0 ]; then
    181     #        echo "MythTV Themes build error."
    182     #        return
    183     #    fi
    184     }
    185 
    186148# A function to install mythtv packages
     149# This doesn't work when building as a user...
     150# There must be a way to get the %{_topdir} from the user's rpm macros
    187151    function installmyth {
    188152        REL="$1"
    189         sudo rpm -Uvh --force --nodeps                                                   \
    190             /usr/src/redhat/RPMS/x86_64/mythtv-docs-$VERSION-0.3.svn.r$REL.*.rpm         \
    191             /usr/src/redhat/RPMS/x86_64/libmyth-$VERSION-0.3.svn.r$REL.*.rpm             \
    192             /usr/src/redhat/RPMS/x86_64/libmyth-devel-$VERSION-0.3.svn.r$REL.*.rpm       \
    193             /usr/src/redhat/RPMS/x86_64/mythtv-base-themes-$VERSION-0.3.svn.r$REL.*.rpm  \
    194             /usr/src/redhat/RPMS/x86_64/mythtv-frontend-$VERSION-0.3.svn.r$REL.*.rpm     \
    195             /usr/src/redhat/RPMS/x86_64/mythtv-backend-$VERSION-0.3.svn.r$REL.*.rpm      \
    196             /usr/src/redhat/RPMS/x86_64/mythtv-setup-$VERSION-0.3.svn.r$REL.*.rpm        \
    197             /usr/src/redhat/RPMS/x86_64/mythtv-common-$VERSION-0.3.svn.r$REL.*.rpm       \
    198             /usr/src/redhat/RPMS/x86_64/perl-MythTV-$VERSION-0.3.svn.r$REL.*.rpm         \
    199             /usr/src/redhat/RPMS/x86_64/python-MythTV-$VERSION-0.3.svn.r$REL.*.rpm       \
    200             /usr/src/redhat/RPMS/x86_64/mythmusic-$VERSION-0.3.svn.r$REL.*.rpm           \
    201             /usr/src/redhat/RPMS/x86_64/mythvideo-$VERSION-0.3.svn.r$REL.*.rpm           \
    202             /usr/src/redhat/RPMS/x86_64/mythweather-$VERSION-0.3.svn.r$REL.*.rpm         \
    203             /usr/src/redhat/RPMS/x86_64/mythtv-debuginfo-$VERSION-0.3.svn.r$REL.*.rpm
    204             #/usr/src/redhat/RPMS/x86_64/mythtv-themes-$VERSION-0.3.svn.r$REL.*.rpm  \
     153        echo "Installing MythTV-$VERSION.r$REL. Please enter root password."
     154        su -c "rpm -Uvh /usr/src/redhat/RPMS/x86_64/{libmyth,libmyth-devel,mytharchive,mythbrowser,mythflix,mythgallery,mythgame,mythmovies,mythmusic,mythnews,mythplugins,mythtv-backend,mythtv-common,mythtv-docs,mythtv-frontend,mythtv-setup,mythvideo,mythweather,mythweb,mythzoneminder,perl-MythTV,python-MythTV,mythtv}-$VERSION-0.3.svn.r$REL.*.rpm /usr/src/redhat/RPMS/noarch/mythtv-themes-$VERSION-0.3.svn.r$REL.*.rpm"
    205155    }
    206156
    207 # And a function to install mythtv theme packages, since they need libmyth
    208 # to be already installed in order to build them
    209     function installthemes {
    210         REL="$1"
    211     }
    212 
    213 
    214157###############################################################################
    215158# Actually execute the program here
    216159###############################################################################
    … …  
    222165    PROG=`basename $0`
    223166
    224167# Check a few things for sanity
    225     for PKG in 'mythtv' 'mythtv-themes'; do
    226     # Make sure the spec exists
    227         if [ ! -f "$ABSPATH/$PKG.spec" ]; then
    228             echo "$ABSPATH/$PKG.spec does not exist"
    229             exit
    230         fi
    231     # Make sure we have a sources directory
    232         if [ ! -d "$ABSPATH/$PKG/" ]; then
    233             echo "$ABSPATH/$PKG does not exist"
    234             exit
    235         fi
    236     done
     168# Make sure the spec exists
     169if [ ! -f "$ABSPATH/mythtv.spec" ]; then
     170    echo "$ABSPATH/mythtv.spec does not exist"
     171    exit
     172fi
     173# Make sure we have a sources directory
     174if [ ! -d "$ABSPATH/mythtv/" ]; then
     175    echo "$ABSPATH/mythtv/ does not exist"
     176    exit
     177fi
    237178
    238179# Auto-detect the source directory?
    239180    if [ -z "$SVNDIR" ]; then

  • packaging/rpm/mythtv/mythbackend.init.in

     
    2828  touch @rundir@/mythbackend.pid; chown mythtv:mythtv @rundir@/mythbackend.pid
    2929  export MYTHCONFDIR="$MYTHTV_HOME"
    3030  export HOME="$MYTHTV_HOME"
    31   daemon $binary $OPTIONS
     31  daemon --user mythtv $binary $OPTIONS
    3232  RETVAL=$?
    3333  echo
    3434  [ $RETVAL = 0 ] && touch @subsysdir@/$prog