Request 4320 (accepted)

This request supersedes: request 4315 (Show diff)

Overview

Request 4320 (accepted)

- Update to version 29.1+git20181015.d8a2db77f5:
* The backend now listens on all addresses
* Add a new MythTV startup page
* mythtv-setup now uses MythUI
* Support for IPV6 link-local addresses
* Improve handling of Bluray overlays
* Resync FFmpeg to 3.2
* VBOX: minimum firmware version to 2.50
* Removed support libraries/prerequisites: libfaac
* ...
- Remove transcode as build dependency
- Disable the mythnetvision plugin on openSUSE > 15
(unresolvable dependencies: python-oauth)
- Add mythbackend.sysusers.in mythbackend.tmpfile.in (switch to systemd)
- Drop the name macro (multiple package versions)
- Add check_py_lib function (send message to _log)
- Update to the headers search path
- Add the mythplugins prefix to packages: mytharchive mythbrowser
mythgallery mythgame mythmusic mythnetvision mythnews mythweather
mythzoneminder (resolve packages conflict with the older versions)
- Add conflict with mythtv-0_28
- Remove obsolete macros
- Fix: env-script-interpreter
- Add build for ARMv8 platform (switch to glesv1_cm)
- Add pkgmanjor macro (package name suffix)
- Remove mythtv-frontend-api as provided package
(switch to mythtv-frontend)
- Spec file cleanup

Created by awissu over 5 years ago
In state accepted
Package maintainer: awissu
Supersedes 4315

Submit mythtv

Submit package home:awissu:branches:Multimedia / mythtv to package Multimedia / mythtv

mythtv.changes Changed

@@ -1,4 +1,41 @@
 -------------------------------------------------------------------
+Mon Oct 29 15:26:57 UTC 2018 - avvissu@yandex.by
+
+- mythbackend.logrotate: Fix invalid user/group name
+
+-------------------------------------------------------------------
+Tue Oct 23 22:34:27 UTC 2018 - Alexei Podvalsky <avvissu@yandex.by>
+
+- Update to version 29.1+git20181015.d8a2db77f5:
+  * The backend now listens on all addresses
+  * Add a new MythTV startup page
+  * mythtv-setup now uses MythUI
+  * Support for IPV6 link-local addresses
+  * Improve handling of Bluray overlays
+  * Resync FFmpeg to 3.2
+  * VBOX: minimum firmware version to 2.50
+  * Removed support libraries/prerequisites: libfaac
+  * ...
+- Remove transcode as build dependency
+- Disable the mythnetvision plugin on openSUSE > 15
+  (unresolvable dependencies: python-oauth)
+- Add mythbackend.sysusers.in mythbackend.tmpfile.in (switch to systemd)
+- Drop the name macro (multiple package versions)
+- Add check_py_lib function (send message to _log)
+- Update to the headers search path
+- Add the mythplugins prefix to packages: mytharchive mythbrowser 
+  mythgallery mythgame mythmusic mythnetvision mythnews mythweather 
+  mythzoneminder (resolve packages conflict with the older versions)
+- Add conflict with mythtv-0_28
+- Remove obsolete macros
+- Fix: env-script-interpreter
+- Add build for ARMv8 platform (switch to glesv1_cm)
+- Add pkgmanjor macro (package name suffix)
+- Remove mythtv-frontend-api as provided package 
+  (switch to mythtv-frontend)
+- Spec file cleanup
+
+-------------------------------------------------------------------
 Wed Aug 22 11:49:54 UTC 2018 - avvissu@yandex.by
 
 - mythbackend.service: Fix invalid user/group name

mythtv.spec Changed

@@ -13,28 +13,42 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.links2linux.org
 #
 
 
-%define major 0_28
+%define manjor 29
 %define soname libmyth
-%define sover  0_28-0
+%define sover 29-29
 %define SYSUSER mythtv
 %define SYSGROUP video
 %define OTHERSYSGROUP audio
+
+# Save a previous major release
+# NOTE: You should have made sure that name of the package is 
+# configured correctly and defines the expected version
+# You can add the manjor macro in the name tag
+# See: Conflicts Tag
+%define pkgmanjor %(echo %{name} | sed -ne '/-/s/[^-]*//p' -ne '/-/!s/[^0-9]*//p') 
+
+%if 0%{?suse_version} <= 1500
+%define mythnetvision 1
+%endif
+            
 # Fix: suse-filelist-forbidden-sysconfig
 %{!?_fillupdir:%global _fillupdir /var/adm/fillup-templates}
 Name:           mythtv
-Version:        0.28.2+git20180529.ae037d012e
+Version:        29.1+git20181015.d8a2db77f5
 Release:        0
 Summary:        A personal video recorder (PVR/DVR) application
 License:        GPL-2.0-or-later
 Group:          Productivity/Multimedia/Video/Players
 URL:            http://mythtv.org/
-Source0:        %{name}-fixes-%{version}.tar.gz
-Source93:       mythbackend.sysconfig.in
-Source94:       mythbackend.service.in
+Source0:        mythtv-fixes-%{version}.tar.gz
+Source91:       mythbackend.sysconfig.in
+Source92:       mythbackend.service.in
+Source93:       mythbackend.sysusers.in
+Source94:       mythbackend.tmpfile.in
 Source95:       mythbackend.rules.in
 Source96:       mythbackend.SuSEfirewall2
 Source97:       mythbackend.logrotate.in
@@ -49,7 +63,6 @@
 BuildRequires:  fftw3-threads-devel
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  libdvdcss-devel
-BuildRequires:  libfaac-devel
 BuildRequires:  libfame-devel
 BuildRequires:  libgsm-devel
 BuildRequires:  libmp3lame-devel
@@ -67,11 +80,8 @@
 BuildRequires:  python-future
 BuildRequires:  python-lxml
 BuildRequires:  python-mysql
-BuildRequires:  python-oauth
 BuildRequires:  python-urlgrabber
 BuildRequires:  python-requests-cache
-BuildRequires:  python-xml
-BuildRequires:  transcode
 BuildRequires:  update-desktop-files
 BuildRequires:  yasm
 BuildRequires:  perl(Config)
@@ -152,19 +162,25 @@
 BuildRequires:  pkgconfig(zlib)
 # FIXME: use proper Requires(pre/post/preun/...)
 PreReq:         coreutils
-Conflicts:      otherproviders(mythtv)
-Provides:       %{name}-0_27 = %{version}
-Obsoletes:      %{name}-0_27 < %{version}
+Conflicts:      mythtv-0_28
+Conflicts:      mythtv-0_27
 %{?systemd_requires}
