[qt3] - better fix for omitting patched qmake.conf files (#639459)

[Rex Dieter]

commit caa5c84f3006abbf27fc62e809de3af9dce122d0
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Oct 18 11:16:28 2010 -0500

    - better fix for omitting patched qmake.conf files (#639459)

 qt3.spec |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/qt3.spec b/qt3.spec
index 29d973d..4cf5e9e 100644
--- a/qt3.spec
+++ b/qt3.spec
@@ -3,7 +3,7 @@
 Summary: The shared library for the Qt 3 GUI toolkit
 Version: 3.3.8b
 Name: qt3
-Release: 31%{?dist}
+Release: 32%{?dist}
 License: QPL or GPLv2 or GPLv3
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -255,7 +255,9 @@ for the Qt 3 toolkit.
 %patch2 -p1 -b .ndebug
 %patch3 -p1 -b .makefile
 %patch4 -p1 -b .umask
-%patch5 -p1
+%patch5 -p1 -b .strip
+# drop backup file(s), else they get installed too, http://bugzilla.redhat.com/639459
+rm -fv mkspecs/linux-g++*/qmake.conf.strip
 %patch7 -p1 -b .quiet
 %patch8 -p1 -b .qembed
 %patch12 -p1 -b .nostdlib
@@ -491,8 +493,6 @@ install -m 644 tools/assistant/images/linguist.png %{buildroot}%{_datadir}/pixma
 # own style directory
 mkdir -p %{buildroot}%{qtdir}/plugins/styles
 
-# drop *.orig files
-rm -f %{buildroot}%{qtdir}/mkspecs/*/*.orig
 
 %clean
 rm -rf %{buildroot}
@@ -590,6 +590,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 18 2010 Rex Dieter <rdieter at fedoraproject.org> - 3.3.8b-32
+- better fix for omitting patched qmake.conf files (#639459)
+
 * Mon Oct 04 2010 Than Ngo <than at redhat.com> - 3.3.8b-31
 - fix bz#639459, don't include *.orig files