From b3fdf4cb69948f710650fb06653ebdde95d5a8da Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
Date: Thu, 30 Jan 2014 15:00:45 +0100
Subject: [PATCH] Update to latest upstream version (0.8.3)

---
 .gitignore    |  2 ++
 pinentry.spec | 22 +++++++---------------
 sources       |  4 ++--
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 10fa526..09d91de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@ pinentry-0.8.0.tar.gz
 pinentry-0.8.0.tar.gz.sig
 /pinentry-0.8.1.tar.gz
 /pinentry-0.8.1.tar.gz.sig
+/pinentry-0.8.3.tar.bz2
+/pinentry-0.8.3.tar.bz2.sig
diff --git a/pinentry.spec b/pinentry.spec
index ad37c03..a1536ce 100644
--- a/pinentry.spec
+++ b/pinentry.spec
@@ -16,16 +16,16 @@
 %endif
 
 Name:    pinentry
-Version: 0.8.1
-Release: 11%{?dist}
+Version: 0.8.3
+Release: 1%{?dist}
 Summary: Collection of simple PIN or passphrase entry dialogs
 
 Group:   Applications/System
 # qt & qt4 subpackage have different license, see subpackage definitions
 License: GPLv2+
 URL:     http://www.gnupg.org/aegypten/
-Source0: ftp://ftp.gnupg.org/gcrypt/pinentry/%{name}-%{version}.tar.gz
-Source1: ftp://ftp.gnupg.org/gcrypt/pinentry/%{name}-%{version}.tar.gz.sig
+Source0: ftp://ftp.gnupg.org/gcrypt/pinentry/%{name}-%{version}.tar.bz2
+Source1: ftp://ftp.gnupg.org/gcrypt/pinentry/%{name}-%{version}.tar.bz2.sig
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # borrowed from opensuse
@@ -130,8 +130,6 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # Backwards compatibility
@@ -145,11 +143,6 @@ install -p -m755 -D %{SOURCE10} $RPM_BUILD_ROOT%{_bindir}/pinentry
 # unpackaged files
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 # alternatives dropped at 0.7.6-3 (use %%trigger instead?)
 %pre
 %{_sbindir}/update-alternatives --remove pinentry %{_bindir}/pinentry-curses ||:
@@ -168,19 +161,16 @@ fi
 
 
 %files
-%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README THANKS TODO
 %{_bindir}/pinentry-curses
 %{_bindir}/pinentry
 %{_infodir}/pinentry.info*
 
 %files gtk
-%defattr(-,root,root,-)
 %{_bindir}/pinentry-gtk
 %{_bindir}/pinentry-gtk-2
 
 %files qt
-%defattr(-,root,root,-)
 %{_bindir}/pinentry-qt
 %if ! 0%{?_enable_pinentry_qt:1}
 %{_bindir}/pinentry-qt4
@@ -188,13 +178,15 @@ fi
 
 %if 0%{?_enable_pinentry_qt4:1}
 %files qt4
-%defattr(-,root,root,-)
 %{_bindir}/pinentry-qt4
 %endif
 %endif
 
 
 %changelog
+* Thu Jan 30 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0.8.3-1
+- Update to latest upstream version (0.8.3)
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.1-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index c4d6ea5..69e194e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-81f99904daee5331eb6738408bb024b6  pinentry-0.8.1.tar.gz
-defb44904ff18f793b3782baf92ee91c  pinentry-0.8.1.tar.gz.sig
+2ae681cbca0d9fb774b2c90b11ebf56c  pinentry-0.8.3.tar.bz2
+ceb97a29e3db6a44f83102fd610f8af8  pinentry-0.8.3.tar.bz2.sig