[owncloud/el6: 42/42] Merge branch 'master' into el6
brummbq
brummbq at fedoraproject.org
Tue May 13 13:40:02 UTC 2014
commit aca362595343e7f996ecfc1b85d2a0cf0212158b
Merge: 4313d60 9050070
Author: Gregor Tätzner <gregor at freenet.de>
Date: Tue May 13 15:37:52 2014 +0200
Merge branch 'master' into el6
.gitignore | 1 +
owncloud-4.5-nginx.conf | 66 ----
...oud-4.5.7-disable-config-dir-access-check.patch | 14 -
owncloud-4.5.7-remove-jslint.patch | 43 ---
owncloud-4.5.7-unbundle-blowfish.patch | 11 -
owncloud-4.5.7-unbundle-phpmailer.patch | 11 -
owncloud-4.5.7-unbundle-phptar.patch | 11 -
owncloud-4.5.8-config.patch | 48 ---
owncloud-6.0.0-config.patch | 46 +++
owncloud-6.0.0-fix-autoloader.patch | 16 +
owncloud-6.0.0-pimple-include.patch | 11 +
owncloud-6.0.0a-apps_3rdparty_includes.patch | 334 +++++++++++++++++++
owncloud-6.0.0a-blowfish-include.patch | 33 ++
owncloud-6.0.0a-disable_irods.patch | 18 +
owncloud-6.0.0a-sharing_backend_log.patch | 11 +
owncloud-6.0.2-videoviewer_noplugins.patch | 11 +
owncloud-6.0.3-fix-routing-symfony-2.3.patch | 22 ++
owncloud-delete-jslint.sh | 8 +-
owncloud-nginx.conf | 77 +++++
owncloud-setup.patch | 22 --
owncloud.spec | 348 +++++++++++++-------
sources | 2 +-
22 files changed, 815 insertions(+), 349 deletions(-)
---
diff --cc .gitignore
index 9a8c311,1f177ea..ce11cc9
--- a/.gitignore
+++ b/.gitignore
@@@ -4,4 -4,14 +4,5 @@@
/owncloud-4.5.10-repack.tar.bz2
/owncloud-4.5.11-repack.tar.bz2
/owncloud-4.5.12-repack.tar.bz2
-/owncloud-5.0.9-repack.tar.bz2
-/owncloud-5.0.10-repack.tar.bz2
-/owncloud-5.0.11-repack.tar.bz2
-/owncloud-5.0.12-repack.tar.bz2
-/owncloud-5.0.13-repack.tar.bz2
-/owncloud-5.0.14a-repack.tar.bz2
-/owncloud-6.0.0-repack.tar.bz2
-/owncloud-6.0.0a-repack.tar.bz2
-/owncloud-6.0.1-repack.tar.bz2
-/owncloud-6.0.2-repack.tar.bz2
-/owncloud-6.0.3-repack.tar.bz2
+/owncloud-4.5.13-repack.tar.bz2
++/owncloud-6.0.3-repack.tar.bz2
diff --cc owncloud.spec
index ed5d6da,7d0fafc..556ca99
--- a/owncloud.spec
+++ b/owncloud.spec
@@@ -1,6 -1,6 +1,7 @@@
++
Name: owncloud
- Version: 4.5.13
- Release: 3%{?dist}
+ Version: 6.0.3
+ Release: 1%{?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
@@@ -38,21 -56,28 +57,30 @@@ Requires: %{name}-webserver = %{v
Requires: %{name}-database = %{version}-%{release}
-# PHP libs
+# core PHP libs
Requires: php-gd php-curl php-dom php-exif php-fileinfo php-gmp php-iconv
Requires: php-json php-ldap php-mbstring php-openssl php-pcre php-pdo
- Requires: php-session php-simplexml php-spl php-zip
+ Requires: php-session php-simplexml php-spl php-zip php-ZendFramework-Pdf
+ Requires: php-ZendFramework-Search-Lucene php-getid3 php-PHPMailer
+ Requires: php-phpass php-Pimple
+ Requires: php-irodsphp
%if 0%{?fedora} || 0%{?rhel} > 6
Requires: php-filter
%endif
+# other PHP libs
+Requires: php-getid3 php-PHPMailer php-cloudfiles php-phpass
# PHP PEAR dependencies
- Requires: php-pear(Crypt_Blowfish) php-pear(pear.dropbox-php.com/Dropbox)
- Requires: php-pear(Net_Curl) php-pear(XML_Parser)
+ # 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.
+ Requires: php-pear(Crypt_Blowfish)
+ Requires: php-pear(pear.dropbox-php.com/Dropbox)
+ Requires: php-pear(Net_Curl) php-pear(XML_Parser) php-pear(pear.symfony.com/Routing)
+ Requires: php-pear(pear.doctrine-project.org/DoctrineDBAL) >= 2.4.2
# SabreDAV
- Requires: php-pear(Sabre_CalDAV) php-pear(Sabre_CardDAV)
-
+ Requires: php-pear(Sabre_CalDAV) >= 1.7.8 php-pear(Sabre_CardDAV) >= 1.7.8
+ Requires: php-pear(phpseclib.sourceforge.net/Net_SFTP)
%if 0%{?rhel}
Requires(post): policycoreutils-python
@@@ -218,22 -243,19 +246,19 @@@ mkdir -p %{buildroot}%{_localstatedir}/
mkdir -p %{buildroot}%{_sysconfdir}/%{name}
# install content
- cp -a apps %{buildroot}%{_datadir}/%{name}
- cp -a core %{buildroot}%{_datadir}/%{name}
- cp -a files %{buildroot}%{_datadir}/%{name}
- cp -a l10n %{buildroot}%{_datadir}/%{name}
- cp -a lib %{buildroot}%{_datadir}/%{name}
- cp -a ocs %{buildroot}%{_datadir}/%{name}
- cp -a search %{buildroot}%{_datadir}/%{name}
- cp -a settings %{buildroot}%{_datadir}/%{name}
- cp -a themes %{buildroot}%{_datadir}/%{name}
- cp -a 3rdparty %{buildroot}%{_datadir}/%{name}
- install -pm 644 {index,public,remote,status,cron}.php %{buildroot}%{_datadir}/%{name}
- install -pm 644 db_structure.xml %{buildroot}%{_datadir}/%{name}
- install -pm 644 config/config.sample.php %{buildroot}%{_sysconfdir}/%{name}/config.php
+ for d in $(find . -mindepth 1 -maxdepth 1 -type d | grep -v config); do
+ cp -a "$d" %{buildroot}%{_datadir}/%{name}
+ done
+
+ for f in {*.php,*.xml,*.html,occ,robots.txt}; do
+ install -pm 644 "$f" %{buildroot}%{_datadir}/%{name}
+ done
+
+ # set default config
+ install -pm 644 config/config.sample.php %{buildroot}%{_sysconfdir}/%{name}/config.php
# symlink config dir
-ln -s %{_sysconfdir}/%{name} %{buildroot}%{_datadir}/%{name}/config
+ln -sf %{_sysconfdir}/%{name} %{buildroot}%{_datadir}/%{name}/config
# httpd config
install -Dpm 644 %{SOURCE1} \
More information about the scm-commits
mailing list