From 281d00402c1d83cc0c403515b7d7a02921236aa1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 14 Jul 2015 08:52:32 +0200 Subject: php-JMSParser: backport fedora changes --- php-JMSParser-get-source.sh | 62 +++++++++++++++++++++ php-JMSParser-strip.sh | 26 --------- php-JMSParser.spec | 129 ++++++++++++++++++++++++++++++++++---------- 3 files changed, 162 insertions(+), 55 deletions(-) create mode 100755 php-JMSParser-get-source.sh delete mode 100755 php-JMSParser-strip.sh diff --git a/php-JMSParser-get-source.sh b/php-JMSParser-get-source.sh new file mode 100755 index 0000000..5c15702 --- /dev/null +++ b/php-JMSParser-get-source.sh @@ -0,0 +1,62 @@ +#/bin/sh + +RPM=$(which rpm) + +if [ -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 + +print "SPEC = $SPEC" + +NAME=$(echo $SPEC | sed 's#\.spec##') +VERSION=$(egrep '%global\s*github_version' $SPEC | awk '{print $3}') + +print "NAME = $NAME" +print "VERSION = $VERSION" + +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} +SOURCE_FILENAME=${NAME}-${VERSION}-${GIT_COMMIT}.tar.gz +RPM_SOURCE_DIR=$(rpm --eval "%{_sourcedir}") + +print "GIT_OWNER = $GIT_OWNER" +print "GIT_NAME = $GIT_NAME" +print "GIT_COMMIT = $GIT_COMMIT" +print "GIT_REPO = $GIT_REPO" +print "SOURCE_FILENAME = $SOURCE_FILENAME" +print "RPM_SOURCE_DIR = $RPM_SOURCE_DIR" + +pushd /tmp + print "Getting full source..." + rm -f ${SOURCE_FILENAME} + wget https://github.com/${GIT_OWNER}/${GIT_NAME}/archive/${GIT_COMMIT}/${SOURCE_FILENAME} + + print "Uncompressing full source..." + tar -xvzf ${SOURCE_FILENAME} + rm -f ${SOURCE_FILENAME} + + print "Removing non-allowable licened content..." + rm -rf ${GIT_NAME}-${GIT_COMMIT}/doc + + print "Re-compressing allowable source..." + rm -f ${RPM_SOURCE_DIR}/${SOURCE_FILENAME} + tar -cvzf ${RPM_SOURCE_DIR}/${SOURCE_FILENAME} ${GIT_NAME}-${GIT_COMMIT} + rm -rf ${GIT_NAME}-${GIT_COMMIT} + + print "Source = \"${RPM_SOURCE_DIR}/${SOURCE_FILENAME}\"" +popd diff --git a/php-JMSParser-strip.sh b/php-JMSParser-strip.sh deleted file mode 100755 index b155801..0000000 --- a/php-JMSParser-strip.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -if [ $# != 2 ]; then - echo "Usage: $0 VERSION GITHUB_COMMIT" 1>&2 - exit 1 -fi - -VERSION=$1 -GITHUB_COMMIT=$2 - -ORIGINAL_SOURCE_FILE="${GITHUB_COMMIT}.tar.gz" -NEW_SOURCE_FILE="php-JMSParser-${VERSION}-${GITHUB_COMMIT}.tar.gz" - -if [ ! -f "$ORIGINAL_SOURCE_FILE" ]; then - echo "ERROR: Original source file '${ORIGINAL_SOURCE_FILE}' not found" 1>&2 - exit 1 -fi - -TAR=`which tar` - -$TAR -xzf "$ORIGINAL_SOURCE_FILE" -rm -rf "parser-lib-${GITHUB_COMMIT}/doc" "$NEW_SOURCE_FILE" -$TAR -czf "$NEW_SOURCE_FILE" "parser-lib-${GITHUB_COMMIT}" - -echo "${NEW_SOURCE_FILE} created" -exit 0 diff --git a/php-JMSParser.spec b/php-JMSParser.spec index 69f4e5e..10ce5b1 100644 --- a/php-JMSParser.spec +++ b/php-JMSParser.spec @@ -1,47 +1,83 @@ +# remirepo spec file for php-JMSParser, from Fedora: +# +# RPM spec file for php-JMSParser +# +# Copyright (c) 2013-2015 Shawn Iwinski +# +# License: MIT +# http://opensource.org/licenses/MIT +# +# Please preserve changelog entries +# + %global github_owner schmittjoh %global github_name parser-lib %global github_version 1.0.0 %global github_commit c509473bc1b4866415627af0e1c6cc8ac97fa51d +%global composer_vendor jms +%global composer_project parser-lib + %global php_min_ver 5.3.0 -%global phpoption_min_ver 0.9 +# "phpoption/phpoption": ">=0.9,<2.0-dev" +# NOTE: min version not 0.9 because autoloader required +%global phpoption_min_ver 1.4.0-4 %global phpoption_max_ver 2.0 +# Build using "--without tests" to disable tests +%global with_tests 0%{!?_without_tests:1} + +%{!?phpdir: %global phpdir %{_datadir}/php} + Name: php-JMSParser Version: %{github_version} -Release: 3%{?dist} +Release: 7%{?dist} Summary: Library for writing recursive-descent parsers Group: Development/Libraries License: ASL 2.0 URL: http://jmsyst.com/libs/%{github_name} -# To create source: -# wget https://github.com/schmittjoh/parser-lib/archive/%%{github_commit}.tar.gz -# php-JMSParser-strip.sh %%{github_version} %%{github_commit} + +# GitHub export contains non-allowable licened documentation. +# Run php-JMSParser-get-source.sh to create allowable source. Source0: %{name}-%{github_version}-%{github_commit}.tar.gz -Source1: %{name}-strip.sh +Source1: %{name}-get-source.sh BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -# Test build requires +# Tests +%if %{with_tests} +BuildRequires: %{_bindir}/phpunit BuildRequires: php(language) >= %{php_min_ver} -BuildRequires: php-pear(pear.phpunit.de/PHPUnit) +## composer.json +#BuildRequires: php-composer(phpoption/phpoption) >= %%{phpoption_min_ver} BuildRequires: php-PhpOption >= %{phpoption_min_ver} -BuildRequires: php-PhpOption < %{phpoption_max_ver} -# Test build requires: phpci +## phpcompatinfo (computed from version 1.0.0) BuildRequires: php-json BuildRequires: php-pcre BuildRequires: php-reflection BuildRequires: php-spl +## Autoloader +BuildRequires: php-composer(symfony/class-loader) +%endif Requires: php(language) >= %{php_min_ver} -Requires: php-PhpOption >= %{phpoption_min_ver} -Requires: php-PhpOption < %{phpoption_max_ver} -# phpci requires +# composer.json +#Requires: php-composer(phpoption/phpoption) >= %%{phpoption_min_ver} +Requires: php-PhpOption >= %{phpoption_min_ver} +Requires: php-composer(phpoption/phpoption) < %{phpoption_max_ver} +# phpcompatinfo (computed from version 1.0.0) Requires: php-json Requires: php-pcre Requires: php-reflection Requires: php-spl +# Autoloader +Requires: php-composer(symfony/class-loader) + +# Standard "php-{COMPOSER_VENDOR}-{COMPOSER_PROJECT}" naming +Provides: php-%{composer_vendor}-%{composer_project} = %{version}-%{release} +# Composer +Provides: php-composer(%{composer_vendor}/%{composer_project}) = %{version} %description %{summary}. @@ -50,16 +86,32 @@ Requires: php-spl %prep %setup -q -n %{github_name}-%{github_commit} -# Rewrite tests' bootstrap (which uses Composer autoloader) with simple -# autoloader that uses include path -( cat <<'AUTOLOAD' +: Create autoloader +cat <<'AUTOLOAD' | tee src/JMS/Parser/autoload.php register(); +} + +$fedoraClassLoader->addPrefix('JMS\\Parser\\', dirname(dirname(__DIR__))); + +return $fedoraClassLoader; AUTOLOAD -) > tests/bootstrap.php %build @@ -67,24 +119,43 @@ AUTOLOAD %install -mkdir -p -m 755 %{buildroot}%{_datadir}/php/JMS -cp -rp src/JMS/Parser %{buildroot}%{_datadir}/php/JMS/ +rm -rf %{buildroot} +mkdir -p %{buildroot}%{phpdir} +cp -rp src/* %{buildroot}%{phpdir}/ %check -%{_bindir}/phpunit \ - -d include_path="./src:./tests:.:%{pear_phpdir}:%{_datadir}/php" \ - -c phpunit.xml.dist +%if %{with_tests} +%{_bindir}/phpunit --verbose \ + --bootstrap %{buildroot}%{phpdir}/JMS/Parser/autoload.php +%else +: Tests skipped +%endif + + +%clean +rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc LICENSE README.md composer.json -%dir %{_datadir}/php/JMS - %{_datadir}/php/JMS/Parser +%{!?_licensedir:%global license %%doc} +%license LICENSE +%doc *.md +%doc composer.json +%dir %{phpdir}/JMS + %{phpdir}/JMS/Parser %changelog +* Sun Jul 12 2015 Shawn Iwinski - 1.0.0-7 +- Added spec license +- New source script %%{name}-get-source.sh instead of %%{name}-strip.sh +- Added autoloader +- Added standard "php-{COMPOSER_VENDOR}-{COMPOSER_PROJECT}" naming provides +- Added php-composer(jms/parser-lib) provide +- %%license usage + * Tue Mar 19 2013 Remi Collet 1.0.0-3 - backport 1.0.0 for remi repo. -- cgit