From 3afa10058190739af05bf9331cb8c33863885fb9 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@fedoraproject.org>
Date: Fri, 18 Sep 2009 18:52:30 +0000
Subject: [PATCH] - install binaries to /bin (#168340)

---
 nano-2.0.6-open-macro.patch | 20 --------------------
 nano.spec                   | 13 ++++++++++---
 2 files changed, 10 insertions(+), 23 deletions(-)
 delete mode 100644 nano-2.0.6-open-macro.patch

diff --git a/nano-2.0.6-open-macro.patch b/nano-2.0.6-open-macro.patch
deleted file mode 100644
index 975e0f6..0000000
--- a/nano-2.0.6-open-macro.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- nano-2.0.6/src/files.c~	2007-04-21 21:33:56.000000000 +0100
-+++ nano-2.0.6/src/files.c	2007-08-22 18:52:11.000000000 +0100
-@@ -1518,7 +1518,7 @@ bool write_file(const char *name, FILE *
- 	}
- 
- 	if (f_open == NULL) {
--	    fd_source = open(realname, O_RDONLY | O_CREAT);
-+		fd_source = open(realname, O_RDONLY | O_CREAT, 0600);
- 
- 	    if (fd_source != -1) {
- 		f_source = fdopen(fd_source, "rb");
-@@ -1637,7 +1637,7 @@ bool write_file(const char *name, FILE *
- 	int fd_source;
- 	FILE *f_source = NULL;
- 
--	fd_source = open(tempname, O_RDONLY | O_CREAT);
-+	fd_source = open(tempname, O_RDONLY | O_CREAT, 0600);
- 
- 	if (fd_source != -1) {
- 	    f_source = fdopen(fd_source, "rb");
diff --git a/nano.spec b/nano.spec
index c7e6bc2..6b129a9 100644
--- a/nano.spec
+++ b/nano.spec
@@ -1,7 +1,7 @@
 Summary:	A small text editor
 Name:		nano
 Version:	2.0.9
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		Applications/Editors
 URL:		http://www.nano-editor.org
@@ -22,14 +22,17 @@ for f in doc/man/fr/{nano.1,nanorc.5,rnano.1} ; do
 done
 
 %build
-%configure --enable-all
+%configure --enable-all --bindir=/bin
 make
 
 %install
 rm -rf %{buildroot}
-make DESTDIR="%{buildroot}" install
+make DESTDIR="%{buildroot}" install bindir=/bin
 #ln -s nano %{buildroot}%{_bindir}/pico
 rm -f %{buildroot}%{_infodir}/dir
+mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
+ln -s ../../bin/nano ${RPM_BUILD_ROOT}%{_bindir}/nano
+ln -s ../../bin/rnano ${RPM_BUILD_ROOT}%{_bindir}/rnano
 
 %find_lang %{name}
 
@@ -55,6 +58,7 @@ rm -rf %{buildroot}
 %doc AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README THANKS TODO
 %doc doc/nanorc.sample
 %doc doc/faq.html
+/bin/*
 %{_bindir}/*
 %{_mandir}/man*/*
 %lang(fr) %{_mandir}/fr/man*/*
@@ -62,6 +66,9 @@ rm -rf %{buildroot}
 %{_datadir}/nano
 
 %changelog
+* Fri Sep 18 2009 Kamil Dudka <kdudka@redhat.com> - 2.0.9-2
+- install binaries to /bin (#168340)
+
 * Fri Sep 18 2009 Kamil Dudka <kdudka@redhat.com> - 2.0.9-1
 - new upstream release
 - dropped patch no longer needed (possible change in behavior though negligible)