[arch-commits] Commit in xorg-twm/trunk (PKGBUILD manpage.patch)

[Andreas Radke]

    Date: Friday, April 17, 2015 @ 19:35:09
  Author: andyrtr
Revision: 237286

upgpkg: xorg-twm 1.0.9-1

upstream update 1.0.9

Modified:
  xorg-twm/trunk/PKGBUILD
Deleted:
  xorg-twm/trunk/manpage.patch

---------------+
 PKGBUILD      |   18 ++++++------------
 manpage.patch |   27 ---------------------------
 2 files changed, 6 insertions(+), 39 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-04-17 17:32:13 UTC (rev 237285)
+++ PKGBUILD	2015-04-17 17:35:09 UTC (rev 237286)
@@ -3,8 +3,8 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 
 pkgname=xorg-twm
-pkgver=1.0.8
-pkgrel=3
+pkgver=1.0.9
+pkgrel=1
 pkgdesc="Tab Window Manager for the X Window System"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -13,17 +13,11 @@
 depends=('libxmu')
 makedepends=('xorg-util-macros')
 options=('!emptydirs')
-source=(${url}/releases/individual/app/twm-${pkgver}.tar.bz2
-        manpage.patch)
-sha256sums=('7660352353d632127ff50390991706aa660b28a4ada816c2582ac02720722e44'
-            '0d08dacdb94bb0b2de1a80cc7275082e8f168e6309252c5250e507dd36950b9f')
+source=(${url}/releases/individual/app/twm-${pkgver}.tar.bz2{,.sig})
+sha256sums=('c575167ac33edf3bd1592f1bedfe0559debb128ed5fb4873c1278e3be166310a'
+            'SKIP')
+validpgpkeys=('4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E') # Alan Coopersmith <alan.coopersmith at oracle.com>
 
-prepare() {
-  cd twm-${pkgver}
-  patch -Np1 -i ../manpage.patch
-  autoreconf -fiv
-}
-
 build() {
   cd twm-${pkgver}
   ./configure --prefix=/usr

Deleted: manpage.patch
===================================================================
--- manpage.patch	2015-04-17 17:32:13 UTC (rev 237285)
+++ manpage.patch	2015-04-17 17:35:09 UTC (rev 237286)
@@ -1,27 +0,0 @@
-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