From ab5f95807fd278dfedf8aedfff05d9baf99d95d8 Mon Sep 17 00:00:00 2001 From: Xavier Bachelot Date: Oct 04 2019 16:18:40 +0000 Subject: 1.0.9.0 --- diff --git a/.gitignore b/.gitignore index 5f2a3fd..badda5a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ geshi-1.0.8.8.tar.gz /GeSHi-1.0.8.10.tar.bz2 /GeSHi-1.0.8.11.tar.bz2 +/GeSHi-1.0.9.0.tar.gz diff --git a/php-geshi.spec b/php-geshi.spec index ed01403..0694a05 100644 --- a/php-geshi.spec +++ b/php-geshi.spec @@ -1,11 +1,15 @@ Name: php-geshi -Version: 1.0.8.11 -Release: 13%{?dist} +Version: 1.0.9.0 +Release: 1%{?dist} Summary: Generic syntax highlighter License: GPLv2+ -URL: http://qbnz.com/highlighter/ -Source0: http://downloads.sourceforge.net/geshi/GeSHi-%{version}.tar.bz2 +URL: https://github.com/GeSHi/geshi-1.0 +Source0: %{url}/archive/v%{version}/GeSHi-%{version}.tar.gz + +# https://github.com/GeSHi/geshi-1.0/commit/ed9f49a7c7a195f6ed2bc864f5ce03b990b5867d.patch +Patch0: %{name}-1.0.9.0-fix_php72_deprecation_warning.patch + BuildArch: noarch Requires: php-mbstring @@ -22,7 +26,9 @@ goals: %prep -%setup -q -n geshi +%setup -q -n geshi-1.0-%{version} +%patch0 -p1 + find docs -type f -exec chmod a-x {} ';' find . -type f -name "*.php" -exec chmod a-x {} ';' @@ -32,20 +38,26 @@ find . -type f -name "*.php" -exec chmod a-x {} ';' %install -rm -rf $RPM_BUILD_ROOT - -mkdir -p $RPM_BUILD_ROOT%{_datadir}/php/ -cp -a geshi geshi.php $RPM_BUILD_ROOT%{_datadir}/php/ - +mkdir -p %{buildroot}%{_datadir}/php/ +cd src +cp -a geshi geshi.php %{buildroot}%{_datadir}/php/ %files +%license LICENSE +%doc BUGS CHANGELOG README.md THANKS %doc docs/* contrib/ %{_datadir}/php/geshi.php %{_datadir}/php/geshi %changelog +* Fri Oct 04 2019 Xavier Bachelot 1.0.9.0-1 +- Update to 1.0.9.0. +- Clean up specfile. +- Add upstream patch to fix a php 7.2 deprecation warning. + (Thanks Artur Iwicki) + * Fri Jul 26 2019 Fedora Release Engineering - 1.0.8.11-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index ebbef7c..0e6e3d0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d35e6e5f5f28ae0d087f9990510a5760 GeSHi-1.0.8.11.tar.bz2 +SHA512 (GeSHi-1.0.9.0.tar.gz) = 8d521e98972ac41399293f28a2c6db7dd467bf7325c7b40cfcc16d52353023a849c3fc9d32e8e6b7228d34219494464cb53ef7a1146dd571ac410b2c21704904