[Pkg-libvirt-maintainers] Pushing Ubuntu's AppArmor-related delta into the Debian libvirt package?

[Serge Hallyn]

Quoting Stefan Bader (stefan.bader at canonical.com):
> On 25.09.2014 22:15, Serge Hallyn wrote:
> > Quoting Stefan Bader (stefan.bader at canonical.com):
> >> On 22.09.2014 16:05, Serge Hallyn wrote:
> >>> Hi Stefan,
> >>>
> >>> didn't mean to derail you with that.  I'd suggest just sending the delta minus
> >>> the local apparmor bit, then we can address that separately.
> >>>
> >> Oh, I rather did derail myself because I wanted to get it right. Also was an
> >> opportunity to learn (or rather refresh my memory) on the compile environment
> >> for the git version. I think the piece missing after just installing everything
> >> that is build-dep on the Debian package was the dtd for xsltproc (because that
> >> gets called with "nonet").
> >>
> >> So this would be the proposal to send to libvirt-devel. Not sure the local
> >> config file can be done cleaner. Would someone else know a way to cause a rename
> >> through Makefile.am?
> > 
> > Can you just add a install-data: rule that moves the file?
> 
> I do not know. That is why I was asking the question. And I would want to try
> being in line with the upstream method. But I am not that much into automake.

All right, the following works.  the _DATA installs the file with its
temporary name, then the install-data-hook moves it to where we want
it.

Index: libvirt-1.2.8/examples/apparmor/Makefile.am
===================================================================
--- libvirt-1.2.8.orig/examples/apparmor/Makefile.am
+++ libvirt-1.2.8/examples/apparmor/Makefile.am
@@ -35,6 +35,14 @@ abstractions_DATA = \
 	libvirt-lxc \
 	$(NULL)
 
+localdir = $(apparmordir)/local
+
+local_DATA = \
+	local-usr.sbin.libvirtd
+
+install-data-hook:
+	mv $(DESTDIR)$(localdir)/local-usr.sbin.libvirtd $(DESTDIR)$(localdir)/usr.sbin.libvirtd
+
 templatesdir = $(apparmordir)/libvirt
 templates_DATA = \
 	TEMPLATE.qemu \