diff options
| -rwxr-xr-x | makesrc.sh | 28 | ||||
| -rw-r--r-- | php-nette.spec | 59 |
2 files changed, 30 insertions, 57 deletions
diff --git a/makesrc.sh b/makesrc.sh deleted file mode 100755 index e9a1ec5..0000000 --- a/makesrc.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/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) -SHORT=${COMMIT:0:7} - -echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION\n" - -echo "Cloning..." -rm -rf $PROJECT-$COMMIT -git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT - -echo "Getting commit..." -pushd $PROJECT-$COMMIT -git checkout $COMMIT -cp composer.json ../composer-$VERSION.json -popd - -echo "Archiving..." -tar czf $NAME-$VERSION-$SHORT.tgz --exclude .git $PROJECT-$COMMIT - -echo "Cleaning..." -rm -rf $PROJECT-$COMMIT - -echo "Done." diff --git a/php-nette.spec b/php-nette.spec index 8e15a18..f7fac50 100644 --- a/php-nette.spec +++ b/php-nette.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 40b55666b78d7ec6272c46e94f15e4f36bd583e2 +%global gh_commit 059cff35c281125e5da0615a1cd0b10908ebb944 #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.7 +Version: 2.3.8 %global specrel 1 Release: %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} Summary: Nette Framework @@ -24,9 +24,7 @@ Summary: Nette Framework 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 +Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -57,49 +55,49 @@ BuildRequires: php-composer(latte/latte) BuildRequires: php-composer(tracy/tracy) %endif # from composer.json, "require": { -# "nette/application": "2.3.7", -# "nette/bootstrap": "2.3.3", -# "nette/caching": "2.3.3", +# "nette/application": "2.3.8", +# "nette/bootstrap": "2.3.4", +# "nette/caching": "2.3.4", # "nette/component-model": "2.2.4", -# "nette/database": "2.3.7", -# "nette/deprecated": "2.3.1", -# "nette/di": "2.3.6", +# "nette/database": "2.3.8", +# "nette/deprecated": "2.3.2", +# "nette/di": "2.3.7", # "nette/finder": "2.3.1", -# "nette/forms": "2.3.5", +# "nette/forms": "2.3.6", # "nette/http": "2.3.3", -# "nette/mail": "2.3.3", +# "nette/mail": "2.3.4", # "nette/neon": "2.3.3", -# "nette/php-generator": "2.3.4", +# "nette/php-generator": "2.3.5", # "nette/reflection": "2.3.1", # "nette/robot-loader": "2.3.1", # "nette/safe-stream": "2.3.1", # "nette/security": "2.3.1", # "nette/tokenizer": "2.2.1", -# "nette/utils": "2.3.6", -# "latte/latte": "2.3.6", -# "tracy/tracy": "2.3.5" +# "nette/utils": "2.3.7", +# "latte/latte": "2.3.8", +# "tracy/tracy": "2.3.7" # Strict version ignored on purpose -Requires: php-composer(%{gh_owner}/application) >= 2.3.7 -Requires: php-composer(%{gh_owner}/bootstrap) >= 2.3.3 -Requires: php-composer(%{gh_owner}/caching) >= 2.3.3 +Requires: php-composer(%{gh_owner}/application) >= 2.3.8 +Requires: php-composer(%{gh_owner}/bootstrap) >= 2.3.4 +Requires: php-composer(%{gh_owner}/caching) >= 2.3.4 Requires: php-composer(%{gh_owner}/component-model) >= 2.2.4 -Requires: php-composer(%{gh_owner}/database) >= 2.3.7 -Requires: php-composer(%{gh_owner}/deprecated) >= 2.3.1 -Requires: php-composer(%{gh_owner}/di) >= 2.3.6 +Requires: php-composer(%{gh_owner}/database) >= 2.3.8 +Requires: php-composer(%{gh_owner}/deprecated) >= 2.3.2 +Requires: php-composer(%{gh_owner}/di) >= 2.3.7 Requires: php-composer(%{gh_owner}/finder) >= 2.3.1 -Requires: php-composer(%{gh_owner}/forms) >= 2.3.5 +Requires: php-composer(%{gh_owner}/forms) >= 2.3.6 Requires: php-composer(%{gh_owner}/http) >= 2.3.3 -Requires: php-composer(%{gh_owner}/mail) >= 2.3.3 +Requires: php-composer(%{gh_owner}/mail) >= 2.3.4 Requires: php-composer(%{gh_owner}/neon) >= 2.3.3 -Requires: php-composer(%{gh_owner}/php-generator) >= 2.3.4 +Requires: php-composer(%{gh_owner}/php-generator) >= 2.3.5 Requires: php-composer(%{gh_owner}/reflection) >= 2.3.1 Requires: php-composer(%{gh_owner}/robot-loader) >= 2.3.1 Requires: php-composer(%{gh_owner}/safe-stream) >= 2.3.1 Requires: php-composer(%{gh_owner}/security) >= 2.3.1 Requires: php-composer(%{gh_owner}/tokenizer) >= 2.2.1 -Requires: php-composer(%{gh_owner}/utils) >= 2.3.6 -Requires: php-composer(latte/latte) >= 2.3.6 -Requires: php-composer(tracy/tracy) >= 2.3.5 +Requires: php-composer(%{gh_owner}/utils) >= 2.3.7 +Requires: php-composer(latte/latte) >= 2.3.8 +Requires: php-composer(tracy/tracy) >= 2.3.7 # from phpcompatinfo report for version 2.3.7: nothing Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version} @@ -185,5 +183,8 @@ rm -rf %{buildroot} %changelog +* Thu Dec 3 2015 Remi Collet <remi@fedoraproject.org> - 2.3.8-1 +- update to 2.3.8 + * Sun Nov 1 2015 Remi Collet <remi@fedoraproject.org> - 2.3.7-1 - initial package
\ No newline at end of file |