[mythweb/f29] Update to 30.0.
by Richard Shaw
Summary of changes:
12344f9... Update to 30.0. (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 1 month
[mythweb] Update to 30.0.
by Richard Shaw
commit 12344f92cabc0786d82a6c8a80c738733071809f
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Wed Feb 27 15:10:17 2019 -0600
Update to 30.0.
.gitignore | 1 +
ChangeLog | 14 --------------
mythweb-fixes.patch | 26 --------------------------
mythweb.spec | 12 ++++++------
sources | 2 +-
5 files changed, 8 insertions(+), 47 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6efc490..b24f3dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ mythweb-0.27.5.tar.gz
/mythweb-0.28.1.tar.gz
/mythweb-29.0.tar.gz
/mythweb-29.1.tar.gz
+/mythweb-30.0.tar.gz
diff --git a/ChangeLog b/ChangeLog
index 93028ff..e69de29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,14 +0,0 @@
-commit 6a6eb1a4a9e48a3f7fcf3006cb4404051e572911
-Author: Bill Meek <billmeek(a)mythtv.org>
-Date: Tue May 22 08:50:21 2018 -0500
-
- Removes error messages from "Recorded Programs" page
-
- In Ubuntu 18.04, the following prints for lines
- 188 (and 189 for disk_used) on the above screen:
-
- Warning at /var/www/mythweb/modules/tv/recorded.php, line 188:
-
- !!NoTrans: Use of undefined constant disk_size - assumed 'disk_size' (this will throw an Error in a future version of PHP)!!
-
- (cherry picked from commit 664dc1707ccf7be8b0b1d9eadf6366de8bbaa9c9)
diff --git a/mythweb.spec b/mythweb.spec
index 02591a0..3514557 100644
--- a/mythweb.spec
+++ b/mythweb.spec
@@ -4,8 +4,8 @@ Name: mythweb
Summary: The web interface to MythTV
URL: http://www.mythtv.org/
-Version: 29.1
-Release: 4%{?dist}
+Version: 30.0
+Release: 1%{?dist}
License: GPLv2 and LGPLv2 and MIT
@@ -13,10 +13,7 @@ Source0: https://github.com/MythTV/%{name}/archive/v%{version}/%{name}-%{
Source1: mythweb.conf
Source2: ChangeLog
-# Patch generated from mythweb fixes branch. From mythweb git directory:
-# git diff -p --stat <git_tag> > mythweb-fixes.patch
-Patch0: mythweb-fixes.patch
-Patch1: mythweb-php_fix.patch
+Patch0: mythweb-php_fix.patch
# This is needed for perl dependency auto-detection
BuildRequires: perl-generators
@@ -76,6 +73,9 @@ rm %{buildroot}%{_datadir}/mythweb/{LICENSE,README,INSTALL,ChangeLog}
%changelog
+* Wed Feb 27 2019 Richard Shaw <hobbes1069(a)gmail.com> - 30.0-1
+- Update to 30.0.
+
* Sun Sep 23 2018 Richard Shaw <hobbes1069(a)gmail.com> - 29.1-4
- Addresses PHP 7.2 issue, fixes #4937.
diff --git a/sources b/sources
index 5dfdfea..c9812cf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fa75156700a740598707c84dbc07359f mythweb-29.1.tar.gz
+00d345b19389ee3ac02c0635fe3527fb mythweb-30.0.tar.gz
5 years, 1 month
[mythtv/f29] (20 commits) ...Add minizip-compat-devel for f30+.
by Richard Shaw
Summary of changes:
d93dc2b... Add patch to report space in GB instead of MB and remove fi (*)
d624891... Rebuild for ffmpeg-3.4.5 on el7 (*)
53b5c9b... Fix BR packages (*)
5544c0f... Fix python package's name (*)
8ee7f34... Rework dependencies for el7 (*)
1559b8d... Update changelog (*)
1e2c560... Fix python shebang ending with python22 on el (*)
f94c2f5... Update changelog (*)
3e1565a... Fix mythweb is noarch (*)
41a7321... Fix mythweb is noarch (*)
4b39b1d... Update to 30.0 with latest fixes/30. (*)
5e0a3f6... Remove configure options that no longer exist. (*)
1052a4e... Add libsamplerate-devel. (*)
1d98828... Add libbluray-devel. (*)
1e00c63... Add libXNVCtrl-devel. (*)
a640a36... Add build requirement for lzo-devel. (*)
a411621... Remove mythhdhomerun_config. (*)
37256af... More %%files cleanup. (*)
d07484f... Update dependencies for mythgame and mythgallery. (*)
05cfd37... Add minizip-compat-devel for f30+. (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 1 month
[obs-studio/f28] fix
by Leigh Scott
Summary of changes:
1056c8e... fix (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 1 month
[obs-studio/f29] fix
by Leigh Scott
Summary of changes:
1056c8e... fix (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 1 month
[obs-studio] fix
by Leigh Scott
commit 1056c8e54e226bc00e7acce2f295501880e3a84f
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Wed Feb 27 16:24:07 2019 +0000
fix
obs-studio.spec | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/obs-studio.spec b/obs-studio.spec
index 2fbffb7..14bd70e 100644
--- a/obs-studio.spec
+++ b/obs-studio.spec
@@ -101,7 +101,9 @@ doxygen
mkdir -p %{buildroot}/%{_libexecdir}/obs-plugins/obs-ffmpeg/
mv -f %{buildroot}/%{_datadir}/obs/obs-plugins/obs-ffmpeg/ffmpeg-mux \
%{buildroot}/%{_libexecdir}/obs-plugins/obs-ffmpeg/ffmpeg-mux
+%ifarch x86_64
mv -f %{buildroot}/%{_prefix}/lib/pkgconfig/ %{buildroot}/%{_libdir}/
+%endif
%check
/usr/bin/desktop-file-validate %{buildroot}/%{_datadir}/applications/obs.desktop
5 years, 1 month
[obs-studio] fix pkgconfig dir and build warning
by Leigh Scott
commit e883faac32967def271aed79b32bb17f9fac673a
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Wed Feb 27 16:10:14 2019 +0000
fix pkgconfig dir and build warning
obs-studio.spec | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/obs-studio.spec b/obs-studio.spec
index a51e1c4..2fbffb7 100644
--- a/obs-studio.spec
+++ b/obs-studio.spec
@@ -83,21 +83,25 @@ that use %{name}.
sed -i 's|OBS_MULTIARCH_SUFFIX|LIB_SUFFIX|g' cmake/Modules/ObsHelpers.cmake
%build
+mkdir -p build
+pushd build
%cmake3 -DOBS_VERSION_OVERRIDE=%{version} \
-DUNIX_STRUCTURE=1 -GNinja \
- -DOpenGL_GL_PREFERENCE=GLVND
+ -DOpenGL_GL_PREFERENCE=GLVND ..
%ninja_build
+popd
# build docs
doxygen
+
%install
-%ninja_install
+%ninja_install -C build
mkdir -p %{buildroot}/%{_libexecdir}/obs-plugins/obs-ffmpeg/
mv -f %{buildroot}/%{_datadir}/obs/obs-plugins/obs-ffmpeg/ffmpeg-mux \
%{buildroot}/%{_libexecdir}/obs-plugins/obs-ffmpeg/ffmpeg-mux
-mv -f %{buildroot}/%{_prefix}/lib/pkgconfig %{buildroot}/%{_libdir}/pkgconfig
+mv -f %{buildroot}/%{_prefix}/lib/pkgconfig/ %{buildroot}/%{_libdir}/
%check
/usr/bin/desktop-file-validate %{buildroot}/%{_datadir}/applications/obs.desktop
5 years, 1 month
[mythtv] Add minizip-compat-devel for f30+.
by Richard Shaw
commit 05cfd372ab13169d25bc30087997c25d2818418f
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Wed Feb 27 09:11:50 2019 -0600
Add minizip-compat-devel for f30+.
mythtv.spec | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/mythtv.spec b/mythtv.spec
index 1d47e8e..d7d1764 100644
--- a/mythtv.spec
+++ b/mythtv.spec
@@ -277,7 +277,11 @@ BuildRequires: systemd-devel
%endif
%if %{with mythgame}
+ %if 0%{?fedora} >= 30
+BuildRequires: minizip-compat-devel
+ %else
BuildRequires: minizip-devel
+ %endif
%endif
@@ -876,9 +880,7 @@ on demand content.
################################################################################
%prep
-%setup -q -n %{name}-%{version}
-%patch0 -p1
-%patch1 -p1
+%autosetup -p1 -n %{name}-%{version}
# Remove compiled python file
#find -name *.pyc -exec rm -f {} \;
5 years, 1 month