SPECS: nekohtml.spec - use java-gcj-compat-devel - unified

[pawelz]

Author: pawelz                       Date: Fri Feb 27 17:33:30 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use java-gcj-compat-devel
- unified

---- Files affected:
SPECS:
   nekohtml.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SPECS/nekohtml.spec
diff -u SPECS/nekohtml.spec:1.6 SPECS/nekohtml.spec:1.7
--- SPECS/nekohtml.spec:1.6	Tue Nov 20 19:04:32 2007
+++ SPECS/nekohtml.spec	Fri Feb 27 18:33:25 2009
@@ -13,8 +13,7 @@
 Patch1:		%{name}-HTMLScanner.patch
 URL:		http://www.apache.org/~andyc/neko/doc/html/
 BuildRequires:	ant
-# for javadoc
-BuildRequires:	java-sun
+BuildRequires:	java-gcj-compat-devel
 BuildRequires:	xerces-j >= 2.3.0
 Requires:	xerces-j >= 2.3.0
 BuildArch:	noarch
@@ -79,6 +78,7 @@
 %build
 export CLASSPATH=$(build-classpath xerces-j2)
 ant -f build-html.xml \
+	-Dbuild.compiler=extJavac \
 	-Djarfile=%{name}-%{version}.jar \
 	-DjarfileXni=%{name}-xni-%{version}.jar \
 	-DjarfileSamples=%{name}-samples-%{version}.jar \
@@ -100,13 +100,13 @@
 install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}-filter
 
 # Samples
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
+install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 install -p %{name}-samples-%{version}.jar \
-	$RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
+	$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 # Javadocs
 install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr bin/package/nekohtml-*/doc/html/javadoc/* \
+cp -a bin/package/nekohtml-*/doc/html/javadoc/* \
 	$RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 
@@ -137,7 +137,7 @@
 
 %files demo
 %defattr(644,root,root,755)
-%{_datadir}/%{name}-%{version}
+%{_examplesdir}/%{name}-%{version}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -145,6 +145,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2009/02/27 17:33:25  pawelz
+- use java-gcj-compat-devel
+- unified
+
 Revision 1.6  2007/11/20 18:04:32  glen
 - java deps; adapter
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/nekohtml.spec?r1=1.6&r2=1.7&f=u