]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rpm: drop init-ceph.in-fedora.patch
authorNathan Cutler <ncutler@suse.com>
Sat, 23 Apr 2016 17:41:06 +0000 (19:41 +0200)
committerBoris Ranto <branto@redhat.com>
Fri, 6 May 2016 11:44:15 +0000 (13:44 +0200)
Signed-off-by: Nathan Cutler <ncutler@suse.com>
ceph.spec.in
rpm/init-ceph.in-fedora.patch [deleted file]

index 3f6adc53d69b5a21789e5a8a672e8d8b90bea4e7..5c79f9fedb8c6c7444f07edf4662c2e43c83b624 100644 (file)
@@ -79,9 +79,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
 #################################################################################
@@ -656,9 +653,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
+++ /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