commit 00ddcd57e8cf7f7c967f8401b0efe746b947629e Author: Richard Shaw <hobbes1069(a)gmail.com&gt; Date: Wed Oct 4 11:01:56 2017 -0500 Update to latest upstream release, 29.0. .gitignore | 1 + ChangeLog | 7 ------- mythweb-0.28-fixes.patch | 24 ------------------------ mythweb-fixes.patch | 0 mythweb.conf | 34 ++++++++++++++++++---------------- mythweb.spec | 42 ++++++++---------------------------------- sources | 2 +- 7 files changed, 28 insertions(+), 82 deletions(-) --- diff --git a/.gitignore b/.gitignore index aadd1d1..dc7d583 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ mythweb-0.27.5.tar.gz /mythweb-0.28.tar.gz /mythweb-0.28.1.tar.gz +/mythweb-29.0.tar.gz diff --git a/ChangeLog b/ChangeLog index 63b47fd..e69de29 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +0,0 @@ -commit d94cf0bb5e1ffb7feaab27aae68d8214371ae266 -Author: Stuart Auchterlonie <stuarta(a)mythtv.org&gt; -Date: Tue Mar 28 09:27:12 2017 +0100 - - Fixes #12981 [php7.1] Use of this is no longer allowed - - (cherry picked from commit 52ff70ecfdad06b0b66f8a5ec67cefc1b55a1861) diff --git a/mythweb-fixes.patch b/mythweb-fixes.patch new file mode 100644 index 0000000..e69de29 diff --git a/mythweb.conf b/mythweb.conf index 13bd6ac..ed5647a 100644 --- a/mythweb.conf +++ b/mythweb.conf @@ -89,28 +89,30 @@ Alias /mythweb "/usr/share/mythweb" # The following settings relate to PHP config. # - <Files *.php> + <IfModule mod_php7.c> + <Files *.php> - # These settings are intended for apache 2.x. If your version of apache - # doesn't support php_value, or things like memory_limit aren't working - # as expected, then use these settings as examples for your own php.ini - # files. -# php_value safe_mode 0 + # These settings are intended for apache 2.x. If your version of apache + # doesn't support php_value, or things like memory_limit aren't working + # as expected, then use these settings as examples for your own php.ini + # files. +# php_value safe_mode 0 - php_value memory_limit 32M + php_value memory_limit 32M -# php_value register_globals 0 -# php_value magic_quotes_gpc 0 - php_value file_uploads 0 - php_value allow_url_fopen On +# php_value register_globals 0 +# php_value magic_quotes_gpc 0 + php_value file_uploads 0 + php_value allow_url_fopen On - php_value zlib.output_handler Off - php_value output_handler NULL + php_value zlib.output_handler Off + php_value output_handler NULL - # Note: php_flag does not work in older versions of php - php_flag output_handler "NULL" + # Note: php_flag does not work in older versions of php + php_flag output_handler "NULL" - </Files> + </Files> + </IfModule> ############################################################################ # The settings below relate specifically to mod_rewrite and the rewrite diff --git a/mythweb.spec b/mythweb.spec index 4ed9f21..5ec85a7 100644 --- a/mythweb.spec +++ b/mythweb.spec @@ -1,11 +1,11 @@ -%global vers_string v0.28.1-1-gd94cf0b +%global vers_string v29.0 Name: mythweb Summary: The web interface to MythTV URL: http://www.mythtv.org/ -Version: 0.28.1 -Release: 3%{?dist} +Version: 29.0 +Release: 1%{?dist} License: GPLv2 and LGPLv2 and MIT @@ -15,16 +15,11 @@ Source2: ChangeLog # Patch generated from mythweb fixes branch. From mythweb git directory: # git diff -p --stat <git_tag> > mythweb-fixes.patch -Patch0: mythweb-0.28-fixes.patch +Patch0: mythweb-fixes.patch # This is needed for perl dependency auto-detection BuildRequires: perl-generators -# The following are required only in mythweb is running on the same computer -# as the backend. They will be pulled in by the mythtv meta package anyway. -#Requires: mythtv-backend >= %{version}-%{release} -#Requires: mysql-server >= 5, mysql >= 5 - Requires: httpd Requires: php >= 5.1 Requires: php-mysqli @@ -40,8 +35,7 @@ The web interface to MythTV. %prep -%setup -q -n %{name}-%{version} -%patch0 -p1 +%autosetup -p1 # Non-executable scripts don't need shebangs sed -i modules/coverart/handler.pl -e '/\/usr\/bin\/perl/d' @@ -72,29 +66,6 @@ install -pm 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/ rm %{buildroot}%{_datadir}/mythweb/{LICENSE,README,INSTALL,ChangeLog} -#%pretrans -## If this is an upgrade -#if [ $1 -eq 0 ] ; then -# # If data exists and is a directory then we need move it out of the way. -# if [ -d "%{_datadir}/%{name}/data" ] ; then -# mv %{_datadir}/%{name}/data %{_datadir}/%{name}/_tmp_data -# fi -#fi - -#%posttrans -## If this is an upgrade -#if [ $1 -eq 0 ] ; then -# # If there is data to migrate, let's do it -# if [ -e "%{_datadir}/%{name}/_tmp_data" ] ; then -# cp -p %{_datadir}/%{name}/_tmp_data/cache/* \ -# %{_sharedstatedir}/%{name}/data/cache/ &> /dev/null || : -# cp -p %{_datadir}/%{name}/_tmp_data/tv_icons/* \ -# %{_sharedstatedir}/%{name}/data/tv_icons/ &> /dev/null || : -# rm -rf %{_datadir}/%{name}/_tmp_data -# fi -#fi - - %files %doc README ChangeLog %license LICENSE @@ -104,6 +75,9 @@ rm %{buildroot}%{_datadir}/mythweb/{LICENSE,README,INSTALL,ChangeLog} %changelog +* Sun Sep 17 2017 Richard Shaw <hobbes1069(a)gmail.com&gt; - 29.0-1 +- Update to latest upstream release, 29.0. + * Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org&gt; - 0.28.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/sources b/sources index d828b60..3bf5f20 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3109e9751a246881084771923ebd57ba mythweb-0.28.1.tar.gz +740b07a57d456e86b45b487ac7c15b80 mythweb-29.0.tar.gz