[owncloud] 5.0.9
brummbq
brummbq at fedoraproject.org
Tue Jul 16 09:24:21 UTC 2013
commit 1e0538dadaa4080f4dc2e9eadb72f7c0a16ac471
Author: Gregor Tätzner <gregor at freenet.de>
Date: Tue Jul 16 11:23:23 2013 +0200
5.0.9
.gitignore | 1 +
...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-5.0.8-config.patch | 47 +++++++
owncloud-delete-jslint.sh | 2 +-
owncloud-setup.patch | 22 ---
owncloud.spec | 139 ++++++++++----------
sources | 2 +-
12 files changed, 119 insertions(+), 232 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5415c65..4e16a76 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/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
diff --git a/owncloud-5.0.8-config.patch b/owncloud-5.0.8-config.patch
new file mode 100644
index 0000000..0ec47d1
--- /dev/null
+++ b/owncloud-5.0.8-config.patch
@@ -0,0 +1,47 @@
+--- config/config.sample.php.orig 2013-07-14 22:11:03.073935230 +0200
++++ config/config.sample.php 2013-07-16 10:24:31.358331189 +0200
+@@ -124,7 +124,7 @@
+ "updatechecker" => true,
+
+ /* Place to log to, can be owncloud and syslog (owncloud is log menu item in admin menu) */
+-"log_type" => "owncloud",
++"log_type" => "syslog",
+
+ /* File for the owncloud logger to log to, (default is ownloud.log in the data dir */
+ "logfile" => "",
+@@ -148,7 +148,7 @@
+ /* The directory where the user data is stored, default to data in the owncloud
+ * directory. The sqlite database is also stored here, when sqlite is used.
+ */
+-// "datadirectory" => "",
++"datadirectory" => "/var/lib/owncloud/data",
+
+ /* Enable maintenance mode to disable ownCloud */
+ "maintenance" => false,
+@@ -160,18 +160,19 @@
+ applications paths. 'writable' indicate if the user can install apps in this folder.
+ You must have at least 1 app folder writable or you must set the parameter : appstoreenabled to false
+ */
++0 =>
+ array(
+- 'path'=> '/var/www/owncloud/apps',
++ 'path'=> '/usr/share/owncloud/apps',
+ 'url' => '/apps',
++ 'writable' => false,
++ ),
++1 =>
++ array (
++ 'path' => '/var/lib/owncloud/apps',
++ 'url' => '/apps-appstore',
+ 'writable' => true,
+ ),
+ ),
+-'user_backends'=>array(
+- array(
+- 'class'=>'OC_User_IMAP',
+- 'arguments'=>array('{imap.gmail.com:993/imap/ssl}INBOX')
+- )
+-),
+ //links to custom clients
+ 'customclient_desktop' => '', //http://owncloud.org/sync-clients/
+ 'customclient_android' => '', //https://play.google.com/store/apps/details?id=com.owncloud.android
diff --git a/owncloud-delete-jslint.sh b/owncloud-delete-jslint.sh
old mode 100755
new mode 100644
index 1e76abb..d1861ee
--- a/owncloud-delete-jslint.sh
+++ b/owncloud-delete-jslint.sh
@@ -8,7 +8,7 @@ tar -xf $1
# delete jslint
pushd owncloud/apps/files_texteditor/js/aceeditor/
-sed -i "/define('ace\/worker\/jshint'/,/});\/\* -\*- Mode:/d" worker-javascript.js
+sed -i '/^define('\''ace\/mode\/javascript\/jshint'\''.*$/,$d' worker-javascript.js
popd
tar -cjf $REPACK_SOURCE owncloud
diff --git a/owncloud.spec b/owncloud.spec
index cd758b0..ecdebf2 100644
--- a/owncloud.spec
+++ b/owncloud.spec
@@ -1,6 +1,6 @@
Name: owncloud
-Version: 4.5.12
+Version: 5.0.9
Release: 1%{?dist}
Summary: Private file sync and share server
@@ -8,7 +8,7 @@ License: AGPLv3+ and MIT and BSD and CC-BY and CC-BY-SA and GPLv3 and Pub
URL: http://owncloud.org
# removed any occurences of jslint, see script delete-jslint
Source0: %{name}-%{version}-repack.tar.bz2
-# orig source: http://owncloud.org/releases/%{name}-%{version}.tar.bz2
+# orig source: http://owncloud.org/releases/%%{name}-%%{version}.tar.bz2
Source1: %{name}-httpd.conf
Source6: %{name}-4.5-nginx.conf
# packaging notes and doc
@@ -17,19 +17,10 @@ Source4: %{name}-mysql.txt
Source5: %{name}-postgresql.txt
# used to repack the source tarball
-Source42: %{name}-delete-jslint.sh
+Source42: %{name}-delete-jslint.sh
-Patch0: %{name}-4.5.8-config.patch
-# triggers selinux avc, write access on config/config.php is sufficient
-Patch1: %{name}-4.5.7-disable-config-dir-access-check.patch
-# remove calls to jslint
-Patch2: %{name}-4.5.7-remove-jslint.patch
-# fix includes
-Patch10: %{name}-4.5.7-unbundle-blowfish.patch
-Patch11: %{name}-4.5.7-unbundle-phpmailer.patch
-Patch12: %{name}-4.5.7-unbundle-phptar.patch
-
-Patch13: %{name}-setup.patch
+# adjust default config
+Patch0: %{name}-5.0.8-config.patch
BuildArch: noarch
@@ -40,7 +31,7 @@ Requires: %{name}-database = %{version}-%{release}
# 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
%if 0%{?fedora} || 0%{?rhel} > 6
Requires: php-filter
%endif
@@ -48,23 +39,15 @@ Requires: php-filter
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)
+Requires: php-pear(Net_Curl) php-pear(XML_Parser) php-pear(pear.symfony.com/Routing)
# SabreDAV
Requires: php-pear(Sabre_CalDAV) php-pear(Sabre_CardDAV)
-
%if 0%{?rhel}
Requires(post): policycoreutils-python
Requires(postun): policycoreutils-python
%endif
-# Bundled 3rdparty libs missing in Fedora
-## JS (mainly jQuery plugins)
-# https://github.com/harvesthq/chosen/
-# http://fgelinas.com/code/timepicker
-# http://arshaw.com/fullcalendar/
-
-
%description
ownCloud gives you universal access to your files through a web interface or
WebDAV. It also provides a platform to easily view & sync your contacts,
@@ -74,10 +57,10 @@ applications and plugins.
%package httpd
-Summary: Httpd integration for ownCloud
+Summary: Httpd integration for ownCloud
-Provides: %{name}-webserver = %{version}-%{release}
-Requires: %{name} = %{version}-%{release}
+Provides: %{name}-webserver = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
# PHP dependencies
Requires: php
@@ -87,54 +70,54 @@ Requires: php
%package nginx
-Summary: Nginx integration for ownCloud
+Summary: Nginx integration for ownCloud
-Provides: %{name}-webserver = %{version}-%{release}
-Requires: %{name} = %{version}-%{release}
+Provides: %{name}-webserver = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
# PHP dependencies
-Requires: php-fpm nginx
+Requires: php-fpm nginx
%description nginx
%{summary}
%package mysql
-Summary: Virtual package providing MySQL dependencies for %{name}
+Summary: Virtual package providing MySQL dependencies for %{name}
-Provides: %{name}-database = %{version}-%{release}
-Requires: %{name} = %{version}-%{release}
+Provides: %{name}-database = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
-Requires: php-mysql
-Requires: php-pear(MDB2_Driver_mysql)
-Requires: mysql-server
+Requires: php-mysql
+Requires: php-pear(MDB2_Driver_mysql)
+Requires: mysql-server
%description mysql
%{summary}
%package postgresql
-Summary: Virtual package providing PostgreSQL dependencies for %{name}
+Summary: Virtual package providing PostgreSQL dependencies for %{name}
-Provides: %{name}-database = %{version}-%{release}
-Requires: %{name} = %{version}-%{release}
+Provides: %{name}-database = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
-Requires: php-pgsql
-Requires: php-pear(MDB2_Driver_pgsql)
-Requires: postgresql-server
+Requires: php-pgsql
+Requires: php-pear(MDB2_Driver_pgsql)
+Requires: postgresql-server
%description postgresql
%{summary}
%package sqlite
-Summary: Virtual package providing Sqlite3 dependencies for %{name}
+Summary: Virtual package providing Sqlite3 dependencies for %{name}
-Provides: %{name}-database = %{version}-%{release}
-Requires: %{name} = %{version}-%{release}
+Provides: %{name}-database = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
# just need mdb2, the sqlite3 driver is already included
-Requires: php-sqlite3 php-pcre
-Requires: php-pear(MDB2)
+Requires: php-sqlite3 php-pcre
+Requires: php-pear(MDB2)
%description sqlite
%{summary}
@@ -143,18 +126,17 @@ Requires: php-pear(MDB2)
%prep
%setup -q -n %{name}
%patch0
-%patch1
-%patch2
-%patch10
-%patch11
-%patch12
-%patch13
-
-# Strip bundled libraries
-rm -rf 3rdparty/{Archive,Console,Crypt_Blowfish,OS,Sabre,simpletest,getid3,php-cloudfiles,phpass,PEAR,Dropbox}
+# Strip bundled libraries from global 3rdparty dir
+# FIXME temporarily bundle sabre - pkg needs upgrade
+# FIXME package 'phpseclib'
+rm -rf 3rdparty/{Archive,Console,OS,simpletest,getid3,php-cloudfiles,phpass,PEAR,Dropbox,symfony/routing/Symfony}
rm -f 3rdparty/{Sabre.includes,System,class.phpmailer,class.smtp,MDB2,PEAR5}.php
+# individual core apps now bundle libs as well - yay
+rm -rf apps/files_encryption/3rdparty/Crypt_Blowfish
+rm -rf apps/search_lucene/3rdparty/Zend
+
# keep MDB2-Schema - consider upgrading system MDB2-Schema to latest git snapshot
find 3rdparty/MDB2 -mindepth 1 -maxdepth 1 ! -name "Schema*" -exec rm -rf {} \;
@@ -176,6 +158,7 @@ rm -rf 3rdparty/XML/Parser
# clean up content
rm -rf apps/files_odfviewer/src
rm -rf apps/files_videoviewer/mediaelement/src
+rm -rf apps/files_texteditor/js/aceeditor/theme-textmate.js
rm -f 3rdparty/PEAR-LICENSE
rm -f apps/files_texteditor/js/aceeditor/mode-text.js
rm -f apps/files_texteditor/js/aceeditor/mode-text-uncompressed.js
@@ -202,19 +185,21 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}/apps
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
+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 robots.txt %{buildroot}%{_datadir}/%{name}
+install -pm 644 index.html %{buildroot}%{_datadir}/%{name}
+install -pm 644 db_structure.xml %{buildroot}%{_datadir}/%{name}
+install -pm 644 config/config.sample.php %{buildroot}%{_sysconfdir}/%{name}/config.php
# symlink config dir
ln -sf %{_sysconfdir}/%{name} %{buildroot}%{_datadir}/%{name}/config
@@ -227,6 +212,15 @@ install -Dpm 644 %{SOURCE1} \
install -Dpm 644 %{SOURCE6} \
%{buildroot}%{_sysconfdir}/nginx/conf.d/%{name}.conf
+# symlink 3rdparty libs - if possible
+# global
+ln -sf %{_datadir}/php/PHPMailer/class.phpmailer.php %{buildroot}%{_datadir}/%{name}/3rdparty/class.phpmailer.php
+ln -sf %{pear_phpdir}/Archive %{buildroot}%{_datadir}/%{name}/3rdparty/Archive
+ln -sf %{pear_phpdir}/Symfony %{buildroot}%{_datadir}/%{name}/3rdparty/symfony/routing/Symfony
+# individual
+ln -sf %{pear_phpdir}/Crypt %{buildroot}%{_datadir}/%{name}/apps/files_encryption/3rdparty/Crypt_Blowfish
+ln -sf %{_datadir}/php/Zend %{buildroot}%{_datadir}/%{name}/apps/search_lucene/3rdparty/Zend
+
%if 0%{?rhel}
%post
@@ -307,6 +301,11 @@ fi
%changelog
+* Tue Jul 16 2013 Gregor Tätzner <brummbq at fedoraproject.org> - 5.0.9-1
+- major upgrade to 5.0.9
+- symlink 3rdparty libs and drop most of the patches
+- new deps: php-ZendFramework symfony
+
* Sat Jun 08 2013 Gregor Tätzner <brummbq at fedoraproject.org> - 4.5.12-1
- 4.5.12
diff --git a/sources b/sources
index 0fd1421..86da764 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d3d56bf1d3c5c3cacec1750df8f9257a owncloud-4.5.12-repack.tar.bz2
+986674381159c9cc1b573da12f1aa9fc owncloud-5.0.9-repack.tar.bz2
More information about the scm-commits
mailing list