[Libvirt-cim] [PATCH] fix spec file for sblim-sfcb and systemctl

[Daniel Veillard]

On Fri, Mar 09, 2012 at 09:32:58AM +0100, Klaus Kaempf wrote:
> Daniel,
> 
> thanks for the patch.
> 
> * Daniel Veillard <veillard at redhat.com> [Mar 09. 2012 08:12]:
> >   Right now the spec file is completely tied to tog-pegasus,
> > this should allow the spec file to be compatible with sblim-sfcb
> > too. This also switches to systemctl which is now used in Fedora.
> > 
> >   I would actually like some feedback on the patch if someone
> > has an environment to test with sblim-sfcb
> 
> I'll test later today.
> For reference, you might want to take a look at the spec file of
> https://build.opensuse.org/package/files?package=libvirt-cim&project=systemsmanagement%3Awbem
> which is a pure-sfcb variant.
> 
> > 
> >   Also I noted that if I built the package with sblim-sfcb installed
> > it failed in the make install phase with the following error:
> 
> Thats a bug in the Makefile.am which does an incomplete substitution -
> patch attached.
> 
> Regards,
> 
> Klaus
> ---
> SUSE LINUX Products GmbH, GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 16746 (AG Nürnberg)
> Maxfeldstraße 5, 90409 Nürnberg, Germany

> diff -wruN -x '*~' ../orig-libvirt-cim-0.6.1/Makefile.am ./Makefile.am
> --- ../orig-libvirt-cim-0.6.1/Makefile.am	2012-02-08 14:23:43.000000000 +0100
> +++ ./Makefile.am	2012-02-09 16:45:16.000000000 +0100
> @@ -189,7 +189,7 @@
>  	$(install_sh_DATA) -t "$(DESTDIR)$(pkgdatadir)" $(INTEROP_MOFS)
>  	$(install_sh_DATA) -t "$(DESTDIR)$(pkgdatadir)" $(INTEROP_REGS)
>  	if [[ @CIMSERVER@ != pegasus ]]; then \
> -	sed -i '/^# --/,/^# --!/d' $(subst schema,$(DESTDIR)$(pkgdatadir), $(PGINTEROP_REGS)); \
> +	sed -i '/^# --/,/^# --!/d' $(subst ./schema,$(DESTDIR)$(pkgdatadir), $(PGINTEROP_REGS)); \
>  	fi
>  
>  uninstall-local:

  Okay, I also pushed Klaus' patch today,

Daniel

-- 
Daniel Veillard      | libxml Gnome XML XSLT toolkit  http://xmlsoft.org/
daniel at veillard.com  | Rpmfind RPM search engine http://rpmfind.net/
http://veillard.com/ | virtualization library  http://libvirt.org/