[jgroups] Upstream release 2.12.1.3, move to maven.
Marek Goldmann
goldmann at fedoraproject.org
Mon Oct 24 08:20:43 UTC 2011
commit 60f4e808c510af86679352351d2cdf17ecaa9b4c
Author: Marek Goldmann <goldmann at fedoraproject.org>
Date: Tue Aug 23 06:19:31 2011 -0400
Upstream release 2.12.1.3, move to maven.
jgroups-2.12.1.3.Final-pom.patch | 22 +++++++
jgroups.spec | 115 +++++++++++++-------------------------
2 files changed, 62 insertions(+), 75 deletions(-)
---
diff --git a/jgroups-2.12.1.3.Final-pom.patch b/jgroups-2.12.1.3.Final-pom.patch
new file mode 100644
index 0000000..87a5272
--- /dev/null
+++ b/jgroups-2.12.1.3.Final-pom.patch
@@ -0,0 +1,22 @@
+diff -Naur jgroups-2.12.1.3.Final/pom.xml jgroups-2.12.1.3.Final-work/pom.xml
+--- jgroups-2.12.1.3.Final/pom.xml 2011-07-21 04:08:34.000000000 -0400
++++ jgroups-2.12.1.3.Final-work/pom.xml 2011-08-18 12:04:25.319350771 -0400
+@@ -149,18 +149,6 @@
+ </configuration>
+ </execution>
+ </executions>
+- <dependencies> <!-- Not really needed in Java 5 -->
+- <dependency>
+- <groupId>xalan</groupId>
+- <artifactId>xalan</artifactId>
+- <version>2.7.1</version>
+- </dependency>
+- <dependency>
+- <groupId>xalan</groupId>
+- <artifactId>serializer</artifactId>
+- <version>2.7.1</version>
+- </dependency>
+- </dependencies>
+ </plugin>
+ <!-- Make sure we generate src jars too -->
+ <plugin>
diff --git a/jgroups.spec b/jgroups.spec
index 697e542..7da0ff5 100644
--- a/jgroups.spec
+++ b/jgroups.spec
@@ -1,39 +1,35 @@
+%global namedreltag .Final
+%global namedversion %{version}%{?namedreltag}
+
Name: jgroups
-Version: 2.2.9.2
-Release: 8%{?dist}
+Version: 2.12.1.3
+Release: 1%{?dist}
Summary: Toolkit for reliable multicast communication
License: LGPLv2+
URL: http://www.jgroups.org/
Group: Development/Libraries
-Source0: JGroups-2.2.9.2.src-RHCLEAN.tar.gz
-Patch0: jgroups-2.2.9-build_xml.patch
+# git clone git://github.com/belaban/JGroups.git
+# cd JGroups/ && git archive --format=tar --prefix=jgroups-2.12.1.3.Final/ JGroups_2_12_1_3 | xz > jgroups-2.12.1.3.Final.tar.xz
+Source0: %{name}-%{namedversion}.tar.xz
+Patch0: %{name}-%{namedversion}-pom.patch
Requires: java
Requires: jpackage-utils
-Requires: bsh
-Requires: concurrent
-Requires: apache-commons-logging
-Requires: jaxp_parser_impl
-Requires: jms
-Requires: log4j
-Requires: xalan-j2
-Requires: bouncycastle
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils
BuildRequires: ant
-BuildRequires: ant-trax
BuildRequires: bsh
-BuildRequires: concurrent
-BuildRequires: apache-commons-logging
-BuildRequires: jaxp_parser_impl
-BuildRequires: jms
-BuildRequires: junit
-BuildRequires: ant-junit
BuildRequires: log4j
-BuildRequires: xalan-j2
-BuildRequires: bouncycastle
+BuildRequires: maven
+BuildRequires: maven-antrun-plugin
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-source-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-plugin-bundle
+BuildRequires: maven-surefire-provider-junit
+BuildRequires: testng
BuildArch: noarch
@@ -49,83 +45,52 @@ Group: Documentation
Requires: jpackage-utils
%description javadoc
-%{summary}.
-
-%package manual
-Summary: Manual for %{name}
-Group: Documentation
-
-%description manual
-%{summary}.
+This package contains the API documentation for %{name}.
%prep
-%setup -q -n JGroups-2.2.9.2.src
+%setup -q -n %{name}-%{namedversion}
# remove all binary bits
find -name '*.class' -exec rm -f '{}' \;
find -name '*.jar' -exec rm -f '{}' \;
-%patch0 -b .sav
+%patch0 -p1
%build
-pushd lib
-ln -sf $(build-classpath bsh) .
-ln -sf $(build-classpath apache-commons-logging) .
-ln -sf $(build-classpath concurrent) .
-ln -sf $(build-classpath jms) .
-ln -sf $(build-classpath junit) .
-ln -sf $(build-classpath log4j) .
-popd
-
-export ANT_OPTS="-Djava.net.preferIPv4Stack=true"
-export CLASSPATH=$CLASSPATH:`build-classpath xalan-j2 xalan-j2-serializer bcprov`
-ant jar javadoc jboss-service jgroups-service unittests testreport
+mvn-rpmbuild install javadoc:aggregate
%install
-rm -rf $RPM_BUILD_ROOT
-# jars
-install -pD -T -m 644 dist/%{name}-all.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-install -pD -T -m 644 dist/%{name}-core.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}-core.jar
+# JAR
+install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
+cp -p target/%{name}-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-# javadoc
-install -p -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr dist/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+# JAVADOC
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -rp target/site/apidocs $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-# services
-install -p -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -m 644 dist/%{name}*.sar \
- $RPM_BUILD_ROOT%{_datadir}/%{name}
+# POM
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-# manual
-install -p -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}
-cp -pr doc/* $RPM_BUILD_ROOT%{_docdir}/%{name}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%pre javadoc
-# workaround for rpm bug, can be removed in F-17
-[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
-rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
+# DEPMAP
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
%files
-%defattr(-,root,root,-)
-%doc CREDITS README doc/LICENSE
+%{_mavenpomdir}/*
+%{_mavendepmapfragdir}/*
%{_javadir}/*
-%{_datadir}/%{name}
+%doc CREDITS INSTALL.html LICENSE README
%files javadoc
-%defattr(-,root,root,-)
%{_javadocdir}/%{name}
-
-%files manual
-%defattr(-,root,root,-)
-%doc %{_docdir}/%{name}
+%doc LICENSE
%changelog
+* Thu Aug 18 2011 Marek Goldmann <mgoldman at redhat.com> - 2.12.1.3
+- Upstream release: 2.12.1.3
+- Moved to Maven
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.9.2-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list