[mythtv] Add one missing occurence for lame
by Nicolas Chauvet
commit f682196d0f55349581149301aab77942f7c017a2
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Jun 29 17:58:11 2021 +0200
Add one missing occurence for lame
mythtv.spec | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/mythtv.spec b/mythtv.spec
index 982590d..ca2cf0a 100644
--- a/mythtv.spec
+++ b/mythtv.spec
@@ -557,7 +557,9 @@ reachable via the network.
%package backend
Summary: Server component of mythtv (a DVR)
+%if 0%{?fedora}
Requires: lame
+%endif
Requires: mythtv-common%{?_isa} = %{version}-%{release}
Requires: mythtv-libs%{?_isa} = %{version}-%{release}
Requires: mythtv-setup%{?_isa}
3 years, 4 months
[mythtv] Update to latest fixes/31 Don't require lame binary on el8
by Andrew Bauer
commit 10eafa1c47f7500a320ff2b1382f491a2cbd9f64
Author: Andrew Bauer <zonexpertconsulting(a)outlook.com>
Date: Tue Jun 29 10:04:53 2021 -0500
Update to latest fixes/31
Don't require lame binary on el8
.gitignore | 1 +
mythtv.spec | 8 +-
sources | 2 +-
v31.0..b6ddf202a4.patch | 28604 ----------------------------------------------
4 files changed, 8 insertions(+), 28607 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9c4d5b3..c484456 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ mythtv-0.27.5.tar.gz
/mythtv-31.0.tar.gz
/v31.0..016630a35c.patch
/v31.0..05c16580e1.patch
+/v31.0..0680b37c68.patch
diff --git a/mythtv.spec b/mythtv.spec
index 182a4ab..982590d 100644
--- a/mythtv.spec
+++ b/mythtv.spec
@@ -1,5 +1,5 @@
# The full MythTV Version string is computed from the output of git describe.
-%global vers_string v31.0-147-g05c16580e1
+%global vers_string v31.0-158-g0680b37c68
# Specfile for building MythTV and MythPlugins RPMs from a git checkout.
#
@@ -74,7 +74,7 @@
#
Name: mythtv
Version: 31.0
-Release: 18%{rel_string}%{?dist}
+Release: 19%{rel_string}%{?dist}
Summary: A digital video recorder (DVR) application
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -1394,6 +1394,10 @@ exit 0
%changelog
+* Tue Jun 29 2021 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 31.0-17.147.20210629git0680b37c68
+- Update to latest fixes/31
+- Don't require lame binary on el8
+
* Tue Jun 15 2021 Leigh Scott <leigh123linux(a)gmail.com> - 31.0-18.147.20210615git05c16580e1
- Rebuild for python-3.10
diff --git a/sources b/sources
index 68583a5..a5bbf3d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (mythtv-31.0.tar.gz) = d53817231409934ef37d12739c38cf6936f04f816b0ba1c9738ce99b5b4ff387c70b683ccd84f649ff2f74992b2158829f5f1d1ffe06c8768da1922b90439f6e
-SHA512 (v31.0..05c16580e1.patch) = 072bf1ff9adef0cd0155ace1b8ad338365e79db7f4b67b58e2057f6563e4654b3bba2eb719870553b3a1c673e91004ffac20ea04f69332ce283b027d66860ed5
+SHA512 (v31.0..0680b37c68.patch) = 9bbeb1c1211dae2d696f7d7cf3d2838c3e0eb579a573a3e789a149f3fa918d7e46ee37d5fc68f29312e575adaae5db191bef54a4e16b51d42edd86bed55b0130
3 years, 4 months
[EmptyEpsilon] Fix the Findjson11.cmake to avoid the CMake warning about case sensitivity (json11 X JSON11)
by Michal Schorm
commit 92a014967c5544fd65be2ddf5826afae3f544e4b
Author: Michal Schorm <mschorm(a)redhat.com>
Date: Tue Jun 29 15:15:25 2021 +0200
Fix the Findjson11.cmake to avoid the CMake warning about case sensitivity (json11 X JSON11)
Findjson11.cmake | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/Findjson11.cmake b/Findjson11.cmake
index 633a942..b36a2d7 100644
--- a/Findjson11.cmake
+++ b/Findjson11.cmake
@@ -1,14 +1,14 @@
# Locate json11
#
# This module defines
-# JSON11_FOUND, if false, do not try to link to json11
-# JSON11_LIBRARY, where to find json11
-# JSON11_INCLUDE_DIR, where to find json11.hpp
+# json11_FOUND, if false, do not try to link to json11
+# json11_LIBRARY, where to find json11
+# json11_INCLUDE_DIR, where to find json11.hpp
#
-# If json11 is not installed in a standard path, you can use the JSON11_DIR CMake variable
+# If json11 is not installed in a standard path, you can use the json11_DIR CMake variable
# to tell CMake where json11 is.
-find_path(JSON11_INCLUDE_DIR json11.hpp
+find_path(json11_INCLUDE_DIR json11.hpp
PATHS
/usr/local/include/
/usr/include/
@@ -22,7 +22,7 @@ if(NOT WIN32)
SET(CMAKE_FIND_LIBRARY_SUFFIXES ".so" ".a")
endif(NOT WIN32)
-find_library(JSON11_LIBRARY
+find_library(json11_LIBRARY
NAMES json11
PATH_SUFFIXES lib64 lib
PATHS /usr/local
@@ -33,7 +33,7 @@ find_library(JSON11_LIBRARY
/opt
/lib)
-# handle the QUIETLY and REQUIRED arguments and set JSON11_FOUND to TRUE if all listed variables are TRUE
+# handle the QUIETLY and REQUIRED arguments and set json11_FOUND to TRUE if all listed variables are TRUE
include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(JSON11 DEFAULT_MSG JSON11_INCLUDE_DIR JSON11_LIBRARY)
-mark_as_advanced(JSON11_INCLUDE_DIR JSON11_LIBRARY)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(json11 DEFAULT_MSG json11_INCLUDE_DIR json11_LIBRARY)
+mark_as_advanced(json11_INCLUDE_DIR json11_LIBRARY)
3 years, 4 months
[EmptyEpsilon] Remove the CMake out-of-source build process related macro Fedora switched to the new behaviour with
by Michal Schorm
commit b4a5bd163a7da81f9953860492be24b23c9397ea
Author: Michal Schorm <mschorm(a)redhat.com>
Date: Tue Jun 29 02:56:28 2021 +0200
Remove the CMake out-of-source build process related macro
Fedora switched to the new behaviour with F33: https://fedoraproject.org/wiki/Changes/CMake_to_do_out-of-source_builds
And since F32 EOL, the line is of no use anymore, since it became a default behaviour
EmptyEpsilon.spec | 2 --
1 file changed, 2 deletions(-)
---
diff --git a/EmptyEpsilon.spec b/EmptyEpsilon.spec
index a26412d..e5d5ca2 100644
--- a/EmptyEpsilon.spec
+++ b/EmptyEpsilon.spec
@@ -2,8 +2,6 @@
%global version_minor 06
%global version_patch 23
-%undefine __cmake_in_source_build
-
Name: EmptyEpsilon
Summary: Spaceship bridge simulator game
Version: %{version_major}.%{version_minor}.%{version_patch}
3 years, 4 months