rpms/hnb/devel hnb-debian.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 hnb-compile.patch, 1.1, 1.2 hnb.spec, 1.3, 1.4 sources, 1.2, 1.3
Dominik Mierzejewski (rathann)
fedora-extras-commits at redhat.com
Sat Aug 25 22:05:54 UTC 2007
Author: rathann
Update of /cvs/pkgs/rpms/hnb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv471
Modified Files:
.cvsignore hnb-compile.patch hnb.spec sources
Added Files:
hnb-debian.patch
Log Message:
- apparently .pre7 tarball contains newer code
- integrate Debian patch
- update license tag
hnb-debian.patch:
--- NEW FILE hnb-debian.patch ---
--- hnb-1.9.18.pre7/src/mark.c.debian 2004-05-09 17:28:11.000000000 +0200
+++ hnb-1.9.18.pre7/src/mark.c 2007-01-28 18:07:38.000000000 +0100
@@ -14,7 +14,7 @@
#define MAX_MARK 10
Node *marks[MAX_MARK]; /* for marks 0-9. should be expandable */
-static int set_mark(int argc, char **argv, void *data)
+static void* set_mark(int argc, char **argv, void *data)
{
Node *pos=(Node *)data;
int mark_number;
@@ -22,7 +22,7 @@
if( (argc!=2))
{
cli_outfunf("usage: %s <mark_number>", argv[0]);
- return (int)data;
+ return data;
}
mark_number=atoi(argv[1]);
@@ -31,10 +31,10 @@
marks[mark_number] = pos;
}
- return (int)pos;
+ return pos;
}
-static int go_mark(int argc, char **argv, void *data)
+static void* go_mark(int argc, char **argv, void *data)
{
Node *pos=(Node *)data;
int mark_number;
@@ -42,7 +42,7 @@
if( (argc!=2))
{
cli_outfunf("usage: %s <mark_number>", argv[0]);
- return (int)data;
+ return data;
}
mark_number=atoi(argv[1]);
@@ -53,7 +53,7 @@
pos = temp;
}
- return (int)pos;
+ return pos;
}
/*
--- hnb-1.9.18.pre7/src/tutorial.inc.debian 2004-05-09 17:28:11.000000000 +0200
+++ hnb-1.9.18.pre7/src/tutorial.inc 2007-01-28 18:06:24.000000000 +0100
@@ -189,7 +189,7 @@
i(4,"http://www.vg.no/",0);
i(3,"fark.com",0);
i(4,"http://www.fark.com/",0);
- i(1,"quotes ",0);
+ i(1,"quotations ",0);
i(2,"Peoples Front To Reunite Gondwanaland: \\Stop the Laurasian Separatist Movement!\\ ",0);
i(2,"slashdot ",0);
i(3,"disbelief ",0);
--- hnb-1.9.18.pre7/src/ui_style.c.debian 2004-05-09 17:28:11.000000000 +0200
+++ hnb-1.9.18.pre7/src/ui_style.c 2007-01-28 18:06:24.000000000 +0100
@@ -116,7 +116,7 @@
}
}
-static int ui_style_cmd (int argc, char **argv, void *data)
+static void* ui_style_cmd (int argc, char **argv, void *data)
{
char *item;
char *colors;
@@ -124,7 +124,7 @@
if(argc!=4){
cli_outfunf("usage: %i <item> <fg/bg> <atts>");
- return (int)data;
+ return data;
}
item=argv[1];
@@ -137,7 +137,7 @@
if (style_no == -1) {
printf ("unknown style 'style [%s] %s %s'\n", item, colors, atts);
- return (int) data;
+ return data;
}
color2 = strchr (colors, '/');
color2[0] = '\0';
@@ -166,7 +166,7 @@
bkgdset (' ' + COLOR_PAIR (ui_style_background));
}
}
- return (int) data;
+ return data;
}
/*
--- hnb-1.9.18.pre7/src/ui_edit.c.debian 2004-05-09 17:28:11.000000000 +0200
+++ hnb-1.9.18.pre7/src/ui_edit.c 2007-01-28 18:06:24.000000000 +0100
@@ -28,7 +28,7 @@
#include "evilloop.h"
#include <stdlib.h>
-static int ui_edit_cmd (int argc, char **argv, void *data)
+static void* ui_edit_cmd (int argc, char **argv, void *data)
{
Tbinding *c;
int stop = 0;
@@ -48,7 +48,7 @@
if(prefs.readonly){
cli_outfun("readonly flag set, avoiding tree change");
ui_current_scope = tempscope;
- return (int)data;
+ return data;
}
if (inputbuf[0]) { /* there is data in the inputbuffer,..
@@ -67,7 +67,7 @@
}
ui_current_scope = tempscope;
docmd(pos,"tree_changed");
- return (int) pos;
+ return pos;
}
node_backup = node_duplicate (pos);
@@ -81,7 +81,7 @@
while (!stop) {
node_set (pos, TEXT, input);
- ui_draw (pos, (char *) cursor_pos, 1);
+ ui_draw (pos, input, 1);
c = parsekey (ui_input (), ui_scope_nodeedit);
switch (c->action) {
case ui_action_right:
@@ -215,7 +215,7 @@
}
node_free (node_backup);
ui_current_scope = tempscope;
- return (int) data;
+ return data;
}
int ui_getstr_loc (char *input, int x, int y, int maxlen)
--- hnb-1.9.18.pre7/src/tree_sort.c.debian 2004-05-09 17:28:11.000000000 +0200
+++ hnb-1.9.18.pre7/src/tree_sort.c 2007-01-28 18:06:24.000000000 +0100
@@ -141,7 +141,7 @@
return cmp_todo(b,a);
}
-static int sort_cmd (int argc, char **argv, void *data)
+static void* sort_cmd (int argc, char **argv, void *data)
{
Node *pos = (Node *) data;
int (*cmp) (Node *a, Node *b)=cmp_todo;
@@ -155,7 +155,7 @@
node_mergesort (node_top (pos), nodes_down (node_top (pos)) + 1, cmp);
if (node_left (pos))
node_left (pos)->right = node_top (pos);
- return (int) pos;
+ return pos;
}
/*
--- hnb-1.9.18.pre7/src/cal.c.debian 2004-05-09 17:28:11.000000000 +0200
+++ hnb-1.9.18.pre7/src/cal.c 2007-01-28 18:06:24.000000000 +0100
@@ -36,7 +36,7 @@
"", "January", "February", "March", "April", "May" ,"June", "July",
"August", "September", "October", "November" , "December"};
-static int insert_cal(int argc, char **argv, void *data){
+static void* insert_cal(int argc, char **argv, void *data){
Node *pos=(void *)data;
int year;
@@ -45,7 +45,7 @@
if( (argc!=3) || (atoi(argv[1])>12 )){
cli_outfunf("usage: %s <month> <year>", argv[0]);
- return (int)data;
+ return data;
}
month=atoi(argv[1]);
@@ -53,7 +53,7 @@
if(prefs.readonly){
cli_outfun("readonly flag set, avoiding insertion");
- return (int)data;
+ return data;
}
@@ -102,8 +102,8 @@
}
}
[...1844 lines suppressed...]
}
{int header,version;
@@ -166,7 +166,7 @@
node=node_remove(node);
cli_outfunf("binary import - imported \"%s\"",filename);
- return (int) node;
+ return node;
}
/*
--- hnb-1.9.18.pre7/src/file_ascii.c.debian 2004-05-09 17:28:11.000000000 +0200
+++ hnb-1.9.18.pre7/src/file_ascii.c 2007-01-28 18:06:24.000000000 +0100
@@ -34,7 +34,7 @@
static int ascii_margin = -1;
-static int import_ascii (int argc, char **argv, void *data)
+static void* import_ascii (int argc, char **argv, void *data)
{
Node *node = (Node *) data;
char *filename = argc==2?argv[1]:"";
@@ -46,7 +46,7 @@
file = fopen (filename, "r");
if (file == NULL) {
cli_outfunf ("ascii import, unable to open \"%s\"", filename);
- return (int) (node);
+ return node;
}
init_import (&ist, node);
@@ -73,7 +73,7 @@
cli_outfunf ("ascii import, imported \"%s\"", filename);
- return (int) (node);
+ return node;
}
static void ascii_export_node (FILE * file, int level, int flags, char *data)
@@ -95,7 +95,7 @@
}
}
-static int export_ascii (int argc, char **argv, void *data)
+static void *export_ascii (int argc, char **argv, void *data)
{
Node *node = (Node *) data;
char *filename = argc==2?argv[1]:"";
@@ -110,7 +110,7 @@
file = fopen (filename, "w");
if (!file) {
cli_outfunf ("ascii export, unable to open \"%s\"", filename);
- return (int) node;
+ return node;
}
startlevel = nodes_left (node);
@@ -130,7 +130,7 @@
cli_outfunf ("ascii export, wrote output to \"%s\"", filename);
- return (int) node;
+ return node;
}
--- hnb-1.9.18.pre7/src/actions.c.debian 2004-05-09 17:28:11.000000000 +0200
+++ hnb-1.9.18.pre7/src/actions.c 2007-01-28 18:06:24.000000000 +0100
@@ -32,7 +32,7 @@
static char web_command[255] = "galeon -n *";
static char mail_command[255] = "rxvt -rv +sb -e mutt *";
-static int cmd_system(int argc, char **argv, void *data){
+static void* cmd_system(int argc, char **argv, void *data){
Node *pos=(Node *)data;
int ui_was_inited = ui_inited;
if (argc>1) {
@@ -42,7 +42,7 @@
if (ui_was_inited)
ui_init ();
}
- return (int)pos;
+ return pos;
}
static int action_node (Node *node)
@@ -76,7 +76,7 @@
strcat (cd, url);
strcat (cd, cs + 1);
cli_outfunf ("shelling out: %s", cmdline);
- //strcat(cd,"> /dev/null 2>&1 &");
+ /* strcat(cd,"> /dev/null 2>&1 &"); */
break;
} else {
*cd = *cs;
@@ -109,7 +109,7 @@
strcat (cd, mail_address);
strcat (cd, cs + 1);
cli_outfunf ("shelling out: %s", cmdline);
- //strcat(cd,"> /dev/null 2>&1 &");
+ /* strcat(cd,"> /dev/null 2>&1 &"); */
break;
} else {
*cd = *cs;
@@ -136,21 +136,21 @@
* url/email address substring,.. and launches an app based on that?
*
*/
-static int cmd_action (int argc, char **argv, void *data)
+static void* cmd_action (int argc, char **argv, void *data)
{
Node *pos = (Node *) data;
Node *node = node_right (pos);
while (node) {
if (!action_node (node))
- return (int) pos;
+ return pos;
node = node_down (node);
}
if (!action_node (pos)) {
- return (int) pos;
+ return pos;
} else {
cli_outfunf ("nothing to do");
- return (int) pos;
+ return pos;
}
/***
--- hnb-1.9.18.pre7/src/ui_draw.c.debian 2004-05-09 17:28:11.000000000 +0200
+++ hnb-1.9.18.pre7/src/ui_draw.c 2007-01-28 18:06:24.000000000 +0100
@@ -538,7 +538,7 @@
/* FIXME: make backup?,.. and make sure data is present,.., make possiblity to write back? */
-int display_format_cmd (int argc, char **argv, void *data)
+void* display_format_cmd (int argc, char **argv, void *data)
{
char *p = argv[1];
int width;
@@ -546,7 +546,7 @@
int col_no = 0;
if(argc<2){
- return (int)data;
+ return data;
}
do {
@@ -631,7 +631,7 @@
col_def[col_no].type = col_terminate;
- return (int) data;
+ return data;
}
@@ -793,7 +793,7 @@
line_nodeno[active_line] = node_no (node);
if (edit_mode) {
- lines = draw_item (active_line, (int) input, node, drawmode_edit);
+ lines = draw_item (active_line, strlen (input) - 1, node, drawmode_edit);
} else {
lines =
draw_item (active_line, strlen (input), node,
--- hnb-1.9.18.pre7/doc/Documentation.html.debian 2004-05-09 17:28:11.000000000 +0200
+++ hnb-1.9.18.pre7/doc/Documentation.html 2007-01-28 18:06:24.000000000 +0100
@@ -350,7 +350,7 @@
</div>
</div>
</div>
- <div class="level2">quotes
+ <div class="level2">quotations
<div class="level3">Peoples Front To Reunite Gondwanaland: 'Stop the Laurasian Separatist Movement!' </div>
<div class="level3">slashdot
<div class="level4">disbelief
--- hnb-1.9.18.pre7/doc/hnb.1.debian 2004-05-09 17:28:11.000000000 +0200
+++ hnb-1.9.18.pre7/doc/hnb.1 2007-01-28 18:06:24.000000000 +0100
@@ -1,4 +1,4 @@
-.TH HNB SECTION "May 15, 2001"
+.TH HNB 1 "MAY 15, 2001"
.SH NAME
hnb \- Hierarchical notebook
.SH SYNOPSIS
--- hnb-1.9.18.pre7/doc/Documentation.hnb.debian 2004-05-09 17:28:11.000000000 +0200
+++ hnb-1.9.18.pre7/doc/Documentation.hnb 2007-01-28 18:06:24.000000000 +0100
@@ -329,7 +329,7 @@
</node>
</node>
</node>
- <node><data>quotes </data>
+ <node><data>quotations </data>
<node><data>Peoples Front To Reunite Gondwanaland: "Stop the Laurasian Separatist Movement!" </data></node>
<node><data>slashdot </data>
<node><data>disbelief </data>
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hnb/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 18 Aug 2006 20:51:11 -0000 1.2
+++ .cvsignore 25 Aug 2007 22:05:21 -0000 1.3
@@ -1 +1,2 @@
-hnb-1.9.18.tar.gz
+hnb-1.9.18.pre7.tar.gz
+hnbrc.vi
hnb-compile.patch:
Index: hnb-compile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hnb/devel/hnb-compile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hnb-compile.patch 18 Aug 2006 20:51:11 -0000 1.1
+++ hnb-compile.patch 25 Aug 2007 22:05:21 -0000 1.2
@@ -1,5 +1,5 @@
---- hnb-1.9.18/src/prefs.c.compile 2003-08-27 04:50:59.000000000 +0200
-+++ hnb-1.9.18/src/prefs.c 2006-08-18 21:18:06.000000000 +0200
+--- hnb-1.9.18.pre7/src/prefs.c.compile 2004-05-09 17:28:11.000000000 +0200
++++ hnb-1.9.18.pre7/src/prefs.c 2007-01-28 17:41:07.000000000 +0100
@@ -84,7 +84,7 @@
FILE *file;
@@ -9,16 +9,15 @@
#include "hnbrc.inc"
);
fclose (file);
---- hnb-1.9.18/src/expanded.c.compile 2003-08-27 04:50:59.000000000 +0200
-+++ hnb-1.9.18/src/expanded.c 2006-08-18 21:18:06.000000000 +0200
-@@ -18,9 +18,9 @@
- * Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-+#include <string.h>
- #include "tree.h"
- #include "cli.h"
--#define NULL 0
-
- #include "evilloop.h"
- #include "ctype.h"
+--- hnb-1.9.18.pre7/src/libcli/Makefile.compile 2007-01-28 17:41:07.000000000 +0100
++++ hnb-1.9.18.pre7/src/libcli/Makefile 2007-01-28 17:41:19.000000000 +0100
+@@ -7,8 +7,7 @@
+ clean:
+ rm -f *.o *.a *.so test-s* *~
+ libcli.a: $(OBJS)
+- ar rc libcli.a cli*.o
+- ranlib -s libcli.a
++ ar rcs libcli.a cli*.o
+ libcli_p.a:
+ $(CC) -pg -c cli.c
+ $(CC) -pg -c cli_history.c
Index: hnb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hnb/devel/hnb.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hnb.spec 29 Aug 2006 17:14:30 -0000 1.3
+++ hnb.spec 25 Aug 2007 22:05:21 -0000 1.4
@@ -1,13 +1,16 @@
Summary: Hierarchical Notebook
Name: hnb
Version: 1.9.18
-Release: 3%{?dist}
-License: GPL
+Release: 4%{?dist}
+License: GPLv2+
URL: http://hnb.sourceforge.net
Group: Applications/Productivity
-Source0: http://hnb.sourceforge.net/.files/%{name}-%{version}.tar.gz
+Source0: http://hnb.sourceforge.net/.files/%{name}-%{version}.pre7.tar.gz
+Source1: hnbrc.vi
Patch0: %{name}-rpm.patch
Patch1: %{name}-compile.patch
+# based on http://ftp.debian.org/debian/pool/main/h/hnb/hnb_1.9.18-3.diff.gz
+Patch2: hnb-debian.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ncurses-devel
@@ -22,9 +25,11 @@
data.
%prep
-%setup -q
+%setup -q -n %{name}-%{version}.pre7
%patch0 -p1 -b .r
%patch1 -p1 -b .compile
+%patch2 -p1 -b .debian
+cp -p %{SOURCE1} doc/
%build
%{__make} OPTFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
@@ -39,11 +44,16 @@
%files
%defattr(644,root,root,755)
-%doc COPYING README doc/Documentation.html doc/hnbrc
+%doc COPYING README doc/Documentation.html doc/hnbrc*
%attr(755,root,root) %{_bindir}/%{name}
%{_mandir}/man1/%{name}.1*
%changelog
+* Sun Aug 25 2007 Dominik Mierzejewski <rpm at greysector.net> 1.9.18-4
+- apparently .pre7 tarball contains newer code
+- integrate Debian patch
+- update license tag
+
* Tue Aug 29 2006 Dominik Mierzejewski <rpm at greysector.net> 1.9.18-3
- mass rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hnb/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 18 Aug 2006 20:51:11 -0000 1.2
+++ sources 25 Aug 2007 22:05:21 -0000 1.3
@@ -1 +1,2 @@
-702867cb3f94936790493eb948c36412 hnb-1.9.18.tar.gz
+65196f236b40ecc8bfccf8aec36e91f6 hnb-1.9.18.pre7.tar.gz
+7a15f4888d144c087b91ae585ed06cca hnbrc.vi
More information about the fedora-extras-commits
mailing list