From 792742e51f1b09e613e61caa59c01d65f3c9959f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 4 Oct 2017 13:50:22 +0200 Subject: Update to 2.1.2 rename to php-egulias-email-validator2 raise dependency on PHP 5.5 --- composer.json | 21 +++-- makesrc.sh | 28 ++++++ php-egulias-email-validator.spec | 182 ------------------------------------- php-egulias-email-validator2.spec | 183 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 227 insertions(+), 187 deletions(-) create mode 100755 makesrc.sh delete mode 100644 php-egulias-email-validator.spec create mode 100644 php-egulias-email-validator2.spec diff --git a/composer.json b/composer.json index 6fdc4d0..44c91d7 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "egulias/email-validator", - "description": "A library for validating emails", + "description": "A library for validating emails against several RFCs", "homepage": "https://github.com/egulias/EmailValidator", "type": "Library", "keywords": ["email", "validation", "validator", "emailvalidation", "emailvalidator"], @@ -13,16 +13,27 @@ "dev-master": "2.0.x-dev" } }, + "repositories": [ + { + "type": "git", + "url": "https://github.com/dominicsayers/isemail" + } + ], "require": { - "php": ">= 5.3.3", + "php": ">= 5.5", "doctrine/lexer": "^1.0.1" }, "require-dev" : { - "phpunit/phpunit": "^4.8.24" + "satooshi/php-coveralls": "dev-master", + "phpunit/phpunit": "^4.8.0", + "dominicsayers/isemail": "dev-master" + }, + "suggest": { + "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation" }, "autoload": { - "psr-0": { - "Egulias\\": "src/" + "psr-4": { + "Egulias\\EmailValidator\\": "EmailValidator" } } } diff --git a/makesrc.sh b/makesrc.sh new file mode 100755 index 0000000..ab1375c --- /dev/null +++ b/makesrc.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +NAME=$(basename $PWD) +OWNER=$(sed -n '/^%global github_owner/{s/.* //;p}' $NAME.spec) +PROJECT=$(sed -n '/^%global github_name/{s/.* //;p}' $NAME.spec) +VERSION=$(sed -n '/^%global github_version/{s/.* //;p}' $NAME.spec) +COMMIT=$(sed -n '/^%global github_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.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-egulias-email-validator.spec b/php-egulias-email-validator.spec deleted file mode 100644 index b65c679..0000000 --- a/php-egulias-email-validator.spec +++ /dev/null @@ -1,182 +0,0 @@ -# remirepo spec file for php-egulias-email-validator, from -# -# Fedora spec file for php-egulias-email-validator -# -# Copyright (c) 2014-2017 Shawn Iwinski -# -# License: MIT -# http://opensource.org/licenses/MIT -# -# Please preserve changelog entries -# - -%global github_owner egulias -%global github_name EmailValidator -%global github_version 1.2.13 -%global github_commit b8bb147f46cc9790326ce2440a13be06cc5a63bb - -%global composer_vendor egulias -%global composer_project email-validator - -# "php": ">= 5.3.3" -%global php_min_ver 5.3.3 -# "doctrine/lexer": "^1.0.1" -# NOTE: Min version not 1.0.1 because autoloader required -%global doctrine_lexer_min_ver 1.0.1-4 -%global doctrine_lexer_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-%{composer_vendor}-%{composer_project} -Version: %{github_version} -Release: 3%{?github_release}%{?dist} -Summary: A library for validating emails - -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 - -BuildArch: noarch -# Tests -%if %{with_tests} -BuildRequires: php-composer(phpunit/phpunit) -## composer.json -BuildRequires: php(language) >= %{php_min_ver} -BuildRequires: php-composer(doctrine/lexer) < %{doctrine_lexer_max_ver} -#BuildRequires: php-composer(doctrine/lexer) >= %%{doctrine_lexer_min_ver} -BuildRequires: php-doctrine-lexer >= %{doctrine_lexer_min_ver} -## phpcompatinfo (computed from version 1.2.13) -BuildRequires: php-filter -BuildRequires: php-pcre -BuildRequires: php-reflection -BuildRequires: php-spl -## Autoloader -BuildRequires: php-composer(fedora/autoloader) -%endif - -# composer.json -Requires: php(language) >= %{php_min_ver} -#Requires: php-composer(doctrine/lexer) >= %%{doctrine_lexer_min_ver} -Requires: php-doctrine-lexer >= %{doctrine_lexer_min_ver} -Requires: php-composer(doctrine/lexer) < %{doctrine_lexer_max_ver} -# phpcompatinfo (computed from version 1.2.13) -Requires: php-pcre -Requires: php-reflection -Requires: php-spl -# Autoloader -Requires: php-composer(fedora/autoloader) - -# Composer -Provides: php-composer(%{composer_vendor}/%{composer_project}) = %{version} - -%description -%{summary}. - -Autoloader: %{phpdir}/Egulias/EmailValidator/autoload.php - - -%prep -%setup -qn %{github_name}-%{github_commit} - - -%build - -: Create autoloader -cat <<'AUTOLOAD' | tee src/Egulias/EmailValidator/autoload.php - - 1.2.13-3 -- Switch autoloader to php-composer(fedora/autoloader) -- Test with SCLs if available - -* Mon Aug 08 2016 Shawn Iwinski - 1.2.13-1 -- Updated to 1.2.13 (RHBZ #1336594) - -* Mon Jan 04 2016 Shawn Iwinski - 1.2.11-1 -- Updated to 1.2.10 (RHBZ #1280283) - -* Sun Oct 11 2015 Shawn Iwinski - 1.2.10-1 -- Updated to 1.2.10 (RHBZ #1270623) -- Modified autoloader to load dependencies after self-registration - -* Sat Jun 27 2015 Shawn Iwinski - 1.2.9-1 -- Updated to 1.2.9 (RHBZ #1215684) -- Added autoloader - -* Mon Jan 05 2015 Shawn Iwinski - 1.2.7-1 -- Updated to 1.2.7 (BZ #1178809) - -* Sun Dec 07 2014 Shawn Iwinski - 1.2.6-1 -- Updated to 1.2.6 (BZ #1171051) - -* Sun Nov 09 2014 Shawn Iwinski - 1.2.5-1 -- Updated to 1.2.5 - -* Thu Nov 6 2014 Remi Collet - 1.2.4-1 -- backport for remi repository - -* Mon Nov 03 2014 Shawn Iwinski - 1.2.4-1 -- Updated to 1.2.4 - -* Mon Oct 27 2014 Shawn Iwinski - 1.2.3-1 -- Updated to 1.2.3 - -* Wed Sep 10 2014 Shawn Iwinski - 1.2.2-1 -- Initial package diff --git a/php-egulias-email-validator2.spec b/php-egulias-email-validator2.spec new file mode 100644 index 0000000..41b4f31 --- /dev/null +++ b/php-egulias-email-validator2.spec @@ -0,0 +1,183 @@ +# remirepo/fedora spec file for php-egulias-email-validator2 +# +# Copyright (c) 2014-2017 Shawn Iwinski, Remi Collet +# +# License: MIT +# http://opensource.org/licenses/MIT +# +# Please preserve changelog entries +# + +%global github_owner egulias +%global github_name EmailValidator +%global github_version 2.1.2 +%global github_commit bc31baa11ea2883e017f0a10d9722ef9d50eac1c +%global github_short %(c=%{github_commit}; echo ${c:0:7}) +%global major 2 + +%global composer_vendor egulias +%global composer_project email-validator + +# "php": ">= 5.5" +%global php_min_ver 5.5 +# "doctrine/lexer": "^1.0.1" +%global doctrine_lexer_min_ver 1.0.1 +%global doctrine_lexer_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-%{composer_vendor}-%{composer_project}%{major} +Version: %{github_version} +Release: 1%{?github_release}%{?dist} +Summary: A library for validating emails + +Group: Development/Libraries +License: MIT +URL: https://github.com/%{github_owner}/%{github_name} +Source0: %{name}-%{github_version}-%{github_short}.tgz +Source1: makesrc.sh + +BuildArch: noarch +# Tests +%if %{with_tests} +BuildRequires: php-composer(phpunit/phpunit) +## composer.json +BuildRequires: php(language) >= %{php_min_ver} +BuildRequires: php-composer(doctrine/lexer) < %{doctrine_lexer_max_ver} +BuildRequires: php-composer(doctrine/lexer) >= %{doctrine_lexer_min_ver} +## phpcompatinfo (computed from version 2.1.2) +BuildRequires: php-dom +BuildRequires: php-filter +BuildRequires: php-intl +BuildRequires: php-pcre +BuildRequires: php-spl +## Autoloader +BuildRequires: php-composer(fedora/autoloader) +%endif + +# composer.json +Requires: php(language) >= %{php_min_ver} +Requires: php-composer(doctrine/lexer) >= %{doctrine_lexer_min_ver} +Requires: php-composer(doctrine/lexer) < %{doctrine_lexer_max_ver} +# phpcompatinfo (computed from version 2.1.2) +Requires: php-intl +Requires: php-pcre +Requires: php-spl +# Autoloader +Requires: php-composer(fedora/autoloader) + +# Composer +Provides: php-composer(%{composer_vendor}/%{composer_project}) = %{version} + +%description +%{summary}. + +Autoloader: %{phpdir}/Egulias/EmailValidator%{major}/autoload.php + + +%prep +%setup -qn %{github_name}-%{github_commit} + + +%build + +: Create autoloader +cat <<'AUTOLOAD' | tee EmailValidator/autoload.php + - 2.1.2-1 +- Update to 2.1.2 +- rename to php-egulias-email-validator2 +- raise dependency on PHP 5.5 + +* Sun May 14 2017 Shawn Iwinski - 1.2.13-3 +- Switch autoloader to php-composer(fedora/autoloader) +- Test with SCLs if available + +* Mon Aug 08 2016 Shawn Iwinski - 1.2.13-1 +- Updated to 1.2.13 (RHBZ #1336594) + +* Mon Jan 04 2016 Shawn Iwinski - 1.2.11-1 +- Updated to 1.2.10 (RHBZ #1280283) + +* Sun Oct 11 2015 Shawn Iwinski - 1.2.10-1 +- Updated to 1.2.10 (RHBZ #1270623) +- Modified autoloader to load dependencies after self-registration + +* Sat Jun 27 2015 Shawn Iwinski - 1.2.9-1 +- Updated to 1.2.9 (RHBZ #1215684) +- Added autoloader + +* Mon Jan 05 2015 Shawn Iwinski - 1.2.7-1 +- Updated to 1.2.7 (BZ #1178809) + +* Sun Dec 07 2014 Shawn Iwinski - 1.2.6-1 +- Updated to 1.2.6 (BZ #1171051) + +* Sun Nov 09 2014 Shawn Iwinski - 1.2.5-1 +- Updated to 1.2.5 + +* Thu Nov 6 2014 Remi Collet - 1.2.4-1 +- backport for remi repository + +* Mon Nov 03 2014 Shawn Iwinski - 1.2.4-1 +- Updated to 1.2.4 + +* Mon Oct 27 2014 Shawn Iwinski - 1.2.3-1 +- Updated to 1.2.3 + +* Wed Sep 10 2014 Shawn Iwinski - 1.2.2-1 +- Initial package -- cgit