SPECS: john.spec - start update to 1.7

[areq]

Author: areq                         Date: Sun Jan 29 00:22:42 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- start update to 1.7

---- Files affected:
SPECS:
   john.spec (1.41 -> 1.42) 

---- Diffs:

================================================================
Index: SPECS/john.spec
diff -u SPECS/john.spec:1.41 SPECS/john.spec:1.42
--- SPECS/john.spec:1.41	Wed May 11 17:27:01 2005
+++ SPECS/john.spec	Sun Jan 29 01:22:37 2006
@@ -11,15 +11,12 @@
 Summary:	Password cracker
 Summary(pl):	Łamacz haseł
 Name:		john
-Version:	1.6.37
-Release:	7
+Version:	1.7
+Release:	0.1
 License:	GPL
 Group:		Applications/System
-Source0:	http://www.openwall.com/john/a/%{name}-%{version}.tar.gz
-# Source0-md5:	9403233b640927295c05b0564ff1f678
-# needed for docs and charset files
-Source1:	http://www.openwall.com/john/%{name}-1.6.tar.gz
-# Source1-md5:	aae782f160041b2bdc624b0a84054e32
+Source0:	http://www.openwall.com/john/d/%{name}-%{version}.tar.bz2
+# Source0-md5:	615b912caa677eec790e28745a12b2ae
 Patch0:		%{name}-1.6.PLD.diff
 Patch1:		%{name}-1.6.ini.diff
 Patch2:		%{name}-1.6.makefile.diff
@@ -44,13 +41,14 @@
 Solaris 2.x SPARC i x86, Digital UNIX, AIX, HP-UX oraz IRIX.
 
 %prep
-%setup -q -a1
+%setup -q 
 %patch0 -p1
 #%patch1 -p1
 #%patch2 -p1
 # or move it to /var maybe?
-%patch3 -p1
+#%patch3 -p1
 sed -i -e 's,/usr/lib,%{_libdir},' src/params.h run/john.conf
+sed -i -e 's/CLK_TCK/CLOCKS_PER_SEC/g' src/*.c
 
 %build
 cd src
@@ -61,9 +59,9 @@
 # K6 optimization exists only in Makefile
 %ifarch %{ix86}
 	%if %{with mmx}
-		TARG=linux-x86-mmx-elf
+		TARG=linux-x86-mmx
 	%else
-		TARG=linux-x86-any-elf
+		TARG=linux-x86-any
 	%endif
 %else
 	%ifarch alpha
@@ -88,7 +86,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/john}
-install run/john.conf john-1.6/run/*.chr $RPM_BUILD_ROOT%{_libdir}/john
+install run/john.conf run/*.chr $RPM_BUILD_ROOT%{_libdir}/john
 install run/john $RPM_BUILD_ROOT%{_bindir}
 
 rm -f doc/INSTALL
@@ -103,7 +101,7 @@
 
 %files
 %defattr(644,root,root,755)
-%doc doc/* john-1.6/doc/{CONFIG,EXAMPLES,EXTERNAL,FAQ,MODES,NEWS,OPTIONS,RULES} run/mailer
+%doc doc/* run/mailer
 %attr(755,root,root) %{_bindir}/*
 %{_libdir}/john
 
@@ -113,6 +111,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.42  2006/01/29 00:22:37  areq
+- start update to 1.7
+
 Revision 1.41  2005/05/11 15:27:01  qboosh
 - use x8664 macro
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/john.spec?r1=1.41&r2=1.42&f=u