rpms/jrefactory/devel jrefactory-2.8.9-fixcrlf.patch, NONE, 1.1 jrefactory.spec, 1.9, 1.10 jrefactory-htmleditorkit.patch, 1.1, NONE jrefactory-pr21880.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Jul 21 00:18:47 UTC 2006
Author: dbhole
Update of /cvs/dist/rpms/jrefactory/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27278
Modified Files:
jrefactory.spec
Added Files:
jrefactory-2.8.9-fixcrlf.patch
Removed Files:
jrefactory-htmleditorkit.patch jrefactory-pr21880.patch
Log Message:
- Added conditional native compilation.
- From gbenson at redhat:
- Remove classes that don't build without said jarfiles.
- Avoid Sun-specific classes.
jrefactory-2.8.9-fixcrlf.patch:
Pretty.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletion(-)
--- NEW FILE jrefactory-2.8.9-fixcrlf.patch ---
--- src/org/acm/seguin/ant/Pretty.java.fixcrlf 2003-08-28 19:42:38.000000000 +0200
+++ src/org/acm/seguin/ant/Pretty.java 2005-04-19 19:03:23.776430224 +0200
@@ -166,7 +166,20 @@
private void configureFixCrlfTask( FixCRLF fixcrlf_task ) {
fixcrlf_task.setOwningTarget( getOwningTarget() );
FixCRLF.CrLf eol = new FixCRLF.CrLf();
- eol.setValue("cr");
+ FileSettings prettySettings = FileSettings.getRefactoryPrettySettings();
+ String lineEnding = prettySettings.getString("end.line");
+ if (lineEnding==null || lineEnding.length()==0) {
+ lineEnding = "asis";
+ } else {
+ lineEnding = lineEnding.toLowerCase();
+ //handle legacy use of obsolete "nl" and "crnl" config values
+ if (lineEnding.equals("nl")) {
+ lineEnding = "lf";
+ } else if (lineEnding.equals("crnl")) {
+ lineEnding = "crlf";
+ }
+ }
+ eol.setValue(lineEnding);
fixcrlf_task.setEol(eol);
}
Index: jrefactory.spec
===================================================================
RCS file: /cvs/dist/rpms/jrefactory/devel/jrefactory.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jrefactory.spec 12 Jul 2006 06:35:14 -0000 1.9
+++ jrefactory.spec 21 Jul 2006 00:18:43 -0000 1.10
@@ -1,38 +1,73 @@
-%define name jrefactory
-%define version 2.8.9
-%define release 3jpp_1fc.1.1
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the
+# distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
%define section devel
-Name: %{name}
-Version: %{version}
-Release: %{release}.1.1
+Name: jrefactory
+Version: 2.8.9
+Release: 6jpp_1fc
Epoch: 0
Summary: JRefactory and Pretty Print
License: Apache Software License
Group: Development/Libraries/Java
Source0: %{name}-%{version}-full-RHCLEAN.zip
-Patch0: %{name}-pr21880.patch
-Patch1: %{name}-htmleditorkit.patch
-Patch2: %{name}-savejpg.patch
+Patch0: jrefactory-2.8.9-fixcrlf.patch
+Patch1: jrefactory-savejpg.patch
Url: http://jrefactory.sourceforge.net/
-BuildRequires: jpackage-utils >= 0:1.5
BuildRequires: ant
+BuildRequires: jpackage-utils >= 0:1.5
+%if ! %{gcj_support}
BuildArch: noarch
+%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
+%if %{gcj_support}
+BuildRequires: java-gcj-compat-devel
+Requires(post): java-gcj-compat
+Requires(postun): java-gcj-compat
+%endif
+
%description
JRefactory provides a variety of refactoring and pretty printing tools
%prep
%setup -q -c -n %{name}
mv settings/.Refactory settings/sample
-%patch0 -p1
+%patch0 -p0 -b .fixcrlf
%patch1 -p1
-%patch2 -p1
-rm -f src/org/acm/seguin/pmd/swingui/PMDLookAndFeel.java
-# clean jarfiles
-find . -name "*.jar" -exec rm -f {} \;
+rm -f src/org/acm/seguin/pmd/swingui/PMDLookAndFeel.java
# remove classes that don't build without said jarfiles
find -name '*.java' | \
@@ -51,34 +86,50 @@
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} ${jar/-%{version}/}; done)
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
+
%clean
rm -rf $RPM_BUILD_ROOT
+%post
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+ %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+ %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
%files
%defattr(0664,root,root,0755)
%doc docs/{*.html,*.jpg,*.gif,*.txt} settings/sample
%{_javadir}/*
-%changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:2.8.9-3jpp_1fc.1.1.1.1
-- rebuild
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}
+%endif
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt
-
-* Wed Jun 15 2005 Gary Benson <gbenson at redhat.com> - 0:2.8.9-3jpp_1fc
-- Build into Fedora.
-
-* Wed Jun 8 2005 Gary Benson <gbenson at redhat.com>
-- Remove jarfiles from the tarball.
-- Remove classes that don't build without said jarfiles.
+%changelog
+* Thu Jul 20 2006 Deepak Bhole <dbhole at redhat.com> - 0:2.8.9-6jpp_1fc
+- Added conditional native compilation.
+- From gbenson at redhat:
+- Remove classes that don't build without said jarfiles.
+- Avoid Sun-specific classes.
-* Thu Jun 2 2005 Gary Benson <gbenson at redhat.com>
-- Avoid some API holes in libgcj's Swing implementation.
-- Avoid Sun-specific classes.
+* Fri Apr 28 2006 Fernando Nasser <fnasser at redhat.com> - 0:2.8.9-5jpp
+- First JPP 1.7 build
-* Fri Oct 15 2004 Fernando Nasser <fnasser at redhat.com> - 0:2.8.9-3jpp_1rh
-- First Red Hat build
+* Tue Apr 19 2005 Ralph Apel <r.apel at r-apel.de> - 0:2.8.9-4jpp
+- Patch to fix CRLF problem; THX to Richard Bullington-McGuire
* Sun Aug 23 2004 Randy Watler <rwatler at finali.com> - 0:2.8.9-3jpp
- Rebuild with ant-1.6.2
--- jrefactory-htmleditorkit.patch DELETED ---
--- jrefactory-pr21880.patch DELETED ---
More information about the fedora-cvs-commits
mailing list