From 1fb80b1ef7231ff2eed2a3494a461b6bcb850107 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Sat, 20 May 2017 00:59:47 +0200 Subject: [PATCH] add missing patch --- debian/patches/80_rpm_part_irrelevant.patch | 35 +++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 36 insertions(+) create mode 100644 debian/patches/80_rpm_part_irrelevant.patch diff --git a/debian/patches/80_rpm_part_irrelevant.patch b/debian/patches/80_rpm_part_irrelevant.patch new file mode 100644 index 0000000..46393bb --- /dev/null +++ b/debian/patches/80_rpm_part_irrelevant.patch @@ -0,0 +1,35 @@ +Author: Mario Fetka +Description: Remove the rpm part of contrib makefile +--- a/contrib/Makefile.in 2017-05-09 19:03:31.000000000 +0200 ++++ b/contrib/Makefile.in 2017-05-20 00:56:54.772000000 +0200 +@@ -85,30 +85,3 @@ + %.cgi : %.c + $(CC) $(CFLAGS) $(LDFLAGS) $< $(CGI_O) -o $@ + +-############################################################################## +-# rpm making automation for CentOS/RHEL. +- +-ARCH ?= $(shell arch) +-ifeq ($(ARCH),x86_64) +-RPM_ARCH := x86_64 +-else +- ifeq ($(ARCH),i686) +-RPM_ARCH := i386 +- else +-$(error Unknown arch "$(ARCH)".) +- endif +-endif +- +-rpm: +- # create nagios tar ball. +- @(cd ..;rm -f nagios-@VERSION@) +- @(cd ..;ln -s . nagios-@VERSION@) +- @(cd ..;tar zhcf nagios-@VERSION@.tar.gz --exclude nagios-@VERSION@/nagios-@VERSION@.tar.gz --exclude nagios-@VERSION@/nagios-@VERSION@ --exclude RCS --exclude CVS --exclude build-* --exclude *~ --exclude .git* nagios-@VERSION@/) +- @(cd ..;rm -f nagios-@VERSION@) +- # build the rpm using rpmbuild from ./rmbuild as topdir +- @rm -rf rpmbuild && mkdir -p rpmbuild/SOURCES +- @cp ../nagios-@VERSION@.tar.gz rpmbuild/SOURCES/nagios-@VERSION@.tar.gz +- @rpmbuild -ba --define "_topdir ${PWD}/rpmbuild" ../nagios.spec +- @mv rpmbuild/RPMS/$(RPM_ARCH)/*.rpm . +- @ls -l *.rpm +- diff --git a/debian/patches/series b/debian/patches/series index 08791fa..d6ec139 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ 52_nagios.cfg-debianize.patch 55_strip_logarchivepath.patch 70_fix_eventhandler_paths.patch +80_rpm_part_irrelevant.patch