From 1bd485daf1544e9b7b9bf020783f6aa0b0085c0b Mon Sep 17 00:00:00 2001 From: Daniel Hokka Zakrisson Date: Tue, 15 Mar 2011 20:40:00 +0100 Subject: [PATCH] Include directories in manifest --- contrib/make-deb-manifest | 2 +- contrib/make-manifest | 5 ++++- contrib/manifest.dat.pathsubst | 16 ++++++++++++++++ util-vserver.spec.in | 17 ----------------- 4 files changed, 21 insertions(+), 19 deletions(-) diff --git a/contrib/make-deb-manifest b/contrib/make-deb-manifest index 44ee869..2bdf68f 100755 --- a/contrib/make-deb-manifest +++ b/contrib/make-deb-manifest @@ -58,6 +58,6 @@ while read style file; do fi for i in ${DESTDIR}$file; do i=${i#${DESTDIR}} - echo "$i ${i%/*}" >>${fullname}.install + echo "${i%/} ${i%/*}" >>${fullname}.install done done < $data diff --git a/contrib/make-manifest b/contrib/make-manifest index fd0d7b2..fd418f2 100755 --- a/contrib/make-manifest +++ b/contrib/make-manifest @@ -33,5 +33,8 @@ while read style file; do case "$style" in (\#*) continue;; esac - echo "$file" >>$name-$style.list + if test "${file%/}" != "$file"; then + echo -n '%dir ' + fi + echo "${file%/}" >>$name-$style.list done diff --git a/contrib/manifest.dat.pathsubst b/contrib/manifest.dat.pathsubst index b284264..e59680e 100644 --- a/contrib/manifest.dat.pathsubst +++ b/contrib/manifest.dat.pathsubst @@ -161,3 +161,19 @@ legacy @CONFIG_NOREPLACE@ @SYSCONFDIR@/vservers.conf build @CONFIG_NOREPLACE@ @CONFDIR@/.distributions/*/apt/sources.list @HAVE_PYTHON_TRUE@python @PYEXECDIR@/* base /sbin/vshelper +base @SYSCONFDIR@/vservers/ +base @SYSCONFDIR@/vservers/.defaults/ +base @SYSCONFDIR@/vservers/.defaults/apps/ +base @SYSCONFDIR@/vservers/.defaults/files/ +base @PKGLIBDIR@/defaults/ +base @PKGCACHEDIR@/ +base @PKGSTATEDIR@/ +base @PKGSTATEREVDIR@/ +base @VSHELPERSTATEDIR@/ +core @PKGLIBDIR@/ +legacy @LEGACYDIR@/ +build @SYSCONFDIR@/vservers/.distributions/ +build @SYSCONFDIR@/vservers/.distributions/.common/ +build @SYSCONFDIR@/vservers/.distributions/.common/pubkeys/ +build @SYSCONFDIR@/vservers/.defaults/apps/vunify/ +build @SYSCONFDIR@/vservers/.defaults/apps/vunify/hash/ diff --git a/util-vserver.spec.in b/util-vserver.spec.in index 639aaef..660c1b4 100644 --- a/util-vserver.spec.in +++ b/util-vserver.spec.in @@ -347,20 +347,10 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README THANKS %doc doc/*.html doc/*.css -%dir %confdir -%dir %confdefaultdir -%dir %confdefaultdir/apps -%dir %confdefaultdir/files -%dir %pkglibdir/defaults %ghost %confdefaultdir/cachebase %ghost %confdefaultdir/vdirbase %ghost %confdefaultdir/run.rev -%dir %_localstatedir/cache/vservers -%dir %_localstatedir/run/vservers -%dir %_localstatedir/run/vservers.rev -%dir %_localstatedir/run/vshelper - %files lib -f %name-lib.list %files sysv -f %name-sysv.list @@ -368,24 +358,17 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %files core -f %name-core.list %defattr(-,root,root,-) -%dir %pkglibdir %files build -f %name-build.list %defattr(-,root,root,-) %doc contrib/yum*.patch -%dir %confdir/.distributions %dir %confdir/.distributions/* %dir %confdir/.distributions/*/apt -%dir %confdir/.distributions/.common -%dir %confdir/.distributions/.common/pubkeys -%dir %confdefaultdir/apps/vunify -%dir %confdefaultdir/apps/vunify/hash %files legacy -f %name-legacy.list %defattr(-,root,root,-) -%dir %pkglibdir/legacy %files devel -f %name-devel.list -- 1.8.1.5