Author: glen Date: Fri Nov 5 11:23:34 2010 GMT Module: packages Tag: HEAD ---- Log message: - fix ix86 build, by passing JOHN_SYSTEMWIDE_EXEC via include file; rel 2
---- Files affected: packages/john: john.spec (1.60 -> 1.61) ---- Diffs: ================================================================ Index: packages/john/john.spec diff -u packages/john/john.spec:1.60 packages/john/john.spec:1.61 --- packages/john/john.spec:1.60 Fri Nov 5 12:21:48 2010 +++ packages/john/john.spec Fri Nov 5 12:23:28 2010 @@ -21,7 +21,7 @@ Summary(pl.UTF-8): Łamacz haseł Name: john Version: 1.7.6 -Release: 1 +Release: 2 License: GPL Group: Applications/System Source0: http://www.openwall.com/john/g/%{name}-%{version}.tar.bz2 @@ -65,10 +65,15 @@ %build cd src +cat > defs.h <<'EOF' +#define JOHN_SYSTEMWIDE 1 +#define JOHN_SYSTEMWIDE_EXEC "%{_libdir}/john" +EOF + %if %{do_mmxfb} %{__make} linux-x86-any \ CC="%{__cc}" \ - OPTFLAGS="%{rpmcflags} -DJOHN_SYSTEMWIDE=1" + OPTFLAGS="%{rpmcflags} -include defs.h" mv ../run/john ../run/john-non-mmx %{__make} clean %endif @@ -93,7 +98,7 @@ %{__make} $TARG \ CC="%{__cc}" \ - OPTFLAGS="%{rpmcflags} -DJOHN_SYSTEMWIDE=1 -DJOHN_SYSTEMWIDE_EXEC=\\\"%{_libdir}/john\\\" %{?optmmxfb}" + OPTFLAGS='%{rpmcflags} -include defs.h %{?optmmxfb}' %install rm -rf $RPM_BUILD_ROOT @@ -131,6 +136,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.61 2010/11/05 11:23:28 glen +- fix ix86 build, by passing JOHN_SYSTEMWIDE_EXEC via include file; rel 2 + Revision 1.60 2010/11/05 11:21:48 glen - add optflags patch, cosmetics ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/john/john.spec?r1=1.60&r2=1.61&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
