commit c54501962876da8b8c91eb97da155edeca4d891c
Author: Elan Ruusamäe <[email protected]>
Date: Thu Apr 7 21:07:38 2016 +0300
up to 6a8e47e, commit before php 5.5 bump
the 5.5+ requirement seems bogus,
https://github.com/composer/satis/commit/1451d2c152cca2791eef3fb9a7ab3cb9e4e62e58
autoload.patch | 20 ++++++++++----------
satis.spec | 12 ++++--------
2 files changed, 14 insertions(+), 18 deletions(-)
---
diff --git a/satis.spec b/satis.spec
index af5c797..0efe3e6 100644
--- a/satis.spec
+++ b/satis.spec
@@ -1,8 +1,8 @@
%define rel 1
-%define githash 48191ff
+%define githash 6a8e47e
# $ git rev-list 1.0.0-alpha1..%{githash} --count
-%define commits 152
+%define commits 193
%define subver alpha1
%define php_min_version 5.3.4
%include /usr/lib/rpm/macros.php
@@ -14,17 +14,14 @@ License: MIT
Group: Development/Languages/PHP
#Source0:
https://github.com/composer/satis/archive/%{version}-%{subver}/%{name}-%{version}%{subver}.tar.gz
Source0:
https://github.com/composer/satis/archive/%{githash}/%{name}-%{version}-%{subver}-%{commits}-g%{githash}.tar.gz
-# Source0-md5: adee07882bc8c526b6bd3489812bc194
+# Source0-md5: ec71a1da6009bf5198a6a8c736c10aab
Source1: autoload.php
Patch0: autoload.patch
-Patch1: https://github.com/composer/satis/pull/292.patch
-# Patch1-md5: 28bbf057c6771e7ddda8ce1be14d22e5
URL: https://github.com/composer/satis
-BuildRequires: composer
BuildRequires: rpm-php-pearprov >= 4.4.2-11
BuildRequires: rpmbuild(macros) >= 1.461
BuildRequires: sed >= 4.0
-Requires: composer >= 1.0.0-16.alpha11
+Requires: composer >= 1.0.0-18
Requires: php(core) >= %{php_min_version}
Requires: php(hash)
Requires: php(json)
@@ -47,7 +44,6 @@ Repository file.
%setup -qc -n %{name}-%{version}-%{release}
mv %{name}-*/* .
%patch0 -p1
-%patch1 -p1
%{__sed} -i -e '1s,^#!.*env php,#!/usr/bin/php,' bin/*
diff --git a/autoload.patch b/autoload.patch
index a65e2b0..bc270ca 100644
--- a/autoload.patch
+++ b/autoload.patch
@@ -24,14 +24,14 @@
$schema = json_decode(file_get_contents($schemaFile));
$validator = new Validator();
$validator->check($data, $schema);
----
satis-1.0.0-1.alpha1.152.g48191ff.0.5/src/Composer/Satis/Builder/WebBuilder.php~
2016-01-06 09:33:13.000000000 +0200
-+++
satis-1.0.0-1.alpha1.152.g48191ff.0.5/src/Composer/Satis/Builder/WebBuilder.php
2016-01-06 23:10:27.276318960 +0200
-@@ -35,7 +35,7 @@
- {
- $twigTemplate = isset($this->config['twig-template']) ?
$this->config['twig-template'] : null;
-
-- $templateDir = $twigTemplate ? pathinfo($twigTemplate,
PATHINFO_DIRNAME) : __DIR__.'/../../../../views';
-+ $templateDir = $twigTemplate ? pathinfo($twigTemplate,
PATHINFO_DIRNAME) : __DIR__.'/../views';
- $loader = new \Twig_Loader_Filesystem($templateDir);
- $twig = new \Twig_Environment($loader);
+---
satis-1.0.0-1.alpha1.197.g6ddaf74.1/src/Composer/Satis/Builder/WebBuilder.php~
2016-04-05 18:16:09.000000000 +0300
++++
satis-1.0.0-1.alpha1.197.g6ddaf74.1/src/Composer/Satis/Builder/WebBuilder.php
2016-04-07 21:01:12.883296920 +0300
+@@ -103,7 +103,7 @@
+ if (null === $this->twig) {
+ $twigTemplate = isset($this->config['twig-template']) ?
$this->config['twig-template'] : null;
+- $templateDir = $twigTemplate ? pathinfo($twigTemplate,
PATHINFO_DIRNAME) : __DIR__.'/../../../../views';
++ $templateDir = $twigTemplate ? pathinfo($twigTemplate,
PATHINFO_DIRNAME) : __DIR__.'/../views';
+ $loader = new \Twig_Loader_Filesystem($templateDir);
+ $this->twig = new \Twig_Environment($loader);
+ }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/satis.git/commitdiff/c54501962876da8b8c91eb97da155edeca4d891c
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
