Hello community, here is the log from the commit of package ndoutils for openSUSE:Factory checked in at 2011-11-08 09:31:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ndoutils (Old) and /work/SRC/openSUSE:Factory/.ndoutils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ndoutils", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/ndoutils/ndoutils.changes 2011-09-23 02:14:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ndoutils.new/ndoutils.changes 2011-11-08 09:31:37.000000000 +0100 @@ -1,0 +2,15 @@ +Sun Nov 6 15:16:35 UTC 2011 - [email protected] + +- use macros defined in nagios-rpm-macros package +- added rpmlintrc for init file name + +------------------------------------------------------------------- +Sat Nov 5 10:24:23 UTC 2011 - [email protected] + +- spec-cleaner +- fix build: directories not owned by a package: + - /usr/lib/nagios/brokers +- rpmlint: wrong-file-end-of-line-encoding + docs/docbook/en-en: Makefile.in ent/documents.ent ent/version.ent + +------------------------------------------------------------------- New: ---- ndoutils-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ndoutils.spec ++++++ --- /var/tmp/diff_new_pack.KhN53w/_old 2011-11-08 09:31:38.000000000 +0100 +++ /var/tmp/diff_new_pack.KhN53w/_new 2011-11-08 09:31:38.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package ndoutils (Version 1.4b9) +# spec file for package ndoutils # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,17 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild -%define libexecdir %_prefix/lib/nagios/plugins -%define nsusr nagios -%define nsgrp nagios -%define cmdusr wwwrun -%define cmdgrp nagcmd - -#Distribution: %dist -#Packager: %packager -#Vendor: %vendor Name: ndoutils Summary: Nagios v3.x Data Output Utilities @@ -33,14 +23,16 @@ Release: 2 License: GPLv2+ Group: System/Monitoring -AutoReqProv: on Url: http://www.nagios.org/ -Source0: %name-%version.tar.bz2 -Source1: %name-init +Source0: %{name}-%{version}.tar.bz2 +Source1: %{name}-init Source2: ndoutils-README.SuSE -Patch: ndoutils-1.4b9-libpq-fe-include.patch +Source3: ndoutils-rpmlintrc +# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines +Patch0: ndoutils-1.4b9-libpq-fe-include.patch +Requires(pre): %insserv_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: %insserv_prereq +BuildRequires: nagios-rpm-macros %if 0%{?suse_version} > 1020 BuildRequires: libmysqlclient-devel %else @@ -67,14 +59,15 @@ Consider this addon to be experimental for the moment, although it will likely play a central role in the a new Nagios web interface in the future. + %package doc License: GPLv2+ Summary: Main documentation for ndoutils Group: Documentation/Other %if 0%{?suse_version} >= 1010 -Recommends: %name = %version +Recommends: %{name} = %{version} %else -Requires: %name = %version +Requires: %{name} = %{version} %endif %description doc @@ -83,53 +76,56 @@ %prep %setup -q -%patch -install -m644 %{S:2} README.SuSE +%patch0 +install -m644 %{SOURCE2} README.SuSE +## rpmlint +# wrong-file-end-of-line-encoding +pushd docs/docbook/en-en +%{__perl} -p -i -e 's|\r\n|\n|' Makefile.in ent/documents.ent ent/version.ent +popd %build %configure \ --enable-mysql \ - --with-mysql-lib=%_libdir/mysql \ - --with-mysql-inc=%_includedir/mysql \ - --localstatedir=%_localstatedir/lib/ndo \ + --with-mysql-lib=%{_libdir}/mysql \ + --with-mysql-inc=%{_includedir}/mysql \ + --localstatedir=%{_localstatedir}/lib/ndo \ --enable-pgsql \ - --with-pgsql-lib=%_libdir \ - --with-pgsql-inc=%_includedir/pgsql \ - --with-ndo2db-user=%nsusr \ - --with-ndo2db-group=%nsgrp + --with-pgsql-lib=%{_libdir} \ + --with-pgsql-inc=%{_includedir}/pgsql \ + --with-ndo2db-user=%{nagios_user} \ + --with-ndo2db-group=%{nagios_group} # do not use jobs here, makefile dependencies are unsafe -%__make +make %install -install -d %buildroot%_sysconfdir/init.d -install -d %buildroot%_sysconfdir/nagios -install -d %buildroot%_sbindir -install -d %buildroot%_bindir -install -d %buildroot%_prefix/lib/nagios/brokers -install -d %buildroot%_localstatedir/lib/ndo - -install -d %_builddir/%name-%version/examples - -install -m0755 src/ndo2db-3x %buildroot%_sbindir/ndo2db -install -m0755 src/file2sock %buildroot%_bindir/file2sock -install -m0755 src/log2ndo %buildroot%_bindir/log2ndo -install -m0755 src/sockdebug %buildroot%_bindir/sockdebug -install -m0755 src/ndomod-3x.o %buildroot%_prefix/lib/nagios/brokers/ndomod.o -install -m0755 %{S:1} %buildroot%_sysconfdir/init.d/ndo2db -ln -s %_sysconfdir/init.d/ndo2db %buildroot%_sbindir/rcndo2db +install -d %{buildroot}%{_sysconfdir}/init.d +install -d %{buildroot}%{nagios_sysconfdir} +install -d %{buildroot}%{_sbindir} +install -d %{buildroot}%{_bindir} +install -d %{buildroot}%{_prefix}/lib/nagios/brokers +install -d %{buildroot}%{_localstatedir}/lib/ndo + +install -d %{_builddir}/%{name}-%{version}/examples + +install -m0755 src/ndo2db-3x %{buildroot}%{_sbindir}/ndo2db +install -m0755 src/file2sock %{buildroot}%{_bindir}/file2sock +install -m0755 src/log2ndo %{buildroot}%{_bindir}/log2ndo +install -m0755 src/sockdebug %{buildroot}%{_bindir}/sockdebug +install -m0755 src/ndomod-3x.o %{buildroot}%{_prefix}/lib/nagios/brokers/ndomod.o +install -m0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/ndo2db +ln -s %{_sysconfdir}/init.d/ndo2db %{buildroot}%{_sbindir}/rcndo2db # # fix path names in config # -# install -m0644 config/ndo2db.cfg %buildroot%_sysconfdir/nagios/ndo2db.cfg -sed -e "s@^socket_name=.*@socket_name=/var/spool/nagios/ndo.sock@g" \ - -e "s@^debug_file=.*@debug_file=/var/log/nagios/ndo2db.debug@g" config/ndo2db.cfg-sample > %buildroot%_sysconfdir/nagios/ndo2db.cfg - -# install -m0644 config/ndomod.cfg %buildroot%_sysconfdir/nagios/ndomod.cfg -sed -e "s@^output=.*@output=/var/spool/nagios/ndo.sock@g" \ - -e "s@^buffer_file=.*@buffer_file=/var/spool/nagios/ndomod.tmp@g" config/ndomod.cfg-sample > %buildroot%_sysconfdir/nagios/ndomod.cfg +sed -e "s@^socket_name=.*@socket_name=%{nagios_spooldir}/ndo.sock@g" \ + -e "s@^debug_file=.*@debug_file=%{nagios_logdir}/ndo2db.debug@g" config/ndo2db.cfg-sample > %{buildroot}%{nagios_sysconfdir}/ndo2db.cfg + +sed -e "s@^output=.*@output=%{nagios_spooldir}/ndo.sock@g" \ + -e "s@^buffer_file=.*@buffer_file=%{nagios_spooldir}/ndomod.tmp@g" config/ndomod.cfg-sample > %{buildroot}%{nagios_sysconfdir}/ndomod.cfg -cat > %_builddir/%name-%version/config/nagios.cfg << EOF +cat > %{_builddir}/%{name}-%{version}/config/nagios.cfg << EOF # SAMPLE NAGIOS CONFIG SNIPPET FOR NDOMOD # # In order to have Nagios run the NDOMOD event broker module, you'll need @@ -137,10 +133,10 @@ # configuration file (nagios.cfg). # Uncomment the line below if you're running Nagios 3.x -#broker_module=%{_prefix}/lib/nagios/brokers/ndomod.o config_file=%{_sysconfdir}/nagios/ndo2db.cfg +#broker_module=%{_prefix}/lib/nagios/brokers/ndomod.o config_file=%{nagios_sysconfdir}/ndo2db.cfg EOF -cat > %_builddir/%name-%version/config/misccommands.cfg << EOF +cat > %{_builddir}/%{name}-%{version}/config/misccommands.cfg << EOF # SAMPLE NDO FILE ROTATION COMMAND # # This is an example Nagios command definition that can be used to @@ -148,22 +144,22 @@ # to suit your needs. This definition will need to be included in your # Nagios config files if you want to use it. -define command{ +define command { command_name rotate_ndo_log - command_line /bin/mv /var/spool/nagios/ndo.dat /var/spool/nagios/ndo.\`date +%s\` - } + command_line /bin/mv %{nagios_spooldir}/ndo.dat %{nagios_spooldir}/ndo.\`date +%s\` +} EOF # install docu -mkdir -p %buildroot/%_defaultdocdir/%name/ -cp -r db docs Changelog README* REQUIREMENTS TODO UPGRADING config/misccommands.cfg config/nagios.cfg %buildroot/%_defaultdocdir/%name/ +mkdir -p %{buildroot}/%{_defaultdocdir}/%{name}/ +cp -r db docs Changelog README* REQUIREMENTS TODO UPGRADING config/misccommands.cfg config/nagios.cfg %{buildroot}/%{_defaultdocdir}/%{name}/ # some rpmlint stuff ## files-duplicate %if 0%{?suse_version} > 1030 -%fdupes -s $RPM_BUILD_ROOT +%fdupes -s %{buildroot} %endif %if 0%{?fedora_version} > 8 -fdupes -q -n -r $RPM_BUILD_ROOT +fdupes -q -n -r %{buildroot} %endif %preun @@ -173,28 +169,29 @@ %insserv_cleanup ndo2db %clean -%{__rm} -rf ${RPM_BUILD_ROOT} +rm -rf %{buildroot} %files %defattr(-,root,root) -%exclude %_defaultdocdir/%name/docs -%config(noreplace) %attr(664,%{nsusr},%{cmdgrp}) %{_sysconfdir}/nagios/ndomod.cfg -%config(noreplace) %attr(660,%{nsusr},%{cmdgrp}) %{_sysconfdir}/nagios/ndo2db.cfg -%attr(0755,%{nsusr},%{nsgrp}) %dir %{_localstatedir}/lib/ndo -%_sysconfdir/init.d/ndo2db -%_bindir/file2sock -%_bindir/log2ndo -%_bindir/sockdebug -%_sbindir/ndo2db -%_sbindir/rcndo2db -%_prefix/lib/nagios/brokers/ndomod.o +%exclude %{_defaultdocdir}/%{name}/docs +%config(noreplace) %attr(664,%{nagios_user},%{nagios_command_group}) %{nagios_sysconfdir}/ndomod.cfg +%config(noreplace) %attr(660,%{nagios_user},%{nagios_command_group}) %{nagios_sysconfdir}/ndo2db.cfg +%attr(0755,%{nagios_user},%{nagios_group}) %dir %{_localstatedir}/lib/ndo +%{_sysconfdir}/init.d/ndo2db +%{_bindir}/file2sock +%{_bindir}/log2ndo +%{_bindir}/sockdebug +%{_sbindir}/ndo2db +%{_sbindir}/rcndo2db +%dir %{_prefix}/lib/nagios/brokers +%{_prefix}/lib/nagios/brokers/ndomod.o # change defattr %defattr(0644,root,root,0755) -%doc %_defaultdocdir/%name +%doc %{_defaultdocdir}/%{name} %files doc %defattr(0644,root,root,0755) -%doc %_defaultdocdir/%name/docs +%doc %{_defaultdocdir}/%{name}/docs %changelog ++++++ ndoutils-rpmlintrc ++++++ addFilter("incoherent-init-script-name.*ndo2db.*"); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
