[ophcrack] 3.3.1-3

[Rex Dieter]

commit 4a247f330b690027422e9ff90e30114b4c766af4
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Oct 19 13:07:36 2012 -0500

    3.3.1-3
    
    - s/qt-devel/qt4-devel/
    - rebuild (qwt)
    - undo LFLAGS hack (the default flags are legit)

 ophcrack-3.3.1-qwt5.patch |   16 ++++++++++++++++
 ophcrack.spec             |   28 +++++++++++++++++++++-------
 2 files changed, 37 insertions(+), 7 deletions(-)
---
diff --git a/ophcrack-3.3.1-qwt5.patch b/ophcrack-3.3.1-qwt5.patch
new file mode 100644
index 0000000..e23ea8a
--- /dev/null
+++ b/ophcrack-3.3.1-qwt5.patch
@@ -0,0 +1,16 @@
+diff -up ophcrack-3.3.1/config/check_qwt.m4.qwt6 ophcrack-3.3.1/config/check_qwt.m4
+--- ophcrack-3.3.1/config/check_qwt.m4.qwt6	2009-07-29 00:50:26.000000000 -0500
++++ ophcrack-3.3.1/config/check_qwt.m4	2012-10-19 13:02:24.129345861 -0500
+@@ -31,6 +31,12 @@ AC_DEFUN([CHECK_QWT],
+ 	    LIBS="$LIBS -lqwt-qt4";
+             break;
+         fi
++        if test -f "$dir/include/qwt5-qt4/qwt.h"; then
++            found_qwt="yes";
++            CXXFLAGS="$CXXFLAGS -I$qwtdir/include/qwt5-qt4";
++            LIBS="$LIBS -lqwt5-qt4";
++            break;
++        fi
+         if test -f "$dir/include/qwt/qwt.h"; then
+             found_qwt="yes";
+             CXXFLAGS="$CXXFLAGS -I$qwtdir/include/qwt";
diff --git a/ophcrack.spec b/ophcrack.spec
index 48bacdb..be6e265 100644
--- a/ophcrack.spec
+++ b/ophcrack.spec
@@ -1,6 +1,6 @@
 Name:           ophcrack
 Version:        3.3.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Free Windows password cracker based on rainbow tables
 Group:          Applications/System
 License:        GPLv2+ with exceptions
@@ -8,12 +8,19 @@ URL:            http://ophcrack.sourceforge.net
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-BuildRequires:  qt-devel >= 4.3
+# upstreamable
+Patch1: ophcrack-3.3.1-qwt5.patch
+
+BuildRequires:  qt4-devel >= 4.3
 BuildRequires:  openssl-devel
-BuildRequires:  libstdc++-devel
-BuildRequires:  qwt-devel
 BuildRequires:  expat
 BuildRequires:  desktop-file-utils
+%if 0%{?fedora} > 17
+BuildRequires:  pkgconfig(qwt5-qt4)
+%else
+BuildRequires:  qwt-devel
+%endif
+
 
 %description
 Ophcrack is a free Windows password cracker based on rainbow tables. 
@@ -38,13 +45,15 @@ Features:
 %prep
 %setup -q
 
+%patch1 -p1 -b .qwt5
+# FIXME? to not require reauto-foo -- rex
+autoreconf -f -i
+
 
 %build
 %configure
 
-# The LFLAGS argument to make is needed since by default the linking uses
-# "-m64 -Wl,-O1" as linker flags instead of %{optflags}.
-make LFLAGS="%{optflags}" %{?_smp_mflags}
+make %{?_smp_mflags}
 
 
 %install
@@ -80,6 +89,11 @@ rm -rf %{buildroot}
 %{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Fri Oct 19 2012 Rex Dieter <rdieter at fedoraproject.org> - 3.3.1-3
+- s/qt-devel/qt4-devel/
+- rebuild (qwt)
+- undo LFLAGS hack (the default flags are legit)
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild