rpms/sks/devel sks-1.1.1-bdb.patch,NONE,1.1 sks.spec,1.2,1.3

Nick Bebout nb at fedoraproject.org
Wed May 19 03:57:32 UTC 2010


Author: nb

Update of /cvs/pkgs/rpms/sks/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv9777

Modified Files:
	sks.spec 
Added Files:
	sks-1.1.1-bdb.patch 
Log Message:
Fix FTBFS

sks-1.1.1-bdb.patch:
 bdb_stubs.c |    4 ----
 1 file changed, 4 deletions(-)

--- NEW FILE sks-1.1.1-bdb.patch ---
--- sks-1.1.1-fixed/bdb/bdb_stubs.c	2010-05-18 23:37:38.000000000 -0400
+++ sks-1.1.1/bdb/bdb_stubs.c	2009-03-25 21:18:03.000000000 -0400
@@ -19,10 +19,6 @@
 #include <string.h>
 #include "bdb_stubs.h"
 
-#ifndef DB_XA_CREATE
-#define DB_XA_CREATE 0
-#endif
-
 #define True 1
 #define False 0
 


Index: sks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sks/devel/sks.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sks.spec	30 Mar 2010 04:13:17 -0000	1.2
+++ sks.spec	19 May 2010 03:57:32 -0000	1.3
@@ -7,6 +7,7 @@ Group:          System Environment/Daemo
 URL:            http://code.google.com/p/sks-keyserver/
 Source0:        http://sks-keyserver.googlecode.com/files/sks-1.1.1.tgz
 Patch0:         sks-1.1.1-libdb.patch
+Patch1:		sks-1.1.1-bdb.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  ocaml ocaml-camlp4-devel db4-devel zlib-devel chrpath
 
@@ -17,6 +18,7 @@ deploy, decentralized, and highly reliab
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %__mv Makefile.local.unused Makefile.local
@@ -41,8 +43,8 @@ chrpath --delete %{buildroot}%{_bindir}/
 %{_mandir}/man8/sks.8.gz
 
 %changelog
-* Mon Mar 29 2010 Nick Bebout <nb at fedoraproject.org> - 1.1.1-3
-- Fix LIBDB so sks builds again
+* Tue Apr 20 2010 Nick Bebout <nb at fedoraproject.org> - 1.1.1-3
+- Fix FTBFS
 * Wed Oct 14 2009 Nick Bebout <nb at fedoraproject.org> - 1.1.1-2
 - Add CFLAGS to make all
 * Tue Oct 13 2009 Nick Bebout <nb at fedoraproject.org> - 1.1.1-1



More information about the scm-commits mailing list