SPECS: john.spec - clean up inspired by Solar Designer

[areq]

Author: areq                         Date: Sun Feb 12 21:35:28 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- clean up inspired by Solar Designer

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

---- Diffs:

================================================================
Index: SPECS/john.spec
diff -u SPECS/john.spec:1.42 SPECS/john.spec:1.43
--- SPECS/john.spec:1.42	Sun Jan 29 01:22:37 2006
+++ SPECS/john.spec	Sun Feb 12 22:35:22 2006
@@ -12,15 +12,12 @@
 Summary(pl):	Łamacz haseł
 Name:		john
 Version:	1.7
-Release:	0.1
+Release:	0.2
 License:	GPL
 Group:		Applications/System
 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
-Patch3:		ftp://ftp.banquise.net/users/bandecon/john-patch/john-1.6.37-bigpatch-11.diff.gz
+Patch0:		%{name}-mailer.patch
 URL:		http://www.openwall.com/john/
 BuildRequires:	rpmbuild(macros) >= 1.213
 BuildRequires:	sed >= 4.0
@@ -43,16 +40,11 @@
 %prep
 %setup -q 
 %patch0 -p1
-#%patch1 -p1
-#%patch2 -p1
-# or move it to /var maybe?
-#%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
-COPT="%{rpmcflags}"
 
 # bleh... MMX code must be chosen at compile time :(
 # cannot use MMX for generic i586 nor i686 (Pentium/Pentium Pro have no MMX)
@@ -80,17 +72,19 @@
 %endif
 
 %{__make} $TARG \
-	OPT="$COPT" \
+	CFLAGS="-c -Wall -fomit-frame-pointer %{rpmcflags} -DJOHN_SYSTEMWIDE=1" \
 	CC="%{__cc}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/john}
-install run/john.conf run/*.chr $RPM_BUILD_ROOT%{_libdir}/john
+
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/john}
+install run/{*.conf,*.chr,*.lst} $RPM_BUILD_ROOT%{_datadir}/john
 install run/john $RPM_BUILD_ROOT%{_bindir}
 
 rm -f doc/INSTALL
 
+
 cd $RPM_BUILD_ROOT%{_bindir}
 ln -sf john unafs
 ln -sf john unique
@@ -103,7 +97,7 @@
 %defattr(644,root,root,755)
 %doc doc/* run/mailer
 %attr(755,root,root) %{_bindir}/*
-%{_libdir}/john
+%{_datadir}/john
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -111,6 +105,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.43  2006/02/12 21:35:22  areq
+- clean up inspired by Solar Designer
+
 Revision 1.42  2006/01/29 00:22:37  areq
 - start update to 1.7
 
================================================================

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