[jrefactory] - Fix merge review comments bug#225952.

[Alexander Kurtakov]

commit 4dd5898a10464c8d337deeb9f3b27cd24542d402
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Thu Oct 28 14:51:18 2010 +0300

    - Fix merge review comments bug#225952.

 jrefactory-savejpg.patch |   26 --------------------------
 jrefactory.spec          |   21 ++++++++++++---------
 2 files changed, 12 insertions(+), 35 deletions(-)
---
diff --git a/jrefactory.spec b/jrefactory.spec
index b0dff5f..f65ff0a 100644
--- a/jrefactory.spec
+++ b/jrefactory.spec
@@ -30,21 +30,23 @@
 
 Name:		jrefactory
 Version:	2.9.19
-Release:	1%{?dist}
+Release:	2%{?dist}
 Epoch:		0
 Summary:	JRefactory and Pretty Print
 License:	BSD and ASL 1.1 and GPL+
 Group:		Development/Libraries
 Source0:	http://downloads.sourceforge.net/project/jrefactory/JRefactory/2.9.19/jrefactory-2.9.19-source.zip
-Patch1: jrefactory-savejpg.patch
+# JAI is not packaged in fedora
 Patch0: jrefactory-saveimage.patch
-Patch2:	jrefactory-build.patch
+# Drop dependencies that are only used to merge into the final jar
+Patch1:	jrefactory-build.patch
 URL:		http://jrefactory.sourceforge.net/
 BuildRequires:	ant
 BuildRequires:	jpackage-utils >= 0:1.5
 BuildRequires:	java-devel >= 1:1.6.0
 BuildArch:	noarch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
+Requires: java
+Requires: jpackage-utils
 
 %description
 JRefactory provides a variety of refactoring and pretty printing tools
@@ -61,17 +63,15 @@ API doc for %{name}.
 %setup -q -c -n %{name}
 mv settings/.Refactory settings/sample
 %patch0
-%patch1 -p1
-%patch2
-
-rm -f src/org/acm/seguin/pmd/swingui/PMDLookAndFeel.java
+%patch1
 
 # remove classes that don't build without said jarfiles
 find -name '*.java' | \
-    xargs grep -l '^import \(edu\|org\.\(jaxen\|saxpath\)\)\.' | \
+    xargs grep -l '^import \(edu\|org\.\(jaxen\)\)\.' | \
 		xargs rm
 
 find -name '*.jar' -exec rm -f '{}' \;
+find -name '*.jar.old' -exec rm -f '{}' \;
 
 %build
 perl -p -i -e 's|^Class-Path:.*||' \
@@ -106,6 +106,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Thu Oct 28 2010 Alexander Kurtakov <akurtako at redhat.com> 0:2.9.19-2
+- Fix merge review comments bug#225952.
+
 * Sat Oct 23 2010 Alexander Kurtakov <akurtako at redhat.com> 0:2.9.19-1
 - Update to 2.9.19.
 - Add javadoc package.