Compare commits

...
Sign in to create a new pull request.

2 commits

Author SHA1 Message Date
Remi Collet
0508f0d597 v4.1.4
(cherry picked from commit 0eaa22b78a)
2017-12-23 07:27:39 +01:00
Remi Collet
2fc761df63 Update to 4.1.3
sources from https://github.com/sabre-io/vobject

(cherry picked from commit 098df77f68)
2017-10-19 05:59:43 +02:00
4 changed files with 26 additions and 10 deletions

2
.gitignore vendored
View file

@ -1,2 +1,4 @@
clog clog
/php-sabre-vobject4-4.1.2-d0fde2f.tar.gz /php-sabre-vobject4-4.1.2-d0fde2f.tar.gz
/php-sabre-vobject4-4.1.3-df99168.tar.gz
/php-sabre-vobject4-4.1.4-6484b9d.tar.gz

View file

@ -6,10 +6,10 @@
# #
# Please, preserve the changelog entries # Please, preserve the changelog entries
# #
%global gh_commit d0fde2fafa2a3dad1f559c2d1c2591d4fd75ae3c %global gh_commit 6484b9d660822c5e221c76122ce8ea658ecc9c5b
%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner fruux %global gh_owner sabre-io
%global gh_project sabre-vobject %global gh_project vobject
%global with_tests %{?_without_tests:0}%{!?_without_tests:1} %global with_tests %{?_without_tests:0}%{!?_without_tests:1}
%if 0%{?fedora} > 25 %if 0%{?fedora} > 25
@ -18,9 +18,9 @@
%global with_cmd 0 %global with_cmd 0
%endif %endif
Name: php-%{gh_project}4 Name: php-sabre-vobject4
Summary: Library to parse and manipulate iCalendar and vCard objects Summary: Library to parse and manipulate iCalendar and vCard objects
Version: 4.1.2 Version: 4.1.4
Release: 1%{?dist} Release: 1%{?dist}
URL: http://sabre.io/vobject/ URL: http://sabre.io/vobject/
@ -30,7 +30,7 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit
Source1: %{name}-autoload.php Source1: %{name}-autoload.php
# replace composer autloader # replace composer autloader
Patch0: %{gh_project}-bin.patch Patch0: %{name}-bin.patch
BuildArch: noarch BuildArch: noarch
%if %{with_tests} %if %{with_tests}
@ -44,10 +44,10 @@ BuildRequires: php-pcre
BuildRequires: php-spl BuildRequires: php-spl
BuildRequires: php-xml BuildRequires: php-xml
# From composer.json, "require-dev" # From composer.json, "require-dev"
# "phpunit/phpunit" : "*", # "phpunit/phpunit" : "> 4.8.35, <6.0.0",
# "squizlabs/php_codesniffer": "*" # "squizlabs/php_codesniffer": "*"
# "sabre/cs" : "^1.0.0" # "sabre/cs" : "^1.0.0"
BuildRequires: php-composer(phpunit/phpunit) BuildRequires: php-composer(phpunit/phpunit) > 4.8.35
# Autoloader # Autoloader
BuildRequires: php-composer(fedora/autoloader) BuildRequires: php-composer(fedora/autoloader)
%endif %endif
@ -90,6 +90,7 @@ Autoloader: %{_datadir}/php/Sabre/VObject4/autoload.php
%setup -q -n %{gh_project}-%{gh_commit} %setup -q -n %{gh_project}-%{gh_commit}
%patch0 -p1 -b .rpm %patch0 -p1 -b .rpm
cp %{SOURCE1} lib/autoload.php cp %{SOURCE1} lib/autoload.php
@ -118,7 +119,13 @@ cd tests
sed -e 's:@BUILDROOT@:%{buildroot}:' -i bootstrap.php sed -e 's:@BUILDROOT@:%{buildroot}:' -i bootstrap.php
: Run upstream test suite against installed library : Run upstream test suite against installed library
%{_bindir}/phpunit --verbose ret=0
for cmd in php php56 php70 php71 php72; do
if which $cmd; then
$cmd %{_bindir}/phpunit --verbose || ret=1
fi
done
exit $ret
%else %else
: Skip upstream test suite : Skip upstream test suite
%endif %endif
@ -136,6 +143,13 @@ sed -e 's:@BUILDROOT@:%{buildroot}:' -i bootstrap.php
%endif %endif
%changelog %changelog
* Sat Dec 23 2017 Remi Collet <remi@remirepo.net> - 4.1.4-1
- Update to 4.1.4
* Thu Oct 19 2017 Remi Collet <remi@remirepo.net> - 4.1.3-1
- Update to 4.1.3
- sources from https://github.com/sabre-io/vobject
* Tue Jan 17 2017 Remi Collet <remi@fedoraproject.org> - 4.1.2-1 * Tue Jan 17 2017 Remi Collet <remi@fedoraproject.org> - 4.1.2-1
- rename to php-sabre-vobject4 - rename to php-sabre-vobject4
- raise dependency on PHP version 5.5 - raise dependency on PHP version 5.5

View file

@ -1 +1 @@
SHA512 (php-sabre-vobject4-4.1.2-d0fde2f.tar.gz) = 55c3b3845967d03003942a81cb3cafa65bedff5bba1a6eb3148de75ddeef99488fe3ca2a176879599addfcbe08cd13e54c221d49720a456e008334e541008954 SHA512 (php-sabre-vobject4-4.1.4-6484b9d.tar.gz) = 7d5bd6d343050835f87f64a37fdcbb8af8444bc76cc6b9a4a0ebbf1c9935f4e5db43e3e6db45f5989492f3a105a2a4382b470a16e23fa127b29efc7e7b8f7870