add missing patch

This commit is contained in:
Mario Fetka 2017-05-20 00:59:47 +02:00
parent c62d34af1e
commit 1fb80b1ef7
2 changed files with 36 additions and 0 deletions

View File

@ -0,0 +1,35 @@
Author: Mario Fetka <mario.fetka@gmail.com>
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
-

View File

@ -4,3 +4,4 @@
52_nagios.cfg-debianize.patch
55_strip_logarchivepath.patch
70_fix_eventhandler_paths.patch
80_rpm_part_irrelevant.patch