[mythtv] Add obsoletes for python2-MythTV, fixes RFBZ#5388.
by Richard Shaw
commit a3f6c008a115c5917682edf61d0510588f78d474
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Sun Sep 29 15:48:37 2019 -0500
Add obsoletes for python2-MythTV, fixes RFBZ#5388.
mythtv.spec | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/mythtv.spec b/mythtv.spec
index d046f93..8c28d18 100644
--- a/mythtv.spec
+++ b/mythtv.spec
@@ -682,9 +682,10 @@ Provides a PHP-based interface to interacting with MythTV.
%if %{with python}
%package -n %{py_prefix}-MythTV
-Summary: Python2 bindings for MythTV
+Summary: Python bindings for MythTV
%if 0%{?fedora} > 30
%{?python_provide:%python_provide python3-%{name}}
+Obsoletes: python2-MythTV
%else
%{?python_provide:%python_provide python2-%{name}}
%{?python_provide:%python_provide python2-MythTV}
5 years
[unifi] Update to 5.11.46, for release notes see: https://community.ui.com/releases/UniFi-Network-Controll
by Richard Shaw
commit b78abe44e76e68632714082c6f693217c82a2bcb
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Sun Sep 29 08:54:17 2019 -0500
Update to 5.11.46, for release notes see:
https://community.ui.com/releases/UniFi-Network-Controller-5-11-46/1984aa...
.gitignore | 2 ++
sources | 2 +-
unifi.spec | 11 +++++++++--
3 files changed, 12 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e73c932..3a4d7f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,5 @@
/UniFi-5.10.23.unix.zip
/UniFi-5.10.24.unix.zip
/UniFi-5.10.25.unix.zip
+/UniFi-5.11.39.unix.zip
+/UniFi-5.11.46.unix.zip
diff --git a/sources b/sources
index 6205213..fffa539 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-782a97c0fbce2aace48decad92e11e3d UniFi-5.10.25.unix.zip
+2500602b70ec7ce55ad964354e8b3574 UniFi-5.11.46.unix.zip
diff --git a/unifi.spec b/unifi.spec
index 2231634..c4d0ab7 100644
--- a/unifi.spec
+++ b/unifi.spec
@@ -4,8 +4,8 @@
%global __strip /bin/true
Name: unifi
-Version: 5.10.25
-Release: 2%{?dist}
+Version: 5.11.46
+Release: 1%{?dist}
Summary: Ubiquiti UniFi controller
License: Proprietary
@@ -279,6 +279,13 @@ fi
%changelog
+* Sun Sep 29 2019 Richard Shaw <hobbes1069(a)gmail.com> - 5.11.46-1
+- Update to 5.11.46, for release notes see:
+ https://community.ui.com/releases/UniFi-Network-Controller-5-11-46/1984aa...
+
+* Wed Sep 11 2019 Richard Shaw <hobbes1069(a)gmail.com> - 5.11.39-1
+- Update to 5.11.39.
+
* Sat Aug 10 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 5.10.25-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
5 years
[mythtv/f30: 14/14] Merge branch 'master' into f30
by Richard Shaw
commit fd0e8d58baae5795ef91a43fa6ffce6bd5a9c490
Merge: 9e0b525 072f9be
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Sun Sep 29 08:52:39 2019 -0500
Merge branch 'master' into f30
mythtv-ChangeLog | 688 +++++++++
mythtv-php72_fix.patch | 13 +
mythtv-py3_configure.patch | 21 +
mythtv-py3_urllib.patch | 592 ++++++++
mythtv-python3.patch | 3519 ++++++++++++++++++++++++++++++++++++++++++++
mythtv-space_in_GB.patch | 57 +-
mythtv.spec | 48 +-
7 files changed, 4883 insertions(+), 55 deletions(-)
---
5 years
[mythtv/f30] (14 commits) ...Merge branch 'master' into f30
by Richard Shaw
Summary of changes:
dc5dc88... Add patch for PHP 7.2 on MythBackend.php. (*)
953f415... rebuilt (*)
9e0565f... Apply fix for php 7.2. (*)
b0be176... Merge branch 'master' of ssh://pkgs.rpmfusion.org/free/myth (*)
4706a9f... - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass (*)
415d065... Use Python3 on Fedora 31+ (*)
3e93708... Deprecate old script (*)
cb5bf3d... Fix Python builds (*)
f25cca2... Fix Python binding conditional macro (*)
37fd45c... Update to v30.0-69-g5cde0578d8. Initial update for Python 3 (*)
c9dd4a2... Update to v30.0-69-g5cde0578d8. Initial update for Python 3 (*)
bd44a6b... Re-add mythwikiscripts as it is being installed again for s (*)
072f9be... Fix packaging for backend only systems. (*)
fd0e8d5... Merge branch 'master' into f30
(*) This commit already existed in another branch; no separate mail sent
5 years
[mythtv] Fix packaging for backend only systems.
by Richard Shaw
commit 072f9beda809c48beb5c2b397e25b4b91efee3e3
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Sun Sep 29 07:23:00 2019 -0500
Fix packaging for backend only systems.
mythtv.spec | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
---
diff --git a/mythtv.spec b/mythtv.spec
index 7a6956c..d046f93 100644
--- a/mythtv.spec
+++ b/mythtv.spec
@@ -75,7 +75,7 @@
#
Name: mythtv
Version: 30.0
-Release: 11%{?rel_string}%{?dist}
+Release: 12%{?rel_string}%{?dist}
Summary: A digital video recorder (DVR) application
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -1237,6 +1237,7 @@ exit 0
%{_bindir}/mythmetadatalookup
%{_bindir}/mythutil
%{_datadir}/mythtv/mythconverg*.pl
+%{_datadir}/mythtv/*.xml
%{_datadir}/mythtv/locales/
%{_datadir}/mythtv/metadata/
%{_datadir}/mythtv/hardwareprofile/
@@ -1252,7 +1253,6 @@ exit 0
%{_bindir}/mythmediaserver
%{_bindir}/mythreplex
%{_bindir}/optimize_mythdb
-%{_datadir}/mythtv/MXML_scpd.xml
%{_datadir}/mythtv/backend-config/
%attr(-,mythtv,mythtv) %dir %{_localstatedir}/lib/mythtv
%attr(-,mythtv,mythtv) %dir %{_localstatedir}/cache/mythtv
@@ -1269,17 +1269,9 @@ exit 0
%files setup
%{_bindir}/mythtv-setup
%{_bindir}/mythtvsetup
-%{_datadir}/mythtv/setup.xml
%{_datadir}/applications/*mythtv-setup.desktop
%files frontend
-%{_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
-%{_datadir}/mythtv/setup.xml
%{_bindir}/mythavtest
%{_bindir}/mythfrontend
%{_bindir}/mythlcdserver
@@ -1467,6 +1459,9 @@ exit 0
%changelog
+* Sun Sep 29 2019 Richard Shaw <hobbes1069(a)gmail.com> - 30.0-12.20190904git5cde0578d8
+- Fix packaging for backend only systems.
+
* Wed Sep 04 2019 Richard Shaw <hobbes1069(a)gmail.com> - 30.0-11.20190904git5cde0578d8
- Update to v30.0-69-g5cde0578d8.
- Initial update for Python 3 compatibility using upstream pull request.
5 years
[rfpkg] cleanup
by Leigh Scott
commit 34ffcbc8d467f35c2a88a8d6bc8ff85e59bc68ea
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Sun Sep 29 11:40:00 2019 +0100
cleanup
rfpkg.spec | 2 --
1 file changed, 2 deletions(-)
---
diff --git a/rfpkg.spec b/rfpkg.spec
index 204cf5a..1e8affc 100644
--- a/rfpkg.spec
+++ b/rfpkg.spec
@@ -30,7 +30,6 @@ Requires: koji
Requires: redhat-rpm-config
%if %{with python2}
-# This package redefines __python and can use the python_ macros
BuildRequires: python2
BuildRequires: python2-rpm-macros
@@ -51,7 +50,6 @@ Requires: rpmfusion-packager >= 0.6.1
Requires: packagedb-cli > 2.2
%else # python3
-# This package redefines __python and can use the python_ macros
BuildRequires: python3
BuildRequires: python3-rpm-macros
5 years
[rfpkg] fix python macro pt2
by Leigh Scott
commit 0bd0e16dc5f00a6e3dc67ef7466dee037597fcf1
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Sun Sep 29 10:56:59 2019 +0100
fix python macro pt2
rfpkg.spec | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/rfpkg.spec b/rfpkg.spec
index be3ace3..204cf5a 100644
--- a/rfpkg.spec
+++ b/rfpkg.spec
@@ -85,8 +85,8 @@ RPM Fusion utility for working with dist-git.
%build
%if %{with python2}
-%py_build
-%{__python} doc/rfpkg_man_page.py > rfpkg.1
+%py2_build
+%{__python2} doc/rfpkg_man_page.py > rfpkg.1
%else
%py3_build
%{__python3} doc/rfpkg_man_page.py > rfpkg.1
@@ -95,7 +95,7 @@ RPM Fusion utility for working with dist-git.
%install
%if %{with python2}
-%py_install
+%py2_install
%else
%py3_install
%endif
5 years
