[php-scssphp] Updated to 0.0.12 (BZ #1116615)
Shawn Iwinski
siwinski at fedoraproject.org
Mon Jul 7 21:04:26 UTC 2014
commit 240e662ca26ce94fbf89b0558a9ad8f3083038eb
Author: Shawn Iwinski <siwinski at redhat.com>
Date: Mon Jul 7 17:04:14 2014 -0400
Updated to 0.0.12 (BZ #1116615)
- Added option to build without tests ("--without tests")
.gitignore | 1 +
php-scssphp.spec | 61 ++++++++++++++++++++++++++++++++++++++---------------
sources | 6 +----
3 files changed, 46 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d3896c1..21bc754 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/php-scssphp-0.0.8-96329a5f259f9d28e6596de84211a0f613c3edae.tar.gz
/php-scssphp-0.0.9-a06d702ebf9fabb22542bbb27cc12a905813bb6d.tar.gz
/php-scssphp-0.0.10-558357feceb9b932a192966945904414dc372e4d.tar.gz
+/php-scssphp-0.0.12-ff76df3e45af45e808f3fcd516a2cb5cbc77f45e.tar.gz
diff --git a/php-scssphp.spec b/php-scssphp.spec
index 2e8d55a..af30359 100644
--- a/php-scssphp.spec
+++ b/php-scssphp.spec
@@ -1,17 +1,32 @@
+#
+# RPM spec file for php-scssphp
+#
+# Copyright (c) 2012-2014 Shawn Iwinski <shawn.iwinski at gmail.com>
+# Remi Collet <remi at fedoraproject.org>
+#
+# License: MIT
+# http://opensource.org/licenses/MIT
+#
+# Please preserve changelog entries
+#
+
%global github_owner leafo
%global github_name scssphp
-%global github_version 0.0.10
-%global github_commit 558357feceb9b932a192966945904414dc372e4d
+%global github_version 0.0.12
+%global github_commit ff76df3e45af45e808f3fcd516a2cb5cbc77f45e
# "php": ">=5.3.0"
%global php_min_ver 5.3.0
# "phpunit/phpunit": "3.7.*"
-# max version ignored
+# NOTE: Max version ignored
%global phpunit_min_ver 3.7.0
+# Build using "--without tests" to disable tests
+%global with_tests %{?_without_tests:0}%{!?_without_tests:1}
+
Name: php-%{github_name}
Version: %{github_version}
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: A compiler for SCSS written in PHP
Group: Development/Libraries
@@ -21,21 +36,24 @@ Source0: https://github.com/%{github_owner}/%{github_name}/archive/%{githu
BuildArch: noarch
BuildRequires: help2man
-# For tests
+%if %{with_tests}
+# For tests: composer.json
BuildRequires: php(language) >= %{php_min_ver}
BuildRequires: php-phpunit-PHPUnit >= %{phpunit_min_ver}
-# For tests: phpcompatinfo (computed from v0.0.10)
+# For tests: phpcompatinfo (computed from version 0.0.12)
BuildRequires: php-ctype
BuildRequires: php-date
BuildRequires: php-pcre
+%endif
+# composer.json
Requires: php(language) >= %{php_min_ver}
-# phpcompatinfo (computed from v0.0.10)
+# phpcompatinfo (computed from version 0.0.12)
Requires: php-ctype
Requires: php-date
Requires: php-pcre
-Provides: php-composer(leafo/scssphp) = %{github_version}
+Provides: php-composer(leafo/scssphp) = %{version}
%description
@@ -47,12 +65,15 @@ The entire compiler comes in a single class file ready for including in any kind
of project in addition to a command line tool for running the compiler from the
terminal.
-scssphp implements SCSS (3.2.10). It does not implement the SASS syntax, only
+scssphp implements SCSS (3.2.12). It does not implement the SASS syntax, only
the SCSS syntax.
%prep
-%setup -q -n %{github_name}-%{github_commit}
+%setup -qn %{github_name}-%{github_commit}
+
+# Fix version (see https://github.com/leafo/scssphp/pull/174)
+sed -i 's/0.0.11/0.0.12/' scss.inc.php
# Create man page for bin
# Required here b/c path to include file is changed in next command
@@ -70,22 +91,24 @@ sed -e 's#/usr/bin/env php#%{_bindir}/php#' \
%install
mkdir -p %{buildroot}%{_datadir}/php/%{github_name}
-install -pm 644 scss.inc.php %{buildroot}%{_datadir}/php/%{github_name}/
+install -pm 0644 scss.inc.php %{buildroot}%{_datadir}/php/%{github_name}/
mkdir -p %{buildroot}%{_bindir}
-install -pm 755 pscss %{buildroot}%{_bindir}/
+install -pm 0755 pscss %{buildroot}%{_bindir}/
mkdir -p %{buildroot}%{_mandir}/man1
-install -pm 644 pscss.1 %{buildroot}%{_mandir}/man1/
+install -pm 0644 pscss.1 %{buildroot}%{_mandir}/man1/
%check
+%if %{with_tests}
# Create PHPUnit config w/ colors turned off
-cat phpunit.xml.dist \
- | sed 's/colors\s*=\s*"true"/colors="false"/' \
- > phpunit.xml
+sed 's/colors\s*=\s*"true"/colors="false"/' phpunit.xml.dist > phpunit.xml
%{_bindir}/phpunit tests
+%else
+: Tests skipped
+%endif
%files
@@ -96,7 +119,11 @@ cat phpunit.xml.dist \
%changelog
-* Mon Jun 8 2014 Remi Collet <remi at fedoraproject.org> - 0.0.10-2
+* Mon Jul 07 2014 Shawn Iwinski <shawn.iwinski at gmail.com> - 0.0.12-1
+- Updated to 0.0.12 (BZ #1116615)
+- Added option to build without tests ("--without tests")
+
+* Mon Jun 08 2014 Remi Collet <remi at fedoraproject.org> - 0.0.10-2
- fix FTBFS, ignore max version of PHPUnit
- provides php-composer(leafo/scssphp)
diff --git a/sources b/sources
index cdb83c7..f2fcad6 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-c9a856209c621f373eeb427ae289fde0 php-scssphp-0.0.5-dd4e4cdc8295b0897b9fe8b1b580561b8174ad35.tar.gz
-aa88cdc0518846247da22490b3333c9e php-scssphp-0.0.7-e5a79218c349cbc03dc99004fbad938c7b82391f.tar.gz
-8544f88b2703b0787b9b29b542872f2b php-scssphp-0.0.8-96329a5f259f9d28e6596de84211a0f613c3edae.tar.gz
-b6cb514a18441721492b4f45899a6a47 php-scssphp-0.0.9-a06d702ebf9fabb22542bbb27cc12a905813bb6d.tar.gz
-0fd7c995a877f17104029effa4191109 php-scssphp-0.0.10-558357feceb9b932a192966945904414dc372e4d.tar.gz
+431f9def6071bd9fea257d28f6805bda php-scssphp-0.0.12-ff76df3e45af45e808f3fcd516a2cb5cbc77f45e.tar.gz
More information about the scm-commits
mailing list