[owncloud/oc8: 1/3] initial dirty 8.0.0-pre git package for testing
Adam Williamson
adamwill at fedoraproject.org
Sun Feb 22 18:44:34 UTC 2015
commit 8173501dbaf6922bb925a990aaa5be4f0b0ad60f
Author: Adam Williamson <awilliam at redhat.com>
Date: Tue Dec 30 00:40:41 2014 -0800
initial dirty 8.0.0-pre git package for testing
owncloud-8.0.0-autoloader_paths.patch | 14 ++++++++++
owncloud.spec | 49 ++++++++++++++++-------------------
2 files changed, 37 insertions(+), 26 deletions(-)
---
diff --git a/owncloud-8.0.0-autoloader_paths.patch b/owncloud-8.0.0-autoloader_paths.patch
new file mode 100644
index 0000000..3cc1c89
--- /dev/null
+++ b/owncloud-8.0.0-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);
+ OC_Template::printErrorPage('Composer autoloader not found, unable to continue.');
diff --git a/owncloud.spec b/owncloud.spec
index 2a1420f..397348a 100644
--- a/owncloud.spec
+++ b/owncloud.spec
@@ -1,14 +1,20 @@
+%global github_owner owncloud
+%global github_name core
+%global github_commit 01374ab6b54091a8ade4a48f8a67d42c928502e8
+%global shortcommit %(c=%{github_commit}; echo ${c:0:7})
+
Name: owncloud
-Version: 7.0.4
-Release: 2%{?dist}
+Version: 8.0.0
+Release: 0.1.20141229git%{shortcommit}%{?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
-# removed any occurences of jslint, see script delete-jslint
-Source0: %{name}-%{version}-repack.tar.bz2
+# added git 20141229 checkouts of the main apps, tarred up manually
+Source0: https://github.com/%{github_owner}/%{github_name}/archive/%{github_commit}/%{name}-%{shortcommit}.tar.xz
# 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
Source1: %{name}-httpd.conf
Source6: %{name}-nginx.conf
# packaging notes and doc
@@ -37,7 +43,7 @@ Patch10: owncloud-7.0.2-composer_3rdparty_autoloader.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.
-Patch11: %{name}-7.0.2-autoloader_paths.patch
+Patch11: %{name}-8.0.0-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
@@ -94,12 +100,7 @@ Requires: php-getid3
Requires: php-PHPMailer
Requires: php-phpass
Requires: php-Pimple
-# Upstream switched from Blowfish to AES in 5.0.7:
-# http://blog.schiessle.org/2013/05/28/introduction-to-the-new-owncloud-encryption-app
-# This is now only used when decrypting files encrypted with older
-# versions. It has already been dropped from OC master after OC 7 branching,
-# will not be used in OC 8 (support for legacy encryption is dropped).
-Requires: php-pear(Crypt_Blowfish)
+Requires: php-opencloud
Requires: php-pear(pear.doctrine-project.org/DoctrineDBAL) >= 2.4.2
Requires: php-pear(pear.symfony.com/Routing)
@@ -217,14 +218,14 @@ work with an SQLite 3 database stored on the local system.
%setup -q -n %{name}
# Fix line endings of a file we're about to patch
sed -i 's/\r$//' apps/files_encryption/lib/crypt.php
-%patch1
-%patch10 -p1
+#patch1
+#patch10 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p1
-%patch14 -p1
+#patch14 -p1
%patch15 -p1
-%patch16 -p1
+#patch16 -p1
# prepare package doc
cp %{SOURCE3} README.fedora
@@ -233,8 +234,8 @@ cp %{SOURCE5} README.postgresql
# Strip bundled libraries from global 3rdparty dir
-rm -r 3rdparty/{Archive,Console,OS,guzzle,james-heinrich,kriswallsmith,phpass,phpmailer/phpmailer/*,phpseclib,PEAR,symfony,sabre,Pimple,doctrine}
-rm 3rdparty/{System,PEAR5}.php 3rdparty/PEAR-LICENSE
+rm -r 3rdparty/{guzzle,james-heinrich,kriswallsmith,phpmailer/phpmailer/*,phpseclib,pear,symfony,sabre,pimple,doctrine,rackspace}
+rm 3rdparty/{PEAR,PEAR5}.php
# we need to symlink some annoying files back here, though...direct file
# autoloading sucks. "files" sections of "autoload" statements in
# composer.json files cause composer to basically hardcode the path to a
@@ -244,8 +245,7 @@ mkdir -p 3rdparty/kriswallsmith/assetic/src
mkdir -p 3rdparty/phpseclib/phpseclib/phpseclib/Crypt
# individual core apps now bundle libs as well - yay
-rm -r apps/files_encryption/3rdparty/Crypt_Blowfish
-rm -r apps/search_lucene/3rdparty/Zend
+#rm -r apps/search_lucene/3rdparty/Zend
rm -r apps/files_external/3rdparty/Dropbox
rm -r apps/files_external/3rdparty/google-api-php-client
@@ -261,8 +261,6 @@ rm -r apps/files_external/3rdparty/google-api-php-client
# We'd also have to set a UTF-8 locale some other way to entirely
# replace OC's use of Patchwork.
-## 3rdparty/rackspace/php-opencloud - https://github.com/rackspace/php-opencloud
-
## 3rdparty/mcnetic/phpzipstreamer - https://github.com/McNetic/PHPZipStreamer
# OC's copy is somewhat behind upstream, and slightly forked: they imported
# it on 2014-02-20, and added a downstream patch to make it work with
@@ -300,12 +298,12 @@ find . -size 0 -exec rm {} \;
# source as part of this package build, they cannot be shipped
# pre-compiled. - AdamW, 2013/08
# https://fedoraproject.org/wiki/Packaging:Guidelines#No_inclusion_of_pre-built_binaries_or_libraries
-rm apps/files_videoviewer/js/flashmediaelement.swf
-rm apps/files_videoviewer/js/silverlightmediaelement.xap
+#rm apps/files_videoviewer/js/flashmediaelement.swf
+#rm apps/files_videoviewer/js/silverlightmediaelement.xap
# let's not ship upstream's 'updater' app, which has zero chance of working and
# a big chance of blowing things up
-rm -r apps/updater
+#rm -r apps/updater
%build
@@ -348,11 +346,10 @@ install -Dpm 644 %{SOURCE6} \
# symlink 3rdparty libs - if possible
# global
ln -s %{_datadir}/php/PHPMailer/class.{phpmailer.php,pop3.php,smtp.php} %{buildroot}%{_datadir}/%{name}/3rdparty/phpmailer/phpmailer
-ln -s %{pear_phpdir}/Archive %{buildroot}%{_datadir}/%{name}/3rdparty/Archive
ln -s %{_datadir}/php/Assetic/functions.php %{buildroot}%{_datadir}/%{name}/3rdparty/kriswallsmith/assetic/src/functions.php
ln -s %{_datadir}/pear/Crypt/Random.php %{buildroot}%{_datadir}/%{name}/3rdparty/phpseclib/phpseclib/phpseclib/Crypt/Random.php
# individual
-ln -s %{_datadir}/php/Zend %{buildroot}%{_datadir}/%{name}/apps/search_lucene/3rdparty/Zend
+#ln -s %{_datadir}/php/Zend %{buildroot}%{_datadir}/%{name}/apps/search_lucene/3rdparty/Zend
%if 0%{?rhel} < 7
More information about the scm-commits
mailing list