summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2016-04-26 07:45:27 +0200
committerRemi Collet <fedora@famillecollet.com>2016-04-26 07:45:27 +0200
commit6b32d02e31658f2a8ef157d50949dc24ff7675b3 (patch)
tree53a03c490219070735f00cb55a42072af0c7640b
parent434a1205344a71a0750c283fe9fac70f3ff82cfc (diff)
owncloud: sync with Fedora (minor)
-rw-r--r--owncloud-fedora-autoloader.php4
-rw-r--r--owncloud.spec8
2 files changed, 4 insertions, 8 deletions
diff --git a/owncloud-fedora-autoloader.php b/owncloud-fedora-autoloader.php
index 6b6e23e..3f5f239 100644
--- a/owncloud-fedora-autoloader.php
+++ b/owncloud-fedora-autoloader.php
@@ -25,7 +25,7 @@ require_once $vendor . '/phpseclib/autoload.php';
// "rackspace/php-opencloud"
require_once $vendor . '/OpenCloud/autoload.php';
// "james-heinrich/getid3"
-require_once $vendor . '/getid3/getid3.php';
+require_once $vendor . '/getid3/autoload.php';
// "jeremeamia/superclosure"
require_once $vendor . '/SuperClosure/autoload.php';
// "ircmaxell/random-lib"
@@ -33,7 +33,7 @@ require_once $vendor . '/RandomLib/autoload.php';
// "bantu/ini-get-wrapper"
require_once $vendor . '/bantu/IniGetWrapper/IniGetWrapper.php';
// "natxet/CssMin"
-require_once $vendor . '/natxet/CssMin/src/CssMin.php';
+require_once $vendor . '/natxet/CssMin/autoload.php';
// "punic/punic"
require_once $vendor . '/Punic/autoload.php';
// "patchwork/utf8"
diff --git a/owncloud.spec b/owncloud.spec
index 1cf1435..280e828 100644
--- a/owncloud.spec
+++ b/owncloud.spec
@@ -134,9 +134,7 @@ Requires: php-composer(phpseclib/phpseclib) < 3.0
Requires: php-opencloud >= 1.9.2
#"james-heinrich/getid3": "dev-master"
-# fedora has 1.9.8 but current release 1.9.12
-# bug filed for update: bz#1319676
-Requires: php-composer(james-heinrich/getid3)
+Requires: php-composer(james-heinrich/getid3) >= 1.9.12
# "jeremeamia/superclosure": "2.0.0"
Requires: php-composer(jeremeamia/superclosure) >= 2.0
@@ -150,9 +148,7 @@ Requires: php-composer(ircmaxell/random-lib) < 2.0
Requires: php-composer(bantu/ini-get-wrapper) >= 1.0.1
# "natxet/CssMin": "dev-master"
-# 3.0.4 is the current release and 3.0.3 in fedora
-# ticket for update bz#1266491
-Requires: php-composer(natxet/CssMin) >= 3.0.2
+Requires: php-composer(natxet/CssMin) >= 3.0.4
# "punic/punic": "1.1.0"
Requires: php-composer(punic/punic) >= 1.1.0