Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 11

mythtv.changes Changed

mythtv.spec Changed

@@ -23,14 +23,16 @@
 %define USER mythtv
 %define GROUP video
 %define OTHERGROUP audio
+# Fix: suse-filelist-forbidden-sysconfig
+%{!?_fillupdir:%global _fillupdir /var/adm/fillup-templates}
 Name:           mythtv
-Version:        0.28.2+git20180201.8238e839c9
+Version:        0.28.2+git20180529.ae037d012e
 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:        https://www.mythtv.org/download/mythtv/%{version}#/%{name}-fixes-%{version}.tar.gz
+Source0:        %{name}-fixes-%{version}.tar.gz
 Source93:       mythbackend.sysconfig.in
 Source94:       mythbackend.service.in
 Source95:       mythbackend.rules.in
@@ -99,6 +101,7 @@
 BuildRequires:  pkgconfig(Qt5Network)
 BuildRequires:  pkgconfig(Qt5OpenGL)
 BuildRequires:  pkgconfig(Qt5Script)
+BuildRequires:  pkgconfig(Qt5Sql)
 BuildRequires:  pkgconfig(Qt5WebKit)
 BuildRequires:  pkgconfig(Qt5WebKitWidgets)
 BuildRequires:  pkgconfig(Qt5Xml)
@@ -187,7 +190,7 @@
 %package        docs
 Summary:        MythTV documentation
 Group:          Documentation/HTML
