rpms/john/F-12 .cvsignore, 1.3, 1.4 john.spec, 1.18, 1.19 sources, 1.3, 1.4

Till Maas till at fedoraproject.org
Mon Jan 18 22:08:37 UTC 2010


Author: till

Update of /cvs/pkgs/rpms/john/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24711

Modified Files:
	.cvsignore john.spec sources 
Log Message:
* Mon Jan 18 2010 Till Maas <opensource at till.name> - 1.7.3.4-1
- Update to new release
- fix Source0
- add missing -m parameters to install
- set LDFLAGS to RPM_OPT_FLAGS for non mmx build
- add signature as Source1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/john/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	10 Jan 2007 14:14:31 -0000	1.3
+++ .cvsignore	18 Jan 2010 22:08:36 -0000	1.4
@@ -1 +1,2 @@
-john-1.7.0.2.tar.bz2
+john-1.7.3.4.tar.bz2
+john-1.7.3.4.tar.bz2.sign


Index: john.spec
===================================================================
RCS file: /cvs/pkgs/rpms/john/F-12/john.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- john.spec	25 Jul 2009 04:06:24 -0000	1.18
+++ john.spec	18 Jan 2010 22:08:36 -0000	1.19
@@ -1,12 +1,13 @@
 Summary:          John the Ripper password cracker
 Name:             john
-Version:          1.7.0.2
-Release:          8%{?dist}
+Version:          1.7.3.4
+Release:          1%{?dist}
 
 URL:              http://www.openwall.com/john
 License:          GPLv2
 Group:            Applications/System
-Source0:          http://www.openwall.com/john/f/john-%{version}.tar.bz2
+Source0:          http://www.openwall.com/john/g/john-%{version}.tar.bz2
+Source1:          http://www.openwall.com/john/g/john-%{version}.tar.bz2.sign
 #Patch1:           http://www.openwall.com/john/contrib/john-1.7-all-4.diff.gz
 #Patch2:           http://www.openwall.com/john/contrib/john-1.7.2-all-2.diff.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -26,25 +27,25 @@ cp -a src src-mmx
 
 %build
 
-%define target_non_mmx generic
+%global target_non_mmx generic
 
 %ifarch %{ix86}
-%define target_non_mmx linux-x86-any
-%define target_mmx linux-x86-mmx
+%global target_non_mmx linux-x86-any
+%global target_mmx linux-x86-mmx
 %endif
 %ifarch x86_64
-%define target_non_mmx linux-x86-64
+%global target_non_mmx linux-x86-64
 %endif
 %ifarch ppc
-%define target_non_mmx linux-ppc32
+%global target_non_mmx linux-ppc32
 %endif
 %ifarch ppc64
-%define target_non_mmx linux-ppc64
+%global target_non_mmx linux-ppc64
 %endif
 
 export CFLAGS="-c ${RPM_OPT_FLAGS} -DJOHN_SYSTEMWIDE=1"
 
-make -C src %{target_non_mmx} CFLAGS="${CFLAGS}" LDFLAGS=""
+make -C src %{target_non_mmx} CFLAGS="${CFLAGS}" LDFLAGS="${RPM_OPT_FLAGS}"
 
 %if 0%{?target_mmx:1}
 mv run/john run/john-non-mmx
@@ -57,14 +58,14 @@ make -C src-mmx %{target_mmx}  CFLAGS="$
 
 %install
 rm -rf %{buildroot}
-install -d 755 %{buildroot}%{_sysconfdir}
-install -d 755 %{buildroot}%{_bindir}
-install -d 755 %{buildroot}%{_datadir}/john
+install -d -m 755 %{buildroot}%{_sysconfdir}
+install -d -m 755 %{buildroot}%{_bindir}
+install -d -m 755 %{buildroot}%{_datadir}/john
 install -m 755 run/{john,mailer} %{buildroot}%{_bindir}
 install -m 644 run/{*.chr,password.lst} %{buildroot}%{_datadir}/john
 install -m 644 run/john.conf %{buildroot}%{_sysconfdir}
 %if 0%{?target_mmx:1}
-install -d 755 %{buildroot}%{_libexecdir}/john
+install -d -m 755 %{buildroot}%{_libexecdir}/john
 install -m 755 run/john-non-mmx %{buildroot}%{_libexecdir}/john/
 %endif
 pushd %{buildroot}%{_bindir}
@@ -87,6 +88,16 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Mon Jan 18 2010 Till Maas <opensource at till.name> - 1.7.3.4-1
+- Update to new release
+- fix Source0
+- add missing -m parameters to install
+- set LDFLAGS to RPM_OPT_FLAGS for non mmx build
+- add signature as Source1
+
+* Fri Jan 08 2010 Till Maas <opensource at till.name> - 1.7.0.2-9
+- Use %%global instead of %%define
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.0.2-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/john/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	10 Jan 2007 14:14:31 -0000	1.3
+++ sources	18 Jan 2010 22:08:36 -0000	1.4
@@ -1 +1,2 @@
-0a87dca1f149493fc087ea8a8b6ae5d5  john-1.7.0.2.tar.bz2
+2f2310c49961c3edea6f92b8dcd45ff4  john-1.7.3.4.tar.bz2
+889eabfd96fdd6dc888d68834d1e18b5  john-1.7.3.4.tar.bz2.sign



More information about the scm-commits mailing list