From 8d90afb4a403d371af9a686394b5cc55da2f7612 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 11 Mar 2021 07:31:52 +0100
Subject: Update to v0.6.0 Drop Patch0 (backport from upstream - included in
 this release)

---
 php-marcusschwarz-lesserphp.spec | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

(limited to 'php-marcusschwarz-lesserphp.spec')

diff --git a/php-marcusschwarz-lesserphp.spec b/php-marcusschwarz-lesserphp.spec
index 1cefd29..c2606f0 100644
--- a/php-marcusschwarz-lesserphp.spec
+++ b/php-marcusschwarz-lesserphp.spec
@@ -14,8 +14,8 @@
 %global with_tests 1
 
 Name:    php-%{composer_vendor}-%{composer_project}
-Version: 0.5.4
-Release: 5%{?dist}
+Version: 0.6.0
+Release: 1%{?dist}
 
 Summary: A compiler for LESS written in PHP
 License: MIT or GPLv3
@@ -25,20 +25,14 @@ URL:     https://www.maswaba.de/lesserphpdocs/
 %global repo_name   lesserphp
 Source0: https://github.com/%{repo_owner}/%{repo_name}/archive/v%{version}/%{repo_name}-%{version}.tar.gz
 
-# A yet-unmerged Pull Request submitted upstream by someone else.
-# Fixes uses of deprecated syntax and old PHPUnit code.
-#
-# https://github.com/MarcusSchwarz/lesserphp/pull/18
-Patch0: lesserphp--pullrequest-18.patch
-
 BuildArch: noarch
 
 %if 0%{?with_tests}
-BuildRequires: phpunit7
+BuildRequires: phpunit9
 %endif
 BuildRequires: php-fedora-autoloader-devel
 
-Requires: php-cli >= 5.3.0
+Requires: php-cli >= 7.2.0
 Requires: php-ctype
 Requires: php-date
 Requires: php-fileinfo
@@ -66,7 +60,6 @@ Autoloader: %{pkgdir}/autoload.php
 
 %prep
 %setup -n %{repo_name}-%{version}
-%patch0 -p1
 
 # Lessify is broken upstream and we don't want to install it
 rm lessify lessify.inc.php
@@ -74,9 +67,6 @@ rm lessify lessify.inc.php
 # Fix include paths
 sed -e 's|^require $path."lessc.inc.php";$|require "%{pkgdir}/lessc.inc.php";|' -i plessc
 
-# Fix homepage link in composer.json (still points to pre-fork page)
-sed -e 's|"http://leafo.net/lessphp/"|"https://www.maswaba.de/lesserphpdocs/"|' -i composer.json
-
 
 %build
 # Create autoloader
@@ -99,9 +89,9 @@ install -m 0755 -p plessc  %{buildroot}%{_bindir}/plessc
 
 %check
 %if 0%{?with_tests}
-for cmd in php php72 php73 php74; do
+for cmd in php php73 php74 php80; do
     if which $cmd; then
-        $cmd %{_bindir}/phpunit7 --verbose --bootstrap %{buildroot}%{pkgdir}/autoload.php
+        $cmd %{_bindir}/phpunit9 --verbose --bootstrap %{buildroot}%{pkgdir}/autoload.php
     fi
 done
 %endif
@@ -117,6 +107,10 @@ done
 
 
 %changelog
+* Wed Mar 10 2021 Artur Frenszek-Iwicki <fedora@svgames.pl> - 0.6.0-1
+- Update to v0.6.0
+- Drop Patch0 (backport from upstream - included in this release)
+
 * Tue Mar 24 2020 Remi Collet <remi@remirepo.net> - 0.5.4-5
 - backport for remirepo
 
-- 
cgit