From fd1cb9722c3402eb7ace3ec92adeef827337a6a1963fc884cce5f458a0d83520 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez@opensuse.org>
Date: Wed, 27 Jul 2011 06:23:51 +0000
Subject: [PATCH] Accepting request 75950 from home:Lazy_Kent:branches:editors

Convert Russian and Ukrainian locales and docs to UTF-8

OBS-URL: https://build.opensuse.org/request/show/75950
OBS-URL: https://build.opensuse.org/package/show/editors/joe?expand=0&rev=11
---
 joe-3.7.tar.bz2 |  3 ---
 joe-3.7.tar.gz  |  3 +++
 joe.changes     |  8 ++++++++
 joe.spec        | 22 +++++++++++++---------
 4 files changed, 24 insertions(+), 12 deletions(-)
 delete mode 100644 joe-3.7.tar.bz2
 create mode 100644 joe-3.7.tar.gz

diff --git a/joe-3.7.tar.bz2 b/joe-3.7.tar.bz2
deleted file mode 100644
index 9e17837..0000000
--- a/joe-3.7.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:990f7f5b68f0964b920c6faeb18f16a3d56e81246536e67fc994da310c58de62
-size 531140
diff --git a/joe-3.7.tar.gz b/joe-3.7.tar.gz
new file mode 100644
index 0000000..6d2f03e
--- /dev/null
+++ b/joe-3.7.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cae456e1ad5a8c1d3c94920a3416c2347277739b260e3494d3bc0f2b9b73106f
+size 696036
diff --git a/joe.changes b/joe.changes
index ebac77b..1d7dd30 100644
--- a/joe.changes
+++ b/joe.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sat Jul  9 08:27:23 UTC 2011 - lazy.kent@opensuse.org
+
+- Convert Russian and Ukrainian docs and locales from KOI8 to
+  UTF-8.
+- Corrected License tag.
+- Use full URL for Source.
+
 -------------------------------------------------------------------
 Mon Oct 26 18:17:39 CET 2009 - pth@suse.de
 
diff --git a/joe.spec b/joe.spec
index 6b2645e..ed77e14 100644
--- a/joe.spec
+++ b/joe.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package joe (Version 3.7)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,14 +20,14 @@
 
 Name:           joe
 BuildRequires:  ncurses-devel
-License:        GPL v2 or later
+License:        GPL-2.0+
 Group:          Productivity/Editors/Other
 AutoReqProv:    on
 Version:        3.7
 Release:        5
 Summary:        A Text Editor
 Url:            http://sourceforge.net/projects/joe-editor
-Source:         joe-%{version}.tar.bz2
+Source0:        http://downloads.sourceforge.net/joe-editor/%{name}-%{version}.tar.gz
 Source2:        de.po
 Patch0:         joe-3.1-terminate_buffer.patch
 Patch2:         joe-3.1-fix_isblanck_argument.patch
@@ -71,7 +71,6 @@ and search and replace using regular expressions.
 Authors:
 --------
     Joseph H. Allen <jhallen@world.std.com>
-    
     Marek 'Marx' Grac <xgrac@fi.muni.cz>
 
 %prep
@@ -86,6 +85,16 @@ Authors:
 %patch9
 %patch10
 cp %{S:2} po
+# Convert Russian docs and locale from KOI8-R to UTF-8.
+for ru in man/ru/joe.1.in po/ru.po rc/jicerc.ru.in ; do
+    iconv -f KOI8-R -t UTF-8 -o "${ru}.tmp" "${ru}" && \
+    mv -f "${ru}.tmp" "${ru}"
+done
+sed -i 's/charset=koi8-r/charset=UTF-8/' po/ru.po
+# Convert Ukrainian locale from KOI8-U to UTF-8.
+iconv -f KOI8-U -t UTF-8 po/uk.po | \
+sed 's/charset=koi8-u/charset=UTF-8/' > po/uk.po.tmp && \
+mv -f po/uk.po.tmp po/uk.po
 
 %build
 autoreconf -fi
@@ -101,11 +110,6 @@ make
 
 %install
 %makeinstall
-#  prefix=%{buildroot}%{_prefix} \
-#  mandir=%{buildroot}%{_mandir} \
-#  sysconfdir=%{buildroot}%{_sysconfdir} \
-#  docdir=%{buildroot}%{_defaultdocdir}/%name \
-#  install
 for i in jmacs jpico jstar rjoe; do
   ln -s joe.1.gz %{buildroot}%{_mandir}/man1/$i.1.gz
 done