From 4cca98279254d3a5b787080ff7ab087737a0badc Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Thu, 3 Apr 2014 16:42:07 +0200
Subject: [PATCH] new upstream release - 2.11

---
 sources                    |   2 +-
 units-2.10-bz1082335.patch |  35 -----------------------------------
 units-2.10.tar.gz.sig      | Bin 72 -> 0 bytes
 units-2.11.tar.gz.sig      | Bin 0 -> 72 bytes
 units.spec                 |  10 +++++-----
 5 files changed, 6 insertions(+), 41 deletions(-)
 delete mode 100644 units-2.10-bz1082335.patch
 delete mode 100644 units-2.10.tar.gz.sig
 create mode 100644 units-2.11.tar.gz.sig

diff --git a/sources b/sources
index 13b434f..5503f6b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-08dc084526a879dd04b64ef46db2b80d  units-2.10.tar.gz
+1d83f4e68135495aa9267b848de78dc5  units-2.11.tar.gz
diff --git a/units-2.10-bz1082335.patch b/units-2.10-bz1082335.patch
deleted file mode 100644
index 2ddce3a..0000000
--- a/units-2.10-bz1082335.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 767f49f2d3e6ded0f2e01563fcf2d272aa6a7141 Mon Sep 17 00:00:00 2001
-From: Kamil Dudka <kdudka@redhat.com>
-Date: Mon, 31 Mar 2014 14:38:57 +0200
-Subject: [PATCH] units_cur2: encode utf-8 for sys.stdout, too
-
-Otherwise, the script ends up with the following error:
-
-$ python2 ./units_cur2 - | cat
-./units_cur2:53: RuntimeWarning: Argument <type 'str'> is not an unicode object. Passing an encoded string will likely have unexpected results.
-  ascii = unidecode(names[i])
-Traceback (most recent call last):
-  File "./units_cur2", line 114, in <module>
-    outfile.write(outstr.replace('\n',os.linesep))
-UnicodeEncodeError: 'ascii' codec can't encode character u'\xf3' in position 41: ordinal not in range(128)
----
- units_cur2 |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/units_cur2 b/units_cur2
-index 7d4e8f5..d810be5 100755
---- a/units_cur2
-+++ b/units_cur2
-@@ -104,7 +104,8 @@ for metal in metals:
- 
- try:
-   if outfile == '-':
--    outfile = sys.stdout
-+    info = codecs.lookup('utf8')
-+    outfile = codecs.StreamReaderWriter(sys.stdout, info.streamreader, info.streamwriter)
-   else:    
-     outfile = codecs.open(outfile,'w','utf8')
- except IOError, exc:
--- 
-1.7.1
-
diff --git a/units-2.10.tar.gz.sig b/units-2.10.tar.gz.sig
deleted file mode 100644
index bee0d8e659ab3389f2f7cb8354973e591eba12cd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 72
zcmV-O0Jr~$Mg#y60ssaD0#h?SUjPaT5EzNo@Ze)_NfSN*pI15hF^x&mEQv5Dfb(C~
euL0o{bpV?O-{_I%5}1g9TijiJLC)<)SniZRQ5<;y

diff --git a/units-2.11.tar.gz.sig b/units-2.11.tar.gz.sig
new file mode 100644
index 0000000000000000000000000000000000000000..b0ac0899707592d47b438ef04c0b314b1f435ca4
GIT binary patch
literal 72
zcmV-O0Jr~$Mg#y60ssaD0#iJQbN~to5EzNo@Ze)_Nl}#mpK(bTxNGvxg$PL_u~wWP
eYMvg+833CF<t^;mVPKEn6z=NVK(XRU)kn)?bsca3

literal 0
HcmV?d00001

diff --git a/units.spec b/units.spec
index e40fca3..37ccd86 100644
--- a/units.spec
+++ b/units.spec
@@ -1,9 +1,8 @@
 Summary: A utility for converting amounts from one unit to another
 Name: units
-Version: 2.10
-Release: 2%{?dist}
+Version: 2.11
+Release: 1%{?dist}
 Source: ftp://ftp.gnu.org/gnu/units/%{name}-%{version}.tar.gz
-Patch0: units-2.10-bz1082335.patch
 URL: http://www.gnu.org/software/units/units.html
 License: GPLv3+
 Group: Applications/Engineering
@@ -24,8 +23,6 @@ well as conversions such as Fahrenheit to Celsius.
 
 %prep
 %setup -q
-%patch0 -p1
-touch units_cur3
 
 %build
 %configure
@@ -60,6 +57,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Thu Apr 03 2014 Kamil Dudka <kdudka@redhat.com> - 2.11-1
+- new upstream release
+
 * Mon Mar 31 2014 Kamil Dudka <kdudka@redhat.com> - 2.10-2
 - require python-unidecode used by the units_cur script
 - improve utf-8 support in the units_cur script