rpms/nano/devel nano.spec, 1.28, 1.29 nano-2.0.6-open-macro.patch, 1.1, NONE

[Kamil Dudka]

Author: kdudka

Update of /cvs/extras/rpms/nano/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14586

Modified Files:
	nano.spec 
Removed Files:
	nano-2.0.6-open-macro.patch 
Log Message:
- install binaries to /bin (#168340)


Index: nano.spec
===================================================================
RCS file: /cvs/extras/rpms/nano/devel/nano.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- nano.spec	18 Sep 2009 18:14:09 -0000	1.28
+++ nano.spec	18 Sep 2009 18:52:30 -0000	1.29
@@ -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,rna
 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 at redhat.com> - 2.0.9-2
+- install binaries to /bin (#168340)
+
 * Fri Sep 18 2009 Kamil Dudka <kdudka at redhat.com> - 2.0.9-1
 - new upstream release
 - dropped patch no longer needed (possible change in behavior though negligible)


--- nano-2.0.6-open-macro.patch DELETED ---