Merge pull request #37 from opinkerfi/filter-out-perl-utils

fixed perl-utils dependency problem by filtering out in spec file

.travis.yml

@@ -1,47 +0,0 @@
-#sudo: required
-#env:
-#  matrix:
-#  - OS_TYPE=centos OS_VERSION=6
-#  - OS_TYPE=centos OS_VERSION=7
-#
-#services:
-#  - docker
-#
-#before_install:
-#  - sudo apt-get update
-#  - echo 'DOCKER_OPTS="-H tcp://127.0.0.1:2375 -H unix:///var/run/docker.sock -s devicemapper"' | sudo tee /etc/default/docker > /dev/null
-#  - sudo service docker restart
-#  - sleep 5
-#  - sudo docker pull centos:centos${OS_VERSION}
-#
-#
-#script:
-# # Run tests in Container
-# - tests/setup_tests.sh ${OS_VERSION}
-#
-sudo: required
-language: python
-
-env:
-  global:
-    - DOCKER_IMAGE=alectolytic/rpmbuilder
-    - COPR_REPOSITORY=opinkerfi/nagios-plugins
-    - OS_ARCH=x86_64
-  matrix:
-    #    - OS_TYPE=fedora OS_DIST=fedora OS_VERSION=24
-    - OS_TYPE=centos OS_DIST=epel OS_VERSION=7
-
-services:
-  - docker
-
-install: true
-
-script:
- - docker run -v ${PWD}/check_firewall_active:/sources -v ${PWD}:/output:Z -e "SRPM_ONLY=1" ${DOCKER_IMAGE}:${OS_TYPE}-${OS_VERSION}
-   #        - docker run -v ${PWD}/check_firewall_active:/sources:ro -v ${PWD}:/output:rw -v ${PWD}/workspace:/workspace:rw -v ${PWD}/rpmbuild:/rpmbuild:rw -e "SRPM_ONLY=1" ${DOCKER_IMAGE}:${OS_TYPE}-${OS_VERSION}
-
-after_success:
-  - pip install copr-cli simplejson
-  - openssl aes-256-cbc -K $encrypted_f965aefb5778_key -iv $encrypted_f965aefb5778_iv -in .copr.enc -out .copr -d 
-  - if [ ! -z "${TRAVIS_TAG}" ]; then copr-cli --config .copr build -r ${OS_DIST}-${OS_VERSION}-${OS_ARCH} ${COPR_REPOSITORY} *.src.rpm; fi
-

check_bl/nagios-okplugin-mailblacklist.spec

@@ -3,7 +3,7 @@
 Summary:	A Nagios plugin to check SMTP blacklists
 Name:		nagios-okplugin-mailblacklist
 Version:	1.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		Applications/System
 URL:		http://opensource.ok.is/trac/wiki/Nagios-OKPlugin-MailBlacklist
@@ -11,7 +11,7 @@ Source0:	http://opensource.ok.is/trac/browser/nagios-plugins/check_bl/releases/%
 Requires:	nagios-plugins
 Requires:	nagios-plugins-perl
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Packager:	Tomas Edwardsson <tommi@ok.is>
+Packager:	Gardar Thorsteinsson <gardar@ok.is>
 BuildArch:	noarch
 
 
@@ -22,6 +22,8 @@ Checks DNS Blacklists for existance of hosts
 %setup -q
 perl -pi -e "s|/usr/lib|%{_libdir}|g" check_bl
 
+%global __requires_exclude %{?__requires_exclude:%__requires_exclude}|}^perl\\(utils\\)
+
 %build
 
 
