[jrefactory] - Update to 2.9.19. - Add javadoc package.
Alexander Kurtakov
akurtakov at fedoraproject.org
Sat Oct 23 08:49:45 UTC 2010
commit b256df408195bc6f0e6b6d4e1d5bd4eee835df6f
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Sat Oct 23 11:49:04 2010 +0300
- Update to 2.9.19.
- Add javadoc package.
.gitignore | 1 +
jrefactory-2.8.9-fixcrlf.patch | 24 -----------------
jrefactory-2.8.9-source14.patch | 51 ------------------------------------
jrefactory-build.patch | 54 +++++++++++++++++++++++++++++++++++++++
jrefactory-saveimage.patch | 26 ++++++++++++++++++
jrefactory.spec | 54 ++++++++++++++++++++++++++++----------
sources | 2 +-
7 files changed, 122 insertions(+), 90 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 46f4e78..06a725f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ jrefactory-2.8.9-full-RHCLEAN.zip
jrefactory
noarch
*.src.rpm
+jrefactory-2.9.19-source.zip
diff --git a/jrefactory-build.patch b/jrefactory-build.patch
new file mode 100644
index 0000000..1d34f68
--- /dev/null
+++ b/jrefactory-build.patch
@@ -0,0 +1,54 @@
+--- build.xml.sav 2004-05-10 18:05:20.000000000 +0300
++++ build.xml 2010-10-22 22:50:08.535099890 +0300
+@@ -475,51 +475,6 @@ Version:
+ <include name="ui/**" />
+ </fileset>
+ </jar>
+- <jar jarfile="${build.lib}/JRefactoryModule.jar"
+- basedir="${build.dest}"
+- manifest="${src.dir}/meta-inf/JRefactoryModule.mf"
+- >
+- <include name="**/org/acm/seguin/ide/netbeans/*" />
+- <fileset dir="${src.dir}/">
+- <include name="**/ide/netbeans/resources/*.gif" />
+- <include name="**/ide/netbeans/resources/*.xml" />
+- <include name="**/ide/netbeans/*.gif" />
+- <include name="**/ide/netbeans/*.xml" />
+- <include name="**/ide/netbeans/*.properties" />
+- <include name="**/ide/netbeans/*.jarContent" />
+- </fileset>
+- </jar>
+- <zip zipfile="${build.lib}/${name}.jar" >
+- <zipfileset src="${build.lib}/${name}_x.jar"/>
+- <zipfileset src="${jars.dir}/coreplugin.jar" >
+- <exclude name="META-INF/MANIFEST.MF"/>
+- </zipfileset>
+- <zipfileset src="${jars.dir}/dom4j-full.jar" >
+- <exclude name="META-INF/MANIFEST.MF"/>
+- </zipfileset>
+- <zipfileset src="${jars.dir}/findbugs.jar" >
+- <exclude name="META-INF/MANIFEST.MF"/>
+- </zipfileset>
+- <zipfileset src="${jars.dir}/findbugsGUI.jar" >
+- <exclude name="META-INF/MANIFEST.MF"/>
+- </zipfileset>
+-<!--
+- <zipfileset src="${jars.dir}/jaxen-core-1.0-fcs.jar" >
+- <exclude name="META-INF/MANIFEST.MF"/>
+- </zipfileset>
+- <zipfileset src="${jars.dir}/saxpath-1.0-fcs.jar" >
+- <exclude name="META-INF/MANIFEST.MF"/>
+- </zipfileset>
+--->
+- <zipfileset src="${jars.dir}/bcel.jar" >
+- <exclude name="META-INF/MANIFEST.MF"/>
+- </zipfileset>
+-<!--
+- <zipfileset src="${jars.dir}/xalan.jar" >
+- <exclude name="META-INF/MANIFEST.MF"/>
+- </zipfileset>
+--->
+- </zip>
+ </target>
+
+
diff --git a/jrefactory-saveimage.patch b/jrefactory-saveimage.patch
new file mode 100644
index 0000000..ae990de
--- /dev/null
+++ b/jrefactory-saveimage.patch
@@ -0,0 +1,26 @@
+--- src/net/sourceforge/jrefactory/action/SaveImageAction.java.sav 2003-12-04 15:54:20.000000000 +0200
++++ src/net/sourceforge/jrefactory/action/SaveImageAction.java 2010-10-22 21:23:22.284825392 +0300
+@@ -110,12 +110,7 @@ public class SaveImageAction extends Gen
+ if ("JPG".equals(imageType)) {
+ return (diagram instanceof UMLPackage);
+ } else {
+- try {
+- new javax.media.jai.JAI();
+- return (diagram instanceof UMLPackage);
+- } catch (Throwable e) {
+ return false;
+- }
+ }
+ }
+
+@@ -165,10 +160,6 @@ public class SaveImageAction extends Gen
+ g.setColor(Color.gray);
+ g.fillRect(0, 0, dim.width, dim.height);
+ diagram.print(g);
+- try {
+- javax.media.jai.JAI.create("filestore", doubleBuffer, filename, imageType, null);
+- } catch (Throwable e) {
+- }
+ }
+ }
+
diff --git a/jrefactory.spec b/jrefactory.spec
index b693951..b0dff5f 100644
--- a/jrefactory.spec
+++ b/jrefactory.spec
@@ -29,61 +29,88 @@
#
Name: jrefactory
-Version: 2.8.9
-Release: 10%{?dist}
+Version: 2.9.19
+Release: 1%{?dist}
Epoch: 0
Summary: JRefactory and Pretty Print
License: BSD and ASL 1.1 and GPL+
-Group: Development/Libraries/Java
-Source0: %{name}-%{version}-full-RHCLEAN.zip
-Patch0: jrefactory-2.8.9-fixcrlf.patch
+Group: Development/Libraries
+Source0: http://downloads.sourceforge.net/project/jrefactory/JRefactory/2.9.19/jrefactory-2.9.19-source.zip
Patch1: jrefactory-savejpg.patch
-Patch2: %{name}-%{version}-source14.patch
-
+Patch0: jrefactory-saveimage.patch
+Patch2: 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
%description
JRefactory provides a variety of refactoring and pretty printing tools
+%package javadoc
+Summary: Javadoc for jrefactory
+Group: Documentation
+Requires: jpackage-utils
+
+%description javadoc
+API doc for %{name}.
+
%prep
%setup -q -c -n %{name}
mv settings/.Refactory settings/sample
-%patch0 -p0 -b .fixcrlf
+%patch0
%patch1 -p1
-%patch2 -p1
+%patch2
rm -f src/org/acm/seguin/pmd/swingui/PMDLookAndFeel.java
# remove classes that don't build without said jarfiles
find -name '*.java' | \
xargs grep -l '^import \(edu\|org\.\(jaxen\|saxpath\)\)\.' | \
- xargs rm
+ xargs rm
+
+find -name '*.jar' -exec rm -f '{}' \;
%build
perl -p -i -e 's|^Class-Path:.*||' \
src/meta-inf/refactory.mf
-ant jar
+ant jar javadocs
%install
+rm -rf $RPM_BUILD_ROOT
# jar
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 ant.build/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+install -m 644 ant.build/lib/%{name}_x.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} ${jar/-%{version}/}; done)
+# javadoc
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -pr docs/api/* \
+ $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} \
+ $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
-%doc docs/{*.html,*.jpg,*.gif,*.txt} settings/sample
%{_javadir}/*
+%files javadoc
+%defattr(-,root,root,-)
+%{_javadocdir}/%{name}
+%{_javadocdir}/%{name}-%{version}
+
%changelog
+* Sat Oct 23 2010 Alexander Kurtakov <akurtako at redhat.com> 0:2.9.19-1
+- Update to 2.9.19.
+- Add javadoc package.
+
+
* Wed Oct 6 2010 Alexander Kurtakov <akurtako at redhat.com> 0:2.8.9-10
- Drop gcj support.
@@ -138,4 +165,3 @@ rm -rf $RPM_BUILD_ROOT
* Mon Dec 15 2003 Paul Nasrat <pauln at truemesh.com> 0:2.6.40-1jpp
- Initial Release
-
diff --git a/sources b/sources
index b3b2621..06a40f7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6176aebb30804a4bd597fff2153b4dad jrefactory-2.8.9-full-RHCLEAN.zip
+7ec44de6d9973eb0d1dfbcf3f903c520 jrefactory-2.9.19-source.zip
More information about the scm-commits
mailing list