X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=john.spec;h=5ae14f1a7d335c5372d202a35bb8e150fc0c456a;hb=df66f5b946316e25ed97193fc1fa1b098491ccf4;hp=b92b701485925148985d7b8d62528c7783fbf998;hpb=368eb0446109f568abce89e236c7e6e54ebf1092;p=packages%2Fjohn.git

diff --git a/john.spec b/john.spec
index b92b701..5ae14f1 100644
--- a/john.spec
+++ b/john.spec
@@ -4,17 +4,22 @@
 # Optimization must be chosen at compile time :(
 # Maybe some patch...? But not yet.
 #
+%ifarch athlon
+%define _with_mmx 1
+%endif
 Summary:	Password cracker
 Summary(pl):	£amacz hase³
 Name:		john
-Version:	1.6
-Release:	6
+Version:	1.6.37
+Release:	1
 License:	GPL
 Group:		Applications/System
-Source0:	http://www.openwall.com/john/%{name}-%{version}.tar.gz
-Patch0:		%{name}-%{version}.PLD.diff
-Patch1:		%{name}-%{version}.ini.diff
-Patch2:		%{name}-%{version}.makefile.diff
+Source0:	http://www.openwall.com/john/%{name}-1.6.tar.gz
+# Source0-md5:	aae782f160041b2bdc624b0a84054e32
+Patch0:		%{name}-1.6.34.patch
+Patch1:		%{name}-1.6.PLD.diff
+Patch2:		%{name}-1.6.ini.diff
+Patch3:		%{name}-1.6.makefile.diff
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -27,13 +32,15 @@ IRIX.
 %description -l pl
 John The Ripper jest "³amaczem" hase³ dostêpnym dla systemów UNIX,
 DOS, WinNT/Win95. G³ównym jego zadaniem jest wykrywanie "s³abych"
-hase³.
+hase³. By³ testowany z Linux x86/Alpha/SPARC, FreeBSD x86, OpenBSD x86,
+Solaris 2.x SPARC i x86, Digital UNIX, AIX, HP-UX oraz IRIX.
 
 %prep
-%setup -q
+%setup -q -n %{name}-1.6
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
+#%patch2 -p1
+#%patch3 -p1
 
 %build
 cd src
@@ -60,16 +67,15 @@ COPT="%{rpmcflags}"
 	%endif
 %endif
 
-%{__make} OPT="$COPT" $TARG
+%{__make} OPT="$COPT" CC="%{__cc}" $TARG
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/john}
-install run/{*.chr,john.ini} $RPM_BUILD_ROOT%{_libdir}/john
+install run/{*.chr,john.conf} $RPM_BUILD_ROOT%{_libdir}/john
 install run/john $RPM_BUILD_ROOT%{_bindir}
-rm -f doc/INSTALL
 
-gzip -9nf doc/* run/mailer
+rm -f doc/INSTALL
 
 cd $RPM_BUILD_ROOT%{_bindir}
 ln -sf john unafs
@@ -81,6 +87,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc doc/* run/mailer.gz
+%doc doc/* run/mailer
 %attr(755,root,root) %{_bindir}/*
 %{_libdir}/john