+# SECTION check:
+%if 0%{?mythnetvision}
+BuildRequires:  python-pycurl
+BuildRequires:  python-oauth
+BuildRequires:  python-xml
+%endif
 %ifarch %{ix86} x86_64
 BuildRequires:  xf86-video-intel
 BuildRequires:  pkgconfig(gl)
 BuildRequires:  pkgconfig(glu)
 %endif
-%ifarch %{arm}
-BuildRequires:  -Mesa-libGL-devel
-BuildRequires:  pkgconfig(glesv2)
+%ifarch %{arm} aarch64
+BuildRequires:  pkgconfig(glesv1_cm)
+#!BuildIgnore:	Mesa-libGL-devel
 %endif
+# /SECTION
 
 %description
 MythTV provides a unified graphical interface for recording and viewing
@@ -190,9 +206,8 @@
 %package        docs
 Summary:        MythTV documentation
 Group:          Documentation/HTML
-Conflicts:      otherproviders(mythtv-docs)
-Provides:       %{name}-0_27-docs = %{version}
-Obsoletes:      %{name}-0_27-docs < %{version}
+Conflicts:      mythtv-0_28-docs
+Conflicts:      mythtv-0_27-docs
 BuildArch:      noarch
 
 %description    docs
@@ -204,24 +219,18 @@
 Summary:        Library providing %{name} support
 Group:          Development/Libraries/C and C++
 Requires:       libQt5Sql5-mysql
-Conflicts:      otherproviders(mythtv-frontend-api)
-Provides:       lib%{name}-%{sover} = %{version}
-Provides:       mythtv-frontend-api = %{version}
-Provides:       %{soname}-0_27 = %{version}
-Obsoletes:      %{soname}-0_27 < %{version}
 
 %description -n %{soname}-%{sover}
 A personal video recorder (PVR/DVR) application.
 
-Common library code for %{name} and add-on modules (development).
+This package contains the shared library for %{name} and add-on modules.
 
 %package        devel
 Summary:        Development files for %{soname}
 Group:          Development/Libraries/C and C++
-Requires:       lib%{name}-%{sover} = %{version}
-Conflicts:      otherproviders(mythtv-devel)
-Provides:       %{soname}-0_27-devel = %{version}
-Obsoletes:      %{soname}-0_27-devel < %{version}
+Requires:       %{soname}-%{sover} = %{version}
+Conflicts:      mythtv-0_28-devel
+Conflicts:      mythtv-0_27-devel
 
 %description    devel
 A personal video recorder (PVR/DVR) application.
@@ -233,9 +242,8 @@
 Summary:        Core user interface themes for %{name}
 Group:          Productivity/Multimedia/Video/Players
 Recommends:     droid-fonts
-Conflicts:      otherproviders(mythtv-base-themes)
-Provides:       %{name}-0_27-base-themes = %{version}
-Obsoletes:      %{name}-0_27-base-themes < %{version}
+Conflicts:      mythtv-0_28-base-themes
+Conflicts:      mythtv-0_27-base-themes
 BuildArch:      noarch
 
 %description    base-themes
@@ -246,9 +254,8 @@
 %package        common
 Summary:        Common components needed by %{name}
 Group:          Productivity/Multimedia/Video/Players
-Conflicts:      otherproviders(mythtv-common)
-Provides:       %{name}-0_27-common = %{version}
-Obsoletes:      %{name}-0_27-common < %{version}
+Conflicts:      mythtv-0_28-common
+Conflicts:      mythtv-0_27-common
 
 %description    common
 A personal video recorder (PVR/DVR) application.
@@ -262,11 +269,9 @@
 Requires:       %(rpm -qf $(readlink -qne %{_libdir}/libcec.so) --qf '%%{NAME} >= %%{VERSION}')
 Requires:       %{name}-base-themes = %{version}
 Requires:       %{name}-common = %{version}
-Requires:       %{name}-frontend-api = %{version}
-Conflicts:      otherproviders(mythvideo)
-Provides:       %{name}-0_27-frontend = %{version}
-Obsoletes:      %{name}-0_27-frontend < %{version}
-Provides:       mythvideo = %{version}
+Requires:       %{soname}-%{sover} = %{version}
+Conflicts:      mythtv-0_28-frontend
+Conflicts:      mythtv-0_27-frontend
 
 %description    frontend
 MythTV provides a unified graphical interface for recording and viewing
@@ -280,17 +285,16 @@
 Summary:        Server component of %{name} (a DVR)
 Group:          Productivity/Multimedia/Video/Players
 Requires:       %{name}-common = %{version}
+Requires:       python-future
+Requires:       python-requests-cache
 Requires(pre):  %fillup_prereq
 Requires(pre):  coreutils
 Requires(pre):  shadow
 Requires(pre):  util-linux-systemd
 Recommends:     logrotate
-Conflicts:      otherproviders(mythtv-backend)
-Provides:       %{name}-0_27-backend = %{version}
-Obsoletes:      %{name}-0_27-backend < %{version}
-%if 0%{?suse_version} > 1320
+Conflicts:      mythtv-0_28-backend
+Conflicts:      mythtv-0_27-backend
 Requires(pre):  system-group-hardware
-%endif
 
 %description    backend
 MythTV provides a unified graphical interface for recording and viewing
@@ -306,9 +310,8 @@
 Group:          Productivity/Multimedia/Video/Players
 Requires:       %{name}-backend = %{version}
 Requires:       %{name}-base-themes = %{version}
