From 219af35f4e712310f8bb64fe4f2565d463b6a70f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Hor=C3=A1k?= Date: Wed, 22 May 2013 08:29:09 +0200 Subject: [PATCH] Update to 1.4.48 Fix help vs. man page differences --- tokyocabinet-manhelp.patch | 66 ++++++++++++++++++++++++++++++++++++++ tokyocabinet.spec | 10 ++++-- 2 files changed, 74 insertions(+), 2 deletions(-) create mode 100644 tokyocabinet-manhelp.patch diff --git a/tokyocabinet-manhelp.patch b/tokyocabinet-manhelp.patch new file mode 100644 index 0000000..0e182bd --- /dev/null +++ b/tokyocabinet-manhelp.patch @@ -0,0 +1,66 @@ +diff -up tokyocabinet-1.4.48/man/tcftest.1.manhelp tokyocabinet-1.4.48/man/tcftest.1 +--- tokyocabinet-1.4.48/man/tcftest.1.manhelp 2013-05-19 11:20:58.078404514 +0200 ++++ tokyocabinet-1.4.48/man/tcftest.1 2013-05-19 11:21:48.949426514 +0200 +@@ -61,6 +61,8 @@ Options feature the following. + .br + \fB\-rl\fR : set the length of values at random. + .br ++\fB\-ru\fR : perform random operation on random key. ++.br + .RE + .PP + This command returns 0 on success, another on failure. +diff -up tokyocabinet-1.4.48/man/tctmgr.1.manhelp tokyocabinet-1.4.48/man/tctmgr.1 +--- tokyocabinet-1.4.48/man/tctmgr.1.manhelp 2013-05-19 11:27:12.273660237 +0200 ++++ tokyocabinet-1.4.48/man/tctmgr.1 2013-05-19 11:27:20.780632188 +0200 +@@ -122,10 +122,6 @@ Options feature the following. + .br + \fB\-it \fItype\fR\fR : specify the index type among "lexical", "decimal", "token", "qgram", and "void". + .br +-\fB\-cd\fR : create the number index instead of the string index. +-.br +-\fB\-cv\fR : remove the existing index. +-.br + \fB\-sc\fR : normalize keys as lower cases. + .br + .RE +diff -up tokyocabinet-1.4.48/man/tcumttest.1.manhelp tokyocabinet-1.4.48/man/tcumttest.1 +--- tokyocabinet-1.4.48/man/tcumttest.1.manhelp 2013-05-19 11:38:38.097051333 +0200 ++++ tokyocabinet-1.4.48/man/tcumttest.1 2013-05-19 11:43:22.167069021 +0200 +@@ -9,12 +9,12 @@ The command `\fBtcumttest\fR' is a utili + .PP + .RS + .br +-\fBtcumttest combo \fR[\fB\-rnd\fR]\fB \fItnum\fB \fIrnum\fB \fR[\fB\fIbnum\fB\fR]\fB\fR ++\fBtcumttest combo \fR[\fB\-rnd\fR]\fB \fItnum\fB \fIrnum\fB \fR[\fB\fIbnum\fB\fR]\fB\fR \fR[\fB\-tr\fB\fR]\fB + .RS + Peform storing, retrieving, and removing in turn. + .RE + .br +-\fBtcumttest typical \fR[\fB\-nc\fR]\fB \fR[\fB\-rr \fInum\fB\fR]\fB \fItnum\fB \fIrnum\fB \fR[\fB\fIbnum\fB\fR]\fB\fR ++\fBtcumttest typical \fR[\fB\-nc\fR]\fB \fR[\fB\-rr \fInum\fB\fR]\fB \fItnum\fB \fIrnum\fB \fR[\fB\fIbnum\fB\fR]\fB\fR \fR[\fB\-tr\fB\fR]\fB + .RS + Perform typical operations selected at random. + .RE +@@ -29,6 +29,8 @@ Options feature the following. + .br + \-rr \fInum\fR : specifiy the ratio of reading operation by percentage. + .br ++\fB\-tr\fR : use on\-memory tree database object. ++.br + .RE + .PP + This command returns 0 on success, another on failure. +diff -up tokyocabinet-1.4.48/tctmgr.c.manhelp tokyocabinet-1.4.48/tctmgr.c +diff -up tokyocabinet-1.4.48/tcucodec.c.manhelp tokyocabinet-1.4.48/tcucodec.c +--- tokyocabinet-1.4.48/tcucodec.c.manhelp 2013-05-19 11:29:49.168261576 +0200 ++++ tokyocabinet-1.4.48/tcucodec.c 2013-05-19 11:34:28.335588929 +0200 +@@ -126,7 +126,7 @@ static void usage(void){ + fprintf(stderr, " %s bzip [-d] [file]\n", g_progname); + fprintf(stderr, " %s xml [-d] [-br] [file]\n", g_progname); + fprintf(stderr, " %s cstr [-d] [-js] [file]\n", g_progname); +- fprintf(stderr, " %s ucs [-d] [-un] [file]\n", g_progname); ++ fprintf(stderr, " %s ucs [-d] [-un] [-kw] [file]\n", g_progname); + fprintf(stderr, " %s hash [-crc] [-ch num] [file]\n", g_progname); + fprintf(stderr, " %s cipher [-key str] [file]\n", g_progname); + fprintf(stderr, " %s date [-ds str] [-jl num] [-wf] [-rf]\n", g_progname); diff --git a/tokyocabinet.spec b/tokyocabinet.spec index a6c7cf6..92ca1ea 100644 --- a/tokyocabinet.spec +++ b/tokyocabinet.spec @@ -1,12 +1,13 @@ Summary: A modern implementation of a DBM Name: tokyocabinet -Version: 1.4.47 -Release: 6%{?dist} +Version: 1.4.48 +Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://fallabs.com/tokyocabinet/ Source: http://fallabs.com/%{name}/%{name}-%{version}.tar.gz Patch0: tokyocabinet-fedora.patch +Patch1: tokyocabinet-manhelp.patch BuildRequires: pkgconfig zlib-devel bzip2-devel autoconf %description @@ -40,6 +41,7 @@ needed for developing with %{name}. %prep %setup -q %patch0 -p0 -b .fedora +%patch1 -p1 -b .manhelp %build autoconf @@ -76,6 +78,10 @@ make check %doc doc/* %changelog +* Mon May 20 2013 Honza Horak - 1.4.48-1 +- Update to 1.4.48 +- Fix help vs. man page differences + * Fri Feb 15 2013 Fedora Release Engineering - 1.4.47-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild