[myproxy/el5] Update to 6.1.10

[Mattias Ellert]

commit 32639d0460c34468879bab3822c25d52ac10a072
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Thu Dec 18 09:45:44 2014 +0100

    Update to 6.1.10
    
    - Drop patches myproxy-tls.patch and myproxy-liblink.patch (fixed upstream)

 myproxy-liblink.patch |  159 -------------------------------------------------
 myproxy-tls.patch     |   53 ----------------
 myproxy.spec          |   24 +++-----
 sources               |    2 +-
 4 files changed, 10 insertions(+), 228 deletions(-)
---
diff --git a/myproxy.spec b/myproxy.spec
index 6504684..9d6b6f4 100644
--- a/myproxy.spec
+++ b/myproxy.spec
@@ -13,7 +13,7 @@
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 Name:           myproxy
-Version:        6.1.6
+Version:        6.1.10
 Release:        1%{?dist}
 Summary:        Manage X.509 Public Key Infrastructure (PKI) security credentials
 
@@ -21,10 +21,6 @@ Group:          Applications/Internet
 License:        NCSA and BSD and ASL 2.0
 URL:            http://grid.ncsa.illinois.edu/myproxy/
 Source0:        http://www.globus.org/ftppub/gt6/packages/%{name}-%{version}.tar.gz
-#               Allow TLS
-Patch0:         %{name}-tls.patch
-#               Missing library linking
-Patch1:         %{name}-liblink.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  globus-common-devel >= 15
@@ -179,10 +175,6 @@ Package %{name}-doc contains the MyProxy documentation.
 
 %prep
 %setup -q
-%patch0 -p1
-touch -r configure.ac x
-%patch1 -p1
-touch -r x configure.ac
 
 %build
 # Reduce overlinking
@@ -244,11 +236,9 @@ install -p -m 644 myproxy.sysconfig \
    %{buildroot}%{_sysconfdir}/sysconfig/myproxy-server
 %else
 mkdir -p %{buildroot}%{_unitdir}
-mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d
-install -p -m 644 systemd/myproxy-server.conf \
-   %{buildroot}%{_sysconfdir}/tmpfiles.d/myproxy-server.conf
-install -p -m 644 systemd/myproxy-server.service \
-   %{buildroot}%{_unitdir}/myproxy-server.service
+mkdir -p %{buildroot}%{_tmpfilesdir}
+install -p -m 644 systemd/myproxy-server.service %{buildroot}%{_unitdir}
+install -p -m 644 systemd/myproxy-server.conf %{buildroot}%{_tmpfilesdir}
 %endif
 
 mkdir -p %{buildroot}%{_localstatedir}/lib/myproxy
@@ -361,8 +351,8 @@ fi
 %{_initddir}/myproxy-server
 %config(noreplace) %{_sysconfdir}/sysconfig/myproxy-server
 %else
-%config(noreplace) %{_sysconfdir}/tmpfiles.d/myproxy-server.conf
 %{_unitdir}/myproxy-server.service
+%{_tmpfilesdir}/myproxy-server.conf
 %endif
 %config(noreplace) %{_sysconfdir}/myproxy-server.config
 # myproxy-server wants exactly 700 permission on its data
@@ -398,6 +388,10 @@ fi
 %doc %{_pkgdocdir}/LICENSE*
 
 %changelog
+* Thu Dec 18 2014 Mattias Ellert <mattias.ellert at fysast.uu.se> - 6.1.10-1
+- Update to 6.1.10
+- Drop patches myproxy-tls.patch and myproxy-liblink.patch (fixed upstream)
+
 * Wed Nov 19 2014 Mattias Ellert <mattias.ellert at fysast.uu.se> - 6.1.6-1
 - Update to 6.1.6
 - Drop patch myproxy-deps.patch (fixed upstream)
diff --git a/sources b/sources
index fafea31..0682ced 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dec87fefd3059033d7c9ec4f5401903f  myproxy-6.1.6.tar.gz
+2e93092bb596a440ee5b124c3769d295  myproxy-6.1.10.tar.gz