rpms/nano/devel nano.spec,1.32,1.33 nanorc,1.1,1.2

[Kamil Dudka]

Author: kdudka

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

Modified Files:
	nano.spec nanorc 
Log Message:
- use nanorc.sample as base of /etc/nanorc


Index: nano.spec
===================================================================
RCS file: /cvs/extras/rpms/nano/devel/nano.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- nano.spec	13 Oct 2009 12:27:43 -0000	1.32
+++ nano.spec	15 Oct 2009 17:10:23 -0000	1.33
@@ -1,7 +1,7 @@
 Summary:         A small text editor
 Name:            nano
 Version:         2.0.9
-Release:         5%{?dist}
+Release:         6%{?dist}
 License:         GPLv2+
 Group:           Applications/Editors
 URL:             http://www.nano-editor.org
@@ -9,7 +9,11 @@ Source:          http://www.nano-editor.
 Source2:         nanorc
 Patch1:          nano-2.0.9-warnings.patch
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:   ncurses-devel, autoconf, gettext-devel, groff
+BuildRequires:   autoconf
+BuildRequires:   gettext-devel
+BuildRequires:   groff
+BuildRequires:   ncurses-devel
+BuildRequires:   sed
 Requires(post):  /sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -36,8 +40,12 @@ 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
+cp %{SOURCE2} ./nanorc
+
+# disable line wrapping by default
+sed 's/# set nowrap/set nowrap/' doc/nanorc.sample >> ./nanorc
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
-install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/nanorc
+install -m 644 ./nanorc $RPM_BUILD_ROOT%{_sysconfdir}/nanorc
 
 %find_lang %{name}
 
@@ -72,6 +80,9 @@ rm -rf %{buildroot}
 %{_datadir}/nano
 
 %changelog
+* Thu Oct 15 2009 Kamil Dudka <kdudka at redhat.com> - 2.0.9-6
+- use nanorc.sample as base of /etc/nanorc
+
 * Tue Oct 13 2009 Kamil Dudka <kdudka at redhat.com> - 2.0.9-5
 - fix build failure of the last build
 


Index: nanorc
===================================================================
RCS file: /cvs/extras/rpms/nano/devel/nanorc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nanorc	13 Oct 2009 11:37:22 -0000	1.1
+++ nanorc	15 Oct 2009 17:10:24 -0000	1.2
@@ -1,7 +1,6 @@
-# This is a system-wide configuration file for the nano editor. Each user can
-# save his own configuration to ~/.nanorc
-#
-# See the nanorc(5) man page for details.
+## This is a system-wide configuration file for the nano editor.
+##
+## Each user can save his own configuration to ~/.nanorc
+##
+## See the nanorc(5) man page for details.
 
-# disable line wrapping by default
-set nowrap