Nagios Support Forum

------=_Part_19993_31037295.1208893237023
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Hi Andreas,

thanks for your reply. I've patched the spec file, too. Testing done.
Patch attached.

######################################################################################################
diff -U 3 nagios-3.0.1-orig/nagios.spec nagios-3.0.1/nagios.spec
--- nagios-3.0.1-orig/nagios.spec 2008-04-01 21:32:05.000000000 +0200
+++ nagios-3.0.1/nagios.spec 2008-04-22 21:26:21.000000000 +0200
@@ -198,6 +198,7 @@
--bindir=%{_prefix}/sbin \
--sbindir=%{_prefix}/lib/nagios/cgi \
--libexecdir=%{_prefix}/lib/nagios/plugins \
+ --includedir=%{_prefix}/include/nagios \
--datadir=%{_prefix}/share/nagios \
--sysconfdir=/etc/nagios \
--localstatedir=/var/log/nagios \
@@ -264,9 +265,6 @@
cd ..
cd ..

-# install headers for development package
-install -m 0644 include/locations.h ${RPM_BUILD_ROOT}%{_prefix}/include/nagios
-
# install httpd configuration in RH80-style httpd config subdir
cp sample-config/httpd.conf ${RPM_BUILD_ROOT}/etc/httpd/conf.d/nagios.conf

@@ -331,10 +329,14 @@
%files devel
%defattr(-,root,root)
%dir %{_prefix}/include/nagios
-%{_prefix}/include/nagios/locations.h
+%{_prefix}/include/nagios/*.h


%changelog
+* Tue Apr 22 2008 Tobias Mucke
+- added include dir to configure statement
+- added header files to development package
+
* Tue Nov 22 2005 Andreas Kasenides
- packaged %{_prefix}/sbin/new_mini_epn
- moved resource.cfg in /etc/nagios
######################################################################################################

I also changed the new file include/Makefile.in because in this
version of Nagios there aren't some header files mentioned in the
first version of include/Makefile.in anymore.

######################################################################################################
###############################
# Makefile for Include Files
#
# Last Modified: 10-18-2007
# Last Modified: 04-13-2008
###############################

prefix=@prefix@
INCLUDEDIR=@includedir@
INSTALL=@INSTALL@
INSTALL_OPTS=@INSTALL_OPTS@

clean:
rm -f *~

distclean: clean
rm -f cgiutils.h config.h locations.h snprintf.h

devclean: distclean

install:
$(MAKE) install-basic

install-basic:
$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(INCLUDEDIR)
for file in *.h; do \
$(INSTALL) -m 644 $(INSTALL_OPTS) $$file
$(DESTDIR)$(INCLUDEDIR); \
done
######################################################################################################

By the way: I had some problems to apply my patches to the Makefiles
after copying them out of my web mailer again, because there need to
be tabs not spaces in front of each line. I hope it is possible to
send files as attachements to the mailing list, so that you can apply
them more easily.

Thanks.

Tobias

------=_Part_19993_31037295.1208893237023
Content-Type: text/x-patch; name=nagios.spec.patch
Content-Transfer-Encoding: base64
X-Attachment-Id: f_ffcvlsoj0
Content-Disposition: attachment; filename=nagios.spec.patch

LS0tIG5hZ2lvcy0zLjAuMS1vcmlnL25hZ2lvcy5zcGVjCTIwMDgtMDQtMDEgMjE6MzI6MDUuMDAw
MDAwMDAwICswMjAwCisrKyBuYWdpb3MtMy4wLjEvbmFnaW9zLnNwZWMJMjAwOC0wNC0yMiAyMToy
NjoyMS4wMDAwMDAwMDAgKzAyMDAKQEAgLTE5OCw2ICsxOTgsNyBAQAogCS0tYmluZGlyPSV7X3By
ZWZpeH0vc2JpbiBcCiAJLS1zYmluZGlyPSV7X3ByZWZpeH0vbGliL25hZ2lvcy9jZ2kgXAogCS0t
bGliZXhlY2Rpcj0le19wcmVmaXh9L2xpYi9uYWdpb3MvcGx1Z2lucyBcCisJLS1pbmNsdWRlZGly
PSV7X3ByZWZpeH0vaW5jbHVkZS9uYWdpb3MgXAogCS0tZGF0YWRpcj0le19wcmVmaXh9L3NoYXJl
L25hZ2lvcyBcCiAJLS1zeXNjb25mZGlyPS9ldGMvbmFnaW9zIFwKIAktLWxvY2Fsc3RhdGVkaXI9
L3Zhci9sb2cvbmFnaW9zIFwKQEAgLTI2NCw5ICsyNjUsNiBAQAogY2QgLi4KIGNkIC4uCiAKLSMg
aW5zdGFsbCBoZWFkZXJzIGZvciBkZXZlbG9wbWVudCBwYWNrYWdlCi1pbnN0YWxsIC1tIDA2NDQg
aW5jbHVkZS9sb2NhdGlvbnMuaCAke1JQTV9CVUlMRF9ST09UfSV7X3ByZWZpeH0vaW5jbHVkZS9u
YWdpb3MKLQogIyBpbnN0YWxsIGh0dHBkIGNvbmZpZ3VyYXRpb24gaW4gUkg4MC1zdHlsZSBodHRw
ZCBjb25maWcgc3ViZGlyCiBjcCBzYW1wbGUtY29uZmlnL2h0dHBkLmNvbmYgJHtSUE1fQlVJTERf
Uk9PVH0vZXRjL2h0dHBk

...[email truncated]...


This post was automatically imported from historical nagios-devel mailing list archives
Original poster: [email protected]