summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2016-08-02 16:26:53 +0200
committerRemi Collet <fedora@famillecollet.com>2016-08-02 16:26:53 +0200
commit6a80314b17e11086d63bf2240e81c5d4da2745d5 (patch)
treedf0ac53f7f747088672a58eb949244b45583bb7a
parentae734c3ec4f23f53026cda4e4e1d13dfaab2d67c (diff)
php-nette-di: 2.4.2
-rw-r--r--composer-dev.json20
-rwxr-xr-xmakesrc.sh10
-rw-r--r--php-nette-di-dev.spec40
3 files changed, 44 insertions, 26 deletions
diff --git a/composer-dev.json b/composer-dev.json
index ea85af1..ef4a5da 100644
--- a/composer-dev.json
+++ b/composer-dev.json
@@ -14,19 +14,27 @@
}
],
"require": {
- "php": ">=5.3.1",
+ "php": ">=5.6.0",
+ "ext-tokenizer": "*",
"nette/neon": "^2.3.3",
- "nette/php-generator": "^2.3.6",
- "nette/utils": "^2.3.5"
+ "nette/php-generator": "^2.4",
+ "nette/utils": "^2.4"
},
"require-dev": {
- "nette/tester": "^1.6"
+ "nette/tester": "~2.0",
+ "tracy/tracy": "^2.3"
},
"conflict": {
- "nette/nette": "<2.2"
+ "nette/nette": "<2.2",
+ "nette/bootstrap": "<2.4"
},
"autoload": {
"classmap": ["src/"]
},
- "minimum-stability": "dev"
+ "minimum-stability": "dev",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.4-dev"
+ }
+ }
}
diff --git a/makesrc.sh b/makesrc.sh
index 87d223d..2070e27 100755
--- a/makesrc.sh
+++ b/makesrc.sh
@@ -1,10 +1,10 @@
#!/bin/bash
NAME=$(basename $PWD)
-OWNER=$(sed -n '/^%global gh_owner/{s/.* //;p}' $NAME.spec)
-PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec)
-VERSION=$(sed -n '/^Version:/{s/.* //;p}' $NAME.spec)
-COMMIT=$(sed -n '/^%global gh_commit/{s/.* //;p}' $NAME.spec)
+OWNER=$(sed -n '/^%global gh_owner/{s/.* //;p}' $NAME$1.spec)
+PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME$1.spec)
+VERSION=$(sed -n '/^Version:/{s/.* //;p}' $NAME$1.spec)
+COMMIT=$(sed -n '/^%global gh_commit/{s/.* //;p}' $NAME$1.spec)
SHORT=${COMMIT:0:7}
echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION\n"
@@ -16,7 +16,7 @@ git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT
echo "Getting commit..."
pushd $PROJECT-$COMMIT
git checkout $COMMIT
-cp composer.json ../composer.json
+cp composer.json ../composer$1.json
popd
echo "Archiving..."
diff --git a/php-nette-di-dev.spec b/php-nette-di-dev.spec
index 5a9451e..be90a88 100644
--- a/php-nette-di-dev.spec
+++ b/php-nette-di-dev.spec
@@ -6,7 +6,7 @@
#
# Please, preserve the changelog entries
#
-%global gh_commit aed06c37a722a1450854176f1d0b11de473092f1
+%global gh_commit e3ae78a0f6cf921968e3298f57a7628d27feef72
#global gh_date 20150728
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner nette
@@ -17,7 +17,7 @@
%global with_tests 0%{!?_without_tests:1}
Name: php-%{gh_owner}-%{gh_project}
-Version: 2.3.12
+Version: 2.4.2
%global specrel 1
Release: %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}
Summary: Nette Dependency Injection Component
@@ -33,36 +33,40 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: php-composer(theseer/autoload)
%if %{with_tests}
-BuildRequires: php(language) >= 5.3.1
+BuildRequires: php(language) >= 5.6
+BuildRequires: php-tokenizer
BuildRequires: php-pcre
BuildRequires: php-reflection
BuildRequires: php-spl
-BuildRequires: php-tokenizer
BuildRequires: php-composer(%{gh_owner}/neon) >= 2.3.3
BuildRequires: php-composer(%{gh_owner}/php-generator) >= 2.3.6
BuildRequires: php-composer(%{gh_owner}/utils) >= 2.3.5
# From composer.json, "require-dev": {
-# "nette/tester": "~1.6"
-BuildRequires: php-composer(%{gh_owner}/tester) >= 1.6
+# "nette/tester": "~2.0",
+# "tracy/tracy": "^2.3"
+BuildRequires: php-composer(%{gh_owner}/tester) >= 2.0
%endif
# from composer.json, "require": {
-# "php": ">=5.3.1"
-# "nette/neon": "^2.3.3",
-# "nette/php-generator": "^2.3.6",
-# "nette/utils": "^2.3.5"
-Requires: php(language) >= 5.3.1
+# "php": ">=5.6.0",
+# "ext-tokenizer": "*",
+# "nette/neon": "^2.3.3",
+# "nette/php-generator": "^2.4",
+# "nette/utils": "^2.4"
+Requires: php(language) >= 5.6
+Requires: php-tokenizer
Requires: php-composer(%{gh_owner}/neon) >= 2.3.3
Requires: php-composer(%{gh_owner}/neon) < 3
-Requires: php-composer(%{gh_owner}/php-generator) >= 2.3.6
+Requires: php-composer(%{gh_owner}/php-generator) >= 2.4
Requires: php-composer(%{gh_owner}/php-generator) < 3
-Requires: php-composer(%{gh_owner}/utils) >= 2.3.5
+Requires: php-composer(%{gh_owner}/utils) >= 2.4
Requires: php-composer(%{gh_owner}/utils) < 3
-# from phpcompatinfo report for version 2.3.6
+# from composer.json, "conflict": {
+Conflicts: php-composer(%{gh_owner}/bootstrap) < 2.4
+# from phpcompatinfo report for version 2.4.2
Requires: php-pcre
Requires: php-reflection
Requires: php-spl
-Requires: php-tokenizer
Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version}
@@ -158,6 +162,12 @@ rm -rf %{buildroot}
%changelog
+* Tue Aug 2 2016 Remi Collet <remi@fedoraproject.org> - 2.4.2-1
+- update to 2.4.2
+- raise dependency on PHP >= 5.6
+- raise dependency on nette/php-generator >= 2.4
+- raise dependency on nette/utils >= 2.4
+
* Sun Jul 31 2016 Remi Collet <remi@fedoraproject.org> - 2.3.12-1
- update to 2.3.12