rpm: drop init-ceph.in-fedora.patch

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit e8cf501d0f22c757a0860a0c91dcb1d7a472ed34)

diff --git a/ceph.spec.in b/ceph.spec.in
index d0c360d0795bb96d0a79fc73ec4ea796ce61a791..9a60ce51885d8f9e5f6c04fdd688e9e52b2f7e0a 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -70,9 +70,6 @@ Group:         System/Filesystems
 %endif
 URL:           http://ceph.com/
 Source0:       http://ceph.com/download/%{name}-%{version}.tar.bz2
-%if 0%{?fedora} || 0%{?rhel}
-Patch0:                init-ceph.in-fedora.patch
-%endif
 #################################################################################
 # dependencies that apply across all distro families
 #################################################################################
@@ -622,9 +619,6 @@ python-cephfs instead.
 #################################################################################
 %prep
 %setup -q
-%if 0%{?fedora} || 0%{?rhel}
-%patch0 -p1 -b .init
-%endif
 
 %build
 %if 0%{with cephfs_java}

diff --git a/rpm/init-ceph.in-fedora.patch b/rpm/init-ceph.in-fedora.patch
deleted file mode 100644 (file)
index ff741f3..0000000
--- a/rpm/init-ceph.in-fedora.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -up ceph-0.46/src/init-ceph.in.orig ceph-0.46/src/init-ceph.in
---- ceph-0.46/src/init-ceph.in.orig    2012-04-24 16:06:39.000000000 -0400
-+++ ceph-0.46/src/init-ceph.in 2012-05-09 16:41:36.500004052 -0400
-@@ -1,11 +1,11 @@
- #!/bin/sh
- # Start/stop ceph daemons
--# chkconfig: 2345 60 80
-+# chkconfig: - 60 80
-
- ### BEGIN INIT INFO
- # Provides:          ceph
--# Default-Start:     2 3 4 5
--# Default-Stop:      0 1 6
-+# Default-Start:
-+# Default-Stop:
- # Required-Start:    $remote_fs $named $network $time
- # Required-Stop:     $remote_fs $named $network $time
- # Short-Description: Start Ceph distributed file system daemons at boot time