[arch-commits] Commit in man-db/trunk (1361_1360.diff PKGBUILD)

[andyrtr at archlinux.org]

    Date: Friday, February 17, 2012 @ 13:38:04
  Author: andyrtr
Revision: 150436

upgpkg: man-db 2.6.1-1

upstream update 2.6.1

Modified:
  man-db/trunk/PKGBUILD
Deleted:
  man-db/trunk/1361_1360.diff

----------------+
 1361_1360.diff |   25 -------------------------
 PKGBUILD       |   11 +++--------
 2 files changed, 3 insertions(+), 33 deletions(-)

Deleted: 1361_1360.diff
===================================================================
--- 1361_1360.diff	2012-02-17 17:32:58 UTC (rev 150435)
+++ 1361_1360.diff	2012-02-17 18:38:04 UTC (rev 150436)
@@ -1,25 +0,0 @@
-=== modified file 'src/straycats.c'
---- src/straycats.c	2011-01-10 20:08:22 +0000
-+++ src/straycats.c	2011-06-04 06:34:51 +0000
-@@ -177,6 +177,7 @@
- 			char *lang, *page_encoding;
- 			char *mandir_base;
- 			pipecmd *col_cmd;
-+			char *col_locale;
- 			char *fullpath;
- 
- 			/* we have a straycat. Need to filter it and get
-@@ -226,6 +227,12 @@
- 			col_cmd = pipecmd_new_argstr
- 				(get_def_user ("col", COL));
- 			pipecmd_arg (col_cmd, "-bx");
-+			col_locale = find_charset_locale ("UTF-8");
-+			if (col_locale) {
-+				pipecmd_setenv (col_cmd, "LC_CTYPE",
-+						col_locale);
-+				free (col_locale);
-+			}
- 			pipeline_command (decomp, col_cmd);
- 
- 			fullpath = canonicalize_file_name (catdir);
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-02-17 17:32:58 UTC (rev 150435)
+++ PKGBUILD	2012-02-17 18:38:04 UTC (rev 150436)
@@ -3,8 +3,8 @@
 # Contributor: Sergej Pupykin <sergej at aur.archlinux.org>
 
 pkgname=man-db
-pkgver=2.6.0.2
-pkgrel=3
+pkgver=2.6.1
+pkgrel=1
 pkgdesc="A utility for reading man pages"
 arch=('i686' 'x86_64')
 url="http://www.nongnu.org/man-db/"
@@ -19,19 +19,14 @@
 replaces=('man')
 install=${pkgname}.install
 source=(http://savannah.nongnu.org/download/man-db/$pkgname-$pkgver.tar.gz
-	1361_1360.diff
-	#http://launchpad.net/man-db/main/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz
         convert-mans man-db.cron.daily)
 options=('!libtool')
-md5sums=('2b41c96efec032d2b74ccbf2e401f93e'
-         '08b76b1f924c5493a280b79fc0aebde4'
+md5sums=('79658e8695c7b9b3be1ee340d78a4692'
          '2b7662a7d5b33fe91f9f3e034361a2f6'
          'd30c39ae47560304471b5461719e0f03')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  # https://bugs.archlinux.org/task/18722
-  patch -Np0 -i $srcdir/1361_1360.diff
   ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
 	--with-db=gdbm --disable-setuid --enable-mandirs=GNU \
 	--with-sections="1 n l 8 3 0 2 5 4 9 6 7"