rpms/hnb/devel hnb-compile.patch, NONE, 1.1 hnb-rpm.patch, NONE, 1.1 hnb.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Dominik Mierzejewski (rathann)]

Author: rathann

Update of /cvs/extras/rpms/hnb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22143/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hnb-compile.patch hnb-rpm.patch hnb.spec 
Log Message:
auto-import hnb-1.9.18-1 on branch devel from hnb-1.9.18-1.src.rpm

hnb-compile.patch:

--- NEW FILE hnb-compile.patch ---
--- 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
@@ -84,7 +84,7 @@
 	FILE *file;
 
 	file = fopen (prefs.rc_file, "w");
-	fprintf (file,
+	(fprintf) (file,
 #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-rpm.patch:

--- NEW FILE hnb-rpm.patch ---
--- hnb-1.9.18/src/libcli/Makefile.r	2004-09-22 16:19:52.000000000 +0200
+++ hnb-1.9.18/src/libcli/Makefile	2004-09-22 16:19:42.000000000 +0200
@@ -1,4 +1,4 @@
-CFLAGS = -Wall
+CFLAGS = -Wall $(RPM_OPT_FLAGS)
 
 OBJS = cli.o cli_history.o cli_tokenize.o
 
--- hnb-1.9.18/src/Makefile.r	2003-08-27 04:50:58.000000000 +0200
+++ hnb-1.9.18/src/Makefile	2004-09-22 16:19:20.000000000 +0200
@@ -1,5 +1,5 @@
 LIBS=-lncurses libcli/libcli.a
-CFLAGS=-I.. -Ilibcli -DHAVE_CONFIG_H -Wall -pedantic -g
+CFLAGS=-I.. -Ilibcli -DHAVE_CONFIG_H -Wall -pedantic $(RPM_OPT_FLAGS)
 
 CFILES=$(wildcard *.c)
 OBJS=$(patsubst %.c,%.o,$(CFILES))


--- NEW FILE hnb.spec ---
Summary: Hierarchical Notebook
Name: hnb
Version: 1.9.18
Release: 1
License: GPL
URL: http://hnb.sourceforge.net
Group: Applications/Productivity
Source0: http://hnb.sourceforge.net/.files/%{name}-%{version}.tar.gz
Patch0: %{name}-rpm.patch
Patch1: %{name}-compile.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ncurses-devel

%description
Hierarchical notebook(hnb) is a curses program to structure many kinds
of data in one place, for example addresses, to-do lists, ideas, book
reviews or to store snippets of brainstorming. Writing structured
documents and speech outlines.

The default format is XML but hnb can also export to ASCII and HTML.
External programs may be used for more advanced conversions of the XML
data.

%prep
%setup -q
%patch0 -p1 -b .r
%patch1 -p1 -b .compile

%build
%{__make} OPTFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
install -D -p src/hnb $RPM_BUILD_ROOT%{_bindir}/hnb
install -D -pm644 doc/hnb.1 $RPM_BUILD_ROOT%{_mandir}/man1/hnb.1

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(644,root,root,755)
%doc COPYING README doc/Documentation.html doc/hnbrc
%attr(755,root,root) %{_bindir}/%{name}
%{_mandir}/man1/%{name}.1*

%changelog
* Fri Aug 18 2006 Dominik Mierzejewski <rpm at greysector.net> 1.9.18-1
- FE compliance
- fixed compilation with gcc4

* Wed Sep 22 2004 Dominik Mierzejewski <rpm at greysector.net>
- initial build
- patch to build using RPM_OPT_FLAGS
- fix some warnings


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hnb/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Aug 2006 20:48:48 -0000	1.1
+++ .cvsignore	18 Aug 2006 20:51:11 -0000	1.2
@@ -0,0 +1 @@
+hnb-1.9.18.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hnb/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Aug 2006 20:48:48 -0000	1.1
+++ sources	18 Aug 2006 20:51:11 -0000	1.2
@@ -0,0 +1 @@
+702867cb3f94936790493eb948c36412  hnb-1.9.18.tar.gz