[dirmngr] new upstream release

[Tomáš Mráz]

commit 18f9cfe2f5cc66f225995f57e99a1e793751042d
Author: Tomas Mraz <tmraz at fedoraproject.org>
Date:   Mon Apr 29 18:32:03 2013 +0200

    new upstream release

 dirmngr-1.1.0-no-blocking.patch |   81 ---------------------------------------
 dirmngr.spec                    |   27 ++++---------
 2 files changed, 9 insertions(+), 99 deletions(-)
---
diff --git a/dirmngr.spec b/dirmngr.spec
index a510c6e..5fdb698 100644
--- a/dirmngr.spec
+++ b/dirmngr.spec
@@ -3,15 +3,14 @@
 
 Name:	 dirmngr
 Summary: Client for Managing/Downloading CRLs
-Version: 1.1.0
-Release: 9%{?dist}
+Version: 1.1.1
+Release: 1%{?dist}
 
-License: GPLv2+ and GPLv3+ and OpenLDAP
+License: GPLv3+
 Group:	 System Environment/Libraries
 URL:	 http://www.gnupg.org/
 Source0: ftp://ftp.gnupg.org/gcrypt/dirmngr/dirmngr-%{version}.tar.bz2
 Source1: ftp://ftp.gnupg.org/gcrypt/dirmngr/dirmngr-%{version}.tar.bz2.sig
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source10: dirmngr.conf
 Source11: ldapservers.conf
@@ -20,9 +19,6 @@ Source13: dirmngrtmp.conf
 
 Patch1:  dirmngr-1.1.0-ocsp-crash.patch
 
-## upstream patches
-Patch20: dirmngr-1.1.0-no-blocking.patch
-
 BuildRequires: gawk
 BuildRequires: gettext
 BuildRequires: libassuan-devel >= 2.0.0
@@ -34,7 +30,6 @@ BuildRequires: pth-devel
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 Requires: logrotate
-Requires: /etc/tmpfiles.d
 
 %description
 Dirmngr is a server for managing and downloading certificate
@@ -49,8 +44,6 @@ the dirmngr-client tool.
 %setup -q
 %patch1 -p1 -b .crash
 
-%patch20 -p1 -b .no-blocking
-
 pushd doc
 iconv -f iso-8859-1 -t utf-8 dirmngr.texi -o dirmngr.texi.NEW && mv dirmngr.texi.NEW dirmngr.texi
 iconv -f iso-8859-1 -t utf-8 dirmngr.info -o dirmngr.info.NEW && mv dirmngr.info.NEW dirmngr.info
@@ -71,7 +64,6 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf %{buildroot}
 
 # dirs
 mkdir -p %{buildroot}%{_sysconfdir}/dirmngr/trusted-certs
@@ -89,7 +81,7 @@ install -p -m644 -D %{SOURCE12} %{buildroot}%{_sysconfdir}/logrotate.d/dirmngr
 install -p -m644 %{SOURCE10} %{SOURCE11} %{buildroot}%{_sysconfdir}/dirmngr/
 
 # autocreate /var/run/dirmngr on boot
-install -p -m644 -D %{SOURCE13} %{buildroot}%{_sysconfdir}/tmpfiles.d/dirmngrtmp.conf
+install -p -m644 -D %{SOURCE13} %{buildroot}%{_prefix}/lib/tmpfiles.d/dirmngr.conf
 
 %find_lang %{name}
 
@@ -111,10 +103,6 @@ if [ $1 -eq 0 ]; then
 fi
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING README ChangeLog NEWS
@@ -128,8 +116,8 @@ rm -rf %{buildroot}
 ## files/dirs for --daemon mode
 %dir %{_sysconfdir}/dirmngr
 %config(noreplace) %{_sysconfdir}/dirmngr/*.conf
-%config %{_sysconfdir}/logrotate.d/*
-%config(noreplace) %{_sysconfdir}/tmpfiles.d/*.conf
+%config(noreplace) %{_sysconfdir}/logrotate.d/*
+%{_prefix}/lib/tmpfiles.d/*.conf
 %{_var}/cache/dirmngr/
 %{_var}/lib/dirmngr/
 %{_var}/log/dirmngr/
@@ -137,6 +125,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Apr 29 2013 Tomáš Mráz <tmraz at redhat.com> - 1.1.1-1
+- new upstream release
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild