[ceph] - remove include of curl/types.h since it's not used anymore

Josef Bacik josef at fedoraproject.org
Tue Jul 12 20:47:43 UTC 2011


commit 454e44368059b40b5e55092d705588fc276fc4a8
Author: Josef Bacik <josef at redhat.com>
Date:   Tue Jul 12 16:47:16 2011 -0400

    - remove include of curl/types.h since it's not used anymore

 ceph-compilefix.patch |   11 +++++++++++
 ceph.spec             |    7 ++++++-
 2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/ceph-compilefix.patch b/ceph-compilefix.patch
new file mode 100644
index 0000000..c91cb24
--- /dev/null
+++ b/ceph-compilefix.patch
@@ -0,0 +1,11 @@
+diff -up ceph-0.31/src/rgw/rgw_os.cc.compilefix ceph-0.31/src/rgw/rgw_os.cc
+--- ceph-0.31/src/rgw/rgw_os.cc.compilefix	2011-07-12 16:33:05.015272759 -0400
++++ ceph-0.31/src/rgw/rgw_os.cc	2011-07-12 16:33:11.849133140 -0400
+@@ -3,7 +3,6 @@
+ #include <unistd.h>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ #include "rgw_common.h"
diff --git a/ceph.spec b/ceph.spec
index d662cd4..d99d293 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -1,6 +1,6 @@
 Name:          ceph
 Version:       0.31
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       User space components of the Ceph file system
 License:       LGPLv2
 Group:         System Environment/Base
@@ -8,6 +8,7 @@ URL:           http://ceph.newdream.net/
 
 Source:        http://ceph.newdream.net/download/%{name}-%{version}.tar.gz
 Patch0:        ceph-init-fix.patch
+Patch1:        ceph-compilefix.patch
 BuildRequires: fuse-devel, libtool, libtool-ltdl-devel, boost-devel, 
 BuildRequires: libedit-devel, fuse-devel, git, perl, gdbm,
 BuildRequires: cryptopp-devel, libatomic_ops-devel, google-perftools-devel
@@ -73,6 +74,7 @@ file system.
 %prep
 %setup -q
 %patch0 -p1 -b .init
+%patch1 -p1 -b .compilefix
 
 %build
 ./autogen.sh
@@ -219,6 +221,9 @@ fi
 %{_bindir}/boto_tool
 
 %changelog
+* Tue Jul 12 2011 Josef Bacik <josef at toxicpanda.com> 0.31-2
+- Remove curl/types.h include since we don't use it anymore
+
 * Tue Jul 12 2011 Josef Bacik <josef at toxicpanda.com> 0.31-1
 - Update to 0.31
 


More information about the scm-commits mailing list