rpms/jakarta-commons-net/devel commons-net-1.4.1.pom, NONE, 1.1 jakarta-commons-net.spec, 1.1, 1.2
Permaine Cheung (pcheung)
fedora-extras-commits at redhat.com
Tue Jan 22 18:17:59 UTC 2008
Author: pcheung
Update of /cvs/extras/rpms/jakarta-commons-net/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32008
Modified Files:
jakarta-commons-net.spec
Added Files:
commons-net-1.4.1.pom
Log Message:
Merge with upstream
--- NEW FILE commons-net-1.4.1.pom ---
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
<name>Jakarta Commons Net</name>
<version>1.4.1</version>
<description></description>
<url>http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/</url>
<issueManagement>
<url>http://issues.apache.org/bugzilla/</url>
</issueManagement>
<ciManagement>
<notifiers>
<notifier>
<configuration>
<address>commons-dev at jakarta.apache.org</address>
</configuration>
</notifier>
</notifiers>
</ciManagement>
<inceptionYear>1997</inceptionYear>
<mailingLists>
<mailingList>
<name>Commons Dev List</name>
<subscribe>commons-dev-subscribe at jakarta.apache.org</subscribe>
<unsubscribe>commons-dev-unsubscribe at jakarta.apache.org</unsubscribe>
<archive>http://mail-archives.apache.org/eyebrowse/SummarizeList?listName=commons-dev@jakarta.apache.org</archive>
</mailingList>
<mailingList>
<name>Commons User List</name>
<subscribe>commons-user-subscribe at jakarta.apache.org</subscribe>
<unsubscribe>commons-user-unsubscribe at jakarta.apache.org</unsubscribe>
<archive>http://mail-archives.apache.org/eyebrowse/SummarizeList?listName=commons-user@jakarta.apache.org</archive>
</mailingList>
</mailingLists>
<developers>
<developer>
<id>brekke</id>
<name>Jeffrey D. Brekke</name>
<email>Jeff.Brekke at qg.com</email>
<organization>Quad/Graphics, Inc.</organization>
</developer>
<developer>
<id>scohen</id>
<name>Steve Cohen</name>
<email>scohen at apache.org</email>
<organization>javactivity.org</organization>
</developer>
<developer>
<id>brudav</id>
<name>Bruno D'Avanzo</name>
<email>bruno.davanzo at hp.com</email>
<organization>Hewlett-Packard</organization>
</developer>
<developer>
<id>dfs</id>
<name>Daniel F. Savarese</name>
<email>dfs -> apache.org</email>
<organization>savarese.org</organization>
</developer>
<developer>
<id>rwinston</id>
<name>Rory Winston</name>
<email>rwinston at apache.org</email>
<organization></organization>
</developer>
</developers>
<contributors>
<contributor>
<name>Mario Ivankovits</name>
<email>mario at ops.co.at</email>
</contributor>
<contributor>
<name>Tapan Karecha</name>
<email>tapan at india.hp.com</email>
</contributor>
<contributor>
<name>Winston Ojeda</name>
<email>Winston.Ojeda at qg.com</email>
<organization>Quad/Graphics, Inc.</organization>
</contributor>
<contributor>
<name>Ted Wise</name>
<email>ctwise at bellsouth.net</email>
</contributor>
</contributors>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>/LICENSE.txt</url>
</license>
</licenses>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.artifactId.substring(8)}/trunk</connection>
<url>http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.artifactId.substring(8)}/trunk</url>
</scm>
<organization>
<name>The Apache Software Foundation</name>
<url>http://jakarta.apache.org</url>
</organization>
<build>
<sourceDirectory>src/java</sourceDirectory>
<testSourceDirectory>src/test</testSourceDirectory>
<resources>
<resource>
<targetPath>META-INF</targetPath>
<directory>${basedir}</directory>
<includes>
<include>NOTICE.txt</include>
</includes>
</resource>
</resources>
<plugins>
<plugin>
<artifactId>surefire</artifactId>
<configuration>
<includes>
<include>**/*Test.java</include>
</includes>
<excludes>
<exclude>**/*FunctionalTest.java</exclude>
<exclude>**/*POP3*.java</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>statcvs</groupId>
<artifactId>maven-statcvs-plugin</artifactId>
<version>2.5</version>
<configuration />
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>oro</groupId>
<artifactId>oro</artifactId>
<version>2.0.8</version>
</dependency>
</dependencies>
<distributionManagement>
<repository>
<id>default</id>
<name>Default Repository</name>
<url>file:///www/jakarta.apache.org/builds/jakarta-commons/${pom.artifactId.substring(8)}/</url>
</repository>
<site>
<id>default</id>
<name>Default Site</name>
<url>scp://jakarta.apache.org//www/jakarta.apache.org/commons/${pom.artifactId.substring(8)}/</url>
</site>
</distributionManagement>
</project>
Index: jakarta-commons-net.spec
===================================================================
RCS file: /cvs/extras/rpms/jakarta-commons-net/devel/jakarta-commons-net.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jakarta-commons-net.spec 8 Mar 2007 21:51:14 -0000 1.1
+++ jakarta-commons-net.spec 22 Jan 2008 18:17:22 -0000 1.2
@@ -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
@@ -32,16 +32,17 @@
# If you don't want to build with maven, and use straight ant instead,
# give rpmbuild option '--without maven'
-
+
%define with_maven %{!?_without_maven:1}%{?_without_maven:0}
%define without_maven %{?_without_maven:1}%{!?_without_maven:0}
-
+%define without_tests 1
+%define gcj_support 0
%define base_name net
%define short_name commons-%{base_name}
Name: jakarta-commons-net
Version: 1.4.1
-Release: 2jpp.1%{?dist}
+Release: 4jpp.1%{?dist}
Epoch: 0
Summary: Internet protocol suite Java library
License: Apache Software License
@@ -56,29 +57,50 @@
# svn export -r '{2007-02-15}' http://svn.apache.org/repos/asf/jakarta/commons/proper/commons-build/trunk/ commons-build
# tar czf commons-build.tar.gz commons-build
Source5: commons-build.tar.gz
+Source6: commons-net-1.4.1.pom
Patch0: %{name}-crosslink.patch
Patch1: %{short_name}-%{version}-project_xml.patch
Patch2: %{short_name}-%{version}-project_properties.patch
Patch3: %{short_name}-%{version}-disable-tests.patch
-BuildRequires: jpackage-utils >= 0:1.6
+BuildRequires: jpackage-utils >= 0:1.7.2
BuildRequires: ant >= 0:1.6
+%if ! %{without_tests}
BuildRequires: ant-junit >= 0:1.6
+%endif
BuildRequires: junit >= 3.8.1
BuildRequires: java-javadoc
-BuildRequires: oro >= 2.0.7
+BuildRequires: oro >= 2.0.8
%if %{with_maven}
BuildRequires: maven >= 0:1.1
+BuildRequires: maven-plugins-base
+BuildRequires: maven-plugin-changes
+BuildRequires: maven-plugin-checkstyle
+BuildRequires: maven-plugin-jcoverage
+BuildRequires: maven-plugin-jdepend
+BuildRequires: maven-plugin-jxr
+BuildRequires: maven-plugin-license
+BuildRequires: maven-plugin-tasklist
+BuildRequires: maven-plugin-test
+BuildRequires: maven-plugin-xdoc
+
BuildRequires: saxon
BuildRequires: saxon-scripts
%endif
-Requires: oro >= 2.0.7
+Requires: oro >= 2.0.8
Requires: java
-Requires: jpackage-utils >= 0:1.6
+%if ! %{gcj_support}
BuildArch: noarch
+%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Provides: %{short_name} = %{epoch}:%{version}-%{release}
Obsoletes: %{short_name} < %{epoch}:%{version}-%{release}
+Requires: jpackage-utils >= 0:1.7.2
+%if %{gcj_support}
+BuildRequires: java-gcj-compat-devel
+Requires(post): java-gcj-compat
+Requires(postun): java-gcj-compat
+%endif
%description
This is an Internet protocol suite Java library originally developed by
@@ -117,13 +139,14 @@
%patch0 -b .sav
%patch1 -b .sav
%patch2 -b .sav
-%patch3 -b .sav
+#%patch3 -b .sav
# remove all binary libs
find . -name "*.jar" -exec rm -f {} \;
%build
%if %{with_maven}
export DEPCAT=$(pwd)/commons-net-1.4.1-depcat.new.xml
+echo '<?xml version="1.0" standalone="yes"?>' > $DEPCAT
echo '<depset>' >> $DEPCAT
for p in $(find . -name project.xml); do
pushd $(dirname $p)
@@ -143,20 +166,26 @@
export MAVEN_HOME_LOCAL=$(pwd)/.maven
-maven \
+# -Dmaven.test.failure.ignore=true \
+maven -e \
-Dmaven.repo.remote=file:/usr/share/maven/repository \
-Dmaven.home.local=${MAVEN_HOME_LOCAL} \
- jar:jar javadoc:generate xdoc:transform
+ jar:jar javadoc:generate site
%else
mkdir -p target/lib
ln -s %{_javadir}/oro.jar target/lib
ln -s %{_javadir}/junit.jar target/lib
export CLASSPATH=%{_javadir}/oro.jar:%{_javadir}/junit.jar
-
+%if %{without_tests}
+ant -Dnoget=true -Dfinal.name=commons-net-%{version} \
+ -Dj2se.api=%{_javadocdir}/java jar javadoc
+%else
+export OPT_JAR_LIST="ant/ant-junit junit"
# FIXME: Investigate test failures in Fedora
ant -Dnoget=true -Dfinal.name=commons-net-%{version} \
- -Dj2se.api=%{_javadocdir}/java dist
+ -Dj2se.api=%{_javadocdir}/java jar test javadoc
+%endif
%endif
%install
@@ -164,13 +193,10 @@
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-%if %{with_maven}
+%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name}
+
install -m 644 target/%{short_name}-%{version}.jar \
$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-%else
-install -m 644 dist/%{short_name}-%{version}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-%endif
(cd $RPM_BUILD_ROOT%{_javadir} &&
for jar in *-%{version}*;
@@ -184,6 +210,11 @@
done
)
+# pom
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -pm 644 %{SOURCE6} \
+ $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
+
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
%if %{with_maven}
@@ -194,18 +225,48 @@
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
rm -rf target/docs/apidocs
# manual
-%if %{with_maven}
install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-cp -pr target/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+cp LICENSE.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+%if %{with_maven}
+install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/site
+cp -pr target/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/site
+%endif
+
+%if %{gcj_support}
+export CLASSPATH=$(build-classpath gnu-crypto)
+%{_bindir}/aot-compile-rpm
%endif
%clean
rm -rf $RPM_BUILD_ROOT
+%post
+%update_maven_depmap
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+ %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%update_maven_depmap
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+ %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
%files
%defattr(0644,root,root,0755)
-%doc LICENSE.txt
+%doc %{_docdir}/%{name}-%{version}/LICENSE.txt
%{_javadir}/*
+%{_datadir}/maven2/poms/*
+%{_mavendepmapfragdir}
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}
+%endif
%files javadoc
%defattr(0644,root,root,0755)
@@ -218,10 +279,26 @@
%endif
%changelog
+* Tue Jan 22 2008 Permaine Cheung <pcheung at redhat.com> - 0:1.4.1-4jpp.1
+- Merge with upstream
+
+* Fri Aug 31 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.4.1-4jpp
+- Add oro Requires
+- Add pom and depmap frags
+- Make Vendor, Distribution based on macro
+
+* Thu May 03 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.4.1-3jpp
+- Fix project_properties.patch to meet new plugins
+- Add maven-plugin-* BRs
+
* Thu Feb 15 2007 Deepak Bhole <dbhole at redhat.com> - 0:1.4.1-2jpp.1
- Fix per Fedora spec
- Disable tests as a bunch of them currently fail on Fedora
+* Mon Feb 12 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.4.1-2jpp
+- Add gcj_support
+- Tests optional when building without maven
+
* Mon May 08 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.4.1-1jpp
- Upgrade to 1.4.1
- First JPP-1.7 release
More information about the fedora-extras-commits
mailing list