On 2/17/2010 12:21 PM, Angus Salkeld wrote:
> On Wed, 2010-02-17 at 07:47 +0100, Fabio M. Di Nitto wrote:
>> I only have a few comments, some of them we discussed on IRC.
>>
>> When adding new files, you need to update the corosync.spec.in too.
>> In general my policy has always been that (s)rpm from development should
>> enable all features and ships all files.
>>
>> Since those files are useful only when augtool are available, I suggest
>> you create a separate binary rpm to ship them (call it corosync-augeas
>> for example) that will Requires: augeas as dependency.
>>
>> This way, it´s clear what those files do, they don´t interfere with
>> normal packaging, and they become optionally installable even in testing.
>>
>> Fabio
>>
>
> Here is a patch that should do the trick.
The Patch is fine, but please split it in 2 commits. Makefile.am -> fix
make dist-check (also try to keep lines < 80 cols ;)) and release
tarball and spec file for augeas.
Thanks
Fabio
>
> -Angus
>
> Index: corosync.spec.in
> ===================================================================
> --- corosync.spec.in (revision 2658)
> +++ corosync.spec.in (working copy)
> @@ -43,6 +43,7 @@
> %{configure} \
> --enable-nss \
> --enable-rdma \
> + --enable-augeas \
> --with-initddir=%{_initddir}
>
> %build
> @@ -210,6 +211,22 @@
> %{_mandir}/man8/coroipc_overview.8*
> %{_mandir}/man8/sam_overview.8*
>
> +%package -n corosync-augeas
> +BuildArch: noarch
> +Summary: The Augeas len for the Corosync Cluster Engine configuration file
> +Group: System Environment/Libraries
> +Requires: %{name} = %{version}-%{release}
> +Requires: augeas
> +
> +%description -n corosync-augeas
> +This package contains the augeas lens for corosync.conf.
> +
> +%files -n corosync-augeas
> +%defattr(-,root,root,-)
> +%doc LICENSE
> +%{_datadir}/augeas/lenses/corosync.aug
> +%{_datadir}/augeas/lenses/tests/test_corosync.aug
> +
> %changelog
> * @date@ Autotools generated version <[email protected]> -
> @vers...@-1.@alphatag@
> - Autotools generated version
> Index: Makefile.am
> ===================================================================
> --- Makefile.am (revision 2658)
> +++ Makefile.am (working copy)
> @@ -33,7 +33,8 @@
>
> TARFILE = $(PACKAGE_NAME)-$(VERSION).tar.gz
>
> -EXTRA_DIST = autogen.sh conf/corosync.conf.example $(SPEC).in
> +EXTRA_DIST = autogen.sh conf/corosync.conf.example $(SPEC).in \
> + conf/lenses/corosync.aug
> conf/lenses/tests/test_corosync.aug
>
> AUTOMAKE_OPTIONS = foreign
>
>
>
_______________________________________________
Openais mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/openais
