From fdb938e48bd41c2e07ecb090420c63a0d0885674 Mon Sep 17 00:00:00 2001 From: "Tom G. Christensen" Date: Fri, 18 Apr 2008 09:02:16 +0000 Subject: [PATCH] Revert using pkgdesc|shortdesc in NAME. NAME should interpret the condensed name in PKG. pkgdesc|shortdesc describes what the package does and that belongs in DESC. --- buildpkg.packaging.solaris | 3 ++- pkginfo.in | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/buildpkg.packaging.solaris b/buildpkg.packaging.solaris index d563146..d3b5a72 100644 --- a/buildpkg.packaging.solaris +++ b/buildpkg.packaging.solaris @@ -136,8 +136,9 @@ pack_info() -e "s#%%pkgcat%%#$pkgcat#g" \ -e "s#%%pkgvendor%%#$pkgvendor - packaged by $pkgedby#g" \ -e "s#%%pkgver%%#$pkgver#g" \ - -e "s#%%name%%#$name - $pkgdesc#g" \ + -e "s#%%name%%#$name#g" \ -e "s#%%topinstalldir%%#$topinstalldir#g" \ + -e "s#%%pkgdesc%%#$pkgdesc#g" \ -e "s#%%pstamp%%#$pstamp#g" \ -e "s#%%email%%#$email#g" \ -e "s#%%maxinst%%#$maxinst#g" \ diff --git a/pkginfo.in b/pkginfo.in index 19b8f40..8e2bda2 100644 --- a/pkginfo.in +++ b/pkginfo.in @@ -8,4 +8,5 @@ EMAIL="%%email%%" PSTAMP="%%pstamp%%" BASEDIR="%%topinstalldir%%" CLASSES="none" +DESC="%%pkgdesc%%" MAXINST="%%maxinst%%"