[grass] SOLVE MAN PAGE CONFLICT AND CORRECT ENCODING

[Volker Fröhlich]

commit 0b2a31f58e205d9357307c9951f28d28f7731078
Author: Volker Fröhlich <volker27 at gmx.at>
Date:   Sun Mar 4 21:18:46 2012 +0100

    SOLVE MAN PAGE CONFLICT AND CORRECT ENCODING

 grass.spec |   49 +++++++++++++++++++++----------------------------
 1 files changed, 21 insertions(+), 28 deletions(-)
---
diff --git a/grass.spec b/grass.spec
index 50d223a..ba03e55 100644
--- a/grass.spec
+++ b/grass.spec
@@ -1,9 +1,10 @@
-#TODO: Create ticket on "shared lib calls exit"
-#TODO: Create a ticket on FHS violation
-#TODO: Should the manpages be called foo.1grass, like in Ubuntu?
-#TODO: The manpages are created from HTML with a parser, that is
+# "shared lib calls exit" -- http://trac.osgeo.org/grass/ticket/1598
+
+# The manpages are created from HTML with a parser, that is
 # included. It has some flaws, see:
 # https://trac.osgeo.org/grass/ticket/612
+
+#TODO: Create a ticket on FHS violation
 #TODO: Add Module Makefile for developers?
 #TODO: xml-etree?
 #TODO: Consider to drop the separate libs packages, like Debian did
@@ -25,7 +26,7 @@
 
 Name:      grass
 Version:   6.4.2
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   GRASS - Geographic Resources Analysis Support System
 Group:     Applications/Engineering
 License:   GPLv2+
@@ -61,7 +62,10 @@ BuildRequires:  geos-devel
 BuildRequires:  gettext
 BuildRequires:  lapack-devel
 BuildRequires:  lesstif-devel
+
+#TODO: Really BR?
 BuildRequires:  libjpeg-devel
+
 BuildRequires:  libpng-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  libXmu-devel
@@ -140,17 +144,6 @@ sed -i 's|--libmysqld-libs|--libs|g' configure
 sed -i 's|^cp |cp -p |' tools/build_html_index.sh
 sed -i 's|-cp |-cp -p |' Makefile
 
-# Update FSF addresses of different age
-# https://trac.osgeo.org/grass/ticket/1422
-# Already fixed for next version!
-for f in `find . -name *.h -o -name *.c -o -name *.rtf` ; do
-  sed -i -e 's/\(59 Temple Place.*Suite 330\|675 Mass Ave\)/51 Franklin Street, Fifth Floor/' \
-      -e 's/\(Boston, MA.*02111-1307\|Cambridge, MA 02139\)/Boston,  MA 02110-1301/' $f
-done
-for f in `find lib/vector/dglib -type f` ; do
-  sed -i -e 's/02111-1307/02110-1301/' $f
-done
-
 # EOL wrong
 sed -i -e 's|\r||g' gui/icons/%{name}/vdigit/box.xbm
 
@@ -191,8 +184,6 @@ export INSTALL="%{__install} -c -p"
    %{configure_64_bit}
 
 make %{?_smp_mflags}
-# Race condition shows up again in 6.4.1
-#make
 
 %install
 rm -rf %{buildroot}
@@ -266,16 +257,13 @@ cat > %{buildroot}%{_sysconfdir}/prelink.conf.d/%{name}-%{cpuarch}.conf <<EOF
 -b %{_libdir}/libgrass_sim.so.6.4
 EOF
 
-# Make man pages available on system, convert to utf8
-pushd %{buildroot}%{_prefix}/%{name}-%{version}/man/
-for manpage in `find  man1 -type f` ; do
-   iconv -f iso88592 -t utf8 \
-        $manpage > $manpage.tmp
-        mv -f $manpage.tmp $manpage
+# Make man pages available on system, convert to utf8 and avoid name conflict with "parallel" manpage
+mkdir -p %{buildroot}%{_mandir}/man1
+for manpage in `find  %{buildroot}%{_prefix}/%{name}-%{version}/man/man1 -type f` ; do
+   iconv -f iso8859-1 -t utf8 \
+        $manpage > %{buildroot}%{_mandir}/man1/`basename $manpage`"grass"
 done
-popd
-mkdir -p %{buildroot}%{_mandir}
-mv %{buildroot}%{_prefix}/%{name}-%{version}/man/* %{buildroot}%{_mandir}
+sed -i -e 's/^.TH \(.*\) 1/.TH \1 1grass/' %{buildroot}%{_mandir}/man1/*
 rm -rf %{buildroot}%{_prefix}/%{name}-%{version}/man
 
 # Make locales available on system, correct case for pt_br locale
@@ -359,7 +347,7 @@ rm -rf %{buildroot}
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
 %dir %{_datadir}/locale/*/LC_MESSAGES
-%{_mandir}/man1/*
+%{_mandir}/man1/*.1grass*
 
 %files libs
 %doc AUTHORS COPYING GPL.TXT CHANGES ChangeLog_%{version}.gz translators.csv contributors.csv contributors_extra.csv
@@ -377,6 +365,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Mar  4 2012 Volker Fröhlich <volker27 at gmx.at> - 6.4.2-2
+- Solve name conflict with "parallel" man pages (BZ 797824)
+- Correct man page encoding conversion
+- Build with multiple workers; assumuption on race-condition was wrong
+
 * Fri Mar  2 2012 Tom Callaway <spot at fedoraproject.org> - 6.4.2-1
 - update to 6.4.2