- rediffed against jumbo-1.7.9-5

[packages/john.git] / john.spec

diff --git a/john.spec b/john.spec
index 5cbf2a67fad7aad305d3c0b7232f4f0bee815beb..1803f52e5275d5234a92ca9b5a5b1b575d5ab731 100644 (file)
--- a/john.spec
+++ b/john.spec
@@ -34,15 +34,17 @@
 Summary:       Password cracker
 Summary(pl.UTF-8):     Łamacz haseł
 Name:          john
-Version:       1.7.7
+Version:       1.7.9
 Release:       1
 License:       GPL v2
 Group:         Applications/System
 Source0:       http://www.openwall.com/john/g/%{name}-%{version}.tar.bz2
-# Source0-md5: be316618de834a58573a21225d4a2674
+# Source0-md5: 45f54fc59386ecd67daaef9f19781d93
 Patch0:                %{name}-mailer.patch
 Patch1:                optflags.patch
-%{?with_jumbopatch:Patch1: http://www.openwall.com/john/contrib/%{name}-%{version}-jumbo-1.diff.gz}
+Patch2:                http://www.openwall.com/john/g/%{name}-1.7.9-jumbo-5.diff.gz
+# Patch2-md5:  68cacb612f20c71eed6c24cbaf28148a
+Patch3:                %{name}-jumbo-optflags.patch
 URL:           http://www.openwall.com/john/
 %{?with_jumbopatch:BuildRequires: openssl-devel >= 0.9.7}
 BuildRequires: rpmbuild(macros) >= 1.213
@@ -82,8 +84,9 @@ Windows NT/2000/XP LM, a także kilka innych przy użyciu łat.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%{?with_jumbopatch:%patch1 -p1}
+%{!?with_jumbopatch:%patch1 -p1}
+%{?with_jumbopatch:%patch2 -p1}
+%{?with_jumbopatch:%patch3 -p1}
 
 %{__rm} doc/INSTALL
 
@@ -183,4 +186,5 @@ rm -rf $RPM_BUILD_ROOT
 %if %{do_ssefb}
 %attr(755,root,root) %{_libdir}/john/john-non-sse
 %endif
+%endif
 %{_datadir}/john