[gfal2/el6: 5/5] Merge branch 'master' into el6
Alejandro Alvarez
aalvarez at fedoraproject.org
Tue Jul 29 08:57:38 UTC 2014
commit 42a9792d355fe159827826e5535e937dc37d9b18
Merge: 96d0110 1c116a6
Author: Alejandro Alvarez Ayllon <aalvarez at cern.ch>
Date: Tue Jul 29 10:52:36 2014 +0200
Merge branch 'master' into el6
Conflicts:
gfal2.spec
.gitignore | 14 +----
LCGUTIL-354.patch | 18 ------
gfal2-bad-string-fmt.patch | 65 ++++++++++++++++++++++
gfal2.spec | 132 ++++++++++++++++++++++---------------------
sources | 2 +-
5 files changed, 135 insertions(+), 96 deletions(-)
---
diff --cc gfal2.spec
index 2873527,9dc951b..c91054d
--- 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: 3%{?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
More information about the scm-commits
mailing list