diff options
| author | Remi Collet <fedora@famillecollet.com> | 2016-01-21 07:44:17 +0100 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2016-01-21 07:44:17 +0100 |
| commit | f5f8cdd3de2d7cf9b2a1bae364e97313677d8830 (patch) | |
| tree | 3b2f6ceb306b2b50ee6abec87c434701efe30111 | |
| parent | 885bb3af283675699de669afdaab9b246f86d14a (diff) | |
php-scssphp: 0.4.0 (backported from Fedora)
| -rwxr-xr-x | php-scssphp-get-source.sh | 4 | ||||
| -rw-r--r-- | php-scssphp.spec | 26 |
2 files changed, 19 insertions, 11 deletions
diff --git a/php-scssphp-get-source.sh b/php-scssphp-get-source.sh index ba71f5d..2397e9b 100755 --- a/php-scssphp-get-source.sh +++ b/php-scssphp-get-source.sh @@ -43,6 +43,8 @@ print "GIT_REPO = $GIT_REPO" print "GIT_DIR = $GIT_DIR" TEMP_DIR=$(mktemp --dir) +TAR_FILE=$PWD/${NAME}-${VERSION}-${GIT_COMMIT}.tar.gz +CMP_FILE=$PWD/composer-${VERSION}.json pushd $TEMP_DIR print "Cloning git repo..." @@ -51,6 +53,7 @@ pushd $TEMP_DIR pushd $GIT_DIR print "Checking out commit..." $GIT checkout $GIT_COMMIT + cp composer.json $CMP_FILE popd TAR_DIR=${GIT_NAME}-${GIT_COMMIT} @@ -58,7 +61,6 @@ pushd $TEMP_DIR mv $GIT_DIR $TAR_DIR - TAR_FILE=`$RPM --eval='%{_sourcedir}'`/${NAME}-${VERSION}-${GIT_COMMIT}.tar.gz print "TAR_FILE = $TAR_FILE" [ -e $TAR_FILE ] && rm -f $TAR_FILE diff --git a/php-scssphp.spec b/php-scssphp.spec index ba2b01b..815755f 100644 --- a/php-scssphp.spec +++ b/php-scssphp.spec @@ -2,7 +2,7 @@ # # Fedora spec file for php-scssphp # -# Copyright (c) 2012-2015 Shawn Iwinski <shawn.iwinski@gmail.com> +# Copyright (c) 2012-2016 Shawn Iwinski <shawn.iwinski@gmail.com> # Remi Collet <remi@fedoraproject.org> # # License: MIT @@ -13,8 +13,8 @@ %global github_owner leafo %global github_name scssphp -%global github_version 0.3.2 -%global github_commit 033dd027dfc8e1905ce782a687160d66d3bd65ee +%global github_version 0.4.0 +%global github_commit 78a6f27aa4eaf70bb3ff4d13b639bab71fdaf47a %global composer_vendor leafo %global composer_project scssphp @@ -53,10 +53,9 @@ BuildRequires: php-cli ## composer.json BuildRequires: php(language) >= %{php_min_ver} BuildRequires: php-composer(phpunit/phpunit) -## phpcompatinfo (computed from version 0.3.2) +## phpcompatinfo (computed from version 0.4.0) BuildRequires: php-ctype BuildRequires: php-date -BuildRequires: php-json BuildRequires: php-mbstring BuildRequires: php-pcre ## Autoloader @@ -66,17 +65,16 @@ BuildRequires: php-composer(symfony/class-loader) Requires: php-cli # composer.json Requires: php(language) >= %{php_min_ver} -# phpcompatinfo (computed from version 0.3.2) +# phpcompatinfo (computed from version 0.4.0) Requires: php-ctype Requires: php-date -Requires: php-json Requires: php-mbstring Requires: php-pcre # Autoloader Requires: php-composer(symfony/class-loader) # Standard "php-{COMPOSER_VENDOR}-{COMPOSER_PROJECT}" naming -Provides: php-%{composer_vendor}-%{composer_project} = %{version}-%{release} +Provides: php-%{composer_vendor}-%{composer_project} = %{version}-%{release} # Composer Provides: php-composer(%{composer_vendor}/%{composer_project}) = %{version} @@ -109,8 +107,7 @@ cat <<'AUTOLOAD' | tee src/autoload.php <?php /** * Autoloader for %{name} and its' dependencies - * - * Created by %{name}-%{version}-%{release} + * (created by %{name}-%{version}-%{release}). * * @return \Symfony\Component\ClassLoader\ClassLoader */ @@ -158,6 +155,11 @@ install -pm 0755 bin/pscss %{buildroot}%{_bindir}/ %if %{with_tests} %{_bindir}/phpunit --verbose \ --bootstrap %{buildroot}%{phpdir}/Leafo/ScssPhp/autoload.php + +if which php70; then + php70 %{_bindir}/phpunit --verbose \ + --bootstrap %{buildroot}%{phpdir}/Leafo/ScssPhp/autoload.php +fi %else : Tests skipped %endif @@ -179,6 +181,10 @@ rm -rf %{buildroot} %changelog +* Wed Jan 20 2016 Shawn Iwinski <shawn.iwinski@gmail.com> - 0.4.0-1 +- Updated to 0.4.0 (RHBZ #1274939) +- Removed php-json dependency + * Sun Oct 11 2015 Shawn Iwinski <shawn.iwinski@gmail.com> - 0.3.2-1 - Updated to 0.3.2 (RHBZ #1268709) |