packages: charles/charles.spec - use system activation, oro

[glen]

Author: glen                         Date: Fri May 20 06:02:07 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use system activation, oro

---- Files affected:
packages/charles:
   charles.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: packages/charles/charles.spec
diff -u packages/charles/charles.spec:1.12 packages/charles/charles.spec:1.13
--- packages/charles/charles.spec:1.12	Sat Jan 15 12:26:46 2011
+++ packages/charles/charles.spec	Fri May 20 08:02:01 2011
@@ -1,11 +1,13 @@
 # $Revision$, $Date$
 # I have no access to full version, so I'm packaging trial version only.
 # If you have full tarball, add with(out?)_trial bcond
+# TODO:
+# - activation.jar link becames invalid if BR jdk and runtime jdk are different as it linked from jvm dir
 
 # Conditional build:
 %bcond_without	trial		# build from full tarball
 
-%define		rel	0.1
+%define		rel	0.2
 %include	/usr/lib/rpm/macros.java
 Summary:	Web debugging proxy application
 Name:		charles
@@ -13,15 +15,20 @@
 Release:	%{rel}
 License:	Proprietary, not distributable
 Group:		Networking/Daemons
-Source0:	http://www.charlesproxy.com/assets/release/%{version}/charles.tar.gz
+Source0:	http://www.charlesproxy.com/assets/release/%{version}/%{name}.tar.gz
 # NoSource0-md5:	49498a331ae53fc1bb02c21d8bcd3be9
 NoSource:	0
 Source1:	%{name}.sh
 URL:		http://www.charlesproxy.com/
+BuildRequires:	java(jaf)
+BuildRequires:	java-oro >= 1.4
+BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
+Requires:	java(jaf)
+Requires:	java-oro >= 1.4
 Requires:	jpackage-utils
-Requires:	jre-X11
+Requires:	jre-X11 >= 1.4
 ExclusiveArch:	i586 i686 pentium3 pentium4 athlon %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -37,6 +44,15 @@
 %prep
 %setup -q -n %{name}
 
+rm lib/jakarta-oro-2.0.8.jar
+rm lib/activation.jar
+
+%build
+for jar in activation oro; do
+	jar=$(find-jar $jar)
+	ln -s $jar lib
+done
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_javadir}/%{name},%{_libdir}/%{name},%{_bindir}}
@@ -65,6 +81,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2011/05/20 06:02:01  glen
+- use system activation, oro
+
 Revision 1.12  2011/01/15 11:26:46  arekm
 - 3.5.2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/charles/charles.spec?r1=1.12&r2=1.13&f=u