-Conflicts:      otherproviders((mythtv-setup)
-Provides:       %{name}-0_27-setup = %{version}
-Obsoletes:      %{name}-0_27-setup < %{version}
+Conflicts:      mythtv-0_28-setup
+Conflicts:      mythtv-0_27-setup
 
 %description    setup
 A personal video recorder (PVR/DVR) application.
@@ -322,9 +325,8 @@
 Requires:       perl(DBD::mysql)
 Requires:       perl(Net::UPnP)
 Requires:       perl(Net::UPnP::ControlPoint)
-Conflicts:      otherproviders(perl-mythtv)
-Provides:       perl-MythTV-0_27 = %{version}
-Obsoletes:      perl-MythTV-0_27 < %{version}
+Conflicts:      perl-mythtv-0_28
+Conflicts:      perl-MythTV-0_27
 BuildArch:      noarch
 %{perl_requires}
 
@@ -336,13 +338,10 @@
 %package -n     python-%{name}
 Summary:        Python bindings for %{name}
 Group:          Development/Libraries/Python
-Requires:       python-future
 Requires:       python-lxml
 Requires:       python-mysql
-Requires:       python-requests-cache
-Conflicts:      otherproviders(python-mythtv)
-Provides:       python-MythTV-0_27 = %{version}
-Obsoletes:      python-MythTV-0_27 < %{version}
+Conflicts:      python-mythtv-0_28
+Conflicts:      python-MythTV-0_27
 BuildArch:      noarch
 
 %description -n python-%{name}
@@ -354,9 +353,8 @@
 Summary:        PHP bindings for %{name}
 Group:          Development/Libraries/Other
 Requires:       perl-%{name}
-Conflicts:      otherproviders(php-mythtv)
-Provides:       php-MythTV-0_27 = %{version}
-Obsoletes:      php-MythTV-0_27 < %{version}
+Conflicts:      php-mythtv-0_28
+Conflicts:      php-MythTV-0_27
 BuildArch:      noarch
 
 %description -n php-%{name}
@@ -364,7 +362,7 @@
 
 Provides a php-based interface to interacting with MythTV.
 
-%package -n     mytharchive
+%package -n     mythplugins-mytharchive%{?pkgmanjor}
 Summary:        A module for %{name} for creating and burning DVDs
 Group:          Productivity/Multimedia/Video/Players
 Requires:       %{_bindir}/cdrecord
@@ -375,25 +373,26 @@
 Requires:       mjpegtools
 Requires:       python-imaging
 Requires:       transcode
-Conflicts:      otherproviders(mytharchive)
-Provides:       mytharchive-0_27 = %{version}
-Obsoletes:      mytharchive-0_27 < %{version}
+Provides:       mytharchive%{?pkgmanjor} = %{version}
+Conflicts:      mytharchive-0_28
+Conflicts:      mytharchive-0_27
 
-%description -n mytharchive
+%description -n mythplugins-mytharchive%{?pkgmanjor}
 A personal video recorder (PVR/DVR) application.
 
 MythArchive is a new plugin for MythTV that lets you create DVDs from your
 recorded shows, MythVideo files and any video files available on your
 system.
 
-%package -n     mythbrowser
+%package -n     mythplugins-mythbrowser%{?pkgmanjor}
 Summary:        A small web browser module for %{name}
 Group:          Productivity/Multimedia/Video/Players
-Conflicts:      otherproviders(mythbrowser)
-Provides:       mythbrowser-0_27 = %{version}
-Obsoletes:      mythbrowser-0_27 < %{version}
+Requires:       %{name}-frontend = %{version}
+Provides:       mythbrowser%{?pkgmanjor} = %{version}
+Conflicts:      mythbrowser-0_28
+Conflicts:      mythbrowser-0_27
 
-%description -n mythbrowser
+%description -n mythplugins-mythbrowser%{?pkgmanjor}
 A personal video recorder (PVR/DVR) application.
 
 MythBrowser is a full fledged web-browser (multiple tabs) to display
@@ -404,16 +403,16 @@
 MythBrowser also contains a BookmarkManager to manage the website links in
 a simple mythplugin.
 
-%package -n     mythgallery
+%package -n     mythplugins-mythgallery%{?pkgmanjor}
 Summary:        Image gallery plugin for %{name}
 Group:          Productivity/Multimedia/Video/Players
-Requires:       %{name}-frontend-api = %{version}
+Requires:       %{name}-frontend = %{version}
 Requires:       dcraw
-Conflicts:      otherproviders(mythgallery)
-Provides:       mythgallery-0_27 = %{version}
-Obsoletes:      mythgallery-0_27 < %{version}
+Provides:       mythgallery%{?pkgmanjor} = %{version}
+Conflicts:      mythgallery-0_28
+Conflicts:      mythgallery-0_27
 
-%description -n mythgallery
+%description -n mythplugins-mythgallery%{?pkgmanjor}
 A personal video recorder (PVR/DVR) application.
 
 The MythGallery plug-in allows you to view all your photos as well as short
@@ -421,29 +420,29 @@
 are organised in your file system. Myth will generate thumbnails of both
 folders as well as individual photos.
 
-%package -n     mythgame
+%package -n     mythplugins-mythgame%{?pkgmanjor}
 Summary:        A game frontend (xmame, nes, snes, pc) for %{name}
 Group:          Productivity/Multimedia/Video/Players
-Requires:       %{name}-frontend-api = %{version}
-Conflicts:      otherproviders(mythgame)
-Provides:       mythgame-0_27 = %{version}
-Obsoletes:      mythgame-0_27 < %{version}
+Requires:       %{name}-frontend = %{version}
+Provides:       mythgame%{?pkgmanjor} = %{version}
+Conflicts:      mythgame-0_28
+Conflicts:      mythgame-0_27
 
-%description -n mythgame
+%description -n mythplugins-mythgame%{?pkgmanjor}
 A personal video recorder (PVR/DVR) application.
 
 MythGame is a starter for games and emulators, so they can be run from
 within %{name}.
 
-%package -n     mythmusic
+%package -n     mythplugins-mythmusic%{?pkgmanjor}
 Summary:        The music player add-on module for %{name}
 Group:          Productivity/Multimedia/Video/Players
-Requires:       %{name}-frontend-api = %{version}
-Conflicts:      otherproviders(mythmusic)
-Provides:       mythmusic-0_27 = %{version}
-Obsoletes:      mythmusic-0_27 < %{version}
+Requires:       %{name}-frontend = %{version}
+Provides:       mythmusic%{?pkgmanjor} = %{version}
+Conflicts:      mythmusic-0_28
+Conflicts:      mythmusic-0_27
 
-%description -n mythmusic
+%description -n mythplugins-mythmusic%{?pkgmanjor}
 A personal video recorder (PVR/DVR) application.
 
 MythMusic is a sophisticated MythTV plugin that allows you to play and
@@ -451,19 +450,20 @@
 streams from the likes of Icecast, Sky FM, Digitally Imported and
 Radionomy.
 
-%package -n     mythnetvision
+%package -n     mythplugins-mythnetvision%{?pkgmanjor}
 Summary:        MythTV Plugin for watching internet content
 Group:          Productivity/Multimedia/Video/Players
+Requires:       %{name}-frontend = %{version}
 Requires:       perl
 Requires:       python-%{name} = %{version}
 Requires:       python-curl
 Requires:       python-oauth
 Requires:       python-xml
-Conflicts:      otherproviders(mythnetvision)
-Provides:       mythnetvision-0_27 = %{version}
-Obsoletes:      mythnetvision-0_27 < %{version}
+Provides:       mythnetvision%{?pkgmanjor} = %{version}
+Conflicts:      mythnetvision-0_28
+Conflicts:      mythnetvision-0_27
 
-%description -n mythnetvision
+%description -n mythplugins-mythnetvision%{?pkgmanjor}
 A personal video recorder (PVR/DVR) application.
 
 MythNetvision is a plugin designed to make adding Internet video sources to
@@ -472,47 +472,47 @@
 on the Media Library screen as the options "Search Internet Video" and
 "Browse Internet Video."
 
-%package -n     mythnews
+%package -n     mythplugins-mythnews%{?pkgmanjor}
 Summary:        An RSS news feed plugin for %{name}
 Group:          Productivity/Multimedia/Video/Players
-Requires:       %{name}-frontend-api = %{version}
-Conflicts:      otherproviders(mythnews)
-Provides:       mythnews-0_27 = %{version}
-Obsoletes:      mythnews-0_27 < %{version}
+Requires:       %{name}-frontend = %{version}
+Provides:       mythnews%{?pkgmanjor} = %{version}
+Conflicts:      mythnews-0_28
+Conflicts:      mythnews-0_27
 
-%description -n mythnews
+%description -n mythplugins-mythnews%{?pkgmanjor}
 A personal video recorder (PVR/DVR) application.
 
 MythNews is a module which permits the user to follow their favorite news
 sources, available in RSS format.
 
-%package -n     mythweather
+%package -n     mythplugins-mythweather%{?pkgmanjor}
 Summary:        A %{name} module that displays a weather forcast
 Group:          Productivity/Multimedia/Video/Players
-Requires:       %{name}-frontend-api = %{version}
+Requires:       %{name}-frontend = %{version}
 Requires:       perl(DateTime::Format::ISO8601)
 Requires:       perl(Image::Size)
 Requires:       perl(SOAP::Lite)
 Requires:       perl(XML::SAX::Base)
 Requires:       perl(XML::XPath)
-Conflicts:      otherproviders(mythweather)
-Provides:       mythweather-0_27 = %{version}
-Obsoletes:      mythweather-0_27 < %{version}
+Provides:       mythweather%{?pkgmanjor} = %{version}
+Conflicts:      mythweather-0_28
+Conflicts:      mythweather-0_27
 
-%description -n mythweather
+%description -n mythplugins-mythweather%{?pkgmanjor}
 A personal video recorder (PVR/DVR) application.
 
 MythWeather is a plugin that downloads and displays weather information.
 
-%package -n     mythzoneminder
+%package -n     mythplugins-mythzoneminder%{?pkgmanjor}
 Summary:        A module for %{name} for camera security and surveillance
 Group:          Productivity/Multimedia/Video/Players
-Requires:       %{name}-frontend-api = %{version}
-Conflicts:      otherproviders(mythzoneminder)
-Provides:       mythzoneminder-0_27 = %{version}
-Obsoletes:      mythzoneminder-0_27 < %{version}
+Requires:       %{name}-frontend = %{version}
+Provides:       mythzoneminder%{?pkgmanjor} = %{version}
+Conflicts:      mythzoneminder-0_28
+Conflicts:      mythzoneminder-0_27
 
-%description -n mythzoneminder
+%description -n mythplugins-mythzoneminder%{?pkgmanjor}
 A personal video recorder (PVR/DVR) application.
 
 MythZoneMinder is a plugin to interface to some of the features of
@@ -521,11 +521,11 @@
 recorded events.
 
 %prep
-%setup -q -n %{name}-fixes-%{version}
+%setup -q -n mythtv-fixes-%{version}
 
 # Check app version
-_newversion=$(grep -os '[0-9]\+\.[.0-9]\+\?[0-9]' %{name}/VERSION)
-_oldversion=$(echo %{version} | grep -o '[0-9]\+\.[.0-9]\+\?[0-9]')
+_newversion=$(grep -os '[0-9]\+\.[.0-9]\+\?[0-9]' mythtv/VERSION | grep -m1 .)
+_oldversion=$(echo %{version} | grep -o '[0-9]\+\.[.0-9]\+\?[0-9]' | grep -m1 .)
 if [ -n "$_newversion" ]; then
     if [ -f %_sourcedir/_service ]; then
         if [[ "$_oldversion" != $_newversion ]]; then
@@ -545,26 +545,34 @@
     -exec sed -r -i -e 's,/lib\b,/%{_lib},g' {} \+
 fi
 
-sed -e 's|^\#\!.*python$|\#\!%{_bindir}/python2|' \
-    -i $(grep -rl 'env\ python')
+# Fix: env-script-interpreter
+grep -rl '^\#\!\/' | xargs -r -t sed -i '/^\#\!\/.\+perl/s/env\ \+//;s|^\#\!.*python$|#!%{_bindir}/python2|'
 
+# Fix: non-executable-script
 find -regex ".*\.$html\|js\|xsl$" -type f -executable -exec chmod 644 {} \; || :
 
-pushd %{name}
+pushd mythtv
 %patch0 -p1
 
-sed -i 's/\-ldconfig//;s/\-O3//' $(grep -rl '\-ldconfig\|\-O3')
+# Remove unnecessary ldconfig call
+sed -i 's/\-ldconfig//' $(grep -rl '\-ldconfig')
+
+# Use optflags when building
+sed -i 's/\-O3//' $(grep -rl '\-O3')
 
-cp -a %{SOURCE93} %{SOURCE94} %{SOURCE95} %{SOURCE96} %{SOURCE97} %{SOURCE98} %{SOURCE99} .
+cp -a %{SOURCE91} %{SOURCE92} %{SOURCE93} %{SOURCE94} %{SOURCE95} %{SOURCE96} %{SOURCE97} %{SOURCE98} %{SOURCE99} .
 
-for file in mythbackend.service.in mythbackend.logrotate.in; do
+for file in mythbackend.{service,sysusers,tmpfile,logrotate}.in; do
     sed -e's|@SYSUSER@|%{SYSUSER}|g' \
         -e's|@SYSGROUP@|%{SYSGROUP}|g' \
+        -e's|@OTHERSYSGROUP@|%{OTHERSYSGROUP}|g' \
         -i $file
 done
 
-FAKE_BUILDDATE=$(LC_ALL=C date -r %{_sourcedir}/%{name}.changes '+%b %e %Y')
-FAKE_BUILDTIME=$(LC_ALL=C date -r %{_sourcedir}/%{name}.changes '+%H:%M:%S')
+# Remove build time references
+# Fix: file-contains-date-and-time
+FAKE_BUILDDATE=$(LC_ALL=C date -r %{_sourcedir}/mythtv.changes '+%b %e %Y')
+FAKE_BUILDTIME=$(LC_ALL=C date -r %{_sourcedir}/mythtv.changes '+%H:%M:%S')
 sed -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" \
     -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" \
     -i $(grep -rl '__DATE__\|__TIME__') || :
@@ -572,9 +580,29 @@
 popd
 
 %build
+# check python libraries
+# can be used to send a message to _log
+check_py_lib() { 
+grep '^\ \+check_py_lib\ \+' configure \
+| awk '{print $2}' \
+| while read _check_py_lib
+do
+python <<EOF
+from distutils.sysconfig import get_python_lib
+import sys
+sys.path.append(get_python_lib(prefix="${temp}%{_prefix}"))
+print (get_python_lib(prefix="${temp}%{_prefix}"))
+import ${_check_py_lib}
+EOF
+done
+}
+
 export CFLAGS="%{optflags} -fomit-frame-pointer -fno-strict-aliasing"
 export CXXFLAGS="$CFLAGS"
-pushd %{name}
+
+# Build MythTV
+pushd mythtv
+check_py_lib || :
 # FIXME: you should use the %%configure macro
 ./configure \
     --prefix=%{_prefix}                         \
@@ -602,7 +630,6 @@
     --enable-libxvid                            \
     --enable-vdpau                              \
     --enable-vaapi                              \
-    --enable-libfaac                            \
     --enable-libx264                            \
     --enable-libvpx                             \
     --enable-libxvid                            \
@@ -620,44 +647,36 @@
 %make_jobs OPTFLAGS="%{optflags}"
 popd
 
+# Prepare to build the plugins
+# Make install into a temporary directory
 mkdir temp
-temp=`pwd`/temp
+temp=$(pwd)/temp
 mkdir -p $temp%{perl_vendorlib}
-make %{?_smp_mflags} -C %{name} install INSTALL_ROOT=$temp
-if [ "%{_libdir}" != "%{_prefix}/lib" ]; then
-    mv $temp/usr/lib{,64}/%{soname}zmq.* $temp%{_libdir} || :
-fi
+make %{?_smp_mflags} -C mythtv install INSTALL_ROOT=$temp
 
 export LD_LIBRARY_PATH=$temp%{_libdir}:$LD_LIBRARY_PATH
 
+# Build plugins
 pushd mythplugins
+# Fix the default mythtv location
 echo "QMAKE_PROJECT_DEPTH = 0" >> settings.pro
 find . -name \*.pro \
-    -exec sed -i -e "s,INCLUDEPATH += .\+/include/%{name},INCLUDEPATH += $temp%{_includedir}/%{name}," {} \; \
-    -exec sed -i -e "s,DEPLIBS = \$\${LIBDIR},DEPLIBS = $temp%{_libdir}," {} \; \
-    -exec sed -i -e "s,\$\${PREFIX}/include/%{name},$temp%{_includedir}/%{name}," {} \;
+    -exec sed -i -e "s,INCLUDEPATH += .\+/include/mythtv,INCLUDEPATH += $temp%{_includedir}/mythtv," {} \; \
+    -exec sed -i -e "s,DEPLIBS = \$\${SYSROOT}\$\${LIBDIR},DEPLIBS = $temp%{_libdir}," {} \; \
+    -exec sed -i -e "s,\$\${PREFIX}/include/mythtv,$temp%{_includedir}/mythtv," {} \;
+
+echo "QMAKE_LIBDIR += $temp%{_libdir}" >> targetdep.pro
 cat >> settings.pro << EOF
 INCLUDEPATH -= \$\${PREFIX}/include
+INCLUDEPATH -= \$\${SYSROOT}/\$\${PREFIX}/include
 INCLUDEPATH -= %{_includedir}
 INCLUDEPATH += $temp%{_includedir}
-INCLUDEPATH += %{_includedir}
 LIBS *= -L$temp%{_libdir}
-QMAKE_LIBDIR += $temp%{_libdir}
 EOF
 
-# check python libraries
-grep '^\ \+check_py_lib\ \+' configure \
-| awk '{print $2}' \
-| while read _check_py_lib
-do
-python <<EOF
-from distutils.sysconfig import get_python_lib
-import sys
-sys.path.append(get_python_lib(prefix="${temp}%{_prefix}"))
-print (get_python_lib(prefix="${temp}%{_prefix}"))
-import ${_check_py_lib}
-EOF
-done
+%if 0%{?mythnetvision}
+check_py_lib || mythnetvision=0
+%endif
 
 # FIXME: you should use the %%configure macro
 ./configure \
@@ -676,44 +695,43 @@
     --enable-mythgallery \
     --enable-mythgame \
     --enable-mythmusic \
-    --enable-mythnetvision \
     --enable-mythnews \
     --enable-mythweather \
     --enable-mythzoneminder \
-    --python=python2
+    --python=python2 \
+    ${mythnetvision:+--disable-mythnetvision} \
+    ${mythnetvision:---enable-mythnetvision} \
 
 %make_jobs
 popd
 
 %install
-pushd %{name}
+pushd mythtv
 %qmake5_install
 
-install -d %{buildroot}{%{_sbindir},%{_libdir}/%{name}/plugins,%{_sysconfdir}/%{name}}
-
-if [ "%{_libdir}" != "%{_prefix}/lib" ]; then
-    mv %{buildroot}%{_prefix}/lib{,64}/%{soname}zmq.* %{buildroot}%{_libdir} || :
-fi
+install -d %{buildroot}{%{_sbindir},%{_libdir}/mythtv/plugins,%{_sysconfdir}/mythtv}
 
-ln -sf %{name}-setup %{buildroot}%{_bindir}/%{name}setup
-echo "# to be filled in by %{name}-setup" > %{buildroot}%{_sysconfdir}/%{name}/config.xml
+ln -sf mythtv-setup %{buildroot}%{_bindir}/mythtvsetup
+echo "# to be filled in by mythtv-setup" > %{buildroot}%{_sysconfdir}/mythtv/config.xml
 install -Dm0644 {./,%{buildroot}%{_datadir}/icons/hicolor/scalable/apps}/mythfrontend.svg
 
 install -Dm0644 mythbackend.sysconfig.in %{buildroot}%{_fillupdir}/sysconfig.mythbackend
 install -Dm0644 mythbackend.service.in %{buildroot}%{_unitdir}/mythbackend.service
+install -Dm0644 mythbackend.tmpfile.in %{buildroot}%{_tmpfilesdir}/mythbackend.conf
+install -Dm0644 mythbackend.sysusers.in %{buildroot}%{_sysusersdir}/mythbackend.conf
 ln -s %{_sbindir}/service  %{buildroot}%{_sbindir}/rcmythbackend
 install -Dm0644 mythbackend.rules.in %{buildroot}/%{_udevrulesdir}/99-mythbackend.rules
 
-install -Dm0644 {./,%{buildroot}%{_datadir}/%{name}/build/}settings.pro
+install -Dm0644 {./,%{buildroot}%{_datadir}/mythtv/build/}settings.pro
 install -Dm0644 mythbackend.SuSEfirewall2 %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/mythbackend
-install -Dm0644 mythbackend.logrotate.in %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
+install -Dm0644 mythbackend.logrotate.in %{buildroot}%{_sysconfdir}/logrotate.d/mythtv
 install -d %{buildroot}$(sed -n 's/\ \+olddir\ \+//p' mythbackend.logrotate.in)$(grep -q 'olddir' mythbackend.logrotate.in)
 
 %{suse_update_desktop_file -c \
 mythfrontend MythTV "PVR/DVR" mythfrontend mythfrontend Qt AudioVideo Video TV}
 
 %{suse_update_desktop_file -c \
-%{name}-setup "MythTV Setup" "MythTV - Sets up the database" %{name}-setup mythfrontend Qt Settings Qt Utility Settings}
+mythtv-setup "MythTV Setup" "MythTV - Sets up the database" mythtv-setup mythfrontend Qt Settings Qt Utility Settings}
 
 # Fix: Unknown option -w/geometry in suse_update_desktop_file
 # Use the following lines instead of suse_update_desktop_file.sh
