From 9a56be96523270ef45e285b7981ad82fb390d0a1 Mon Sep 17 00:00:00 2001
From: Simon Wesp <cassmodiah@schafwiese.(none)>
Date: Sun, 14 Nov 2010 17:40:24 +0100
Subject: [PATCH] update Committer: Simon Wesp <cassmodiah@fedoraproject.org>

---
 .gitignore           |  1 +
 sources              |  2 +-
 yapet.spec           | 29 +++++++++++------------------
 yapet_gcc44-0.6.diff | 13 -------------
 4 files changed, 13 insertions(+), 32 deletions(-)
 delete mode 100644 yapet_gcc44-0.6.diff

diff --git a/.gitignore b/.gitignore
index dbd2235..2a9bd52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 yapet-0.6.tar.gz
+/yapet-0.7.tar.bz2
diff --git a/sources b/sources
index 27c9ddd..93039bd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-30ee2bf2d4658e667b8eea4a62704b76  yapet-0.6.tar.gz
+2d70b470b40b9c662988f4b8f8d4b333  yapet-0.7.tar.bz2
diff --git a/yapet.spec b/yapet.spec
index 0fc7a0f..ae7f0a0 100644
--- a/yapet.spec
+++ b/yapet.spec
@@ -1,14 +1,12 @@
 Name:          yapet
-Version:       0.6
-Release:       2%{?dist}
+Version:       0.7
+Release:       1%{?dist}
 Summary:       Curses based password encryption tool
 
 Group:         Applications/Productivity
 License:       GPLv3+ with exceptions
 URL:           http://www.guengel.ch/myapps/%{name}/
-Source0:       http://www.guengel.ch/myapps/%{name}/downloads/%{name}-%{version}.tar.gz
-# patch from:  http://bugs.guengel.ch/show_bug.cgi?id=26
-Patch0:        %{name}_gcc44-0.6.diff
+Source0:       http://www.guengel.ch/myapps/%{name}/downloads/%{name}-%{version}.tar.bz2
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
@@ -26,18 +24,6 @@ for installing on desktop and server systems alike.
 %prep
 %setup -q
 
-%if 0%{?fedora} >=11
-%patch0 -p1
-%endif
-
-for i in README DESIGN
-do
- iconv -f iso-8859-1 -t utf-8 $i |sed 's|\r||g' > $i.utf8
- touch -c -r $i $i.utf8
- mv $i.utf8 $i
-done
-
-
 %build
 %configure --enable-terminal-title --enable-csv2yapet --enable-pwgen --disable-build-doc --disable-source-doc --disable-install-doc
 make %{?_smp_mflags} CXXFLAGS+="%{optflags}" CFLAGS+="%{optflags}"
@@ -45,8 +31,12 @@ make %{?_smp_mflags} CXXFLAGS+="%{optflags}" CFLAGS+="%{optflags}"
 
 %install
 rm -rf %{buildroot}
-make install INSTALL="install -p" DESTDIR=%{buildroot}
+make install \
+     INSTALL="install -p" \
+     DESTDIR=%{buildroot}
+
 rm -rf %{buildroot}/%{_datadir}/applications/
+
 %find_lang %{name}
 
 
@@ -63,6 +53,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Nov 14 2010 Simon Wesp <cassmdodiah@fedoraproject.org> - 0.7-1
+- New upstream release
+
 * Sun Oct 12 2009 Simon Wesp <cassmdodiah@fedoraproject.org> - 0.6-2
 - Correct License and patch integration
 - Add LICENSE to DOC
diff --git a/yapet_gcc44-0.6.diff b/yapet_gcc44-0.6.diff
deleted file mode 100644
index 5c621b6..0000000
--- a/yapet_gcc44-0.6.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- yapet-0.6/yapet/pwgen/rng.cc.orig	2009-09-04 21:54:54.287587639 +0200
-+++ yapet-0.6/yapet/pwgen/rng.cc	2009-09-04 21:55:32.575747627 +0200
-@@ -42,6 +42,10 @@
- # include <fcntl.h>
- #endif
- 
-+#ifdef HAVE_STDIO_H
-+# include <stdio.h>
-+#endif
-+
- #ifdef HAVE_STDLIB_H
- # include <stdlib.h>
- #endif