-Conflicts:      otherproviders((mythtv-docs)
+Conflicts:      otherproviders(mythtv-docs)
 Provides:       %{name}-0_27-docs = %{version}
 Obsoletes:      %{name}-0_27-docs < %{version}
 BuildArch:      noarch
@@ -203,7 +206,7 @@
 Requires:       libQt5Sql5-mysql
 Conflicts:      otherproviders(mythtv-frontend-api)
 Provides:       lib%{name}-%{sover} = %{version}
-Provides:       %{name}-frontend-api = %{version}
+Provides:       mythtv-frontend-api = %{version}
 Provides:       %{soname}-0_27 = %{version}
 Obsoletes:      %{soname}-0_27 < %{version}
 
@@ -230,7 +233,7 @@
 Summary:        Core user interface themes for %{name}
 Group:          Productivity/Multimedia/Video/Players
 Recommends:     droid-fonts
-Conflicts:      otherproviders((mythtv-base-themes)
+Conflicts:      otherproviders(mythtv-base-themes)
 Provides:       %{name}-0_27-base-themes = %{version}
 Obsoletes:      %{name}-0_27-base-themes < %{version}
 BuildArch:      noarch
@@ -520,6 +523,17 @@
 %prep
 %setup -q -n %{name}-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]')
+if [ -n "$_newversion" ]; then
+    if [ -f %_sourcedir/_service ]; then
+        if [[ "$_oldversion" != $_newversion ]]; then
+            "You need to update the version number in the _service file: $_newversion" 2> /dev/null
+        fi
+    fi
+fi
+
 # Fix build gcc6
 # Don't use -isystem /usr/include
 find . -type f -name \*.pro | while read file; do
@@ -685,7 +699,7 @@
 echo "# to be filled in by %{name}-setup" > %{buildroot}%{_sysconfdir}/%{name}/config.xml
 install -Dm0644 {./,%{buildroot}%{_datadir}/icons/hicolor/scalable/apps}/mythfrontend.svg
 
-install -Dm0644 mythbackend.sysconfig.in %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.mythbackend
+install -Dm0644 mythbackend.sysconfig.in %{buildroot}%{_fillupdir}/sysconfig.mythbackend
 install -Dm0644 mythbackend.service.in %{buildroot}%{_unitdir}/mythbackend.service
 ln -s %{_sbindir}/service  %{buildroot}%{_sbindir}/rcmythbackend
 install -Dm0644 mythbackend.rules.in %{buildroot}/%{_udevrulesdir}/99-mythbackend.rules
@@ -698,15 +712,24 @@
 %{suse_update_desktop_file -c \
 mythfrontend MythTV "PVR/DVR" mythfrontend mythfrontend Qt AudioVideo Video TV}
 
-%{suse_update_desktop_file -c mythfrontend-1024x576 \
-"MythTV 1024x576" "PVR/DVR (medium window size)" 'mythfrontend -w -geometry 1024x576' mythfrontend Qt AudioVideo Video TV}
-
-%{suse_update_desktop_file -c mythfrontend-800x450 \
-"MythTV 800x450" "PVR/DVR (small window size)" 'mythfrontend -w -geometry 800x450' 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}
 
+# Fix: Unknown option -w/geometry in suse_update_desktop_file
+# Use the following lines instead of suse_update_desktop_file.sh
+for _application in medium-1024x576 small-800x450; do
+cat > %{buildroot}%{_datadir}/applications/mythfrontend-${_application#*-}.desktop << EOF
+[Desktop Entry]
+Encoding=UTF-8
+Name=MythTV ${_application#*-}
+GenericName=PVR/DVR (${_application%-*} window size)
+Categories=Qt;AudioVideo;Video;TV;
+Type=Application
+Exec=mythfrontend -w -geometry ${_application#*-}
+Icon=mythfrontend
+EOF
+done
+
 install -Dm0644 %{name}-session.desktop %{buildroot}%{_datadir}/xsessions/%{name}.desktop
 popd
 
@@ -771,6 +794,7 @@
     %udev_rules_update
 fi
 
+%if 0%{?suse_version} < 1500
 %post frontend
 %icon_theme_cache_post
 %desktop_database_post
@@ -778,6 +802,7 @@
 %postun frontend
 %icon_theme_cache_postun
 %desktop_database_postun
+%endif
 
 %files docs
 %doc %{name}/README*
@@ -830,9 +855,9 @@
 %{_datadir}/%{name}/html/
 %{_datadir}/%{name}/backend-config
 %{_datadir}/%{name}/MXML_scpd.xml
+%{_fillupdir}/sysconfig.mythbackend
 %attr(0750,%{USER},%{GROUP}) %dir %{_localstatedir}/lib/mythtv
 %attr(0750,%{USER},%{GROUP}) %dir %{_localstatedir}/cache/mythtv
-%{_localstatedir}/adm/fillup-templates/sysconfig.mythbackend
 %attr(0750,%{USER},%{GROUP}) %dir %{_localstatedir}/log/%{name}
 %attr(0750,%{USER},%{GROUP}) %dir %{_localstatedir}/log/%{name}/old
 %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/mythbackend

_servicedata Changed

mythfrontend.svg Changed

@@ -15,7 +15,7 @@
    id="svg6907"
    sodipodi:version="0.32"
    inkscape:version="0.48.1 r9760"
-   sodipodi:docname="high_res_blue.svg"
+   sodipodi:docname="high_res_square_blue.svg"
    version="1.1"
    inkscape:export-filename="mythtv.png"
    inkscape:export-xdpi="443.29596"
@@ -337,38 +337,125 @@
          stdDeviation="1.7192709"
          id="feGaussianBlur4205" />
     </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3873"
+       id="linearGradient3879"
+       x1="169.18579"
+       y1="97.805878"
+       x2="169.18579"
+       y2="161.56454"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3873"
+       id="linearGradient3898"
+       x1="203.28761"
+       y1="139.85756"
+       x2="324.953"
+       y2="139.85756"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3873"
+       id="linearGradient4073"
+       gradientUnits="userSpaceOnUse"
+       x1="144.23938"
+       y1="98.208237"
+       x2="145.0441"
+       y2="158.748" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3873"
+       id="linearGradient4075"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.242663,0,0,1.242663,-48.949496,-35.986307)"
+       x1="256.80173"
+       y1="111.69224"
+       x2="256.80173"
+       y2="165.26756" />
     <clipPath
        clipPathUnits="userSpaceOnUse"
-       id="clipPath4536">
-      <path
-         clip-path="none"
-         id="path4538"
-         d="m 77.144861,72.637391 0,0.09369 c -30.6204,0.28556 -55.401917,26.31628 -55.401946,58.371279 0,32.05502 24.781536,58.08568 55.401946,58.37127 l 0,0.0937 234.969809,0 0,-0.0625 c 30.85428,0 55.90619,-26.17018 55.90618,-58.4025 0,-32.232299 -25.05191,-58.402489 -55.90618,-58.402509 l 0,-0.06246 -234.969809,0 z"
-         style="fill:none;stroke:#006a98;stroke-width:4.88806581;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         inkscape:connector-curvature="0" />
+       id="clipPath4089">
+      <rect
+         ry="30.854246"
+         rx="30.854246"
+         y="4.8897781"
+         x="35.928093"
+         height="252.42516"
+         width="252.42516"
+         id="rect4091"
+         style="fill:none;stroke:#006a98;stroke-width:5.2547245;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     </clipPath>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3873"
+       id="linearGradient4108"
+       gradientUnits="userSpaceOnUse"
+       x1="144.23938"
+       y1="98.208237"
+       x2="145.0441"
+       y2="158.748" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3873"
+       id="linearGradient4110"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.242663,0,0,1.242663,-48.949496,-35.986307)"
+       x1="256.80173"
+       y1="111.69224"
+       x2="256.80173"
+       y2="165.26756" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3873"
+       id="linearGradient4140"
+       gradientUnits="userSpaceOnUse"
+       x1="144.23938"
+       y1="98.208237"
+       x2="145.0441"
+       y2="158.748" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3873"
+       id="linearGradient4142"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.242663,0,0,1.242663,-48.949496,-35.986307)"
+       x1="256.80173"
+       y1="111.69224"
+       x2="256.80173"
+       y2="165.26756" />
     <filter
        inkscape:collect="always"
-       id="filter4594"
-       color-interpolation-filters="sRGB">
+       id="filter4162">
       <feGaussianBlur
          inkscape:collect="always"
-         stdDeviation="1.7768067"
-         id="feGaussianBlur4596" />
+         stdDeviation="1.2621258"
+         id="feGaussianBlur4164" />
     </filter>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3873"
-       id="linearGradient3879"
-       x1="169.18579"
-       y1="97.805878"
-       x2="169.18579"
-       y2="161.56454"
-       gradientUnits="userSpaceOnUse" />
+       id="linearGradient4181"
+       gradientUnits="userSpaceOnUse"
+       x1="144.23938"
+       y1="98.208237"
+       x2="145.0441"
+       y2="158.748" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3873"
-       id="linearGradient3888"
+       id="linearGradient4183"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.242663,0,0,1.242663,-48.949496,-35.986307)"
+       x1="256.80173"
+       y1="111.69224"
+       x2="256.80173"
+       y2="165.26756" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3873"
+       id="linearGradient4222"
        gradientUnits="userSpaceOnUse"
        x1="144.23938"
        y1="98.208237"