@@ -730,25 +748,25 @@
 EOF
 done
 
-install -Dm0644 %{name}-session.desktop %{buildroot}%{_datadir}/xsessions/%{name}.desktop
+install -Dm0644 mythtv-session.desktop %{buildroot}%{_datadir}/xsessions/mythtv.desktop
 popd
 
-install -d %{buildroot}%{_localstatedir}/{lib/%{name},log/%{name},cache/%{name}}
+install -d %{buildroot}%{_localstatedir}/{lib/mythtv,log/mythtv,cache/mythtv}
 
 pushd mythplugins
 %qmake5_install
 
 install -d %{buildroot}%{_localstatedir}/{lib/mythmusic,lib/pictures}
-install -d %{buildroot}%{_datadir}/%{name}/games/nes/{roms,screens}
-install -d %{buildroot}%{_datadir}/%{name}/games/snes/{roms,screens}
-install -d %{buildroot}%{_datadir}/{%{name}/games/PC/screens,mame,mame/flyers}
+install -d %{buildroot}%{_datadir}/mythtv/games/nes/{roms,screens}
+install -d %{buildroot}%{_datadir}/mythtv/games/snes/{roms,screens}
+install -d %{buildroot}%{_datadir}/{mythtv/games/PC/screens,mame,mame/flyers}
 install -d %{buildroot}%{_sysconfdir}/mythgame
 
