This commit is contained in:
Remi Collet 2020-01-14 14:19:34 +01:00
commit b2bf57757e
4 changed files with 16 additions and 12 deletions

1
.gitignore vendored
View file

@ -6,3 +6,4 @@ clog
/php-sabre-vobject4-4.1.6-122cacb.tar.gz
/php-sabre-vobject4-4.2.0-bd50001.tar.gz
/php-sabre-vobject4-4.2.1-6d7476f.tar.gz
/php-sabre-vobject4-4.2.2-449616b.tar.gz

View file

@ -1,6 +1,6 @@
diff -up ./bin/generate_vcards.rpm ./bin/generate_vcards
--- ./bin/generate_vcards.rpm 2019-02-19 14:05:37.000000000 +0100
+++ ./bin/generate_vcards 2019-02-20 07:21:38.282053251 +0100
--- ./bin/generate_vcards.rpm 2020-01-14 11:18:45.000000000 +0100
+++ ./bin/generate_vcards 2020-01-14 14:13:58.718903396 +0100
@@ -6,8 +6,7 @@ namespace Sabre\VObject;
// This sucks.. we have to try to find the composer autoloader. But chances
// are, we can't find it this way. So we'll do our bestest
@ -21,8 +21,8 @@ diff -up ./bin/generate_vcards.rpm ./bin/generate_vcards
}
diff -up ./bin/vobject.rpm ./bin/vobject
--- ./bin/vobject.rpm 2019-02-19 14:05:37.000000000 +0100
+++ ./bin/vobject 2019-02-20 07:21:38.282053251 +0100
--- ./bin/vobject.rpm 2020-01-14 11:18:45.000000000 +0100
+++ ./bin/vobject 2020-01-14 14:13:58.718903396 +0100
@@ -6,8 +6,7 @@ namespace Sabre\VObject;
// This sucks.. we have to try to find the composer autoloader. But chances
// are, we can't find it this way. So we'll do our bestest
@ -43,8 +43,8 @@ diff -up ./bin/vobject.rpm ./bin/vobject
}
diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php
--- ./tests/bootstrap.php.rpm 2019-02-20 07:21:38.282053251 +0100
+++ ./tests/bootstrap.php 2019-02-20 07:22:58.069649015 +0100
--- ./tests/bootstrap.php.rpm 2020-01-14 11:18:45.000000000 +0100
+++ ./tests/bootstrap.php 2020-01-14 14:15:34.557472825 +0100
@@ -3,8 +3,7 @@
date_default_timezone_set('UTC');
@ -55,12 +55,12 @@ diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php
];
foreach ($try as $path) {
@@ -14,7 +13,7 @@ foreach ($try as $path) {
@@ -14,6 +13,8 @@ foreach ($try as $path) {
}
}
-$autoLoader->addPsr4('Sabre\\VObject\\', __DIR__.'/VObject');
+\Fedora\Autoloader\Autoload::addPsr4('Sabre\\VObject\\', __DIR__ . '/VObject');
+
if (!defined('SABRE_TEMPDIR')) {
define('SABRE_TEMPDIR', __DIR__.'/temp/');
}

View file

@ -10,7 +10,7 @@
# For compatibility with SCL
%undefine __brp_mangle_shebangs
%global gh_commit 6d7476fbd227ae285029c19ad518cd451336038c
%global gh_commit 449616b2d45b95c8973975de23f34a3d14f63b4b
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner sabre-io
%global gh_project vobject
@ -24,7 +24,7 @@
Name: php-sabre-vobject4
Summary: Library to parse and manipulate iCalendar and vCard objects
Version: 4.2.1
Version: 4.2.2
Release: 1%{?dist}
URL: http://sabre.io/vobject/
@ -148,6 +148,9 @@ exit $ret
%endif
%changelog
* Tue Jan 14 2020 Remi Collet <remi@remirepo.net> - 4.2.2-1
- update to 4.2.2
* Thu Dec 19 2019 Remi Collet <remi@remirepo.net> - 4.2.1-1
- update to 4.2.1
- drop patch merged upstream

View file

@ -1 +1 @@
SHA512 (php-sabre-vobject4-4.2.1-6d7476f.tar.gz) = c5b486912a2f7b6099217e18316845f254cb429d44c01211b59abff9f1cbc60febe1deba11638fe9116aa05e37d1ac31fb9f3d59f3cf5f2cf77fd892fe1ce0d5
SHA512 (php-sabre-vobject4-4.2.2-449616b.tar.gz) = 46e9e798fed6d3bf5795fbf5c29bf6c20075529d572d951ed36b92e6e06c992f909b45291736a3206363239ee048d4a4c4bec539e1a37dbfa476b85e5c972e99