- install binaries to /bin (#168340)

This commit is contained in:
Kamil Dudka 2009-09-18 18:52:30 +00:00
parent c69a40bf3f
commit 3afa100581
2 changed files with 10 additions and 23 deletions

View File

@ -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");

View File

@ -1,7 +1,7 @@
Summary: A small text editor Summary: A small text editor
Name: nano Name: nano
Version: 2.0.9 Version: 2.0.9
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2+ License: GPLv2+
Group: Applications/Editors Group: Applications/Editors
URL: http://www.nano-editor.org URL: http://www.nano-editor.org
@ -22,14 +22,17 @@ for f in doc/man/fr/{nano.1,nanorc.5,rnano.1} ; do
done done
%build %build
%configure --enable-all %configure --enable-all --bindir=/bin
make make
%install %install
rm -rf %{buildroot} rm -rf %{buildroot}
make DESTDIR="%{buildroot}" install make DESTDIR="%{buildroot}" install bindir=/bin
#ln -s nano %{buildroot}%{_bindir}/pico #ln -s nano %{buildroot}%{_bindir}/pico
rm -f %{buildroot}%{_infodir}/dir 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} %find_lang %{name}
@ -55,6 +58,7 @@ rm -rf %{buildroot}
%doc AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README THANKS TODO %doc AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README THANKS TODO
%doc doc/nanorc.sample %doc doc/nanorc.sample
%doc doc/faq.html %doc doc/faq.html
/bin/*
%{_bindir}/* %{_bindir}/*
%{_mandir}/man*/* %{_mandir}/man*/*
%lang(fr) %{_mandir}/fr/man*/* %lang(fr) %{_mandir}/fr/man*/*
@ -62,6 +66,9 @@ rm -rf %{buildroot}
%{_datadir}/nano %{_datadir}/nano
%changelog %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 * Fri Sep 18 2009 Kamil Dudka <kdudka@redhat.com> - 2.0.9-1
- new upstream release - new upstream release
- dropped patch no longer needed (possible change in behavior though negligible) - dropped patch no longer needed (possible change in behavior though negligible)