v4.1.3

4 files changed, 26 insertions, 25 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..fc9aa8c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+clog
+package-*.xml
+*.tgz
+*.tar.gz
+*.tar.xz
+*.tar.xz.asc
+*.src.rpm
+*/*rpm
diff --git a/composer.json b/composer.json
index cfa4a71..1f22f6d 100644
--- a/composer.json
+++ b/composer.json
@@ -37,7 +37,7 @@
         "sabre/xml"    : ">=1.5 <3.0"
     },
     "require-dev" : {
-        "phpunit/phpunit" : "*",
+        "phpunit/phpunit" : "> 4.8, <6.0.0",
         "sabre/cs"        : "^1.0.0"
 
     },
diff --git a/sabre-vobject-bin.patch b/php-sabre-vobject4-bin.patch
index 79ed1a5..79ed1a5 100644
--- a/sabre-vobject-bin.patch
+++ b/php-sabre-vobject4-bin.patch
diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec
index 08db086..09b4b4c 100644
--- a/php-sabre-vobject4.spec
+++ b/php-sabre-vobject4.spec
@@ -6,10 +6,10 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    d0fde2fafa2a3dad1f559c2d1c2591d4fd75ae3c
+%global gh_commit    df9916813d1d83e4f761c4cba13361ee74196fac
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
-%global gh_owner     fruux
-%global gh_project   sabre-vobject
+%global gh_owner     sabre-io
+%global gh_project   vobject
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 
 %if 0%{?fedora} > 25
@@ -18,9 +18,9 @@
 %global with_cmd 0
 %endif
 
-Name:           php-%{gh_project}4
+Name:           php-sabre-vobject4
 Summary:        Library to parse and manipulate iCalendar and vCard objects
-Version:        4.1.2
+Version:        4.1.3
 Release:        1%{?dist}
 
 URL:            http://sabre.io/vobject/
@@ -30,9 +30,8 @@ Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit
 Source1:        %{name}-autoload.php
 
 # replace composer autloader
-Patch0:         %{gh_project}-bin.patch
+Patch0:         %{name}-bin.patch
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 %if %{with_tests}
 BuildRequires:  php(language) >= 5.5
@@ -45,10 +44,10 @@ BuildRequires:  php-pcre
 BuildRequires:  php-spl
 BuildRequires:  php-xml
 # From composer.json, "require-dev"
-#        "phpunit/phpunit" : "*",
+#        "phpunit/phpunit" : "> 4.8, <6.0.0",
 #        "squizlabs/php_codesniffer": "*"
 #        "sabre/cs"        : "^1.0.0"
-BuildRequires:  php-composer(phpunit/phpunit)
+BuildRequires:  php-composer(phpunit/phpunit) > 4.8
 # Autoloader
 BuildRequires:  php-composer(fedora/autoloader)
 %endif
@@ -119,21 +118,12 @@ cd tests
 sed -e 's:@BUILDROOT@:%{buildroot}:' -i bootstrap.php
 
 : Run upstream test suite against installed library
-# remirepo:11
-run=0
 ret=0
-if which php56; then
-   php56 %{_bindir}/phpunit || ret=1
-   run=1
-fi
-if which php71; then
-   php71 %{_bindir}/phpunit || ret=1
-   run=1
-fi
-if [ $run -eq 0 ]; then
-%{_bindir}/phpunit --verbose
-# remirepo:2
-fi
+for cmd in php php56 php70 php71 php72; do
+  if which $cmd; then
+   $cmd %{_bindir}/phpunit --verbose || ret=1
+  fi
+done
 exit $ret
 %else
 : Skip upstream test suite
@@ -141,7 +131,6 @@ exit $ret
 
 
 %files
-%defattr(-,root,root,-)
 %{!?_licensedir:%global license %%doc}
 %license LICENSE
 %doc *md
@@ -153,6 +142,10 @@ exit $ret
 %endif
 
 %changelog
+* 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
 - rename to php-sabre-vobject4
 - raise dependency on PHP version 5.5