[jacorb] - Added idl-compiler jar to the package - Remove unnecessary depednencies from POM since we don't bu
Marek Goldmann
goldmann at fedoraproject.org
Fri Aug 31 09:49:03 UTC 2012
commit 7d7c0c7f75780e8020466a753fdc3859569ba850
Author: Marek Goldmann <goldmann at fedoraproject.org>
Date: Fri Aug 31 11:48:35 2012 +0200
- Added idl-compiler jar to the package
- Remove unnecessary depednencies from POM since we don't build the notification module
- Additional groupId mappings
...b-2.3.1-notification-dependencies-removal.patch | 58 ++++++++++++++++++++
jacorb-idl-compiler-2.3.1.pom | 33 +++++++++++
jacorb.spec | 18 ++++++-
3 files changed, 107 insertions(+), 2 deletions(-)
---
diff --git a/jacorb-2.3.1-notification-dependencies-removal.patch b/jacorb-2.3.1-notification-dependencies-removal.patch
new file mode 100644
index 0000000..afc1ca9
--- /dev/null
+++ b/jacorb-2.3.1-notification-dependencies-removal.patch
@@ -0,0 +1,58 @@
+--- jacorb.pom 2012-08-30 23:23:38.409997165 +0200
++++ jacorb-work.pom 2012-08-30 23:25:18.405020084 +0200
+@@ -20,13 +20,6 @@
+ <dependencies>
+
+ <dependency>
+- <groupId>tanukisoft</groupId>
+- <artifactId>wrapper</artifactId>
+- <version>3.2.3</version>
+- <scope>compile</scope>
+- </dependency>
+-
+- <dependency>
+ <groupId>antlr</groupId>
+ <artifactId>antlr</artifactId>
+ <version>2.7.7</version>
+@@ -34,41 +27,6 @@
+ </dependency>
+
+ <dependency>
+- <groupId>picocontainer</groupId>
+- <artifactId>picocontainer</artifactId>
+- <version>1.2</version>
+- <scope>compile</scope>
+- </dependency>
+-
+- <dependency>
+- <groupId>nanocontainer</groupId>
+- <artifactId>nanocontainer</artifactId>
+- <version>1.0</version>
+- <scope>compile</scope>
+- </dependency>
+-
+- <dependency>
+- <groupId>nanocontainer</groupId>
+- <artifactId>nanocontainer-remoting</artifactId>
+- <version>1.0-RC-1</version>
+- <scope>compile</scope>
+- </dependency>
+-
+- <dependency>
+- <groupId>org.beanshell</groupId>
+- <artifactId>bsh</artifactId>
+- <version>1.3.0</version>
+- <scope>compile</scope>
+- </dependency>
+-
+- <dependency>
+- <groupId>backport-util-concurrent</groupId>
+- <artifactId>backport-util-concurrent</artifactId>
+- <version>3.1</version>
+- <scope>provided</scope>
+- </dependency>
+-
+- <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.5.6</version>
diff --git a/jacorb-idl-compiler-2.3.1.pom b/jacorb-idl-compiler-2.3.1.pom
new file mode 100644
index 0000000..b2e3e73
--- /dev/null
+++ b/jacorb-idl-compiler-2.3.1.pom
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jacorb</groupId>
+ <artifactId>jacorb-parent</artifactId>
+ <version>2.3.1</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jacorb</groupId>
+ <artifactId>jacorb-idl-compiler</artifactId>
+ <version>2.3.1</version>
+ <name>JacORB :: IDL</name>
+
+ <packaging>jar</packaging>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.7.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>avalon</groupId>
+ <artifactId>avalon-logkit</artifactId>
+ <version>1.2</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+</project>
diff --git a/jacorb.spec b/jacorb.spec
index b3f4cb2..d5e07a6 100644
--- a/jacorb.spec
+++ b/jacorb.spec
@@ -1,6 +1,6 @@
Name: jacorb
Version: 2.3.1
-Release: 2.20120215git%{?dist}
+Release: 3.20120215git%{?dist}
Summary: The Java implementation of the OMG's CORBA standard
Group: Development/Libraries
License: LGPLv2
@@ -12,6 +12,7 @@ URL: http://www.jacorb.org/index.html
Source0: jacorb-20120215git5481b0.tar.xz
Source1: http://central.maven.org/maven2/org/jacorb/jacorb-parent/%{version}/jacorb-parent-%{version}.pom
Source2: http://central.maven.org/maven2/org/jacorb/jacorb/%{version}/jacorb-%{version}.pom
+Source3: http://central.maven.org/maven2/org/jacorb/jacorb-idl-compiler/%{version}/jacorb-idl-compiler-%{version}.pom
# These methods are not implemented in the current
Patch0: 0001-Implement-a-few-methods-in-GSSUPContextSpi-to-make-i.patch
@@ -26,6 +27,9 @@ Patch2: 0003-Set-encoding-to-UTF-8-when-generating-javadoc.patch
# Remove the Class-Path entry to fix class-path-in-manifest issue
Patch3: 0004-Removed-Class-Path-entry-from-MANIFEST.MF.patch
+# Remove unnecessary deps from POM since we don't have notification module available
+Patch4: jacorb-%{version}-notification-dependencies-removal.patch
+
BuildArch: noarch
BuildRequires: jpackage-utils
@@ -57,6 +61,7 @@ This package contains the API documentation for %{name}.
cp %{SOURCE1} jacorb-parent.pom
cp %{SOURCE2} jacorb.pom
+cp %{SOURCE3} jacorb-idl-compiler.pom
find -name '*.class' -exec rm -f '{}' \;
find -name '*.jar' -exec rm -f '{}' \;
@@ -65,6 +70,7 @@ find -name '*.jar' -exec rm -f '{}' \;
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p0
# No xdoclet available
sed -i 's|,notification||' src/org/jacorb/build.xml
@@ -81,15 +87,18 @@ ant all doc
# JAR
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/
install -pm 644 lib/jacorb.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+install -pm 644 lib/idl.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-idl-compiler.jar
# POM
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -pm 644 jacorb-parent.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-parent.pom
install -pm 644 jacorb.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+install -pm 644 jacorb-idl-compiler.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-idl-compiler.pom
# DEPMAP
%add_maven_depmap JPP-%{name}-parent.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
+%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "jacorb:jacorb"
+%add_maven_depmap JPP-%{name}-idl-compiler.pom %{name}-idl-compiler.jar -a "jacorb:jacorb-idl-compiler"
# APIDOCS
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -106,6 +115,11 @@ cp -rp doc/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%doc doc/LICENSE
%changelog
+* Thu Aug 30 2012 Marek Goldmann <mgoldman at redhat.com> - 2.3.1-3.20120215git
+- Added idl-compiler jar to the package
+- Remove unnecessary depednencies from POM since we don't build the notification module
+- Additional groupId mappings
+
* Thu Aug 30 2012 Marek Goldmann <mgoldman at redhat.com> - 2.3.1-2.20120215git
- Added LICENSE file to package
- Removed Class-Path entry from MANIFEST.MF
More information about the scm-commits
mailing list