Patches to get Nagios header files also installed

[Tobias Mucke]

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 <mucke at users.sourceforge.net>
+- added include dir to configure statement
+- added header files to development package
+
 * Tue Nov 22 2005 Andreas Kasenides <ank {at} cs.ucy.ac.cy>
 - 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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: nagios.spec.patch
Type: text/x-patch
Size: 1190 bytes
Desc: not available
URL: <https://www.monitoring-lists.org/archive/developers/attachments/20080422/7de5fb0d/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: Makefile.in
Type: application/octet-stream
Size: 555 bytes
Desc: not available
URL: <https://www.monitoring-lists.org/archive/developers/attachments/20080422/7de5fb0d/attachment.obj>
-------------- next part --------------
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
-------------- next part --------------
_______________________________________________
Nagios-devel mailing list
Nagios-devel at lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nagios-devel