[packages/owncloud] - Up to 8.2.2. Builds, but not tested.

lmasko lmasko at pld-linux.org
Fri Jan 22 15:36:55 CET 2016


commit f8965470a273ba5abb8d9bc2c7787fa7c86ab009
Author: Lukasz Masko <lmasko at pld-linux.org>
Date:   Fri Jan 22 15:36:27 2016 +0100

    - Up to 8.2.2. Builds, but not tested.

 owncloud.spec         | 13 +++----------
 pear-not-strict.patch | 14 --------------
 2 files changed, 3 insertions(+), 24 deletions(-)
---
diff --git a/owncloud.spec b/owncloud.spec
index 1c8e6dd..2fa3029 100644
--- a/owncloud.spec
+++ b/owncloud.spec
@@ -13,16 +13,15 @@
 #  - sabredav - https://code.google.com/p/sabredav/
 Summary:	Private file sync and share server
 Name:		owncloud
-Version:	7.0.4
+Version:	8.2.2
 Release:	1
 License:	AGPL v3, MIT
 Group:		Applications/WWW
 Source0:	http://download.owncloud.org/community/%{name}-%{version}.tar.bz2
-# Source0-md5:	6d4a3f9275d1f2b2607e7e6484051d4c
+# Source0-md5:	f5732baa2c0a5a44db3cf76775fe0c4f
 Source1:	config.php
 Source2:	apache.conf
 Source3:	lighttpd.conf
-Patch1:		pear-not-strict.patch
 URL:		http://owncloud.org
 BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	getid3
@@ -77,18 +76,12 @@ ownCloud server on their devices.
 
 %prep
 %setup -q -n %{name}
-%patch1 -p1
-
-# remove bundled 3rdparty libs
-%{__rm} -r 3rdparty/phpmailer
-# PEAR-core
-%{__rm} -r 3rdparty/{PEAR.php,PEAR5.php,System.php,PEAR}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir}/config,%{_appdir}}
 
-cp -pdR robots.txt index.html *.php db_structure.xml 3rdparty apps core l10n lib ocs search settings themes $RPM_BUILD_ROOT%{_appdir}
+cp -pdR robots.txt index.html *.php db_structure.xml 3rdparty apps core l10n lib ocs ocs-provider resources settings themes $RPM_BUILD_ROOT%{_appdir}
 ln -s %{_sysconfdir}/config $RPM_BUILD_ROOT%{_appdir}/config
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/config/config.php
 
diff --git a/pear-not-strict.patch b/pear-not-strict.patch
deleted file mode 100644
index c285fc8..0000000
--- a/pear-not-strict.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- owncloud/lib/base.php~	2013-01-21 22:47:28.000000000 +0200
-+++ owncloud/lib/base.php	2013-01-23 01:16:31.774667432 +0200
-@@ -276,9 +276,10 @@
- 
- 		// set some stuff
- 		//ob_start();
--		error_reporting(E_ALL | E_STRICT);
-+		error_reporting(E_ALL);
- 		if (defined('DEBUG') && DEBUG) {
- 			ini_set('display_errors', 1);
-+			error_reporting(E_ALL| E_STRICT);
- 		}
- 		self::$CLI=(php_sapi_name() == 'cli');
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/owncloud.git/commitdiff/f8965470a273ba5abb8d9bc2c7787fa7c86ab009



More information about the pld-cvs-commit mailing list