From 473822dd8bd7e3443c6ef1beb8a8904a77932c29 Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@fedoraproject.org>
Date: Fri, 12 Feb 2010 20:43:18 +0000
Subject: [PATCH] - update to 0.18 - add support for using encrypted storage
 for keys, using PIN values     supplied directly or read from files whose
 names are supplied - don't choke on NSS database locations that use the
 "sql:" or "dbm:"     prefix

---
 .cvsignore      |  1 +
 certmonger.spec | 19 ++++++++++++++-----
 sources         |  2 +-
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 89159ef..01cc37f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 certmonger-0.17.tar.gz
+certmonger-0.18.tar.gz
diff --git a/certmonger.spec b/certmonger.spec
index fa91e43..63b4172 100644
--- a/certmonger.spec
+++ b/certmonger.spec
@@ -2,8 +2,8 @@
 %{?_with_check: %global pcheck 1}
 
 Name:		certmonger
-Version:	0.17
-Release:	2%{?dist}
+Version:	0.18
+Release:	1%{?dist}
 Summary:	Certificate status monitor and PKI enrollment client
 
 Group:		System Environment/Daemons
@@ -40,13 +40,15 @@ system enrolled with a certificate authority (CA) and keeping it enrolled.
 
 %build
 %configure --with-file-store-dir=%{_localstatedir}/lib/certmonger
-make %{?_smp_mflags}
+# For some reason, Fedora's xmlrpc-c-config just tells us about
+# libxmlrpc_client, but in F13 we need all of them.  Workaround.
+make %{?_smp_mflags} XMLRPC_LIBS="-lxmlrpc_client -lxmlrpc_util -lxmlrpc"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/certmonger/{cas,requests}
-%if 0%{?fedora} <= 9
+%if 0%{?fedora} <= 9 || 0%{?rhel} < 6
 mkdir -p $RPM_BUILD_ROOT/%{_initrddir}
 install -m755 src/certmonger.init $RPM_BUILD_ROOT/%{_initrddir}/certmonger
 %else
@@ -82,7 +84,7 @@ exit 0
 %defattr(-,root,root,-)
 %doc README LICENSE STATUS doc/*.txt
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/*
-%if 0%{?fedora} <= 9
+%if 0%{?fedora} <= 9 || 0%{?rhel} < 6
 %{_initrddir}/certmonger
 %else
 %{_initddir}/certmonger
@@ -94,6 +96,13 @@ exit 0
 %{_localstatedir}/lib/certmonger
 
 %changelog
+* Fri Feb 12 2010 Nalin Dahyabhai <nalin@redhat.com> 0.18-1
+- update to 0.18
+  - add support for using encrypted storage for keys, using PIN values
+    supplied directly or read from files whose names are supplied
+  - don't choke on NSS database locations that use the "sql:" or "dbm:"
+    prefix
+
 * Mon Jan 25 2010 Nalin Dahyabhai <nalin@redhat.com> 0.17-2
 - make the D-Bus configuration file (noreplace) (#541072)
 - make the %%check section and the deps we have just for it conditional on
diff --git a/sources b/sources
index e952f54..994e5ba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-55a3e841b82c32886840e3be94846c0a  certmonger-0.17.tar.gz
+7b20ca8e6123064c81964ef3af7e1bef  certmonger-0.18.tar.gz