[packages/owncloud: 13/13] Removed not used files
wiget
wiget at pld-linux.org
Thu Jul 18 21:52:03 CEST 2013
commit 94bdf3de71dae363957bfda0b14d60ec3e07be1c
Author: Artur Frysiak <artur at frysiak.net>
Date: Thu Jul 18 15:08:34 2013 +0200
Removed not used files
httpd.conf | 25 -------------------------
owncloud.spec | 6 ++----
system-config.patch | 13 -------------
3 files changed, 2 insertions(+), 42 deletions(-)
---
diff --git a/owncloud.spec b/owncloud.spec
index 4060195..34e823d 100644
--- a/owncloud.spec
+++ b/owncloud.spec
@@ -22,8 +22,7 @@ Source0: http://download.owncloud.org/community/%{name}-%{version}.tar.bz2
Source1: config.php
Source2: apache.conf
Source3: lighttpd.conf
-Patch1: system-config.patch
-Patch2: pear-not-strict.patch
+Patch1: pear-not-strict.patch
URL: http://owncloud.org
BuildRequires: rpmbuild(macros) >= 1.268
Requires: getid3
@@ -79,8 +78,7 @@ ownCloud server on their devices.
%prep
%setup -q -n %{name}
-#patch1 -p1
-%patch2 -p1
+%patch1 -p1
# remove bundled 3rdparty libs
%{__rm} -r 3rdparty/{class.phpmailer.php,class.smtp.php,getid3,Archive,Console,MDB2,MDB2.php,XML}
diff --git a/httpd.conf b/httpd.conf
deleted file mode 100644
index d269367..0000000
--- a/httpd.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-Alias /owncloud /usr/share/owncloud
-<Directory /usr/share/owncloud>
- ErrorDocument 403 /owncloud/core/templates/403.php
- ErrorDocument 404 /owncloud/core/templates/404.php
- <IfModule mod_php5.c>
- php_value upload_max_filesize 512M
- php_value post_max_size 512M
- php_value memory_limit 512M
- </IfModule>
- <IfModule mod_rewrite.c>
- RewriteEngine on
- RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
- RewriteRule ^.well-known/host-meta /owncloud/public.php?service=host-meta [QSA,L]
- RewriteRule ^.well-known/carddav /owncloud/remote.php/carddav/ [R]
- RewriteRule ^.well-known/caldav /owncloud/remote.php/caldav/ [R]
- RewriteRule ^apps/([^/]*)/(.*\.(css|php))$ index.php?app=$1&getfile=$2 [QSA,L]
- RewriteRule ^remote/(.*) remote.php [QSA,L]
- </IfModule>
- Options -Indexes
- Require all granted
-</Directory>
-
-<Directory /usr/share/owncloud/data>
- Require all denied
-</Directory>
diff --git a/system-config.patch b/system-config.patch
deleted file mode 100644
index d45117e..0000000
--- a/system-config.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- owncloud/lib/setup.php~ 2012-12-19 23:24:24.000000000 +0200
-+++ owncloud/lib/setup.php 2013-01-23 00:10:58.370941116 +0200
-@@ -6,10 +6,6 @@
- $hasOracle = is_callable('oci_connect');
- $datadir = OC_Config::getValue('datadirectory', OC::$SERVERROOT.'/data');
-
--// Test if .htaccess is working
--$content = "deny from all";
--file_put_contents(OC::$SERVERROOT.'/data/.htaccess', $content);
--
- $opts = array(
- 'hasSQLite' => $hasSQLite,
- 'hasMySQL' => $hasMySQL,
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/owncloud.git/commitdiff/94bdf3de71dae363957bfda0b14d60ec3e07be1c
More information about the pld-cvs-commit
mailing list