[gfal2/el5: 5/5] Merge branch 'master' into el5

[Alejandro Alvarez]

commit 022c659e688db3ee306345e702d8972803a39945
Merge: 5436afe 1c116a6
Author: Alejandro Alvarez Ayllon <aalvarez at cern.ch>
Date:   Tue Jul 29 10:44:54 2014 +0200

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

 .gitignore                 |   14 +-----
 LCGUTIL-354.patch          |   18 ------
 gfal2-bad-string-fmt.patch |   65 ++++++++++++++++++++++
 gfal2.spec                 |  130 +++++++++++++++++++++++---------------------
 sources                    |    2 +-
 5 files changed, 134 insertions(+), 95 deletions(-)
---
diff --cc gfal2.spec
index a310c72,9dc951b..777cf42
--- a/gfal2.spec
+++ b/gfal2.spec
@@@ -1,20 -1,21 +1,20 @@@
  # unversionned doc dir F20 change https://fedoraproject.org/wiki/Changes/UnversionedDocdirs
  %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
  
- Name:				gfal2
- Version:			2.5.5
+ Name:		gfal2
+ Version:	2.6.8
  # https://fedoraproject.org/wiki/Packaging:NamingGuidelines#Release_Tag
- Release:			2%{?dist}
- Summary:			Grid file access library 2.0
- Group:				Applications/Internet
- License:			ASL 2.0
- URL:				https://svnweb.cern.ch/trac/lcgutil/wiki/gfal2
- # svn export http://svn.cern.ch/guest/lcgutil/gfal2/trunk gfal2
- Source0:			http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/%{name}/%{name}-%{version}.tar.gz
- BuildRoot:			%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
- 
- # https://its.cern.ch/jira/browse/LCGUTIL-354
- Patch0:		LCGUTIL-354.patch
+ Release:	1%{?dist}
+ Summary:	Grid file access library 2.0
+ Group:		Applications/Internet
+ License:	ASL 2.0
+ URL:	 	http://dmc.web.cern.ch
+ # svn export http://svn.cern.ch/guest/lcgutil/gfal2/tags/data-gfal2_R_2_6_8 gfal2-2.6.8
+ # tar czf gfal2-2.6.8.tar.gz gfal2-2.6.8 
+ Source0:	http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/%{name}/%{name}-%{version}.tar.gz
+ BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+ 
 -# https://its.cern.ch/jira/browse/LCGUTIL-469
+ Patch0:		gfal2-bad-string-fmt.patch
  
  #main lib dependencies
  BuildRequires:		cmake