diff options
| author | Allan McRae <allan@archlinux.org> | 2009-10-11 14:32:22 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2009-10-21 05:29:02 +0200 |
| commit | 2020e6297b021946c31c1e46b6ede3c4734ef85d (patch) | |
| tree | 058b6ecd9e2f2281834559b3d95f489b2fbc77e6 | |
| parent | 2c2596177d88a60cbef8154927f847ca214aadd0 (diff) | |
| download | pacman-2020e6297b021946c31c1e46b6ede3c4734ef85d.tar.gz pacman-2020e6297b021946c31c1e46b6ede3c4734ef85d.tar.xz | |
makepkg: allow overriding pkgver and pkgrel in split packages
Fixing a single package within a split package requires the overriding
or pkgrel. In very rare (but existing) cases, it is useful to
override pkgver. Partial fix for FS#15955.
Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | PKGBUILD-split.proto | 2 | ||||
| -rw-r--r-- | doc/PKGBUILD.5.txt | 6 | ||||
| -rw-r--r-- | scripts/makepkg.sh.in | 5 |
3 files changed, 8 insertions, 5 deletions
diff --git a/PKGBUILD-split.proto b/PKGBUILD-split.proto index 11ceff2b..2d772d50 100644 --- a/PKGBUILD-split.proto +++ b/PKGBUILD-split.proto @@ -34,6 +34,8 @@ build() { package_pkg1() { # options and directives that can be overridden + pkgver= + pkgrel= pkgdesc="" license=() groups=() diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 8d5537e9..44c35eb5 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -275,9 +275,9 @@ name of the split package. All options and directives for the split packages default to the global values given within the PKGBUILD. However, some of these can be overridden within each split -package's packaging function. The following variables can be overridden: `pkgdesc`, -`license`, `groups`, `depends`, `optdepends`, `provides`, `conflicts`, `replaces`, -`backup`, `options`, `install` and `changelog`. +package's packaging function. The following variables can be overridden: `pkgver`, +`pkgrel`, `pkgdesc`, `license`, `groups`, `depends`, `optdepends`, +`provides`, `conflicts`, `replaces`, `backup`, `options`, `install` and `changelog`. An optional global directive is available when building a split package: diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index c48bb343..4d06a00b 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -46,8 +46,9 @@ pkgdir="$startdir/pkg" packaging_options=('strip' 'docs' 'libtool' 'emptydirs' 'zipman' 'purge') other_options=('ccache' 'distcc' 'makeflags' 'force') -splitpkg_overrides=('pkgdesc' 'license' 'groups' 'depends' 'optdepends' 'provides' \ - 'conflicts' 'replaces' 'backup' 'options' 'install' 'changelog') +splitpkg_overrides=('pkgver' 'pkgrel' 'pkgdesc' 'license' 'groups' \ + 'depends' 'optdepends' 'provides' 'conflicts' 'replaces' \ + 'backup' 'options' 'install' 'changelog') readonly -a packaging_options other_options splitpkg_overrides # Options |