-ln -s ../../mame %{buildroot}%{_datadir}/%{name}/games/xmame
-ln -s snap %{buildroot}%{_datadir}/%{name}/games/xmame/screens
+ln -s ../../mame %{buildroot}%{_datadir}/mythtv/games/xmame
+ln -s snap %{buildroot}%{_datadir}/mythtv/games/xmame/screens
 cp -a mythgame/gamelist.xml %{buildroot}%{_sysconfdir}/mythgame/
 ln -s ../../../../../%{_sysconfdir}/mythgame/ \
-    %{buildroot}%{_datadir}/%{name}/games/PC/gamelist.xml
+    %{buildroot}%{_datadir}/mythtv/games/PC/gamelist.xml
 popd
 
 find %{buildroot} -type f -name \*.py | while read py; do
@@ -757,29 +775,24 @@
 done
 
 pushd %{buildroot}
-find . -path .%{_includedir}/%{name} -prune -o \
+find . -path .%{_includedir}/mythtv -prune -o \
     -iregex ".*\.$la\|a\|pc\|hpp\|h\|.*/\..*$" -print -exec rm {} \;
 popd
 
 %fdupes %{buildroot}%{_docdir}
-%fdupes %{buildroot}%{_datadir}/%{name}
-%fdupes %{buildroot}%{_includedir}/%{name}
+%fdupes %{buildroot}%{_datadir}/mythtv
+%fdupes %{buildroot}%{_includedir}/mythtv
 
 %post -n %{soname}-%{sover} -p /sbin/ldconfig
 %postun -n %{soname}-%{sover} -p /sbin/ldconfig
 
 %pre backend
