From dc939fa62b29326db69a77c48b9b1e5a43129926 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 23 Apr 2018 15:26:26 +0200 Subject: v1.3.0 from Fedora: * Sun Apr 22 2018 Shawn Iwinski - 1.3.0-1 - Update to 1.3.0 (RHBZ #1539946) - Add get source script - Add composer.json to repo - Update running of tests --- .gitignore | 9 +++++ php-webmozart-assert-get-source.sh | 73 ++++++++++++++++++++++++++++++++++++++ php-webmozart-assert.spec | 60 +++++++++++++++++-------------- 3 files changed, 116 insertions(+), 26 deletions(-) create mode 100644 .gitignore create mode 100755 php-webmozart-assert-get-source.sh diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6f69818 --- /dev/null +++ b/.gitignore @@ -0,0 +1,9 @@ +clog +package-*.xml +*.tgz +*.tar.gz +*.tar.bz2 +*.tar.xz +*.tar.xz.asc +*.src.rpm +*/*rpm diff --git a/php-webmozart-assert-get-source.sh b/php-webmozart-assert-get-source.sh new file mode 100755 index 0000000..b2ac62b --- /dev/null +++ b/php-webmozart-assert-get-source.sh @@ -0,0 +1,73 @@ +#/bin/sh + +GIT=`which git` +RPM=`which rpm` + +if [ -z "$GIT" ] +then + echo "ERROR: 'git' command not found" 1>&2 + exit 1 +elif [ -z "$RPM" ] +then + echo "ERROR: 'rpm' command not found" 1>&2 + exit 1 +fi + +function print { + echo -e "\e[0;33m>>>>> ${1}\e[0m" +} + +if [ -x "$1" ] +then + SPEC=$1 +else + SPEC=`ls *.spec | head -1` +fi + +SPEC_DIR=`pwd` + +print "SPEC_DIR = $SPEC_DIR" + +NAME=`echo $SPEC | sed 's#\.spec##'` +VERSION=`egrep '%global\s*github_version' $SPEC | awk '{print $3}'` + +print "SPEC = $SPEC" +print "NAME = $NAME" + +GIT_OWNER=`egrep '%global\s*github_owner' $SPEC | awk '{print $3}'` +GIT_NAME=`egrep '%global\s*github_name' $SPEC | awk '{print $3}'` +GIT_COMMIT=`egrep '%global\s*github_commit' $SPEC | awk '{print $3}'` +GIT_REPO=https://github.com/${GIT_OWNER}/${GIT_NAME} +GIT_DIR=`echo $GIT_REPO | sed 's#.*/##'` + +print "GIT_OWNER = $GIT_OWNER" +print "GIT_NAME = $GIT_NAME" +print "GIT_COMMIT = $GIT_COMMIT" +print "GIT_REPO = $GIT_REPO" +print "GIT_DIR = $GIT_DIR" + +TEMP_DIR=$(mktemp --dir) + +pushd $TEMP_DIR + print "Cloning git repo..." + $GIT clone $GIT_REPO + + pushd $GIT_DIR + print "Checking out commit..." + $GIT checkout $GIT_COMMIT + popd + + TAR_DIR=${GIT_NAME}-${GIT_COMMIT} + print "TAR_DIR = $TAR_DIR" + + mv $GIT_DIR $TAR_DIR + + TAR_FILE=${SPEC_DIR}/${NAME}-${VERSION}-${GIT_COMMIT}.tar.gz + print "TAR_FILE = $TAR_FILE" + + [ -e $TAR_FILE ] && rm -f $TAR_FILE + tar --exclude-vcs -czf $TAR_FILE $TAR_DIR + chmod 0644 $TAR_FILE +popd + +rm -rf $TEMP_DIR diff --git a/php-webmozart-assert.spec b/php-webmozart-assert.spec index a110478..0f955b3 100644 --- a/php-webmozart-assert.spec +++ b/php-webmozart-assert.spec @@ -2,7 +2,7 @@ # # Fedora spec file for php-webmozart-assert # -# Copyright (c) 2016 Shawn Iwinski +# Copyright (c) 2016,2018 Shawn Iwinski # # License: MIT # http://opensource.org/licenses/MIT @@ -12,8 +12,8 @@ %global github_owner webmozart %global github_name assert -%global github_version 1.2.0 -%global github_commit 2db61e59ff05fe5126d152bd0655c9ea113e550f +%global github_version 1.3.0 +%global github_commit 0df1908962e7a3071564e857d86874dad1ef204a %global composer_vendor webmozart %global composer_project assert @@ -34,16 +34,19 @@ Summary: Assertions to validate method input/output with nice error messag Group: Development/Libraries License: MIT URL: https://github.com/%{github_owner}/%{github_name} -Source0: %{url}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# GitHub export does not include tests. +# Run php-webmozart-assert-get-source.sh to create full source. +Source0: %{name}-%{github_version}-%{github_commit}.tar.gz +Source1: %{name}-get-source.sh + BuildArch: noarch # Tests %if %{with_tests} ## composer.json BuildRequires: php(language) >= %{php_min_ver} BuildRequires: php-composer(phpunit/phpunit) -## phpcompatinfo (computed from version 1.2.0) +## phpcompatinfo (computed from version 1.3.0) BuildRequires: php-ctype BuildRequires: php-mbstring BuildRequires: php-pcre @@ -54,7 +57,7 @@ BuildRequires: php-composer(fedora/autoloader) # composer.json Requires: php(language) >= %{php_min_ver} -# phpcompatinfo (computed from version 1.2.0) +# phpcompatinfo (computed from version 1.3.0) Requires: php-ctype Requires: php-mbstring Requires: php-pcre @@ -90,43 +93,42 @@ cat <<'AUTOLOAD' | tee src/autoload.php */ require_once '%{phpdir}/Fedora/Autoloader/autoload.php'; -\Fedora\Autoloader\Autoload::addPsr4('Webmozart\\Assert\\', __DIR__); +\Fedora\Autoloader\Dependencies::required(array( + __DIR__.'/Assert.php', +)); AUTOLOAD %install -rm -rf %{buildroot} - -mkdir -p %{buildroot}%{phpdir}/Webmozart/Assert -cp -rp src/* %{buildroot}%{phpdir}/Webmozart/Assert/ +mkdir -p %{buildroot}%{phpdir}/Webmozart +cp -rp src %{buildroot}%{phpdir}/Webmozart/Assert %check %if %{with_tests} -BOOTSTRAP=%{buildroot}%{phpdir}/Webmozart/Assert/autoload.php +: Create tests bootstrap +cat <<'BOOTSTRAP' | tee bootstrap.php + - 1.3.0-1 +- Update to 1.3.0 (RHBZ #1539946) +- Add get source script +- Add composer.json to repo +- Update running of tests + * Tue Dec 27 2016 Shawn Iwinski - 1.2.0-1 - Update to 1.2.0 (RHBZ #1398043) - Use php-composer(fedora/autoloader) -- cgit