$ git diff --patch-with-stat --summary 9ef22629b58451512ac570a169c5ce6663934caf..d6af6287e8e89e348cb48d9a744f6971dafdad9a

 joe.spec | 29 +++++++----------------------
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/joe.spec b/joe.spec
index 6948ef5..f43dc35 100644
--- a/joe.spec
+++ b/joe.spec
@@ -3,7 +3,7 @@
 Summary:	Summary An easy to use text editor, supporting syntax highlight and UTF-8
 Name:		joe
 Version:	4.6
-Release:	7
+Release:	10
 License:	GPLv2+
 Group:		Editors
 Url:		http://joe-editor.sourceforge.net/
@@ -25,30 +25,15 @@ have a fondness for WordStar.  If you're just starting out, you should
 probably install joe because it is very easy to use.
 
 %prep
-%setup -q
-%autopatch -p1
+%autosetup -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -DUSE_LOCALE"
 %configure
-%make
+%make_build
 
 %install
-%makeinstall
-
-# XXX: hack to install the manpages, otherwise one goes over the other ...
-# (trap for when this ugly thing is no more needed)
-[ -d %{buildroot}/%{_mandir}/ru ] && exit 1
-rm -rf %{buildroot}/%{_mandir}
-pushd man && %makeinstall mandir=%{buildroot}/%{_mandir} && popd
-pushd man/ru && %makeinstall mandir=%{buildroot}/%{_mandir}/ru && popd
-for dir in %{buildroot}/%{_mandir} %{buildroot}/%{_mandir}/ru; do
-  pushd $dir/man1
-  for bin in jmacs jpico jstar rjoe; do
-    ln -s joe.1 ${bin}.1
-  done
-  popd
-done
+%make_install
 
 cp -p %{SOURCE1} %{buildroot}%{_datadir}/joe/syntax/
 
@@ -65,12 +50,12 @@ Categories=X-MandrivaLinux-MoreApplications-Editors;TextEditor;
 EOF
 
 %files
-%doc ChangeLog docs/help-system.html
+%doc docs/help-system.html
 %{_bindir}/*
 %dir %{_sysconfdir}/joe
 %config(noreplace) %{_sysconfdir}/joe/*
 %{_datadir}/%{name}/*
-%{_mandir}/man1/*
+%doc %{_mandir}/man1/*
 %lang(ru) %{_mandir}/ru/man1/*
 %{_datadir}/applications/*
-%{_datadir}/doc/joe/*
+%doc %{_docdir}/joe/*