[john] Adjust release

[Till Maas]

commit 8d6a3e12d7c05fcdafa7fec650b33a98fd988f8b
Author: Till Maas <opensource at till.name>
Date:   Fri May 31 18:57:57 2013 +0200

    Adjust release
    
    - remove INSTALL in install to keep it available after prep
    - Add john extra charsets
    - Use xz

 .gitignore |   12 ++++--------
 john.spec  |   26 +++++++++++++++++++-------
 sources    |    4 ++--
 3 files changed, 25 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 74740f5..24af8f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,4 @@
-john-1.7.3.4.tar.bz2
-john-1.7.3.4.tar.bz2.sign
-/john-1.7.6.tar.bz2
-/john-1.7.6.tar.bz2.sign
-/john-1.7.8.tar.bz2
-/john-1.7.8.tar.bz2.sign
-/john-1.7.9.tar.bz2
-/john-1.7.9.tar.bz2.sign
+/john-1.8.0.tar.xz
+/john-1.8.0.tar.xz.sign
+/john-extra-20130529.tar.xz
+/john-extra-20130529.tar.xz.sign
diff --git a/john.spec b/john.spec
index d50f293..33faf3e 100644
--- a/john.spec
+++ b/john.spec
@@ -1,15 +1,17 @@
+%global extra_date 20130529
+
 Summary:          John the Ripper password cracker
 Name:             john
-Version:          1.7.9
-Release:          3%{?dist}
+Version:          1.8.0
+Release:          1%{?dist}
 
 URL:              http://www.openwall.com/john
 License:          GPLv2
 Group:            Applications/System
-Source0:          http://www.openwall.com/john/g/john-%{version}.tar.bz2
-Source1:          http://www.openwall.com/john/g/john-%{version}.tar.bz2.sign
-#Patch1:           http://www.openwall.com/john/contrib/john-1.7-all-4.diff.gz
-#Patch2:           http://www.openwall.com/john/contrib/john-1.7.2-all-2.diff.gz
+Source0:          http://www.openwall.com/john/j/john-%{version}.tar.xz
+Source1:          http://www.openwall.com/john/j/john-%{version}.tar.xz.sign
+Source2:          http://www.openwall.com/john/j/john-extra-%{extra_date}.tar.xz
+Source3:          http://www.openwall.com/john/j/john-extra-%{extra_date}.tar.xz.sign
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
@@ -21,9 +23,9 @@ supported as well.
 %setup -q
 #%patch2 -p0 -b .jumbo
 chmod 0644 doc/*
-rm doc/INSTALL
 sed -i 's#\$JOHN/john.conf#%{_sysconfdir}/john.conf#' src/params.h
 cp -a src src-mmx
+tar --strip-components 1 --directory run -xf "%{SOURCE2}"
 
 %build
 
@@ -73,6 +75,7 @@ ln -s john unafs
 ln -s john unique
 ln -s john unshadow
 popd
+rm doc/INSTALL
 
 %clean
 rm -rf %{buildroot}
@@ -92,6 +95,15 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Fri May 31 2013 Till Maas <opensource at till.name> - 1.8.0-1
+- Adjust release
+- remove INSTALL in install to keep it available after prep
+- Add john extra charsets
+- Use xz
+
+* Fri May 31 2013 Dhiru Kholia <dhiru at openwall.com> - 1.8.0-0
+- Update to latest release john-1.8.0 (RH #969157)
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.9-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index 63e24de..6330962 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-45f54fc59386ecd67daaef9f19781d93  john-1.7.9.tar.bz2
-43ba6009a2c7ea972e4fc4fdb5834426  john-1.7.9.tar.bz2.sign
+bb191828e8cbfd5fe0779dff5d87d5f4  john-extra-20130529.tar.xz
+4de42f4dd5c4988aaa7c26c5d5a288d8  john-extra-20130529.tar.xz.sign