rpms/nano/F-12 nanorc,NONE,1.1 nano.spec,1.30,1.31

[Kamil Dudka]

Author: kdudka

Update of /cvs/extras/rpms/nano/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4824

Modified Files:
	nano.spec 
Added Files:
	nanorc 
Log Message:
F-12 synced with devel


--- NEW FILE nanorc ---
## 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.



Index: nano.spec
===================================================================
RCS file: /cvs/extras/rpms/nano/F-12/nano.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- nano.spec	21 Sep 2009 13:50:12 -0000	1.30
+++ nano.spec	18 Nov 2009 17:48:24 -0000	1.31
@@ -1,15 +1,20 @@
-Summary:	A small text editor
-Name:		nano
-Version:	2.0.9
-Release:	3%{?dist}
-License:	GPLv2+
-Group:		Applications/Editors
-URL:		http://www.nano-editor.org
-Source:		http://www.nano-editor.org/dist/v1.3/%{name}-%{version}.tar.gz
-Patch1:		nano-2.0.9-warnings.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	ncurses-devel, autoconf, gettext-devel, groff
-Requires(post):	 /sbin/install-info
+Summary:         A small text editor
+Name:            nano
+Version:         2.0.9
+Release:         4%{?dist}
+License:         GPLv2+
+Group:           Applications/Editors
+URL:             http://www.nano-editor.org
+Source:          http://www.nano-editor.org/dist/v1.3/%{name}-%{version}.tar.gz
+Source2:         nanorc
+Patch1:          nano-2.0.9-warnings.patch
+BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:   autoconf
+BuildRequires:   gettext-devel
+BuildRequires:   groff
+BuildRequires:   ncurses-devel
+BuildRequires:   sed
+Requires(post):  /sbin/install-info
 Requires(preun): /sbin/install-info
 
 %description
@@ -35,6 +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 ./nanorc $RPM_BUILD_ROOT%{_sysconfdir}/nanorc
 
 %find_lang %{name}
 
@@ -62,12 +73,17 @@ rm -rf %{buildroot}
 %doc doc/faq.html
 /bin/*
 %{_bindir}/*
+%config(noreplace) %{_sysconfdir}/nanorc
 %{_mandir}/man*/*
 %lang(fr) %{_mandir}/fr/man*/*
 %{_infodir}/nano.info*
 %{_datadir}/nano
 
 %changelog
+* Wed Nov 18 2009 Kamil Dudka <kdudka at redhat.com> - 2.0.9-4
+- install a system-wide configuration file based on nanorc.sample
+- disable line wrapping by default (#528359)
+
 * Mon Sep 21 2009 Kamil Dudka <kdudka at redhat.com> - 2.0.9-3
 - suppress warnings for __attribute__((warn_unused_result)) (#523951)