[icinga-checkins] icinga.org: icinga-core/next: icinga.spec: import from repoforge with rpmline fixes

git at icinga.org git at icinga.org
Fri Feb 15 00:58:18 CET 2013


Module: icinga-core
Branch: next
Commit: 7713a67adb71357c027e3096a746c852dff9fb75
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=7713a67adb71357c027e3096a746c852dff9fb75

Author: Michael Friedrich <michael.friedrich at gmail.com>
Date:   Fri Feb 15 00:56:02 2013 +0100

icinga.spec: import from repoforge with rpmline fixes

Conflicts:
	icinga.spec

---

 icinga.spec |   24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/icinga.spec b/icinga.spec
index 03f01af..de6a325 100644
--- a/icinga.spec
+++ b/icinga.spec
@@ -64,7 +64,7 @@ This package contains the webgui (html,css,cgi etc.) for %{name}
 
 %package devel
 Summary: Provides include files that Icinga-related applications may compile against
-Group: Development/Libraries/C and C++
+Group: Development/Libraries
 Requires: %{name} = %{version}
 
 %description devel
@@ -246,14 +246,14 @@ fi
 # cgi.cfg luckily knows where icinga.cfg is and does not need an update
 # retention.dat, objects.cache, objects.precache, status.dat, cmdfile, pidfile, checkresults
 %{__perl} -pi -e '
-        s|/var/icinga/retention.dat|%{spooldir}/retention.dat|;
-        s|/var/icinga/objects.precache|%{spooldir}/objects.precache|;
-        s|/var/icinga/objects.cache|%{spooldir}/objects.cache|;
-        s|/var/icinga/status.dat|%{spooldir}/status.dat|;
-        s|/var/icinga/rw/icinga.cmd|%{spooldir}/cmd/icinga.cmd|;
-        s|/var/icinga/icinga.pid|/var/run/icinga.pid|;
+	s|/var/icinga/retention.dat|%{spooldir}/retention.dat|;
+	s|/var/icinga/objects.precache|%{spooldir}/objects.precache|;
+	s|/var/icinga/objects.cache|%{spooldir}/objects.cache|;
+	s|/var/icinga/status.dat|%{spooldir}/status.dat|;
+	s|/var/icinga/rw/icinga.cmd|%{spooldir}/cmd/icinga.cmd|;
+	s|/var/icinga/icinga.pid|/var/run/icinga.pid|;
 	s|/var/icinga/checkresults|%{spooldir}/checkresults|;
-   ' /etc/icinga/icinga.cfg
+	' /etc/icinga/icinga.cfg
 
 # start icinga
 /sbin/service icinga start &>/dev/null || :
@@ -408,6 +408,7 @@ fi
 %{_includedir}/%{name}/
 
 %files idoutils
+%defattr(-,root,root)
 %doc README.idoutils.transitional
 
 %files idoutils-libdbi-mysql
@@ -436,8 +437,13 @@ fi
 
 
 %changelog
-* Wed Feb 06 2013 Michael Friedrich <michael.friedrich at netways.de> - 1.9.0-1
+* Thu Apr 25 2013 Michael Friedrich <michael.friedrich at netways.de> - 1.9.0-1
 - bump 1.9.0
+
+* Fri Feb 15 2013 Michael Friedrich <michael.friedrich at netways.de> - 1.8.4-4
+- fix rpmlint errors/warnings
+
+* Wed Feb 06 2013 Michael Friedrich <michael.friedrich at netways.de> - 1.8.4-3
 - add idoutils as transitional package (thx Stefan Marx, Michael Grüner)
 
 * Fri Feb 01 2013 Michael Friedrich <michael.friedrich at netways.de> - 1.8.4-2





More information about the icinga-checkins mailing list