-if [ $1 -eq 1 ]; then
-    if ! %{_bindir}/id %{SYSUSER} &>/dev/null; then
-        %{_sbindir}/useradd -r -c "MythTV Backend User" -g %{SYSGROUP} -G %{OTHERSYSGROUP} \
-        -s /sbin/nologin -d %{_localstatedir}/lib/%{name} %{SYSUSER} 2> /dev/null || :
-    fi
-fi
-
 %service_add_pre mythbackend.service
 
 %post backend
 %{fillup_and_insserv -i -n mythbackend}
+%tmpfiles_create %{_tmpfilesdir}/mythbackend.conf
+%sysusers_create %{_sysusersdir}/mythbackend.conf
 %service_add_post mythbackend.service
 %udev_rules_update
 
@@ -789,31 +802,19 @@
 %postun backend
 %service_del_postun mythbackend.service
 if [ $1 -eq 0 ]; then
-    userdel %{SYSUSER} || logger "User \"%{SYSUSER}\" could not be deleted."
-    rm -rf %{_localstatedir}/{lib/%{name},log/%{name},cache/%{name}}
     %udev_rules_update
 fi
 
-%if 0%{?suse_version} < 1500
-%post frontend
-%icon_theme_cache_post
-%desktop_database_post
-
-%postun frontend
-%icon_theme_cache_postun
-%desktop_database_postun
-%endif
-
 %files docs
-%doc %{name}/README*
-%doc %{name}/UPGRADING
-%doc %{name}/AUTHORS
-%doc %{name}/COPYING
-%doc %{name}/FAQ
-%doc %{name}/database
-%doc %{name}/keys.txt
-%doc %{name}/docs
-%doc %{name}/contrib
+%doc mythtv/README*
+%doc mythtv/UPGRADING
+%doc mythtv/AUTHORS
+%doc mythtv/COPYING
+%doc mythtv/FAQ
+%doc mythtv/database
+%doc mythtv/keys.txt
+%doc mythtv/docs
+%doc mythtv/contrib
 
 %files common
 %{_bindir}/mythcommflag
