rpms/concurrent/devel concurrent-build.patch, NONE, 1.1 concurrent.spec, 1.17, 1.18

[Permaine Cheung (pcheung)]

Author: pcheung

Update of /cvs/pkgs/rpms/concurrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19479

Modified Files:
	concurrent.spec 
Added Files:
	concurrent-build.patch 
Log Message:
Merge with upstream version



concurrent-build.patch:

--- NEW FILE concurrent-build.patch ---
*** build.xml.orig	2007-03-23 13:38:19.000000000 -0400
--- build.xml	2007-03-23 13:39:30.000000000 -0400
***************
*** 42,48 ****
  </target>
  
  <target name="compile" depends="setup.packages">
!         <javac srcdir="src" destdir="build" optimize="true"/>
  </target>
  
  <target name="dist" depends="compile">
--- 42,48 ----
  </target>
  
  <target name="compile" depends="setup.packages">
!         <javac srcdir="src" destdir="build" debug="on" optimize="true"/>
  </target>
  
  <target name="dist" depends="compile">


Index: concurrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/concurrent/devel/concurrent.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- concurrent.spec	5 Apr 2007 00:02:18 -0000	1.17
+++ concurrent.spec	21 Jan 2008 18:58:22 -0000	1.18
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2005, JPackage Project
+# Copyright (c) 2000-2007, JPackage Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -28,25 +28,25 @@
 # 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 gcj_support 1
 
 Name:           concurrent
 Version:        1.3.4
-Release:        5jpp.1%{?dist}
+Release:        7jpp.1%{?dist}
 Epoch:          0
 Summary:        Utility classes for concurrent Java programming
 License:        Public Domain
 Source0:        http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/current/concurrent.tar.gz
+# Source1 not used, kept for reference
 Source1:        %{name}-%{version}.build.xml
+Patch0:         concurrent-build.patch
 URL:            http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html
 Group:          Development/Libraries/Java
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if ! %{gcj_support}
 BuildArch:      noarch
 %endif
-BuildRequires:  jpackage-utils >= 0:1.5, ant
+BuildRequires:  jpackage-utils >= 0:1.6, ant
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -71,22 +71,31 @@
 %setup -c -q
 mkdir -p src/EDU/oswego/cs/dl/util
 mv concurrent src/EDU/oswego/cs/dl/util
-cp -pr %{SOURCE1} build.xml
+# Build with debug on
+pushd src/EDU/oswego/cs/dl/util/concurrent
+%patch0
+popd
 sed -i -e 's/..\/sun-u.c.license.pdf/http:\/\/gee.cs.oswego.edu\/dl\/classes\/EDU\/oswego\/cs\/dl\/util\/sun-u.c.license.pdf/' src/EDU/oswego/cs/dl/util/concurrent/intro.html
 
 %build
+pushd src/EDU/oswego/cs/dl/util/concurrent
+
 ant \
   -Dversion=%{version} \
   -Dj2se.apiurl=%{_javadocdir}/java \
-  jar javadoc
+  dist javadoc
+
+popd
 
 %install
 rm -fr $RPM_BUILD_ROOT
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/
+install -m 644 src/EDU/oswego/cs/dl/util/concurrent/lib/%{name}.jar \
+               $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
 ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -pr src/EDU/oswego/cs/dl/util/concurrent/docs/* \
+       $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 %if %{gcj_support}
@@ -127,6 +136,9 @@
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Jan 10 2008 Permaine Cheung <pcheung at redhat.com> - 0:1.3.4-7jpp.1
+- Merge with upstream version
+
 * Fri Mar 16 2007 Permaine Cheung <pcheung at redhat.com> - 0:1.3.4-5jpp.1
 - Merge with upstream version, update with the correct src tar ball