]> git.pld-linux.org Git - packages/john.git/commitdiff
- store jumbo patch in df
authorAdam Gołębiowski <adamg@pld-linux.org>
Sun, 3 Jul 2011 10:10:37 +0000 (10:10 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
- solve conflict between optflags and jumbo patches

Changed files:
    john.spec -> 1.67

john.spec

index ec9576ec09ddf8ef2757b7bc46f899d8e69e0537..4508f381d6db9ef2aa85e22a6d3deb39c9aa559c 100644 (file)
--- a/john.spec
+++ b/john.spec
@@ -43,6 +43,8 @@ Source0:      http://www.openwall.com/john/g/%{name}-%{version}.tar.bz2
 Patch0:                %{name}-mailer.patch
 Patch1:                optflags.patch
 Patch2:                http://www.openwall.com/john/g/%{name}-%{version}-jumbo-2.diff.gz
+# Patch2-md5:  445bbcc9049a632c18359cb7a0fdfb27
+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:%patch2 -p1}
+%{?with_jumbopatch:%patch3 -p1}
 
 %{__rm} doc/INSTALL
 
This page took 0.169963 seconds and 4 git commands to generate.