SPECS: httpunit.spec - use java-gcj-compat-devel - manual and demo subpacka...

[pawelz]

Author: pawelz                       Date: Thu Feb 26 22:14:57 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use java-gcj-compat-devel
- manual and demo subpackages are in Documentaion group
- install demo in %{_examplesdir}/%{name}-%{version}

---- Files affected:
SPECS:
   httpunit.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SPECS/httpunit.spec
diff -u SPECS/httpunit.spec:1.9 SPECS/httpunit.spec:1.10
--- SPECS/httpunit.spec:1.9	Sun Dec  9 03:36:05 2007
+++ SPECS/httpunit.spec	Thu Feb 26 23:14:52 2009
@@ -25,6 +25,7 @@
 URL:		http://httpunit.sourceforge.net/
 BuildRequires:	ant
 BuildRequires:	jaf >= 1.0.1
+BuildRequires:	java-gcj-compat-devel
 BuildRequires:	javamail >= 0:1.2
 BuildRequires:	junit >= 3.8
 BuildRequires:	rhino
@@ -78,7 +79,7 @@
 %package manual
 Summary:	Manual for %{name}
 Summary(pl.UTF-8):	Podręcznik dla pakietu %{name}
-Group:		Development
+Group:		Documentation
 
 %description manual
 Documentation for %{name}.
@@ -89,7 +90,7 @@
 %package demo
 Summary:	Demo for %{name}
 Summary(pl.UTF-8):	Pliki demonstracyjne dla pakietu %{name}
-Group:		Development
+Group:		Documentation
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description demo
@@ -104,14 +105,14 @@
 %patch1
 %patch2
 %patch3
-%{__unzip} -qd META-INF lib/httpunit.jar '*.dtd' # 1.6 dist zip is borked
+%{__unzip} -qd META-INF lib/httpunit.jar '*.dtd' # 1.6 dist zip is borken
 
 find -name '*.jar' | xargs rm -v
 rm -rf doc/api
 
 %build
 export CLASSPATH=$(build-classpath jaf mail junit)
-%ant -Dbuild.compiler=modern -Dbuild.sysclasspath=last \
+%ant -Dbuild.compiler=extJavac -Dbuild.sysclasspath=last \
   jar testjar examplesjar javadocs test servlettest
 
 %install
@@ -132,12 +133,13 @@
 rm -rf manual/api
 
 # Demo
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
-cp -a examples/* $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_examplesdir}/%{name}
+cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 cp -a lib/%{name}-test.jar \
-	$RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}-test-%{version}.jar
+	$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/%{name}-test-%{version}.jar
 cp -a lib/%{name}-examples.jar \
-	$RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}-examples-%{version}.jar
+	$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/%{name}-examples-%{version}.jar
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -160,7 +162,8 @@
 
 %files demo
 %defattr(644,root,root,755)
-%{_datadir}/%{name}
+%{_examplesdir}/%{name}-%{version}
+%{_examplesdir}/%{name}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -168,6 +171,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2009/02/26 22:14:52  pawelz
+- use java-gcj-compat-devel
+- manual and demo subpackages are in Documentaion group
+- install demo in %{_examplesdir}/%{name}-%{version}
+
 Revision 1.9  2007/12/09 02:36:05  glen
 - add bcond for jtidy/nekohtml
 - cleanup deps and build
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/httpunit.spec?r1=1.9&r2=1.10&f=u