@@ -38,6 +40,9 @@ rm -rf %{buildroot}
 %{_libdir}/nagios/plugins/*
 
 %changelog
+* Fri May 04 2018 Richard Allen <ra@ok.is> 1.1-2
+- Filter out perl-utils dependancy
+
 * Thu Feb 20 2014 Pall Sigurdsson <palli@opensource.is> 1.1-1
 - 
 

check_brocade/nagios-okplugin-brocade.spec

@@ -3,14 +3,14 @@
 Summary:	A Nagios plugin to check Brocade devices
 Name:		nagios-okplugin-brocade
 Version:	0.0.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		Applications/System
 URL:		http://opensource.ok.is/trac/wiki/Nagios-OKPlugin-Brocade
 Source0:	http://opensource.ok.is/trac/browser/nagios-plugins/check_brocade/releases/nagios-okplugin-brocade-%{version}.tar.gz
 Requires:	perl-Nagios-Plugin
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Packager:	Tomas Edwardsson <tommi@ok.is>
+Packager:	Gardar Thorsteinsson <gardar@ok.is>
 
 
 %description
@@ -20,6 +20,8 @@ Checks Brocade devices
 %setup -q
 perl -pi -e "s|/usr/lib|%{_libdir}|g" check_brocade_env
 
+%global __requires_exclude %{?__requires_exclude:%__requires_exclude}|}^perl\\(utils\\)
+
 %build
 
 
@@ -36,6 +38,9 @@ rm -rf %{buildroot}
 %{_libdir}/nagios/plugins/*
 
 %changelog
+* Fri May 09 2018 Gardar Thorsteinsson <gardar@ok.is> 0.0.5-2
+- filter out perl-utils dep
+
 * Thu Feb 20 2014 Pall Sigurdsson <palli@opensource.is> 0.0.5-1
 - 
 

check_cifs/nagios-okplugin-cifs.spec

@@ -3,7 +3,7 @@
 Summary:	A Nagios plugin to check CIFS shares
 Name:		nagios-okplugin-cifs
 Version:	1.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		Applications/System
 URL:		http://opensource.ok.is/trac/wiki/Nagios-OKPlugin-Brocade
@@ -11,7 +11,7 @@ Source0:	http://opensource.ok.is/trac/browser/nagios-plugins/check_cifs/releases
 Requires:	perl-Nagios-Plugin
 Requires:	samba-client, krb5-workstation
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Packager:	Tomas Edwardsson <tommi@ok.is>
+Packager: Gardar Thorsteinsson <gardar@ok.is>	
 BuildArch:	noarch
 
 
@@ -23,6 +23,8 @@ NTML authentication
 %setup -q
 perl -pi -e "s|/usr/lib|%{_libdir}|g" check_cifs
 
+%global __requires_exclude %{?__requires_exclude:%__requires_exclude}|}^perl\\(utils\\)
+
 %build
 
 
@@ -39,6 +41,9 @@ rm -rf %{buildroot}
 %{_libdir}/nagios/plugins/*
 
 %changelog
+* Fri May 09 2018 Gardar Thorsteinsson <gardar@ok.is> 1.1-2
+- Filter out perl-utils dep
+
 * Thu Feb 20 2014 Pall Sigurdsson <palli@opensource.is> 1.1-1
 - Merge github.com:opinkerfi/misc (palli@opensource.is)
 

check_msa_hardware-pl/nagios-okplugin-check_msa.spec

@@ -1,11 +1,11 @@
 %define debug_package %{nil}
 %define plugin check_msa_hardware
-%define packager Pall Sigurdsson <palli@opensource.is>
+%define packager Gardar Thorsteinsson <gardar@ok.is>
 
 Summary:	A Nagios plugin to check status of an MSA (HP P2000) disk array
 Name:		nagios-okplugin-%{plugin}
 Version:	1.0.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv3+
 Group:		Applications/System
 URL:		https://github.com/opinkerfi/nagios-plugins/tree/master/%{plugin}
@@ -21,6 +21,8 @@ Checks status of a remote MSA disk array, also known as HP P2000
 %prep
 %setup -q
 
+%global __requires_exclude %{?__requires_exclude:%__requires_exclude}|}^perl\\(utils\\)
+
 %build
 
 
@@ -46,6 +48,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/nrpe.d/%{plugin}.cfg
 
 %changelog
+* Fri May 09 2018 Gardar Thorsteinsson <gardar@ok.is> 1.0.5-2
+- Filter out perl-utils dep
+
 * Thu Jan 30 2014 Pall Sigurdsson <palli@opensource.is> 1.0.5-1
 - 
 

check_snmp/nagios-okplugin-check_snmp.spec

@@ -3,14 +3,14 @@
 Summary:	Various nagios plugins to check cpu,memory,interfaces via SNMP
 Name:		nagios-okplugin-check_snmp
 Version:	2
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		Applications/System
 URL:		http://opensource.is/trac/wiki/check_snmp
 Source0:	http://opensource.ok.is/trac/browser/nagios-plugins/check_snmp/releases/nagios-okplugin-check_snmp-%{version}.tar.gz
 Requires:	perl-Net-SNMP
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Packager:	Pall Sigurdsson <palli@opensource.is>
+Packager:	Gardar Thorsteinsson <gardar@ok.is>
 
 
 %description
@@ -20,6 +20,8 @@ Various nagios plugins to check cpu,memory,interfaces via SNMP
 %setup -q
 #perl -pi -e "s|/usr/lib|%{_libdir}|g" nrpe.d/check_hpacucli.cfg
 
+%global __requires_exclude %{?__requires_exclude:%__requires_exclude}|}^perl\\(utils\\)
+
 %build
 
 
@@ -45,6 +47,9 @@ rm -rf %{buildroot}
 %{_libdir}/nagios/plugins/*
 
 %changelog
+* Fri May 09 2018 Gardar Thorsteinsson <gardar@ok.is> 2-2
+- Filter out perl-utils dep
+
 * Thu Feb 20 2014 Pall Sigurdsson <palli@opensource.is> 2-1
 - make sure nagios does not run us in embedded perl (palli@opensource.is)
 

tests/setup_tests.sh

@@ -1,24 +0,0 @@
-#!/bin/sh -xe
-
-# This script starts docker and systemd (if el7)
-
-# Version of CentOS/RHEL
-el_version=$1
-
- # Run tests in Container
-if [ "$el_version" = "6" ]; then
-
-sudo docker run --rm=true -v `pwd`:/nagios-plugins:rw centos:centos${OS_VERSION} /bin/bash -c "bash -xe /nagios-plugins/tests/test_inside_docker.sh ${OS_VERSION}"
-
-elif [ "$el_version" = "7" ]; then
-
-docker run --privileged -d -ti -e "container=docker"  -v /sys/fs/cgroup:/sys/fs/cgroup -v `pwd`:/nagios-plugins:rw  centos:centos${OS_VERSION}   /usr/sbin/init
-DOCKER_CONTAINER_ID=$(docker ps | grep centos | awk '{print $1}')
-docker logs $DOCKER_CONTAINER_ID
-docker exec -ti $DOCKER_CONTAINER_ID /bin/bash -xec "bash -xe /nagios-plugins/tests/test_inside_docker.sh ${OS_VERSION};
-  echo -ne \"------\nEND NAGIOS-PLUGINS TESTS\n\";"
-docker ps -a
-docker stop $DOCKER_CONTAINER_ID
-docker rm -v $DOCKER_CONTAINER_ID
-
-fi

tests/test_inside_docker.sh

@@ -1,2 +0,0 @@
-echo "Keyrsla fyrir CentOS $1"
-ls -l /