From 949743137b8c091b3cd0670b281872ad5682a701 Mon Sep 17 00:00:00 2001
From: Simon Wesp <cassmodiah@fedoraproject.org>
Date: Tue, 15 Mar 2011 22:07:06 +0100
Subject: [PATCH] 0.7->0.8.pre2

---
 .gitignore |  1 +
 sources    |  2 +-
 yapet.spec | 34 ++++++++++++++++++++++++++++------
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2a9bd52..5c5b8c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 yapet-0.6.tar.gz
 /yapet-0.7.tar.bz2
+/yapet-0.8pre2.tar.bz2
diff --git a/sources b/sources
index 93039bd..b66135d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2d70b470b40b9c662988f4b8f8d4b333  yapet-0.7.tar.bz2
+e7f06fa1d556d051a3548729f0cb7e9d  yapet-0.8pre2.tar.bz2
diff --git a/yapet.spec b/yapet.spec
index 2dbea94..f7c5fa7 100644
--- a/yapet.spec
+++ b/yapet.spec
@@ -1,12 +1,14 @@
+%global pre pre2
+
 Name:          yapet
-Version:       0.7
-Release:       2%{?dist}
+Version:       0.8
+Release:       0.1.%{pre}%{?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.bz2
+Source0:       http://www.guengel.ch/myapps/%{name}/downloads/%{name}-%{version}%{pre}.tar.bz2
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
@@ -22,11 +24,28 @@ for installing on desktop and server systems alike.
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{pre}
+
+for f in ./DESIGN ./README
+do
+  iconv -f iso-8859-1 -t utf-8 $f |sed 's|\r||g' > $f.utf8
+  touch -c -r $f $f.utf8
+  mv $f.utf8 $f
+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}"
+%configure \
+           --enable-terminal-title \
+           --enable-csv2yapet \
+           --enable-pwgen \
+           --disable-build-doc \
+           --disable-source-doc \
+           --disable-install-doc
+
+make %{?_smp_mflags} \
+     CXXFLAGS+="%{optflags}" \
+     CFLAGS+="%{optflags}"
 
 
 %install
@@ -53,6 +72,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Mar 15 2011 Simon Wesp <cassmdodiah@fedoraproject.org> - 0.8-0.1.pre2
+- Update
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild