Adding the post-install and pre-uninstall rules for the Info document,

plus some tweaks.  (Patch was tested by Kamil Dudka.)

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5240 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index 80970183b4a3f1c94067e3303de0b8b462d49159..1d4ac6b6c5329201b9b7830a9e9720ab000ee50b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2015-06-04  Benno Schulenberg  <bensberg@justemail.net>
        * src/nano.h: Fix compilation with --enable-tiny.
+       * nano.spec.in: Add the post-install and pre-uninstall rules for the
+       Info document, plus some tweaks.  (Patch was tested by Kamil Dudka.)
 
 2015-06-02  Benno Schulenberg  <bensberg@justemail.net>
        * doc/man/nanorc.5, doc/texinfo/nano.texi: Tweak some wordings, and

diff --git a/nano.spec.in b/nano.spec.in
index 1d6525afa0cfca49c20f71e62bf760b2d46f65a6..f60d24e3b8001045075838802c11de119c5f21ed 100644 (file)
--- a/nano.spec.in
+++ b/nano.spec.in
@@ -2,20 +2,24 @@
 %define version        @VERSION@
 %define release        1
 
-Summary        : Pico editor clone with enhancements
 Name           : %{name}
 Version                : %{version}
 Release                : %{release}
+Summary                : a user-friendly editor, a Pico clone with enhancements
+
 License                : GPLv3+
 Group          : Applications/Editors
 URL            : http://www.nano-editor.org/
-Source         : http://www.nano-editor.org/dist/v2.3/%{name}-%{version}.tar.gz
+Source         : http://www.nano-editor.org/dist/v2.4/%{name}-%{version}.tar.gz
+
 BuildRoot      : %{_tmppath}/%{name}-%{version}-root
 BuildRequires  : autoconf, automake, gettext-devel, ncurses-devel, texinfo
+Requires(post) : info
+Requires(preun)        : info
 
 %description
 GNU nano is a small and friendly text editor.  It aims to emulate the
-Pico text editor while also offering a few enhancements.
+Pico text editor while also offering several enhancements.
 
 %prep
 %setup -q
@@ -26,8 +30,16 @@ make
 
 %install
 make DESTDIR="%{buildroot}" install
-#ln -s nano %{buildroot}%{_bindir}/pico
-rm -f %{buildroot}%{_infodir}/dir
+#ln -s nano %{buildroot}/%{_bindir}/pico
+rm -f %{buildroot}/%{_infodir}/dir
+
+%post
+/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
+
+%preun
+if [ $1 = 0 ] ; then
+/sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
+fi
 
 %files
 %defattr(-,root,root)