@@ -377,17 +464,28 @@
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3873"
-       id="linearGradient3898"
-       x1="203.28761"
-       y1="139.85756"
-       x2="324.953"
-       y2="139.85756"
-       gradientUnits="userSpaceOnUse" />
+       id="linearGradient4224"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.242663,0,0,1.242663,-48.949496,-35.986307)"
+       x1="256.80173"
+       y1="111.69224"
+       x2="256.80173"
+       y2="165.26756" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3873"
-       id="linearGradient3904"
+       id="linearGradient4240"
        gradientUnits="userSpaceOnUse"
+       x1="144.23938"
+       y1="98.208237"
+       x2="145.0441"
+       y2="158.748" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3873"
+       id="linearGradient4242"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.242663,0,0,1.242663,-48.949496,-35.986307)"
        x1="256.80173"
        y1="111.69224"
        x2="256.80173"
@@ -400,9 +498,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.0000001"
-     inkscape:cx="218.27329"
-     inkscape:cy="122.75106"
+     inkscape:zoom="1.0000001"
+     inkscape:cx="7.6788566"
+     inkscape:cy="145.13915"
      inkscape:current-layer="svg6907"

mythtv-fixes-0.28.2+git20180201.8238e839c9.tar.gz Deleted

mythtv-fixes-0.28.2+git20180529.ae037d012e.tar.gz Added