9:25 a.m.
commit de1a2d59b8feb8935836e560fa102ef119f99138
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Feb 2 10:25:16 2018 +0100
Various fixed and clean-up
mythtv.spec | 56 ++++++++++++++++++++++++++++----------------------------
1 file changed, 28 insertions(+), 28 deletions(-)
---
diff --git a/mythtv.spec b/mythtv.spec
index 24bb182..04a33c2 100644
--- a/mythtv.spec
+++ b/mythtv.spec
@@ -56,9 +56,6 @@
# A list of which applications we want to put into the desktop menu system
%define desktop_applications mythfrontend mythtv-setup
-# The vendor name we should attribute the aforementioned entries to
-%define desktop_vendor RPMFusion
-
# MythTV Version string -- preferably the output from git describe
%define vers_string v29.0-77-g771115f47d
%define rel_string .20180111.77.g771115f47d
@@ -75,7 +72,7 @@
#
Name: mythtv
Version: 29.0
-Release: 10%{?rel_string}%{?dist}
+Release: 11%{?rel_string}%{?dist}
Summary: A digital video recorder (DVR) application
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -116,7 +113,7 @@ Source0:
https://github.com/MythTV/%{name}/archive/%{githash}/%{name}-%{v
%bcond_without mythnews
%bcond_without mythweather
%bcond_without mythzoneminder
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} > 7
%bcond_without mythnetvision
%else
%bcond_with mythnetvision
@@ -163,12 +160,12 @@ BuildRequires: qt5-qtbase-devel >= 5.2
BuildRequires: qt5-qtscript-devel >= 5.2
BuildRequires: qt5-qtwebkit-devel >= 5.2
BuildRequires: freetype-devel >= 2
-%if 0%{?fedora} > 24
+%if 0%{?fedora} || 0%{?rhel} > 7
BuildRequires: mariadb-connector-c-devel
%else
BuildRequires: mariadb-devel >= 5
%endif
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} >= 7
BuildRequires: libcec-devel >= 1.7
%endif
BuildRequires: libvpx-devel
@@ -237,11 +234,13 @@ BuildRequires: libavc1394-devel
BuildRequires: libiec61883-devel
BuildRequires: libraw1394-devel
-%if 0%{?fedora}
-# For ttvdb.py, not available in EPEL
BuildRequires: python2-future
+%if 0%{?fedora} || 0%{?rhel} > 7
+# For ttvdb.py, not available in EPEL
BuildRequires: python2-requests
BuildRequires: python-requests-cache
+%else
+BuildRequires: python-requests
%endif
%if %{with vdpau}
@@ -284,10 +283,10 @@ BuildRequires: perl(IO::Socket::INET6)
%if %{with python}
BuildRequires: python2-devel
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} > 7
BuildRequires: python2-mysql
%else
-BuildRequires: MySQL-python
+BuildRequires: MySQL-python
%endif
BuildRequires: python-urlgrabber
%endif
@@ -420,7 +419,7 @@ Summary: Development files for mythtv
Requires: mythtv-libs = %{version}-%{release}
Requires: freetype-devel >= 2
-%if 0%{?fedora} > 24
+%if 0%{?fedora} || 0%{?rhel} > 7
BuildRequires: mariadb-connector-c-devel
%else
BuildRequires: mariadb-devel >= 5
@@ -514,7 +513,7 @@ Requires: mythtv-common = %{version}-%{release}
Requires: mythtv-base-themes = %{version}
Requires: mysql >= 5
Requires: python-MythTV
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} > 7
Recommends: libaacs
%else
Requires: libaacs
@@ -540,9 +539,11 @@ Requires: lame
Requires: mythtv-common = %{version}-%{release}
Requires: mythtv-setup
Requires: python2-future
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} > 7
Requires: python2-requests
Requires: python-requests-cache
+%else
+Requires: python-requests
%endif
Requires(pre): shadow-utils
@@ -579,9 +580,11 @@ mythtv backend.
Summary: Common components needed by multiple other MythTV components
# For ttvdb.py
Requires: python2-future
-%if 0%{?fedora}
-Requires: python2-requests
-Requires: python-requests-cache
+%if 0%{?fedora} || 0%{?rhel} > 7
+Requires: python2-requests
+Requires: python-requests-cache
+%else
+Requires: python-requests
%endif
%description common
@@ -893,14 +896,9 @@ pushd mythtv
%if !%{with python}
--without-bindings=python \
%endif
-%ifarch ppc
- --extra-cflags="%{optflags} -maltivec -fomit-frame-pointer" \
- --extra-cxxflags="%{optflags} -maltivec -fomit-frame-pointer" \
-%else
--extra-cflags="%{optflags} -fomit-frame-pointer -fno-devirtualize" \
--extra-cxxflags="%{optflags} -fomit-frame-pointer -fno-devirtualize" \
-%endif
- --extra-ldflags="%{optflags}" \
+ --extra-ldflags="%{__global_ldflags}" \
%ifarch %{ix86}
--cpu=i686 --tune=i686 --enable-mmx \
%endif
@@ -938,7 +936,6 @@ pushd mythplugins
echo "INCLUDEPATH -= \$\${SYSROOT}/\$\${PREFIX}/include" >>
settings.pro
echo "INCLUDEPATH -= %{_includedir}" >> settings.pro
echo "INCLUDEPATH += $temp%{_includedir}" >> settings.pro
- #echo "INCLUDEPATH += %{_includedir}" >> settings.pro
echo "LIBS *= -L$temp%{_libdir}" >> settings.pro
echo "QMAKE_LIBDIR += $temp%{_libdir}" >> targetdep.pro
@@ -994,8 +991,7 @@ pushd mythplugins
--disable-mythnetvision \
%endif
--enable-opengl \
- --enable-fftw \
-# --enable-sdl
+ --enable-fftw
make %{?_smp_mflags}
@@ -1045,9 +1041,8 @@ pushd mythtv
mkdir -p %{buildroot}%{_datadir}/applications
for file in %{desktop_applications}; do
install -p $file.png %{buildroot}%{_datadir}/pixmaps/$file.png
- desktop-file-install --vendor %{desktop_vendor} \
+ desktop-file-install \
--dir %{buildroot}%{_datadir}/applications \
- --add-category X-Fedora-Extra \
--add-category Application \
--add-category AudioVideo \
$file.desktop
@@ -1382,6 +1377,11 @@ exit 0
%changelog
+* Fri Feb 02 2018 Nicolas Chauvet <kwizart(a)gmail.com> -
29.0-11.20180111.77.g771115f47d
+- Clean-up conditionals
+- Remove vendor entry for desktop files
+- Remove ppc conditional for cflags and use corrects ldflags
+
* Sat Jan 27 2018 Leigh Scott <leigh123linux(a)googlemail.com> -
29.0-10.20180111.77.g771115f47d
- Rebuild for new libcdio and libvpx