@@ -829,48 +830,51 @@
 %{_bindir}/mythhdhomerun_config
 %{_bindir}/mythscreenwizard
 %{_bindir}/mythfilerecorder
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/mythconverg*.pl
-%dir %{_datadir}/%{name}/locales
-%{_datadir}/%{name}/locales/*
-%dir %{_datadir}/%{name}/metadata
-%{_datadir}/%{name}/metadata/*
-%dir %{_datadir}/%{name}/hardwareprofile
-%{_datadir}/%{name}/hardwareprofile/*
+%dir %{_datadir}/mythtv
+%{_datadir}/mythtv/mythconverg*.pl
+%dir %{_datadir}/mythtv/locales
+%{_datadir}/mythtv/locales/*
+%dir %{_datadir}/mythtv/metadata
+%{_datadir}/mythtv/metadata/*
+%dir %{_datadir}/mythtv/hardwareprofile
+%{_datadir}/mythtv/hardwareprofile/*
 %{_bindir}/mythwikiscripts
-%{_datadir}/%{name}/CDS_scpd.xml
-%{_datadir}/%{name}/CMGR_scpd.xml
-%{_datadir}/%{name}/MFEXML_scpd.xml
-%{_datadir}/%{name}/MSRR_scpd.xml
-%{_datadir}/%{name}/devicemaster.xml
-%{_datadir}/%{name}/deviceslave.xml
-%dir %{_sysconfdir}/%{name}
-%config(noreplace) %{_sysconfdir}/%{name}/config.xml
+%{_datadir}/mythtv/CDS_scpd.xml
+%{_datadir}/mythtv/CMGR_scpd.xml
+%{_datadir}/mythtv/MFEXML_scpd.xml
+%{_datadir}/mythtv/MSRR_scpd.xml
+%{_datadir}/mythtv/devicemaster.xml
+%{_datadir}/mythtv/deviceslave.xml
+%dir %{_sysconfdir}/mythtv
+%config(noreplace) %{_sysconfdir}/mythtv/config.xml
 
 %files backend
 %{_bindir}/mythbackend
 %{_bindir}/mythfilldatabase
 %{_bindir}/mythjobqueue
 %{_bindir}/mythmediaserver
-%{_datadir}/%{name}/html/
-%{_datadir}/%{name}/backend-config
-%{_datadir}/%{name}/MXML_scpd.xml
+%{_datadir}/mythtv/html/
+%{_datadir}/mythtv/backend-config
+%{_datadir}/mythtv/MXML_scpd.xml
+%{_datadir}/mythtv/internetcontent/
 %{_fillupdir}/sysconfig.mythbackend
-%attr(0750,%{SYSUSER},%{SYSGROUP}) %dir %{_localstatedir}/lib/mythtv
-%attr(0750,%{SYSUSER},%{SYSGROUP}) %dir %{_localstatedir}/cache/mythtv
-%attr(0750,%{SYSUSER},%{SYSGROUP}) %dir %{_localstatedir}/log/%{name}
-%attr(0750,%{SYSUSER},%{SYSGROUP}) %dir %{_localstatedir}/log/%{name}/old
+%ghost %attr(0750,%{SYSUSER},%{SYSGROUP}) %dir %{_localstatedir}/lib/mythtv
+%ghost %attr(0750,%{SYSUSER},%{SYSGROUP}) %dir %{_localstatedir}/cache/mythtv
+%ghost %attr(0750,%{SYSUSER},%{SYSGROUP}) %dir %{_localstatedir}/log/mythtv
+%ghost %attr(0750,%{SYSUSER},%{SYSGROUP}) %dir %{_localstatedir}/log/mythtv/old
 %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/mythbackend
-%config %{_sysconfdir}/logrotate.d/%{name}
+%config %{_sysconfdir}/logrotate.d/mythtv
 %{_sbindir}/rcmythbackend
+%{_sysusersdir}/mythbackend.conf
+%{_tmpfilesdir}/mythbackend.conf
 %{_unitdir}/mythbackend.service
 %{_udevrulesdir}/99-mythbackend.rules
 
 %files setup
-%{_bindir}/%{name}-setup
-%{_bindir}/%{name}setup
-%{_datadir}/%{name}/setup.xml
-%{_datadir}/applications/*%{name}-setup.desktop
+%{_bindir}/mythtv-setup
+%{_bindir}/mythtvsetup
+%{_datadir}/mythtv/setup.xml
+%{_datadir}/applications/*mythtv-setup.desktop
 
 %files frontend
 %{_bindir}/mythavtest
@@ -878,31 +882,31 @@
 %{_bindir}/mythlcdserver
 %{_bindir}/mythshutdown
 %{_bindir}/mythwelcome
-%{_libdir}/%{name}/filters
-%dir %{_libdir}/%{name}
-%dir %{_libdir}/%{name}/plugins
-%dir %{_datadir}/%{name}/i18n
-%{_datadir}/%{name}/i18n/mythfrontend_*.qm
+%{_libdir}/mythtv/filters
+%dir %{_libdir}/mythtv
+%dir %{_libdir}/mythtv/plugins
+%dir %{_datadir}/mythtv/i18n
+%{_datadir}/mythtv/i18n/mythfrontend_*.qm
 %{_datadir}/applications/mythfrontend*.desktop
 %{_datadir}/icons/hicolor/*/apps/mythfrontend.svg
