From 9cbcffcecfebbdc676c01b6c67e78652d0b1b58e Mon Sep 17 00:00:00 2001
From: Till Maas <till@fedoraproject.org>
Date: Jan 18 2010 22:09:33 +0000
Subject: - Update to new release

- fix Source0
- add missing -m parameters to install
- set LDFLAGS to RPM_OPT_FLAGS for non mmx build
- add signature as Source1

---

diff --git a/.cvsignore b/.cvsignore
index 182b48f..04e0fc0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
-john-1.7.0.2.tar.bz2
+john-1.7.3.4.tar.bz2
+john-1.7.3.4.tar.bz2.sign
diff --git a/john.spec b/john.spec
index b78eb37..4151589 100644
--- a/john.spec
+++ b/john.spec
@@ -1,12 +1,13 @@
 Summary:          John the Ripper password cracker
 Name:             john
-Version:          1.7.0.2
-Release:          7%{?dist}
+Version:          1.7.3.4
+Release:          1%{?dist}
 
 URL:              http://www.openwall.com/john
 License:          GPLv2
 Group:            Applications/System
-Source0:          http://www.openwall.com/john/f/john-%{version}.tar.bz2
+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
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -26,25 +27,25 @@ cp -a src src-mmx
 
 %build
 
-%define target_non_mmx generic
+%global target_non_mmx generic
 
 %ifarch %{ix86}
-%define target_non_mmx linux-x86-any
-%define target_mmx linux-x86-mmx
+%global target_non_mmx linux-x86-any
+%global target_mmx linux-x86-mmx
 %endif
 %ifarch x86_64
-%define target_non_mmx linux-x86-64
+%global target_non_mmx linux-x86-64
 %endif
 %ifarch ppc
-%define target_non_mmx linux-ppc32
+%global target_non_mmx linux-ppc32
 %endif
 %ifarch ppc64
-%define target_non_mmx linux-ppc64
+%global target_non_mmx linux-ppc64
 %endif
 
 export CFLAGS="-c ${RPM_OPT_FLAGS} -DJOHN_SYSTEMWIDE=1"
 
-make -C src %{target_non_mmx} CFLAGS="${CFLAGS}" LDFLAGS=""
+make -C src %{target_non_mmx} CFLAGS="${CFLAGS}" LDFLAGS="${RPM_OPT_FLAGS}"
 
 %if 0%{?target_mmx:1}
 mv run/john run/john-non-mmx
@@ -57,14 +58,14 @@ make -C src-mmx %{target_mmx}  CFLAGS="${CFLAGS}" LDFLAGS=""
 
 %install
 rm -rf %{buildroot}
-install -d 755 %{buildroot}%{_sysconfdir}
-install -d 755 %{buildroot}%{_bindir}
-install -d 755 %{buildroot}%{_datadir}/john
+install -d -m 755 %{buildroot}%{_sysconfdir}
+install -d -m 755 %{buildroot}%{_bindir}
+install -d -m 755 %{buildroot}%{_datadir}/john
 install -m 755 run/{john,mailer} %{buildroot}%{_bindir}
 install -m 644 run/{*.chr,password.lst} %{buildroot}%{_datadir}/john
 install -m 644 run/john.conf %{buildroot}%{_sysconfdir}
 %if 0%{?target_mmx:1}
-install -d 755 %{buildroot}%{_libexecdir}/john
+install -d -m 755 %{buildroot}%{_libexecdir}/john
 install -m 755 run/john-non-mmx %{buildroot}%{_libexecdir}/john/
 %endif
 pushd %{buildroot}%{_bindir}
@@ -87,6 +88,19 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Mon Jan 18 2010 Till Maas <opensource@till.name> - 1.7.3.4-1
+- Update to new release
+- fix Source0
+- add missing -m parameters to install
+- set LDFLAGS to RPM_OPT_FLAGS for non mmx build
+- add signature as Source1
+
+* Fri Jan 08 2010 Till Maas <opensource@till.name> - 1.7.0.2-9
+- Use %%global instead of %%define
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.0.2-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.0.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
diff --git a/sources b/sources
index 884a256..4225c64 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-0a87dca1f149493fc087ea8a8b6ae5d5  john-1.7.0.2.tar.bz2
+2f2310c49961c3edea6f92b8dcd45ff4  john-1.7.3.4.tar.bz2
+889eabfd96fdd6dc888d68834d1e18b5  john-1.7.3.4.tar.bz2.sign