[gridsite/el5: 2/2] Merge branch 'master' into el5

[stevetraylen]

commit b572b0fb51aca6f88397883dcb3575a2aa2e8807
Merge: f64605a e1d9709
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Wed Jul 6 06:16:32 2011 +0200

    Merge branch 'master' into el5
    
    Conflicts:
    	gridsite.spec

 gridsite.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --cc gridsite.spec
index 7dc3010,9ee371d..eb48660
--- a/gridsite.spec
+++ b/gridsite.spec
@@@ -139,7 -140,7 +140,7 @@@ This package gridsite-doc, contains dev
  Group:    System Environment/Daemons
  Summary:  Run time libraries for mod_gridsite and gridsite-clients
  Version:  %{vercompat}
- Release:  1%{?dist}.1
 -Release:  1
++Release:  2%{?dist}
  
  %description compat
  GridSite was originally a web application developed for managing and formatting 
@@@ -330,10 -331,10 +331,13 @@@ rm -rf $RPM_BUILD_ROO
  %doc src/doxygen LICENSE
  
  %changelog
+ * Wed Jul 6 2011 Steve Traylen <steve.traylen at cern.ch>  - 1.7.15-4
+ - devel package require openssl devel rhbz#719174
+ 
 -* Sun Jul 3 2011 Steve Traylen <steve.traylen at cern.ch>  - 1.7.15-3
 +* Sun Jul 3 2011 Steve Traylen <steve.traylen at cern.ch>  - 1.7.15-2 2
 +- Release of compat package must also be increased.
 +
 +* Sun Jul 3 2011 Steve Traylen <steve.traylen at cern.ch>  - 1.7.15-2 1
  - Correct dependency mistake.
  
  * Thu Jun 30 2011 Steve Traylen <steve.traylen at cern.ch>  - 1.7.15-2