summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-06-29 17:36:54 +0200
committerRemi Collet <remi@remirepo.net>2021-06-29 17:36:54 +0200
commitbdd38d1e5956fc449116deae1a8b39b3609814c9 (patch)
tree7c0e1f99f317325d5e0aa465aeca082754277a8a
parentb82acd8fac0fcc1fd01330805eb0185cb873f6fd (diff)
update to 1.0.1
open https://github.com/awslabs/aws-crt-php/issues/37 incomplete archive open https://github.com/awslabs/aws-crt-php/issues/38 missing tag
-rwxr-xr-xmakesrc.sh15
-rw-r--r--php-pecl-awscrt.spec18
2 files changed, 27 insertions, 6 deletions
diff --git a/makesrc.sh b/makesrc.sh
index 4406870..87afb43 100755
--- a/makesrc.sh
+++ b/makesrc.sh
@@ -3,8 +3,9 @@
NAME=$(basename $PWD)
OWNER=$(sed -n '/^%global gh_owner/{s/.* //;p}' $NAME.spec)
PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec)
+COMMIT=$(sed -n '/^%global gh_commit/{s/.* //;p}' $NAME.spec)
+TAG=$(sed -n '/^%global gh_tag/{s/.* //;p}' $NAME.spec)
VERSION=$(sed -n '/^Version:/{s/.* //;p}' $NAME.spec)
-SHORT=${COMMIT:0:7}
if [ -f $NAME-$VERSION.tgz ]; then
echo Skip $NAME-$VERSION.tgz
@@ -12,8 +13,16 @@ else
echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION\n"
echo "Cloning..."
- rm -rf $PROJECT-$COMMIT
- git clone --recursive --branch v$VERSION https://github.com/$OWNER/$PROJECT.git $PROJECT-$VERSION
+ rm -rf $PROJECT-$VERSION
+
+ if [ -z "$TAG" ]; then
+ git clone --recursive https://github.com/$OWNER/$PROJECT.git $PROJECT-$VERSION
+ pushd $PROJECT-$VERSION
+ git checkout $COMMIT || exit 1
+ popd
+ else
+ git clone --recursive --branch $TAG https://github.com/$OWNER/$PROJECT.git $PROJECT-$VERSION
+ fi
echo "Archiving..."
tar czf $NAME-$VERSION.tgz --exclude .git $PROJECT-$VERSION
diff --git a/php-pecl-awscrt.spec b/php-pecl-awscrt.spec
index f26875a..fb3e773 100644
--- a/php-pecl-awscrt.spec
+++ b/php-pecl-awscrt.spec
@@ -22,13 +22,15 @@
%global pecl_name awscrt
%global ini_name 40-%{pecl_name}.ini
-%global gh_tag v1.0.0
+# commit is used only if tag is missing
+%global gh_commit 1feba3eb6a4e89a43baf96a4251e00e68531c7a5
+#global gh_tag v1.0.1
%global gh_owner awslabs
%global gh_project aws-crt-php
Summary: AWS Common Runtime PHP bindings
Name: %{?scl_prefix}php-pecl-%{pecl_name}
-Version: 1.0.0
+Version: 1.0.1
Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
License: ASL 2.0
URL: https://pecl.php.net/package/%{pecl_name}
@@ -98,10 +100,13 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
sed -e 's/role="test"/role="src"/' \
-e 's/role="doc"/role="src"/' \
%{!?_licensedir:-e '/LICENSE/s/role="src"/role="doc"/' } \
- -e '/md"/s/role="src"/role="doc"/'\
+ -e '/"CODE_OF_CONDUCT.md"/s/role="src"/role="doc"/'\
+ -e '/"CONTRIBUTING.md"/s/role="src"/role="doc"/'\
+ -e '/"README.md"/s/role="src"/role="doc"/'\
-i package.xml
mv %{pecl_name}-%{version} NTS
+rm -rf NTS/crt
ln -s ../%{gh_project}-%{version}/crt NTS/crt
pushd %{gh_project}-%{version}
@@ -229,5 +234,12 @@ fi
%changelog
+* Tue Jun 29 2021 Remi Collet <remi@remirepo.net> - 1.0.1-1
+- update to 1.0.1
+- open https://github.com/awslabs/aws-crt-php/issues/37 incomplete archive
+- open https://github.com/awslabs/aws-crt-php/issues/38 missing tag
+
* Wed Jun 23 2021 Remi Collet <remi@remirepo.net> - 1.0.0-1
- initial package, version 1.0.0 (devel)
+- open https://github.com/awslabs/aws-crt-php/issues/34 broken archive
+- open https://github.com/awslabs/aws-crt-php/issues/35 broken build