- changed all BuildRoot definitons

[packages/john.git] / john.spec

diff --git a/john.spec b/john.spec
index c2d6af3f7cc114ff2a2ded78ba6d9f20fc9c3e49..0605bd77257824f84d112de480b212a8b5a68089 100644 (file)
--- a/john.spec
+++ b/john.spec
@@ -2,16 +2,15 @@ Summary:      Password cracker
 Summary(pl):   £amacz hase³
 Name:          john
 Version:       1.6
-Release:       2d
+Release:       4
 Copyright:     GPL
 Group:         Utilities/System
 Group(pl):     Narzêdzia/System
-Source:                %{name}-%{version}.tar.gz
+Source:                http://www.openwall.com/john//%{name}-%{version}.tar.gz
 Patch0:                %{name}-%{version}.PLD.diff
 Patch1:                %{name}-%{version}.ini.diff
 Patch2:                %{name}-%{version}.makefile.diff
-URL:           http://www.false.com/security/john/
-Buildroot:     /tmp/%{name}-%{version}-buildroot
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 John the Ripper is a password cracker, currently available for UNIX, DOS,
@@ -46,15 +45,14 @@ fi
        
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/john}
+install run/*.chr $RPM_BUILD_ROOT%{_libdir}/john
+install run/john.ini $RPM_BUILD_ROOT%{_libdir}/john
+install run/john $RPM_BUILD_ROOT%{_bindir}
 
-install -d $RPM_BUILD_ROOT/usr/{bin,lib/john}
-install run/*.chr $RPM_BUILD_ROOT/usr/lib/john
-install run/john.ini $RPM_BUILD_ROOT/usr/lib/john
-install run/john $RPM_BUILD_ROOT/usr/bin
+gzip -9nf doc/* run/mailer
 
-bzip2 -9 doc/* run/mailer
-
-cd $RPM_BUILD_ROOT/usr/bin
+cd $RPM_BUILD_ROOT%{_bindir}
 ln -s john unafs; ln -s john unique; ln -s john unshadow
 
 %clean
@@ -62,16 +60,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc doc/* run/mailer.bz2
-
-%attr(755,root,root) /usr/bin/*
-
-%dir /usr/lib/john
-/usr/lib/john/*
-
-%changelog
-* Wed Dec 09 1998 Arkadiusz Mi¶kiewicz <misiek@misiek.eu.org>
-- added ini patch.
+%doc doc/* run/mailer.gz
+%attr(755,root,root) %{_bindir}/*
 
-* Sun Oct 06 1998 Arkadiusz Mi¶kiewicz <misiek@misiek.eu.org>
-- initial rpm release.
+%dir %{_libdir}/john
+%{_libdir}/john/*