switch the spec

4 files changed, 68 insertions, 271 deletions

diff --git a/composer-dev.json b/composer-dev.json
deleted file mode 100644
index 384f9b4..0000000
--- a/composer-dev.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-	"name": "latte/latte",
-	"description": "Latte: the amazing template engine for PHP",
-	"keywords": ["templating", "twig"],
-	"homepage": "https://latte.nette.org",
-	"license": ["BSD-3-Clause", "GPL-2.0", "GPL-3.0"],
-	"authors": [
-		{
-			"name": "David Grudl",
-			"homepage": "https://davidgrudl.com"
-		},
-		{
-			"name": "Nette Community",
-			"homepage": "https://nette.org/contributors"
-		}
-	],
-	"require": {
-		"php": ">=5.4.4",
-		"ext-json": "*",
-		"ext-tokenizer": "*"
-	},
-	"require-dev": {
-		"nette/tester": "~2.0",
-		"tracy/tracy": "^2.3"
-	},
-	"suggest": {
-		"ext-mbstring": "to use filters like lower, upper, capitalize, ...",
-		"ext-fileinfo": "to use filter |datastream",
-		"ext-xml": "to use filters like length, substring, ..."
-	},
-	"conflict": {
-		"nette/application": "<2.4.1"
-	},
-	"autoload": {
-		"classmap": ["src/"]
-	},
-	"minimum-stability": "dev",
-	"extra": {
-		"branch-alias": {
-			"dev-master": "2.4-dev"
-		}
-	}
-}
diff --git a/composer.json b/composer.json
index f53ed49..384f9b4 100644
--- a/composer.json
+++ b/composer.json
@@ -15,18 +15,29 @@
 		}
 	],
 	"require": {
-		"php": ">=5.3.1",
+		"php": ">=5.4.4",
+		"ext-json": "*",
 		"ext-tokenizer": "*"
 	},
 	"require-dev": {
-		"nette/tester": "~1.3"
+		"nette/tester": "~2.0",
+		"tracy/tracy": "^2.3"
 	},
 	"suggest": {
 		"ext-mbstring": "to use filters like lower, upper, capitalize, ...",
-		"ext-fileinfo": "to use filter |datastream"
+		"ext-fileinfo": "to use filter |datastream",
+		"ext-xml": "to use filters like length, substring, ..."
+	},
+	"conflict": {
+		"nette/application": "<2.4.1"
 	},
 	"autoload": {
 		"classmap": ["src/"]
 	},
-	"minimum-stability": "dev"
+	"minimum-stability": "dev",
+	"extra": {
+		"branch-alias": {
+			"dev-master": "2.4-dev"
+		}
+	}
 }
