1
0
mirror of https://github.com/moparisthebest/pacman synced 2024-08-13 17:03:46 -04:00

Merge branch 'maint'

This commit is contained in:
Dan McGee 2010-12-15 00:41:59 -06:00
commit 45146dccbb
3 changed files with 24 additions and 19 deletions

2
NEWS
View File

@ -5,7 +5,7 @@ VERSION DESCRIPTION
- documentation: remove unnecessary "|| return 1" - documentation: remove unnecessary "|| return 1"
- contrib/bacman: update package compression selection - contrib/bacman: update package compression selection
- contrib/PKGBUILD.vim: add a few more license options - contrib/PKGBUILD.vim: add a few more license options
- translations: kk, pt, es updated - translations: es, kk, sv, pt, ru updated
3.4.1 - fix interaction of --needed and multiple repo groups (FS#20221) 3.4.1 - fix interaction of --needed and multiple repo groups (FS#20221)
- bash completion: small fixes to prevent alias problems - bash completion: small fixes to prevent alias problems
- rankmirrors: fix bogus/empty variable assignment (FS#19911) - rankmirrors: fix bogus/empty variable assignment (FS#19911)

View File

@ -42,12 +42,12 @@ AC_PREREQ(2.62)
# pacman_version_micro += 1 # pacman_version_micro += 1
m4_define([lib_current], [5]) m4_define([lib_current], [5])
m4_define([lib_revision], [1]) m4_define([lib_revision], [2])
m4_define([lib_age], [0]) m4_define([lib_age], [0])
m4_define([pacman_version_major], [3]) m4_define([pacman_version_major], [3])
m4_define([pacman_version_minor], [4]) m4_define([pacman_version_minor], [4])
m4_define([pacman_version_micro], [1]) m4_define([pacman_version_micro], [2])
m4_define([pacman_version], m4_define([pacman_version],
[pacman_version_major.pacman_version_minor.pacman_version_micro]) [pacman_version_major.pacman_version_minor.pacman_version_micro])

View File

@ -237,9 +237,11 @@ name. The syntax is: `source=('filename::url')`.
build() Function build() Function
---------------- ----------------
In addition to the above directives, the optional build() bash function usually In addition to the above directives, the optional build() bash function usually
comprises the remainder of the PKGBUILD. This is directly sourced and executed by comprises the remainder of the PKGBUILD. This is directly sourced and executed
makepkg, so anything that bash or the system has available is available for use by makepkg, so anything that bash or the system has available is available for
here. Be sure any exotic commands used are covered by `makedepends`. use here. The function is run in `bash -e` mode, meaning any command that exits
with a non-zero status will cause the function to exit. Be sure any exotic
commands used are covered by `makedepends`.
All of the above variables such as `pkgname` and `pkgver` are available for use All of the above variables such as `pkgname` and `pkgver` are available for use
in the build function. In addition, makepkg defines three variables for your in the build function. In addition, makepkg defines three variables for your
@ -263,24 +265,27 @@ the build function.
package() Function package() Function
------------------ ------------------
An optional package() function can be specified in addition to the build() function. An optional package() function can be specified in addition to the build()
This function is run immediately after the build() function. When specified in function. This function is run immediately after the build() function. The
combination with the fakeroot BUILDENV option in linkman:makepkg.conf[5], fakeroot function is run in `bash -e` mode, meaning any command that exits with a
usage will be limited to running the packaging stage. An existing build() function non-zero status will cause the function to exit. When specified in combination
with the fakeroot BUILDENV option in linkman:makepkg.conf[5], fakeroot usage
will be limited to running the packaging stage. An existing build() function
will be run as the user calling makepkg. will be run as the user calling makepkg.
Package Splitting Package Splitting
----------------- -----------------
makepkg supports building multiple packages from a single PKGBUILD. This is achieved makepkg supports building multiple packages from a single PKGBUILD. This is
by assigning an array of package names to the `pkgname` directive. Each split package achieved by assigning an array of package names to the `pkgname` directive.
uses a corresponding packaging function with name `package_foo()`, where `foo` is the Each split package uses a corresponding packaging function with name
name of the split package. `package_foo()`, where `foo` is the name of the split package.
All options and directives for the split packages default to the global values given All options and directives for the split packages default to the global values
within the PKGBUILD. However, some of these can be overridden within each split given within the PKGBUILD. However, some of these can be overridden within each
package's packaging function. The following variables can be overridden: `pkgver`, split package's packaging function. The following variables can be overridden:
`pkgrel`, `pkgdesc`, `arch`, `license`, `groups`, `depends`, `optdepends`, `pkgver`, `pkgrel`, `pkgdesc`, `arch`, `license`, `groups`, `depends`,
`provides`, `conflicts`, `replaces`, `backup`, `options`, `install` and `changelog`. `optdepends`, `provides`, `conflicts`, `replaces`, `backup`, `options`,
`install` and `changelog`.
An optional global directive is available when building a split package: An optional global directive is available when building a split package: