[gridsite/el6/master: 9/9] Merge branch 'master' into el6

[stevetraylen]

commit f9e322a83250cb3d387917689b6cfb741dd50228
Merge: 9c8a4fe 8d3271b
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Sun Sep 26 14:52:20 2010 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	gridsite.spec
    	root-level.gacl
    	sources

 .gitignore             |    2 +-
 gridsite-include.patch |   60 ++++++++++++++++++++++++++++++++++++++++++++++++
 gridsite.spec          |   29 ++++++++++++++++++----
 root-level.gacl        |   23 ++++++++++--------
 sources                |    2 +-
 5 files changed, 98 insertions(+), 18 deletions(-)
---
diff --cc .gitignore
index e875fa9,8b71c97..5d18c6a
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--gridsite-1.5.18.src.tar.gz
+ /gridsite-1.5.19.src.tar.gz
diff --cc gridsite.spec
index 0320ffa,b3b5b3c..2877685
--- a/gridsite.spec
+++ b/gridsite.spec
@@@ -25,7 -25,12 +25,11 @@@ Source2:        gridsitehead.tx
  Source3:        gridsitefoot.txt
  Source4:        root-level.gacl
  Source5:        gridsitelogo.png
 -
  Patch1:         cgi-bin-location.patch
+ # Includes are wrong.
+ #https://bugzilla.redhat.com/show_bug.cgi?id=612109
+ #https://savannah.cern.ch/bugs/index.php?69632
+ Patch2:         gridsite-include.patch
  
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)