[concurrent] Added depmap RHBZ#755588, removed gcj support, cleaned up the spec file.

[Marek Goldmann]

commit 2fe087fd20663fe527fcb5d8ec68e570eaae6229
Author: Marek Goldmann <goldmann at fedoraproject.org>
Date:   Fri Jan 27 14:11:28 2012 -0500

    Added depmap RHBZ#755588, removed gcj support, cleaned up the spec file.

 concurrent-1.3.4.pom |   20 +++++++++++++
 concurrent.spec      |   75 ++++++++++++++++++--------------------------------
 2 files changed, 47 insertions(+), 48 deletions(-)
---
diff --git a/concurrent-1.3.4.pom b/concurrent-1.3.4.pom
new file mode 100644
index 0000000..eca35d2
--- /dev/null
+++ b/concurrent-1.3.4.pom
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>concurrent</groupId>
+  <artifactId>concurrent</artifactId>
+  <version>1.3.4</version>
+  <name>Dough Lea's util.concurrent package</name>
+  <licenses>
+    <license>
+      <name>Public domain, Sun Microsoystems</name>
+      <url>>http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html</url>
+      <comments>All classes are released to the public domain and may be used for any purpose whatsoever without permission or acknowledgment. Portions of the CopyOnWriteArrayList and ConcurrentReaderHashMap classes are adapted from Sun JDK source code. These are copyright of Sun Microsystems, Inc, and are used with their kind permission, &lt;a href="http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/sun-u.c.license.pdf">as described in this license&lt;/a>.</comments>
+    </license>
+  </licenses>
+  <organization>
+    <name>Dough Lea</name>
+    <url>http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html</url>
+  </organization>
+</project>
\ No newline at end of file
diff --git a/concurrent.spec b/concurrent.spec
index da3b1e5..6ff9956 100644
--- a/concurrent.spec
+++ b/concurrent.spec
@@ -28,31 +28,26 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define gcj_support 1
-
 Name:           concurrent
 Version:        1.3.4
-Release:        13%{?dist}
+Release:        14%{?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
+Source2:        %{name}-%{version}.pom
 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.6, ant
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
+BuildRequires:  jpackage-utils
+BuildRequires:  ant
+
+Requires:       jpackage-utils
 
 %description 
 This package provides standardized, efficient versions of utility classes
@@ -63,6 +58,7 @@ to save you the trouble of coding them.
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
+Requires:       jpackage-utils
 
 %description javadoc
 Javadoc for %{name}.
@@ -88,54 +84,37 @@ ant \
 popd
 
 %install
-rm -fr $RPM_BUILD_ROOT
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+
+# JAR
 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}
+               $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+
+# JAVADOCS
 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}
-%{_bindir}/aot-compile-rpm
-%endif
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%if %{gcj_support}
-%post
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
+       $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+# POM
+install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+
+# DEPMAP
+%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "oswego-concurrent:concurrent"
 
 %files
-%defattr(0644,root,root,0755)
 %{_javadir}/*.jar
+%{_mavenpomdir}/*
+%{_mavendepmapfragdir}/*
 %doc src/EDU/oswego/cs/dl/util/concurrent/intro.html
 
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/concurrent-1.3.4.jar.*
-%endif
-
 %files javadoc
-%defattr(0644,root,root,0755)
-%doc %{_javadocdir}/%{name}-%{version}
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Fri Jan 27 2012 Marek Goldmann <mgoldman at redhat.com> - 0:1.3.4-14
+- Added depmaps
+- Removed gcj support
+
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.3.4-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild