summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-02-18 14:19:42 +0100
committerRemi Collet <remi@remirepo.net>2019-02-18 14:19:42 +0100
commit03718b35f83fa7462befc29da18b7c80b7f13718 (patch)
tree92738276056cdcc70d1e0cc3a082f772820fd952
parentcb0763556086a07240cccdc75fd3f5897e490ce1 (diff)
From Fedora:
- Disable Ruby Compass for Fedora >= 29 to fix FTBFS because dependency FTBFS "nothing provides rubygem(sass) < 3.5 needed by rubygem-compass" (RHBZ #1605436 / RHBZ #1675660)
-rw-r--r--.gitignore8
-rw-r--r--php-Assetic.spec51
2 files changed, 36 insertions, 23 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..fc9aa8c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+clog
+package-*.xml
+*.tgz
+*.tar.gz
+*.tar.xz
+*.tar.xz.asc
+*.src.rpm
+*/*rpm
diff --git a/php-Assetic.spec b/php-Assetic.spec
index f8041f4..be271db 100644
--- a/php-Assetic.spec
+++ b/php-Assetic.spec
@@ -2,7 +2,7 @@
#
# Fedora spec file for php-Assetic
#
-# Copyright (c) 2013-2016 Shawn Iwinski <shawn.iwinski@gmail.com>
+# Copyright (c) 2013-2019 Shawn Iwinski <shawn.iwinski@gmail.com>
#
# License: MIT
# http://opensource.org/licenses/MIT
@@ -61,9 +61,9 @@
# Conditionals for BuildRequires and Suggests
%global with_libjpeg_turbo_utils 0%{?fedora} || 0%{?rhl} >= 7
%global with_npm_clean_css 0%{?fedora} || 0%{?rhl} >= 7
-%global with_npm_handlebars 0%{?fedora} || 0%{?rhl} >= 6
+%global with_npm_handlebars 1
%global with_npm_typescript 0%{?fedora} >= 23
-%global with_rubygem_compass 0%{?fedora} >= 23
+%global with_rubygem_compass 0%{?fedora} >= 23 && 1%{?fedora} < 129
%global with_rubygem_sass 0%{?fedora} >= 23
%global with_rubygem_sprockets 0%{?fedora}
@@ -74,10 +74,9 @@
Name: php-Assetic
Version: %{github_version}
-Release: 1%{?dist}
+Release: 8%{?dist}
Summary: Asset Management for PHP
-Group: Development/Libraries
License: MIT
URL: https://github.com/%{github_owner}/%{github_name}
@@ -86,18 +85,23 @@ URL: https://github.com/%{github_owner}/%{github_name}
Source0: %{name}-%{github_version}-%{github_commit}.tar.gz
Source1: %{name}-get-source.sh
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
# Tests
%if %{with_tests}
## composer.json
BuildRequires: php(language) >= %{php_min_ver}
+BuildRequires: php-composer(leafo/lessphp) < %{lessphp_max_ver}
BuildRequires: php-composer(leafo/lessphp) >= %{lessphp_min_ver}
+BuildRequires: php-composer(leafo/scssphp) < %{scssphp_max_ver}
BuildRequires: php-composer(leafo/scssphp) >= %{scssphp_min_ver}
+BuildRequires: php-composer(patchwork/jsqueeze) < %{jsqueeze_max_ver}
BuildRequires: php-composer(patchwork/jsqueeze) >= %{jsqueeze_min_ver}
BuildRequires: php-composer(phpunit/phpunit)
+BuildRequires: php-composer(psr/log) < %{psr_log_max_ver}
BuildRequires: php-composer(psr/log) >= %{psr_log_min_ver}
+BuildRequires: php-composer(symfony/process) < %{symfony_max_ver}
BuildRequires: php-composer(symfony/process) >= %{symfony_min_ver}
+BuildRequires: php-composer(twig/twig) < %{twig_max_ver}
BuildRequires: php-composer(twig/twig) >= %{twig_min_ver}
## phpcompatinfo (computed from version 1.4.0)
BuildRequires: php-ctype
@@ -187,14 +191,6 @@ Suggests: rubygem(sass)
Suggests: rubygem(sprockets)
%endif
%endif
-Conflicts: php-composer(leafo/lessphp) < %{lessphp_min_ver}
-Conflicts: php-composer(leafo/lessphp) >= %{lessphp_max_ver}
-Conflicts: php-composer(leafo/scssphp) < %{scssphp_min_ver}
-Conflicts: php-composer(leafo/scssphp) >= %{scssphp_max_ver}
-Conflicts: php-composer(patchwork/jsqueeze) < %{jsqueeze_min_ver}
-Conflicts: php-composer(patchwork/jsqueeze) >= %{jsqueeze_max_ver}
-Conflicts: php-composer(twig/twig) < %{twig_min_ver}
-Conflicts: php-composer(twig/twig) >= %{twig_max_ver}
# Standard "php-{COMPOSER_VENDOR}-{COMPOSER_PROJECT}" naming
Provides: php-%{composer_vendor}-%{composer_project} = %{version}-%{release}
@@ -231,7 +227,10 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
\Fedora\Autoloader\Dependencies::required(array(
__DIR__.'/functions.php',
- '%{phpdir}/Symfony/Component/Process/autoload.php',
+ array(
+ '%{phpdir}/Symfony3/Component/Process/autoload.php',
+ '%{phpdir}/Symfony/Component/Process/autoload.php',
+ ),
));
\Fedora\Autoloader\Dependencies::optional(array(
@@ -244,8 +243,6 @@ AUTOLOAD
%install
-rm -rf %{buildroot}
-
mkdir -p %{buildroot}%{phpdir}
cp -rp src/Assetic %{buildroot}%{phpdir}/
@@ -256,6 +253,8 @@ cp -rp src/Assetic %{buildroot}%{phpdir}/
rm -f \
tests/Assetic/Test/Asset/HttpAssetTest.php \
tests/Assetic/Test/Filter/GoogleClosure/CompilerApiFilterTest.php
+: skip for https://github.com/kriswallsmith/assetic/issues/863
+rm tests/Assetic/Test/Filter/UglifyJs2FilterTest.php
: Create tests bootstrap
cat <<'BOOTSTRAP' | tee bootstrap.php
@@ -269,7 +268,7 @@ BOOTSTRAP
: Upstream tests with SCLs if available
SCL_RETURN_CODE=0
-for SCL in php56 php70 php71; do
+for SCL in php70 php71 php72 php73; do
if which $SCL; then
$SCL %{_bindir}/phpunit --verbose --bootstrap bootstrap.php || SCL_RETURN_CODE=1
fi
@@ -280,12 +279,7 @@ exit $SCL_RETURN_CODE
%endif
-%clean
-rm -rf %{buildroot}
-
-
%files
-%defattr(-,root,root,-)
%{!?_licensedir:%global license %%doc}
%license LICENSE
%doc *.json
@@ -296,6 +290,17 @@ rm -rf %{buildroot}
%changelog
+* Thu Feb 14 2019 Shawn Iwinski <shawn.iwinski@gmail.com> - 1.4.0-8
+- Disable Ruby Compass for Fedora >= 29 to fix FTBFS because dependency
+ FTBFS "nothing provides rubygem(sass) < 3.5 needed by rubygem-compass"
+ (RHBZ #1605436 / RHBZ #1675660)
+
+* Wed Nov 8 2017 Remi Collet <remi@remirepo.net> - 1.4.0-4
+- fix FTBFS from Koschei, add maximum version to build dependencies
+- fix autoloader for Symfony 3
+- skip test failing with uglify-js 2.8
+ https://github.com/kriswallsmith/assetic/issues/863
+
* Thu Dec 29 2016 Shawn Iwinski <shawn.iwinski@gmail.com> - 1.4.0-1
- Updated to 1.4.0 (RHBZ #1394441)
- Use php-composer(fedora/autoloader)