summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-07-01 15:16:13 +0200
committerRemi Collet <remi@remirepo.net>2020-07-01 15:16:13 +0200
commit5f23efc20869ee93c8c7533c414f2a39157e106f (patch)
tree92b035674b12cc28861facbb80eec67c3dd6aaaa
parent42cf9bccd37dc27dd45ca0c2e930b138fe07e4f5 (diff)
update to 1.1.1HEADmaster
-rw-r--r--composer.json2
-rw-r--r--php-scssphp-scssphp.spec17
2 files changed, 11 insertions, 8 deletions
diff --git a/composer.json b/composer.json
index ff0590f..43f5565 100644
--- a/composer.json
+++ b/composer.json
@@ -31,7 +31,7 @@
"ext-ctype": "*"
},
"require-dev": {
- "squizlabs/php_codesniffer": "~2.5",
+ "squizlabs/php_codesniffer": "~3.5",
"phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.3",
"twbs/bootstrap": "~4.3",
"zurb/foundation": "~6.5"
diff --git a/php-scssphp-scssphp.spec b/php-scssphp-scssphp.spec
index 467b47f..ab9874a 100644
--- a/php-scssphp-scssphp.spec
+++ b/php-scssphp-scssphp.spec
@@ -10,9 +10,9 @@
# For compatibility with SCL
#undefine __brp_mangle_shebangs
-%global with_tests 0%{!?_without_tests:1}
+%bcond_without tests
# Github
-%global gh_commit 20d661952d19d4d75508180c453a594423b4f10b
+%global gh_commit 824e4cec10b2bfa88eec5dac23991cb9106622c1
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner scssphp
%global gh_project scssphp
@@ -25,7 +25,7 @@
%global major %nil
Name: php-%{pk_vendor}-%{pk_project}%{major}
-Version: 1.0.8
+Version: 1.1.1
Release: 1%{?gh_date?%{gh_date}git%{gh_short}}%{?dist}
Summary: Compiler for SCSS
@@ -41,7 +41,7 @@ Patch0: %{name}-rpm.patch
BuildArch: noarch
BuildRequires: php(language) >= 5.6.0
BuildRequires: php-cli
-%if %{with_tests}
+%if %{with tests}
BuildRequires: php-ctype
BuildRequires: php-date
BuildRequires: php-json
@@ -49,7 +49,7 @@ BuildRequires: php-mbstring
BuildRequires: php-pcre
BuildRequires: php-spl
# For tests, from composer.json "require-dev": {
-# "squizlabs/php_codesniffer": "~2.5",
+# "squizlabs/php_codesniffer": "~3.5",
# "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.3",
# "twbs/bootstrap": "~4.3",
# "zurb/foundation": "~6.5"
@@ -118,10 +118,10 @@ install -pm 0755 bin/pscss %{buildroot}%{_bindir}/%{name}
php -r '
require "%{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}%{major}/autoload.php";
printf("Project version: %s\n", ScssPhp\ScssPhp\Version::VERSION);
- exit(ScssPhp\ScssPhp\Version::VERSION === "v%{version}" ? 0 : 1);
+ exit(ScssPhp\ScssPhp\Version::VERSION === "%{version}" ? 0 : 1);
'
-%if %{with_tests}
+%if %{with tests}
mkdir -p vendor/
cat << 'EOF' | tee vendor/autoload.php
<?php
@@ -162,6 +162,9 @@ exit $ret
%changelog
+* Wed Jul 1 2020 Remi Collet <remi@remirepo.net> - 1.1.1-1
+- update to 1.1.1
+
* Fri Feb 21 2020 Remi Collet <remi@remirepo.net> - 1.0.8-1
- update to 1.0.8