php-tracy: 2.4.2

3 files changed, 48 insertions, 25 deletions

diff --git a/composer-dev.json b/composer-dev.json
index 2336955..95d4d41 100644
--- a/composer-dev.json
+++ b/composer-dev.json
@@ -15,15 +15,22 @@
 		}
 	],
 	"require": {
-		"php": ">=5.3.1"
+		"php": ">=5.4.4",
+		"ext-session": "*",
+		"ext-json": "*"
 	},
 	"require-dev": {
 		"nette/di": "~2.3",
-		"nette/tester": "~1.3"
+		"nette/tester": "~2.0"
 	},
 	"autoload": {
 		"classmap": ["src"],
 		"files": ["src/shortcuts.php"]
 	},
-	"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-tracy-dev.spec b/php-tracy-dev.spec
index f9a42e5..1f7bcba 100644
--- a/php-tracy-dev.spec
+++ b/php-tracy-dev.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    152b7602115dd3a66f3190280951390097a15f65
+%global gh_commit    6b67ebb3a4ab663f7230f769627b6d1e138b1423
 #global gh_date      20150728
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     nette
@@ -16,7 +16,7 @@
 %global with_tests   0%{!?_without_tests:1}
 
 Name:           php-%{gh_project}
-Version:        2.3.11
+Version:        2.4.2
 %global specrel 1
 Release:        %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}
 Summary:        Tracy: useful PHP debugger
@@ -32,36 +32,36 @@ 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.4.4
+BuildRequires:  php-session
+BuildRequires:  php-json
 BuildRequires:  php-date
 BuildRequires:  php-iconv
-BuildRequires:  php-json
 BuildRequires:  php-pcre
 BuildRequires:  php-posix
 BuildRequires:  php-reflection
-BuildRequires:  php-session
 BuildRequires:  php-spl
-BuildRequires:  php-xml
 # From composer.json, "require-dev": {
 #        "nette/di": "~2.3",
-#        "nette/tester": "~1.3"
+#        "nette/tester": "~2.0"
 BuildRequires:  php-composer(%{gh_owner}/di) >= 2.3
-BuildRequires:  php-composer(%{gh_owner}/tester) >= 1.3
+BuildRequires:  php-composer(%{gh_owner}/tester) >= 2.0
 %endif
 
 # from composer.json, "require": {
-#        "php": ">=5.3.1"
-Requires:       php(language) >= 5.3.1
+#               "php": ">=5.4.4",
+#               "ext-session": "*",
+#               "ext-json": "*"
+Requires:       php(language) >= 5.4.4
+Requires:       php-session
+Requires:       php-json
 # from phpcompatinfo report for version 2.3.5, XDebug is optional
 Requires:       php-date
 Requires:       php-iconv
-Requires:       php-json
 Requires:       php-pcre
 Requires:       php-posix
 Requires:       php-reflection
-Requires:       php-session
 Requires:       php-spl
-Requires:       php-xml
 
 # provides tracy/tracy
 Provides:       php-composer(%{gh_project}/%{gh_project}) = %{version}
@@ -120,12 +120,24 @@ require_once '%{buildroot}%{php_home}/%{ns_vendor}/autoload.php';
 EOF
 
 : Run test suite in sources tree
+# remirepo:13
+ret=0
+run=0
+if which php56; then
+   cat /opt/remi/php56/root/etc/php.ini /opt/remi/php56/root/etc/php.d/*ini >php.ini
+   php56 %{_bindir}/nette-tester --colors 0 -p php56 -c ./php.ini tests -s || ret=1
+   run=1
+fi
+if which php71; then
+   cat /etc/opt/remi/php71/php.ini /etc/opt/remi/php71/php.d/*ini >php.ini
+   php71 %{_bindir}/nette-tester --colors 0 -p php71 -c ./php.ini tests -s || ret=1
+   run=1
+fi
+if [ $run -eq 0 ]; then
 %{_bindir}/nette-tester --colors 0 -p php -c ./php.ini tests -s
-
-if which php70; then
-  cat /etc/opt/remi/php70/php.ini /etc/opt/remi/php70/php.d/*ini >php.ini
-  php70 %{_bindir}/nette-tester --colors 0 -p php70 -c ./php.ini tests -s
+# remirepo:2
 fi
+exit $ret
 %else
 : Test suite disabled
 %endif
@@ -145,6 +157,10 @@ 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.4.4
+
 * Mon May 30 2016 Remi Collet <remi@fedoraproject.org> - 2.3.11-1
 - update to 2.3.11