Date: Monday, August 4, 2014 @ 09:52:32 Author: lcarlier Revision: 219285
upgpkg: xorg-twm 1.0.8-3 fix FS#41094 Added: xorg-twm/trunk/manpage.patch Modified: xorg-twm/trunk/PKGBUILD ---------------+ PKGBUILD | 21 ++++++++++++--------- manpage.patch | 27 +++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 9 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-08-04 07:28:34 UTC (rev 219284) +++ PKGBUILD 2014-08-04 07:52:32 UTC (rev 219285) @@ -4,18 +4,26 @@ pkgname=xorg-twm pkgver=1.0.8 -pkgrel=2 +pkgrel=3 pkgdesc="Tab Window Manager for the X Window System" arch=(i686 x86_64) url="http://xorg.freedesktop.org/"; -backup=(etc/X11/twm/system.twmrc) +backup=(usr/share/X11/twm/system.twmrc) license=('custom') depends=('libxmu') makedepends=('xorg-util-macros') options=('!emptydirs') -source=(${url}/releases/individual/app/twm-${pkgver}.tar.bz2) -sha256sums=('7660352353d632127ff50390991706aa660b28a4ada816c2582ac02720722e44') +source=(${url}/releases/individual/app/twm-${pkgver}.tar.bz2 + manpage.patch) +sha256sums=('7660352353d632127ff50390991706aa660b28a4ada816c2582ac02720722e44' + '0d08dacdb94bb0b2de1a80cc7275082e8f168e6309252c5250e507dd36950b9f') +prepare() { + cd twm-${pkgver} + patch -Np1 -i ../manpage.patch + autoreconf -fiv +} + build() { cd twm-${pkgver} ./configure --prefix=/usr @@ -26,10 +34,5 @@ cd twm-${pkgver} make DESTDIR="${pkgdir}" install - # fix config file location - install -m755 -d "${pkgdir}/etc/X11/twm" - install -m644 src/system.twmrc "${pkgdir}/etc/X11/twm/" - rm $pkgdir/usr/share/X11/twm/system.twmrc - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } Added: manpage.patch =================================================================== --- manpage.patch (rev 0) +++ manpage.patch 2014-08-04 07:52:32 UTC (rev 219285) @@ -0,0 +1,27 @@ +diff --git a/man/Makefile.am b/man/Makefile.am +index 7d45968..4d36ec4 100644 +--- a/man/Makefile.am ++++ b/man/Makefile.am +@@ -33,6 +33,9 @@ CLEANFILES = $(appman_DATA) + + SUFFIXES = .$(APP_MAN_SUFFIX) .man + ++# taken from manpages.am in xserver ++MAN_SUBSTS += -e 's|__datadir__|$(datadir)|g' ++ + # String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure + .man.$(APP_MAN_SUFFIX): + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ +diff --git a/man/twm.man b/man/twm.man +index cc8bc5f..d1dbaa0 100644 +--- a/man/twm.man ++++ b/man/twm.man +@@ -132,7 +132,7 @@ differing visual types. + .B "$HOME/.twmrc" + This is the usual name for an individual user's startup file. + .TP 8 +-.B __projectroot__/lib/X11/twm/system.twmrc ++.B __datadir__/X11/twm/system.twmrc + If neither of the preceding files are found, \fItwm\fP will look in this + file for a + default configuration. This is often tailored by the site administrator to
