From 9b11c5efc6e63454653a9ce21fa736222ee449d2 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Jan 11 2016 19:56:37 +0000
Subject: New upstream release


- Drop patch dcap-dlopen.patch - merged upstream

---

diff --git a/dcap-dlopen.patch b/dcap-dlopen.patch
deleted file mode 100644
index 2b79657..0000000
--- a/dcap-dlopen.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur dcap-1.9.7.1.orig/src/tunnelManager.c dcap-1.9.7.1/src/tunnelManager.c
---- dcap-1.9.7.1.orig/src/tunnelManager.c	2010-03-09 09:47:40.028551086 +0100
-+++ dcap-1.9.7.1/src/tunnelManager.c	2010-03-09 11:32:11.657304932 +0100
-@@ -84,6 +84,7 @@
- {
- 	void *handle;
- 	ioTunnel *tunnel;
-+	char *fullpath;
- 
- 	if(libname == NULL) {
- 		dc_debug(DC_ERROR, "Bad tunnel name");
-@@ -97,6 +98,14 @@
- 
- 	handle = dlopen( libname, RTLD_NOW);
- 		
-+	if(handle == NULL) {
-+		fullpath = malloc(strlen("@@LIBDIR@@/dcap/") + strlen(libname) + 1);
-+		strcpy(fullpath, "@@LIBDIR@@/dcap/");
-+		strcat(fullpath, libname);
-+		handle = dlopen(fullpath, RTLD_NOW);
-+		free(fullpath);
-+	}
-+
- 	if(handle == NULL) {		
- 		goto fail;
- 	}
diff --git a/dcap.spec b/dcap.spec
index ff42693..14958cd 100644
--- a/dcap.spec
+++ b/dcap.spec
@@ -1,6 +1,6 @@
 Name:		dcap
-Version:	2.47.9
-Release:	2%{?dist}
+Version:	2.47.10
+Release:	1%{?dist}
 Summary:	Client Tools for dCache
 
 Group:		Applications/Internet
@@ -9,8 +9,6 @@ Group:		Applications/Internet
 License:	LGPLv2+ and BSD
 URL:		http://www.dcache.org/manuals/libdcap.shtml
 Source0:	https://github.com/dCache/%{name}/archive/%{version}.tar.gz
-#		Allow loading of plugins outside default library search path
-Patch0:		%{name}-dlopen.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
@@ -90,7 +88,6 @@ This library is dynamically loaded at runtime.
 
 %prep
 %setup -q
-%patch0 -p1
 
 sed 's!@@LIBDIR@@!%{_libdir}!' -i src/tunnelManager.c
 
@@ -100,6 +97,7 @@ chmod +x bootstrap.sh
 
 %configure \
     --disable-static \
+    --with-tunneldir=%{_libdir}/%{name} \
     --with-globus-include=%{_includedir}/globus \
     --with-globus-lib=/dummy
 make %{?_smp_mflags}
@@ -111,10 +109,7 @@ make install DESTDIR=%{buildroot}
 
 # Remove libtool archive files
 rm -rf %{buildroot}/%{_libdir}/*.la
-
-# Move plugins out of the default library path
-mkdir %{buildroot}/%{_libdir}/%{name}
-mv %{buildroot}/%{_libdir}/lib*Tunnel* %{buildroot}/%{_libdir}/%{name}
+rm -rf %{buildroot}/%{_libdir}/%{name}/*.la
 
 # We are installing the docs in the files sections
 rm -rf %{buildroot}/%{_docdir}
@@ -166,6 +161,10 @@ make %{?_smp_mflags} check
 %{_libdir}/%{name}/libtelnetTunnel.so
 
 %changelog
+* Mon Jan 11 2016 Mattias Ellert <mattias.ellert@fysast.uu.se> - 2.47.10-1
+- New upstream release
+- Drop patch dcap-dlopen.patch - merged upstream
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.47.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index c0d0c34..f885437 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-48a358745e9d3a01c899cf31e946d084  2.47.9.tar.gz
+3207bd7170dcc0bcebf508986aef9956  2.47.10.tar.gz