From d2bae7c4969625680f1bf54024b420dceb21d166 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Sat, 23 Apr 2016 19:41:06 +0200 Subject: [PATCH] rpm: drop init-ceph.in-fedora.patch Signed-off-by: Nathan Cutler --- ceph.spec.in | 6 ------ rpm/init-ceph.in-fedora.patch | 18 ------------------ 2 files changed, 24 deletions(-) delete mode 100644 rpm/init-ceph.in-fedora.patch diff --git a/ceph.spec.in b/ceph.spec.in index 3f6adc53d69..5c79f9fedb8 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -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 index ff741f34123..00000000000 --- 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 -- 2.47.3