diff --git a/.gitignore b/.gitignore index eadb6fc..11921b5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /php-williamdes-mariadb-mysql-kbs-1.2.7-6416780.tar.gz /php-williamdes-mariadb-mysql-kbs-1.2.8-ebae198.tar.gz /php-williamdes-mariadb-mysql-kbs-1.2.9-0da5be5.tar.gz +/php-williamdes-mariadb-mysql-kbs-1.2.10-152fa14.tgz diff --git a/makesrc.sh b/makesrc.sh new file mode 100755 index 0000000..87a1c0b --- /dev/null +++ b/makesrc.sh @@ -0,0 +1,28 @@ +#!/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, Commit=$COMMIT\n" + +echo "Cloning..." +git clone --recursive https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT + +echo "Getting commit..." +pushd $PROJECT-$COMMIT +git checkout $COMMIT +cp composer.json ../composer.json +popd + +echo "Archiving..." +tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs $PROJECT-$COMMIT + +echo "Cleaning..." +rm -rf $PROJECT-$COMMIT + +echo "Done." + diff --git a/php-williamdes-mariadb-mysql-kbs.spec b/php-williamdes-mariadb-mysql-kbs.spec index 54526cf..1f10f1d 100644 --- a/php-williamdes-mariadb-mysql-kbs.spec +++ b/php-williamdes-mariadb-mysql-kbs.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-williamdes-mariadb-mysql-kbs # -# Copyright (c) 2019 Remi Collet +# Copyright (c) 2019-2020 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -9,7 +9,7 @@ %global with_tests 0%{!?_without_tests:1} # Github -%global gh_commit 0da5be5f43c184f497c84e4865c9fd8f37f19d5d +%global gh_commit 152fa144bd5f9fbdd3b5e764a506e239a730df83 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner williamdes %global gh_project mariadb-mysql-kbs @@ -22,13 +22,15 @@ %global major %nil Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 1.2.9 -Release: 2%{?gh_date?%{gh_date}git%{gh_short}}%{?dist} +Version: 1.2.10 +Release: 1%{?gh_date?%{gh_date}git%{gh_short}}%{?dist} Summary: An index of the MariaDB and MySQL Knowledge bases License: MPLv2.0 URL: https://github.com/%{gh_owner}/%{gh_project} -Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{?gh_short}.tar.gz +# pull from github to retrieve full data +Source0: %{name}-%{version}-%{?gh_short}.tgz +Source1: makesrc.sh Patch0: %{name}-layout.patch @@ -147,6 +149,10 @@ exit $ret %changelog +* Thu Feb 27 2020 Remi Collet - 1.2.10-1 +- update to 1.2.10 +- sources from git snapshot + * Thu Jan 30 2020 Fedora Release Engineering - 1.2.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 6cc7599..f69e758 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-williamdes-mariadb-mysql-kbs-1.2.9-0da5be5.tar.gz) = 33ade98b8165080f806e0f16197011552cb8cafd5eef1fa265ded607f4999ad37a7b522ec733e29effccf55d6a0ca0dd51213c12d87ee2948c48650e1dc3e15f +SHA512 (php-williamdes-mariadb-mysql-kbs-1.2.10-152fa14.tgz) = fac5c2d6f8744b6fc9b0230e43a242188c28cf91dd4c5fdad2b3b8865da437627d49e0af9cdb934b1a6f0987213c73c17debbefde9fd26baf374ac7818d34238