diff --git a/php-latte-dev.spec b/php-latte-dev.spec
deleted file mode 100644
index 90a602b..0000000
--- a/php-latte-dev.spec
+++ /dev/null
@@ -1,198 +0,0 @@
-# remirepo/fedora spec file for php-latte
-#
-# Copyright (c) 2015-2017 Remi Collet
-# License: CC-BY-SA
-# http://creativecommons.org/licenses/by-sa/4.0/
-#
-# Please, preserve the changelog entries
-#
-%global gh_commit    b62ee346467e1e2402a43c499cf6047fddc5d321
-#global gh_date      20150728
-%global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
-%global gh_owner     nette
-%global gh_project   latte
-%global ns_vendor    Latte
-%global php_home     %{_datadir}/php
-%global with_tests   0%{!?_without_tests:1}
-
-Name:           php-%{gh_project}
-Version:        2.4.3
-%global specrel 1
-Release:        %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}
-Summary:        Latte: the amazing template engine for PHP
-
-Group:          Development/Libraries
-License:        BSD or GPLv2 or GPLv3
-URL:            https://github.com/%{gh_owner}/%{gh_project}
-Source0:        %{name}-%{version}-%{gh_short}.tgz
-# pull a git snapshot to get test sutie
-Source1:        makesrc.sh
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:      noarch
-BuildRequires:  php-composer(theseer/autoload)
-%if %{with_tests}
-BuildRequires:  php(language) >= 5.4.4
-BuildRequires:  php-tokenizer
-BuildRequires:  php-date
-BuildRequires:  php-fileinfo
-BuildRequires:  php-iconv
-BuildRequires:  php-json
-BuildRequires:  php-mbstring
-BuildRequires:  php-pcre
-BuildRequires:  php-reflection
-BuildRequires:  php-spl
-BuildRequires:  php-tokenizer
-BuildRequires:  php-xml
-# From composer.json, "require-dev": {
-#		"nette/tester": "~2.0",
-#		"tracy/tracy": "^2.3"
-# ignore tester min version (pass with 1.7), ignore tracy (pass without)
-BuildRequires:  php-composer(%{gh_owner}/tester) >= 1.7
-%endif
-
-# from composer.json, "require": {
-#        "php": ">=5.4.4"
-#        "ext-json": "*",
-#        "ext-tokenizer": "*"
-Requires:       php(language) >= 5.4.4
-Requires:       php-json
-Requires:       php-tokenizer
-# from composer.json, "suggest": {
-#               "ext-mbstring": "to use filters like lower, upper, capitalize, ...",
-#               "ext-fileinfo": "to use filter |datastream",
-#               "ext-xml": "to use filters like length, substring, ..."
-Requires:       php-fileinfo
-Requires:       php-mbstring
-Requires:       php-xml
-# from composer.json, "conflict": {
-#               "nette/application": "<2.4"
-Conflicts:      php-composer(%{gh_owner}/application) < 2.4.1
-# from phpcompatinfo report for version 2.4.1
-Requires:       php-date
-Requires:       php-iconv
-Requires:       php-pcre
-Requires:       php-reflection
-Requires:       php-spl
-Requires:       php-tokenizer
-
-# provides latte/latte
-Provides:       php-composer(%{gh_project}/%{gh_project}) = %{version}
-
-
-%description
-Latte is a template engine for PHP which eases your work and ensures the
-output is protected against vulnerabilities, such as XSS.
-
-Latte is fast: it compiles templates to plain optimized PHP code.
-
-Latte is secure: it is the first PHP engine introducing content-aware escaping.
-
-Latte speaks your language: it has intuitive syntax and helps you to build
-better websites easily.
-
-To use this library, you just have to add, in your project:
-  require_once '%{php_home}/%{ns_vendor}/autoload.php';
-
-
-%prep
-%setup -q -n %{gh_project}-%{gh_commit}
-
-# drop upstream autoloader which is outside tree
-rm src/latte.php
-
-
-%build
-: Generate a classmap autoloader
-phpab --output src/%{ns_vendor}/autoload.php src
-
-
-%install
-rm -rf       %{buildroot}
-mkdir -p     %{buildroot}%{php_home}
-cp -pr src/* %{buildroot}%{php_home}/
-
-
-%check
-%if %{with_tests}
-export LANG=fr_FR.utf8
-
-: Generate autoloader
-mkdir vendor
-cat << 'EOF' | tee vendor/autoload.php
-<?php
-require_once '%{php_home}/Tester/autoload.php';
-require_once '%{buildroot}%{php_home}/%{ns_vendor}/autoload.php';
-EOF
-
-: Run test suite in sources tree
-# remirepo:12
-ret=0
-run=0
-if which php56; then
-   php56 %{_bindir}/nette-tester --colors 0 -p php56 -C -s || ret=1
-   run=1
-fi
-if which php71; then
-   rm tests/Latte/Filters.general.phpt
-   php71 %{_bindir}/nette-tester --colors 0 -p php71 -C -s || ret=1
-   run=1
-fi
-if [ $run -eq 0 ]; then
-%{_bindir}/nette-tester --colors 0 -p php -C tests -s
-# remirepo:2
-fi
-exit $ret
-%else
-: Test suite disabled
-%endif
-
-
-%clean
-rm -rf %{buildroot}
-
-
-%files
-%defattr(-,root,root,-)
-%{!?_licensedir:%global license %%doc}
-%license license.md
-%doc readme.md contributing.md
-%doc composer.json
-%{php_home}/%{ns_vendor}
-
-
-%changelog
-* Thu Jan 19 2017 Remi Collet <remi@fedoraproject.org> - 2.4.3-1
-- update to 2.4.3
-
-* Wed Sep 28 2016 Remi Collet <remi@fedoraproject.org> - 2.4.2-1
-- update to 2.4.2
-
-* Thu Aug  4 2016 Remi Collet <remi@fedoraproject.org> - 2.4.1-1
-- update to 2.4.1
-
-* Fri Jul  1 2016 Remi Collet <remi@fedoraproject.org> - 2.4.0-1
-- update to 2.4.0
-- raise dependency on php >= 5.4.4
-
-* Mon May 30 2016 Remi Collet <remi@fedoraproject.org> - 2.3.12-1
-- update to 2.3.12
-
-* Tue Apr 12 2016 Remi Collet <remi@fedoraproject.org> - 2.3.11-1
-- update to 2.3.11
-
-* Sat Feb 20 2016 Remi Collet <remi@fedoraproject.org> - 2.3.10-1
-- update to 2.3.10
-
-* Wed Jan 20 2016 Remi Collet <remi@fedoraproject.org> - 2.3.9-1
-- update to 2.3.9
-
-* Thu Dec  3 2015 Remi Collet <remi@fedoraproject.org> - 2.3.8-1
-- update to 2.3.8
-- run test suite with both php 5 and 7 when available
-
-* Sun Nov  8 2015 Remi Collet <remi@fedoraproject.org> - 2.3.7-1
-- update to 2.3.7
-
-* Tue Oct 20 2015 Remi Collet <remi@fedoraproject.org> - 2.3.6-1
-- initial package
diff --git a/php-latte.spec b/php-latte.spec
index 4a65483..90a602b 100644
--- a/php-latte.spec
+++ b/php-latte.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    995521e5ce0dc99ce8c801cba4c19322878f0a98
+%global gh_commit    b62ee346467e1e2402a43c499cf6047fddc5d321
 #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.13
+Version:        2.4.3
 %global specrel 1
 Release:        %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}
 Summary:        Latte: the amazing template engine for PHP
@@ -32,7 +32,7 @@ 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-tokenizer
 BuildRequires:  php-date
 BuildRequires:  php-fileinfo
@@ -42,25 +42,39 @@ BuildRequires:  php-mbstring
 BuildRequires:  php-pcre
 BuildRequires:  php-reflection
 BuildRequires:  php-spl
+BuildRequires:  php-tokenizer
+BuildRequires:  php-xml
 # From composer.json, "require-dev": {
-#        "nette/tester": "~1.3"
-BuildRequires:  php-composer(%{gh_owner}/tester) >= 1.3
+#		"nette/tester": "~2.0",
+#		"tracy/tracy": "^2.3"
+# ignore tester min version (pass with 1.7), ignore tracy (pass without)
+BuildRequires:  php-composer(%{gh_owner}/tester) >= 1.7
 %endif
 
 # from composer.json, "require": {
-#        "php": ">=5.3.1"
+#        "php": ">=5.4.4"
+#        "ext-json": "*",
 #        "ext-tokenizer": "*"
-Requires:       php(language) >= 5.3.1
+Requires:       php(language) >= 5.4.4
+Requires:       php-json
 Requires:       php-tokenizer
-# from phpcompatinfo report for version 2.3.6
-Requires:       php-date
+# from composer.json, "suggest": {
+#               "ext-mbstring": "to use filters like lower, upper, capitalize, ...",
+#               "ext-fileinfo": "to use filter |datastream",
+#               "ext-xml": "to use filters like length, substring, ..."
 Requires:       php-fileinfo
-Requires:       php-iconv
-Requires:       php-json
 Requires:       php-mbstring
+Requires:       php-xml
+# from composer.json, "conflict": {
+#               "nette/application": "<2.4"
+Conflicts:      php-composer(%{gh_owner}/application) < 2.4.1
+# from phpcompatinfo report for version 2.4.1
+Requires:       php-date
+Requires:       php-iconv
 Requires:       php-pcre
 Requires:       php-reflection
 Requires:       php-spl
+Requires:       php-tokenizer
 
 # provides latte/latte
 Provides:       php-composer(%{gh_project}/%{gh_project}) = %{version}
@@ -101,16 +115,8 @@ cp -pr src/* %{buildroot}%{php_home}/
 
 %check
 %if %{with_tests}
-: Ignore failed test under investigation
-rm 'tests/Latte/Helpers.optimizePhp().phpt'
-
-: Generate configuration
-cat /etc/php.ini /etc/php.d/*ini >php.ini
 export LANG=fr_FR.utf8
 
-: For PHP 5.3.3 on RHEL-6
-sed -e 's/50303/99999/' -i tests/Latte/Object.phpt
-
 : Generate autoloader
 mkdir vendor
 cat << 'EOF' | tee vendor/autoload.php
@@ -120,12 +126,23 @@ require_once '%{buildroot}%{php_home}/%{ns_vendor}/autoload.php';
 EOF
 
 : Run test suite in sources tree
-%{_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:12
+ret=0
+run=0
+if which php56; then
+   php56 %{_bindir}/nette-tester --colors 0 -p php56 -C -s || ret=1
+   run=1
+fi
+if which php71; then
+   rm tests/Latte/Filters.general.phpt
+   php71 %{_bindir}/nette-tester --colors 0 -p php71 -C -s || ret=1
+   run=1
 fi
+if [ $run -eq 0 ]; then
+%{_bindir}/nette-tester --colors 0 -p php -C tests -s
+# remirepo:2
+fi
+exit $ret
 %else
 : Test suite disabled
 %endif
@@ -145,8 +162,18 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Wed Dec 21 2016 Remi Collet <remi@fedoraproject.org> - 2.3.13-1
-- update to 2.3.13
+* Thu Jan 19 2017 Remi Collet <remi@fedoraproject.org> - 2.4.3-1
+- update to 2.4.3
+
+* Wed Sep 28 2016 Remi Collet <remi@fedoraproject.org> - 2.4.2-1
+- update to 2.4.2
+
+* Thu Aug  4 2016 Remi Collet <remi@fedoraproject.org> - 2.4.1-1
+- update to 2.4.1
+
+* Fri Jul  1 2016 Remi Collet <remi@fedoraproject.org> - 2.4.0-1
+- update to 2.4.0
+- raise dependency on php >= 5.4.4
 
 * Mon May 30 2016 Remi Collet <remi@fedoraproject.org> - 2.3.12-1
 - update to 2.3.12