adamwill pushed to owncloud (epel7). "update to 8.0.1 RC1, rediff patches, drop now-upstreamed patch"
notifications at fedoraproject.org
notifications at fedoraproject.org
Sat May 2 00:05:30 UTC 2015
>From 93bff0f09a5edeb0840e0dbc971160efd3b50132 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam at redhat.com>
Date: Fri, 6 Mar 2015 17:25:38 -0800
Subject: update to 8.0.1 RC1, rediff patches, drop now-upstreamed patch
diff --git a/owncloud-7.0.2-composer_includepath.patch b/owncloud-7.0.2-composer_includepath.patch
deleted file mode 100644
index c1cb04e..0000000
--- a/owncloud-7.0.2-composer_includepath.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- owncloud/lib/base.php 2014-07-29 00:30:26.998084605 -0700
-+++ owncloud/lib/base.php.new 2014-07-29 00:35:08.579372364 -0700
-@@ -491,6 +491,7 @@
- $loader->add('Pimple', '/usr/share/php/Pimple');
- $loader->add('Sabre', '/usr/share/php');
- $loader->add('Sabre\VObject', '/usr/share/pear');
-+ $loader->setUseIncludePath(true);
- } else {
- OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE);
- OC_Template::printErrorPage('Composer autoloader not found, unable to continue.');
diff --git a/owncloud-8.0.0-autoloader_paths.patch b/owncloud-8.0.0-autoloader_paths.patch
deleted file mode 100644
index 3cc1c89..0000000
--- a/owncloud-8.0.0-autoloader_paths.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- owncloud/lib/base.php 2014-07-29 00:27:51.154263240 -0700
-+++ owncloud/lib/base.php.new 2014-07-29 00:30:26.998084605 -0700
-@@ -475,7 +475,10 @@
- // setup 3rdparty autoloader
- $vendorAutoLoad = OC::$THIRDPARTYROOT . '/3rdparty/autoload.php';
- if (file_exists($vendorAutoLoad)) {
-- require_once $vendorAutoLoad;
-+ $loader = require_once $vendorAutoLoad;
-+ $loader->add('Pimple', '/usr/share/php/Pimple');
-+ $loader->add('Sabre', '/usr/share/php');
-+ $loader->add('Sabre\VObject', '/usr/share/pear');
- } else {
- OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE);
- OC_Template::printErrorPage('Composer autoloader not found, unable to continue.');
diff --git a/owncloud-8.0.0-dbal_251.patch b/owncloud-8.0.0-dbal_251.patch
deleted file mode 100644
index 53421b5..0000000
--- a/owncloud-8.0.0-dbal_251.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From bdfc9b57bdf6d7660ac30341d7ca4c4a3419d34b Mon Sep 17 00:00:00 2001
-From: Victor Dubiniuk <victor.dubiniuk at gmail.com>
-Date: Wed, 11 Feb 2015 19:35:46 +0300
-Subject: [PATCH] Skip primary index if the table has one
-
----
- lib/private/db/mdb2schemareader.php | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/lib/private/db/mdb2schemareader.php b/lib/private/db/mdb2schemareader.php
-index 7dd4168..23104b1 100644
---- a/lib/private/db/mdb2schemareader.php
-+++ b/lib/private/db/mdb2schemareader.php
-@@ -293,6 +293,9 @@ private function loadIndex($table, $xml) {
- }
- if (!empty($fields)) {
- if (isset($primary) && $primary) {
-+ if ($table->hasPrimaryKey()) {
-+ return;
-+ }
- $table->setPrimaryKey($fields, $name);
- } else {
- if (isset($unique) && $unique) {
-
diff --git a/owncloud-8.0.1-autoloader_paths.patch b/owncloud-8.0.1-autoloader_paths.patch
new file mode 100644
index 0000000..bb471f8
--- /dev/null
+++ b/owncloud-8.0.1-autoloader_paths.patch
@@ -0,0 +1,14 @@
+--- owncloud/lib/base.php 2014-07-29 00:27:51.154263240 -0700
++++ owncloud/lib/base.php.new 2014-07-29 00:30:26.998084605 -0700
+@@ -475,7 +475,10 @@
+ // setup 3rdparty autoloader
+ $vendorAutoLoad = OC::$THIRDPARTYROOT . '/3rdparty/autoload.php';
+ if (file_exists($vendorAutoLoad)) {
+- require_once $vendorAutoLoad;
++ $loader = require_once $vendorAutoLoad;
++ $loader->add('Pimple', '/usr/share/php/Pimple');
++ $loader->add('Sabre', '/usr/share/php');
++ $loader->add('Sabre\VObject', '/usr/share/pear');
+ } else {
+ OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE);
+ // we can't use the template error page here, because this needs the
diff --git a/owncloud-8.0.1-composer_includepath.patch b/owncloud-8.0.1-composer_includepath.patch
new file mode 100644
index 0000000..f7b3a56
--- /dev/null
+++ b/owncloud-8.0.1-composer_includepath.patch
@@ -0,0 +1,10 @@
+--- owncloud/lib/base.php 2014-07-29 00:30:26.998084605 -0700
++++ owncloud/lib/base.php.new 2014-07-29 00:35:08.579372364 -0700
+@@ -491,6 +491,7 @@
+ $loader->add('Pimple', '/usr/share/php/Pimple');
+ $loader->add('Sabre', '/usr/share/php');
+ $loader->add('Sabre\VObject', '/usr/share/pear');
++ $loader->setUseIncludePath(true);
+ } else {
+ OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE);
+ // we can't use the template error page here, because this needs the
diff --git a/owncloud.spec b/owncloud.spec
index 2d3e8a7..e6798b0 100644
--- a/owncloud.spec
+++ b/owncloud.spec
@@ -1,13 +1,13 @@
Name: owncloud
-Version: 8.0.0
-Release: 6%{?dist}
+Version: 8.0.1
+Release: 0.1.rc1%{?dist}
Summary: Private file sync and share server
License: AGPLv3+ and MIT and BSD and CC-BY and CC-BY-SA and GPLv3 and Public Domain and (MPLv1.1 or GPLv2+ or LGPLv2+) and (MIT or GPL+) and (MIT or GPLv2) and ASL 2.0 and LGPLv3
URL: http://owncloud.org
# Tarball with non-free sources stripped. To generate:
# ./owncloud-delete-nonfree.sh %%{name}-%%{version}.tar.bz2
-Source0: %{name}-%{version}-repack.tar.bz2
+Source0: %{name}-%{version}RC1-repack.tar.bz2
# orig source: https://download.owncloud.org/community/%%{name}-%%{version}.tar.bz2
# sha256sum: https://download.owncloud.org/community/%%{name}-%%{version}.tar.bz2.sha256
# snapshot source: https://github.com/%{github_owner}/%{github_name}/archive/%{github_commit}/%{github_name}-%{github_commit}.tar.gz
@@ -41,12 +41,12 @@ Patch1: %{name}-6.0.2-videoviewer_noplugins.patch
# and *test* if changing this; test with all versions of all Sabre packages
# installed to make sure it DTRT. Keep an eye on upstream for future changes
# also.
-Patch2: %{name}-8.0.0-autoloader_paths.patch
+Patch2: %{name}-8.0.1-autoloader_paths.patch
# Turn on include path usage for the Composer autoloader (so it'll find
# systemwide PSR-0 and PSR-4 compliant libraries)
# Upstream wouldn't likely take this, they probably only care about their
# bundled copies
-Patch3: %{name}-7.0.2-composer_includepath.patch
+Patch3: %{name}-8.0.1-composer_includepath.patch
# Drop use of dropbox's unnecessary autoloader (composer will find the
# systemwide copy). This is not upstreamable, but see
# https://github.com/owncloud/core/pull/12113 with similar effect for 8.1+
@@ -62,8 +62,6 @@ Patch7: owncloud-8.0.0-disable_minify.patch
# Stop OC from trying to do stuff to .htaccess files. Just calm down, OC.
# Distributors are on the case.
Patch8: 0001-setup-allow-disabling-all-htaccess-fiddling.patch
-# Fix OC for DBAL 2.5.1: https://github.com/owncloud/core/pull/14119
-Patch9: owncloud-8.0.0-dbal_251.patch
BuildArch: noarch
@@ -246,7 +244,6 @@ sed -i 's/\r$//' apps/files_encryption/lib/crypt.php
%patch6 -p1
%patch7 -p1
%patch8 -p1
-%patch9 -p1
# prepare package doc
cp %{SOURCE3} README.fedora
@@ -465,6 +462,9 @@ fi
%changelog
+* Fri Mar 06 2015 Adam Williamson <awilliam at redhat.com> - 8.0.1-0.1.rc1
+- update to 8.0.1rc1
+
* Mon Feb 23 2015 Adam Williamson <awilliam at redhat.com> - 8.0.0-6
- extend the htaccess patch to cover updater as well as initial setup
- rebase apache config stuff again, private dir denials only on 8.x branch
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/owncloud.git/commit/?h=epel7&id=93bff0f09a5edeb0840e0dbc971160efd3b50132
More information about the scm-commits
mailing list