[dcap/el5: 2/2] New upstream release

[Mattias Ellert]

commit 34f597c674a5b4e6fc1f485174134ac56dc03cf7
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Thu Aug 15 16:05:12 2013 +0200

    New upstream release
    
    - Drop patch dcap-segfault.patch - merged upstream

 dcap-segfault.patch |   15 ---------------
 dcap.spec           |   36 +++++++++++++++++-------------------
 sources             |    2 +-
 3 files changed, 18 insertions(+), 35 deletions(-)
---
diff --git a/dcap.spec b/dcap.spec
index 0f45619..67381a6 100644
--- a/dcap.spec
+++ b/dcap.spec
@@ -1,6 +1,6 @@
 Name:		dcap
-Version:	2.47.7
-Release:	4%{?dist}
+Version:	2.47.8
+Release:	1%{?dist}
 Summary:	Client Tools for dCache
 
 Group:		Applications/Internet
@@ -8,20 +8,15 @@ Group:		Applications/Internet
 #		the rest - LGPLv2+ license
 License:	LGPLv2+ and BSD
 URL:		http://www.dcache.org/manuals/libdcap.shtml
-#		The source tarfile is created from a subversion checkout:
-#		svn export http://svn.dcache.org/dCache/tags/dcap-2.47.7
-#		tar -z -c -f dcap-2.47.7.tar.gz dcap-2.47.7
-Source0:	%{name}-%{version}.tar.gz
+Source0:	https://github.com/dCache/%{name}/archive/%{version}.tar.gz
 #		Allow loading of plugins outside default library search path
 Patch0:		%{name}-dlopen.patch
-#		Fix segfault (fixed in upstream github)
-Patch1:		%{name}-segfault.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
-BuildRequires:	globus-gssapi-gsi-devel%{?_isa}
-BuildRequires:	krb5-devel%{?_isa}
-BuildRequires:	openssl-devel%{?_isa}
+BuildRequires:	globus-gssapi-gsi-devel
+BuildRequires:	krb5-devel
+BuildRequires:	openssl-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	libtool
@@ -92,7 +87,6 @@ This library is dynamically loaded at runtime.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 sed 's!@@LIBDIR@@!%{_libdir}!' -i src/tunnelManager.c
 
@@ -107,22 +101,22 @@ chmod +x bootstrap.sh
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 
 # Remove libtool archive files
-rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la
+rm -rf %{buildroot}/%{_libdir}/*.la
 
 # Move plugins out of the default library path
-mkdir $RPM_BUILD_ROOT/%{_libdir}/%{name}
-mv $RPM_BUILD_ROOT/%{_libdir}/lib*Tunnel* $RPM_BUILD_ROOT/%{_libdir}/%{name}
+mkdir %{buildroot}/%{_libdir}/%{name}
+mv %{buildroot}/%{_libdir}/lib*Tunnel* %{buildroot}/%{_libdir}/%{name}
 
 # We are installing the docs in the files sections
-rm -rf $RPM_BUILD_ROOT/%{_docdir}
+rm -rf %{buildroot}/%{_docdir}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post libs -p /sbin/ldconfig
 
@@ -167,6 +161,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/libtelnetTunnel.so
 
 %changelog
+* Thu Aug 15 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.47.8-1
+- New upstream release
+- Drop patch dcap-segfault.patch - merged upstream
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.47.7-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index fc4d151..4804dcc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-50ec39271e87b441620bd9c5cd688a9c  dcap-2.47.7.tar.gz
+8dfa5b3d665a7c950050b05576c59d8e  2.47.8.tar.gz