-%{_datadir}/xsessions/%{name}.desktop
-%dir %{_datadir}/%{name}/fonts
-%{_datadir}/%{name}/fonts/*.ttf
-%{_datadir}/%{name}/fonts/*.otf
-%{_datadir}/%{name}/fonts/tiresias_gpl3.txt
+%{_datadir}/xsessions/mythtv.desktop
+%dir %{_datadir}/mythtv/fonts
+%{_datadir}/mythtv/fonts/*.ttf
+%{_datadir}/mythtv/fonts/*.otf
+%{_datadir}/mythtv/fonts/tiresias_gpl3.txt
 
 %files base-themes
-%dir %{_datadir}/%{name}/themes
-%{_datadir}/%{name}/themes/*
+%dir %{_datadir}/mythtv/themes
+%{_datadir}/mythtv/themes/*
 
 %files -n %{soname}-%{sover}
 %{_libdir}/*.so.*
 
 %files devel
-%{_includedir}/%{name}/
+%{_includedir}/mythtv/
 %{_libdir}/*.so
-%dir %{_datadir}/%{name}/build
-%{_datadir}/%{name}/build/settings.pro
+%dir %{_datadir}/mythtv/build
+%{_datadir}/mythtv/build/settings.pro
 
 %files -n perl-%{name}
 %{perl_vendorlib}/MythTV.pm
@@ -920,74 +924,75 @@
 %{python_sitelib}/MythTV-*.egg-info
 
 %files -n php-%{name}
-%dir %{_datadir}/%{name}/bindings
-%{_datadir}/%{name}/bindings/php
+%dir %{_datadir}/mythtv/bindings
+%{_datadir}/mythtv/bindings/php
 
-%files -n mytharchive
+%files -n mythplugins-mytharchive%{?pkgmanjor}
 %{_bindir}/mytharchivehelper
-%{_libdir}/%{name}/plugins/%{soname}archive.so
-%{_datadir}/%{name}/archivemenu.xml
-%{_datadir}/%{name}/archiveutils.xml
-%{_datadir}/%{name}/mytharchive/
-%{_datadir}/%{name}/i18n/mytharchive_*.qm
-
-%files -n mythbrowser
-%{_libdir}/%{name}/plugins/%{soname}browser.so
-%{_datadir}/%{name}/i18n/mythbrowser_*.qm
-
-%files -n mythgallery
-%{_libdir}/%{name}/plugins/%{soname}gallery.so
-%{_datadir}/%{name}/i18n/mythgallery_*.qm
+%{_libdir}/mythtv/plugins/%{soname}archive.so
+%{_datadir}/mythtv/archivemenu.xml
+%{_datadir}/mythtv/archiveutils.xml
+%{_datadir}/mythtv/mytharchive/
+%{_datadir}/mythtv/i18n/mytharchive_*.qm
+
+%files -n mythplugins-mythbrowser%{?pkgmanjor}
+%{_libdir}/mythtv/plugins/%{soname}browser.so
+%{_datadir}/mythtv/i18n/mythbrowser_*.qm
+
+%files -n mythplugins-mythgallery%{?pkgmanjor}
+%{_libdir}/mythtv/plugins/%{soname}gallery.so
+%{_datadir}/mythtv/i18n/mythgallery_*.qm
 %{_localstatedir}/lib/pictures
 
-%files -n mythgame
+%files -n mythplugins-mythgame%{?pkgmanjor}
 %dir %{_sysconfdir}/mythgame
 %config(noreplace) %{_sysconfdir}/mythgame/gamelist.xml
-%{_libdir}/%{name}/plugins/%{soname}game.so
-%dir %{_datadir}/%{name}/games
-%dir %{_datadir}/%{name}/games/PC
-%{_datadir}/%{name}/games/PC/gamelist.xml
-%{_datadir}/%{name}/games/xmame
+%{_libdir}/mythtv/plugins/%{soname}game.so
+%dir %{_datadir}/mythtv/games
+%dir %{_datadir}/mythtv/games/PC
+%{_datadir}/mythtv/games/PC/gamelist.xml
+%{_datadir}/mythtv/games/xmame
 %dir %{_datadir}/mame
 %{_datadir}/mame/screens
 %dir %{_datadir}/mame/flyers
-%{_datadir}/%{name}/game_settings.xml
-%{_datadir}/%{name}/i18n/mythgame_*.qm
+%{_datadir}/mythtv/game_settings.xml
+%{_datadir}/mythtv/i18n/mythgame_*.qm
 
-%files -n mythmusic
-%{_libdir}/%{name}/plugins/%{soname}music.so
+%files -n mythplugins-mythmusic%{?pkgmanjor}
+%{_libdir}/mythtv/plugins/%{soname}music.so
 %{_localstatedir}/lib/mythmusic
-%{_datadir}/%{name}/musicmenu.xml
-%{_datadir}/%{name}/music_settings.xml
-%{_datadir}/%{name}/i18n/mythmusic_*.qm
+%{_datadir}/mythtv/musicmenu.xml
+%{_datadir}/mythtv/music_settings.xml
+%{_datadir}/mythtv/i18n/mythmusic_*.qm
 
-%files -n mythnetvision
+%if 0%{?mythnetvision}
+%files -n mythplugins-mythnetvision%{?pkgmanjor}
 %{_bindir}/mythfillnetvision
-%{_libdir}/%{name}/plugins/%{soname}netvision.so
-%{_datadir}/%{name}/mythnetvision/
-%{_datadir}/%{name}/netvisionmenu.xml
-%{_datadir}/%{name}/i18n/mythnetvision_*.qm
-%{_datadir}/%{name}/internetcontent/
-
-%files -n mythnews
-%{_libdir}/%{name}/plugins/%{soname}news.so
-%{_datadir}/%{name}/mythnews/
-%{_datadir}/%{name}/i18n/mythnews_*.qm
-
-%files -n mythweather
-%{_libdir}/%{name}/plugins/%{soname}weather.so
-%{_datadir}/%{name}/i18n/mythweather_*.qm
-%{_datadir}/%{name}/weather_settings.xml
-%{_datadir}/%{name}/mythweather/
-
-%files -n mythzoneminder
+%{_libdir}/mythtv/plugins/%{soname}netvision.so
+%{_datadir}/mythtv/mythnetvision/
+%{_datadir}/mythtv/netvisionmenu.xml
+%{_datadir}/mythtv/i18n/mythnetvision_*.qm
+%endif
+
+%files -n mythplugins-mythnews%{?pkgmanjor}
+%{_libdir}/mythtv/plugins/%{soname}news.so
+%{_datadir}/mythtv/mythnews/
+%{_datadir}/mythtv/i18n/mythnews_*.qm
+
+%files -n mythplugins-mythweather%{?pkgmanjor}
+%{_libdir}/mythtv/plugins/%{soname}weather.so
+%{_datadir}/mythtv/i18n/mythweather_*.qm
+%{_datadir}/mythtv/weather_settings.xml
+%{_datadir}/mythtv/mythweather/
+
+%files -n mythplugins-mythzoneminder%{?pkgmanjor}
 %{_bindir}/mythzmserver
-%{_datadir}/%{name}/zonemindermenu.xml
-%{_datadir}/%{name}/i18n/mythzoneminder_*.qm
-%{_libdir}/%{name}/plugins/%{soname}zoneminder.so
-%exclude %{_datadir}/%{name}/fonts/README-TeX-Gyre-Chorus.txt
-%exclude %{_datadir}/%{name}/fonts/README-droid.txt
-%exclude %{_datadir}/%{name}/fonts/README-freefont-20120503.txt
-%exclude %{_datadir}/%{name}/fonts/README-purisa.txt
+%{_datadir}/mythtv/zonemindermenu.xml
+%{_datadir}/mythtv/i18n/mythzoneminder_*.qm
+%{_libdir}/mythtv/plugins/%{soname}zoneminder.so
+%exclude %{_datadir}/mythtv/fonts/README-TeX-Gyre-Chorus.txt
+%exclude %{_datadir}/mythtv/fonts/README-droid.txt
+%exclude %{_datadir}/mythtv/fonts/README-freefont-20120503.txt
+%exclude %{_datadir}/mythtv/fonts/README-purisa.txt
 
 %changelog