[owncloud: 10/10] Merge my side branch with OC 7 (https://www.happyassassin.net/temp/oc7_repo/)

[Adam Williamson]

commit d6f75e863dbd3d1fde6f8cabdd10b00a60ef1e19
Merge: c1b2b9e f4eaa6d
Author: Adam Williamson <awilliam at redhat.com>
Date:   Wed Aug 20 08:37:27 2014 -0700

    Merge my side branch with OC 7 (https://www.happyassassin.net/temp/oc7_repo/)
    
    Conflicts:
    	owncloud.spec

 ...r-autoloader-not-OC-for-non-Composer-3rdp.patch |   84 ++++++++++
 owncloud-6.0.0-fix-autoloader.patch                |   16 --
 owncloud-6.0.0-pimple-include.patch                |   11 --
 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.3-fix-routing-symfony-2.3.patch       |   22 ---
 owncloud-7.0.0-autoloader_paths.patch              |   12 ++
 owncloud-7.0.0-composer_includepath.patch          |   10 ++
 owncloud-7.0.0-contact_type.patch                  |   28 ++++
 owncloud-7.0.0-opcache_invalidate.patch            |   42 +++++
 ...ch => owncloud-7.0.0rc1-3rdparty_includes.patch |   93 +-----------
 owncloud-httpd.conf                                |    7 +
 owncloud-nginx.conf                                |    9 +-
 owncloud.spec                                      |  163 +++++++++++++-------
 15 files changed, 299 insertions(+), 260 deletions(-)
---
diff --cc owncloud.spec
index 8a5bc96,a6adfa8..ef31dbc
--- a/owncloud.spec
+++ b/owncloud.spec
@@@ -355,11 -388,35 +388,35 @@@ f
  
  
  %changelog
- * Tue Jul 29 2014 Adam Williamson <awilliam at redhat.com> - 6.0.4-3
+ * Wed Aug 20 2014 Adam Williamson <awilliam at redhat.com> - 7.0.1-1
+ - update to 7.0.1
 -- drop contact type fix (merged upstream)
++- drop contact_type.patch (merged upstream)
+ 
+ * Tue Jul 29 2014 Adam Williamson <awilliam at redhat.com> - 7.0.0-6
  - do not ship upstream's 'updater' app (it'll only lead to tears)
+ - don't patch and ship OC's sample config, write a stub instead
+ 
+ * Tue Jul 29 2014 Adam Williamson <awilliam at redhat.com> - 7.0.0-5
+ - fix up sabre paths right this time
+ 
+ * Tue Jul 29 2014 Adam Williamson <awilliam at redhat.com> - 7.0.0-4
+ - more autoloader tweaking
+ - use composer not OC autoloader for legacy 3rdparty includes (core#9643)
+ - specify explicit paths to Sabre deps
+ 
+ * Sun Jul 27 2014 Adam Williamson <awilliam at redhat.com> - 7.0.0-3
+ - update apache config for OC 7 changes
+ - drop unneeded isoft/mssql-bundle from 3rdparty
+ 
+ * Sun Jul 27 2014 Adam Williamson <awilliam at redhat.com> - 7.0.0-2
+ - opcache_invalidate.patch: avoid triggering a crash in the PHP opcache
+ - contact_type.patch: fix selection of current field type in contact view
  
- * Tue Jul 29 2014 Adam Williamson <awilliam at redhat.com> - 6.0.4-2
- - don't patch the sample config, just include a stub with our settings
+ * Thu Jul 24 2014 Adam Williamson <awilliam at redhat.com> - 7.0.0-1
+ - 7.0.0
+ - rediff 3rdparty_includes.patch
+ - update 3rdparty strip commands and dependencies for upstream changes
+ - update dependencies
  
  * Mon Jun 30 2014 Gregor Tätzner <brummbq at fedoraproject.org> - 6.0.4-1
  - 6.0.4