rpms/jakarta-commons-net/devel build.xml.tar.gz, NONE, 1.1 commons-net-MANIFEST.MF, NONE, 1.1 .cvsignore, 1.2, 1.3 jakarta-commons-net.spec, 1.10, 1.11 sources, 1.2, 1.3 commons-net-1.4.1-jpp-depmap.xml, 1.1, NONE commons-net-1.4.1-disable-tests.patch, 1.1, NONE pom-maven2jpp-newdepmap.xsl, 1.1, NONE commons-net-1.4.1-project_properties.patch, 1.2, NONE pom-maven2jpp-depcat.xsl, 1.1, NONE MANIFEST.MF, 1.1, NONE commons-net-1.4.1.pom, 1.1, NONE jakarta-commons-net-crosslink.patch, 1.2, NONE commons-net-1.4.1-project_xml.patch, 1.3, NONE jakarta-commons-net-build-xml.patch, 1.1, NONE pom-maven2jpp-mapdeps.xsl, 1.1, NONE
Alexander Kurtakov
akurtakov at fedoraproject.org
Thu Aug 13 07:47:54 UTC 2009
- Previous message (by thread): rpms/translation-filter/EL-5 translation-filter.spec,1.1,1.2
- Next message (by thread): rpms/translation-filter/devel .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 sources, 1.2, 1.3 translation-filter.spec, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: akurtakov
Update of /cvs/pkgs/rpms/jakarta-commons-net/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32317/devel
Modified Files:
.cvsignore jakarta-commons-net.spec sources
Added Files:
build.xml.tar.gz commons-net-MANIFEST.MF
Removed Files:
commons-net-1.4.1-jpp-depmap.xml
commons-net-1.4.1-disable-tests.patch
pom-maven2jpp-newdepmap.xsl
commons-net-1.4.1-project_properties.patch
pom-maven2jpp-depcat.xsl MANIFEST.MF commons-net-1.4.1.pom
jakarta-commons-net-crosslink.patch
commons-net-1.4.1-project_xml.patch
jakarta-commons-net-build-xml.patch pom-maven2jpp-mapdeps.xsl
Log Message:
Update to upstream 2.0.
--- NEW FILE build.xml.tar.gz ---
Ù;ZãʨXR# R§ß«ÙóÔ¬«Û$J8ó-é\ø2muËfjÒöÔLÐA C1lÉï]E¬ ñ,y^/ 'W§¢7ñÐ3¼zyïÑÖøYGÀ(%\R"^càÿpwoPÃÿýþÿ×Ñ~ø
$cIB4¢se
j¯¢ì&ÈAï/ÑÅå
:yvn>]£Ó³ßN¾ßúáav}Ôó¶ðvw\ß a¿ÿf+K7Æ !5 õ¸¥ÞùñÅÙ)»ç§[Ú]A¤CG¸l<hBü1É;_
,\ø{y±Ü1Mpt¡üªÓÎÐí[A8Ñ^å&mDeVñ¼§Üíûn¥OÂJ.3fzýWû
fMø
Ãë68ësA
Þs«òlf\<°ûýñ]mRNï=üêSò¨%iÙíÿä¬þðg§¬¶!À¨+»'ÏêSUÚ)Ô²â0¤d!I#6¡Ce,òEnµ@é[1Oäâäæ×o Õb´Ì1ÿüîïvjçÿ~lÎÿu´Mþ×.ßjÜÑÝd¡Î+X°æ÷B¤à)ÁÆ4Ðg@4Ð ÐàTJ@àåù½´|ó_p¼Aßë¿A*ÂEÇçø]òåVlN§«0¹cxë[ïÚË3æ,vô2ÿÆZÉÏXHrO9Kâ¼*ç·ÏÜ»Õrq¦yµ¤ù §þµaí ¼¢%µæL=t£¬¦BÎêó5Yí`¨/c0;²;[ÌHj,³Jr³x|%Û³LÜÅ+©à¼¥SÂåØ6dÃöå|l]ÔÒÊ ÞÂtsøufµó«ìv®ÏrÎÜa|õÂå§K¬¥O3§4ªXÅjPî=?6±ËÉsÀm("!È¡zF¹VÌ¢ö©Pöé¡0rr:U[N(I®m÷3æF9ª³1ÅQÅÿ¨ermÙ/&Áç,¡àMúß÷Àïþ¾PºÕÄ»`mÙWÃ×T´*L§©ÔY^~¡aÙ²T¡³DDªÊfèÑ(¯n¯umGǶßÂ^JÚí$¡ð{ÐçÀQW!4ï åÛßÁö¶íú¬®f^3b+çÓ£ÒFGía Ùö¶Gqãxð]¹;[Ub§ÎtU=`H^é
É(»ÍºÒÁ`bú'é%b³KͱyyÒè½jd;#&ÚyBv{×Ú57ApY"
pà
:¼Uhe«îu#YÕ(×(±9´8&-PmqLëty[ðÎOn³SË!`éI¶ä(+a+D·Dp3¬n 5ä×gïN\ù(gÛÐ ú
H.®kTøV?Õ"Ö07:|üjY/À8ê c¶c1¨ÒÙ= 2y:D%\w4]R}I ªÙÕÁÊ&@Ѫƹ
^µPÏ{¦ÍóL;~uê*vC[ÍAµF7ÙÁ)pgîoYpiþ¢Ä´5Ár.Z@û
X¥,ÛøÑßåßÏ@¨æ)Òðhe0Ñ:®CU¥Öz´!äY
dhÃ
Û5lh§lC9ïÔøêüX,QfI ¶G]34Æ(Âk"³ô
sxæ#ëêòj§¹ÜªV7ÏÖ¯FS¯þR¤Oÿ==4æ¡Ó@_Ç +Ä+|¯ÀBÂÞÚµJew¬Vð
ÚZè[!;:òsá
[X
ã_,«:Rµ¤&é}uÀmºjQ©rÞ6ýèKGËÿ=þxqvñË2É¡§¹&@¿þ®m* ÜW§·Þ@D4
X½:¾¸ùôáòüÄèhVõruhGdn÷×G¯#bü=dÁ×^à]SÄøÙH[+¯
í±±þÓ4Ê_&sÉs'9t×n*ÉBùÛT%Ê?ëÝl¶ó%ÌS
B::&QW©´ÍBcQØ ÎO ÉÑìBJ3mE*tlïÀÌÞjÝõä±C¬ù2éZW$ë$t>aó
P¼;;|?¼£[NqÔYC@(`.TÆv}Ù±ïå,¾ÖÑä®ènÛà'øª÷`Y-Ô«Ñh!¼ßËïG(ãwE¦ïGêxû²De^µè×DWƳ¾ ²·*ê)ë&©à]ZqÅuÆ;Ùê#{àI¿ë*Y|¦f']¦_\/®4îíýe^)Tjtùf¹Yd¨ë0¨cB~>-J]fS
È
ÑzëY KF"àO²tUem'/SɼJv¤¯ÖCNÙL±¢²Iö¥7{H"Ã\N8PÔg;ì«KNq·`N n93ÆR«øîø¶Ý×/.áÁpví@]:´½ìªí
®ºÕ*þµ3§ß²â¶*Xù¼·×xCoªUCle£°4"åÛzÈ:S1a榹LÒäÛxó_Zm¨qm)ñæ± GRö$Ûâz0:TÑOÔ ¾V%ÂÀ5â¨êoÃoiQ/÷ßß6mÓ6mÓ6mÓ6mÓ6mÓ6mÓ6mÓ6mÓ6mÓþÑíÿëÈ
--- NEW FILE commons-net-MANIFEST.MF ---
Manifest-Version: 1.0
Bundle-DocURL: http://commons.apache.org/net/
Implementation-Vendor: The Apache Software Foundation
Bundle-Localization: plugin
X-Compile-Target-JDK: 1.5
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Implementation-Vendor-Id: org.apache
Built-By: Rory
Bundle-SymbolicName: org.apache.commons.net
Export-Package: org.apache.commons.net;version="2.0",org.apache.common
s.net.bsd;version="2.0",org.apache.commons.net.chargen;version="2.0",
org.apache.commons.net.daytime;version="2.0",org.apache.commons.net.d
iscard;version="2.0",org.apache.commons.net.echo;version="2.0",org.ap
ache.commons.net.finger;version="2.0",org.apache.commons.net.ftp;vers
ion="2.0",org.apache.commons.net.ftp.parser;version="2.0",org.apache.
commons.net.io;version="2.0",org.apache.commons.net.nntp;version="2.0
",org.apache.commons.net.ntp;version="2.0",org.apache.commons.net.pop
3;version="2.0",org.apache.commons.net.smtp;version="2.0",org.apache.
commons.net.telnet;version="2.0",org.apache.commons.net.tftp;version=
"2.0",org.apache.commons.net.time;version="2.0",org.apache.commons.ne
t.util;version="2.0",org.apache.commons.net.whois;version="2.0"
Bundle-Version: 2.0.0.v200905272248
X-Compile-Source-JDK: 1.5
Specification-Version: 2.0
Specification-Title: Commons Net
Bundle-Description: %bundleDesc
Specification-Vendor: The Apache Software Foundation
Build-Jdk: 1.5.0_04
Bundle-Vendor: %providerName
Bundle-Name: %pluginName
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
Implementation-Title: Commons Net
Implementation-Version: 2.0
Import-Package: javax.net,javax.net.ssl,org.apache.commons.net;version
="2.0",org.apache.commons.net.bsd;version="2.0",org.apache.commons.ne
t.chargen;version="2.0",org.apache.commons.net.daytime;version="2.0",
org.apache.commons.net.discard;version="2.0",org.apache.commons.net.e
cho;version="2.0",org.apache.commons.net.finger;version="2.0",org.apa
che.commons.net.ftp;version="2.0",org.apache.commons.net.ftp.parser;v
ersion="2.0",org.apache.commons.net.io;version="2.0",org.apache.commo
ns.net.nntp;version="2.0",org.apache.commons.net.ntp;version="2.0",or
g.apache.commons.net.pop3;version="2.0",org.apache.commons.net.smtp;v
ersion="2.0",org.apache.commons.net.telnet;version="2.0",org.apache.c
ommons.net.tftp;version="2.0",org.apache.commons.net.time;version="2.
0",org.apache.commons.net.util;version="2.0",org.apache.commons.net.w
hois;version="2.0"
Bundle-ManifestVersion: 2
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-net/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 8 Mar 2007 21:51:14 -0000 1.2
+++ .cvsignore 13 Aug 2009 07:47:53 -0000 1.3
@@ -1,2 +1,3 @@
commons-build.tar.gz
commons-net-1.4.1-src.tar.gz
+commons-net-2.0-src.tar.bz2
Index: jakarta-commons-net.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-net/devel/jakarta-commons-net.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- jakarta-commons-net.spec 25 Jul 2009 03:51:42 -0000 1.10
+++ jakarta-commons-net.spec 13 Aug 2009 07:47:53 -0000 1.11
@@ -28,43 +28,24 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%define _without_maven 1
-
-# 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 without_tests %{?_without_tests:1}%{!?_without_tests:%{?_with_tests:0}%{!?_with_tests:%{?_tests:%{_tests}}%{!?_tests:0}}}
-%define gcj_support 0
%define base_name net
%define short_name commons-%{base_name}
Name: jakarta-commons-net
-Version: 1.4.1
-Release: 6.4%{?dist}
+Version: 2.0
+Release: 1%{?dist}
Epoch: 0
Summary: Internet protocol suite Java library
License: ASL 2.0
Group: Development/Libraries/Java
-Url: http://jakarta.apache.org/commons/%{base_name}/
-Source0: http://www.apache.org/dist/jakarta/commons/net/source/commons-net-1.4.1-src.tar.gz
-Source1: pom-maven2jpp-depcat.xsl
-Source2: pom-maven2jpp-newdepmap.xsl
-Source3: pom-maven2jpp-mapdeps.xsl
-Source4: commons-net-1.4.1-jpp-depmap.xml
-
-# 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
-Source7: MANIFEST.MF
-
-Patch0: %{name}-crosslink.patch
-Patch1: %{short_name}-%{version}-project_xml.patch
-Patch2: %{short_name}-%{version}-project_properties.patch
-Patch3: %{name}-build-xml.patch
+URL: http://commons.apache.org/%{base_name}/
+Source0: http://apache.mirror.rbftpnetworks.com/commons/net/source/commons-net-2.0-src.tar.bz2
+# generated by mvn ant:ant
+Source1: commons-net-MANIFEST.MF
+Source2: build.xml.tar.gz
+
BuildRequires: jpackage-utils >= 0:1.7.2
BuildRequires: ant >= 0:1.6
%if ! %{without_tests}
@@ -73,36 +54,14 @@ BuildRequires: ant-junit >= 0:1.6
BuildRequires: junit >= 3.8.1
BuildRequires: java-javadoc
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.8
Requires: java
-%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
@@ -118,80 +77,19 @@ Group: Documentation
%description javadoc
Javadoc for %{name}.
-%if %{with_maven}
-%package manual
-Summary: Documents for %{name}
-Group: Documentation
-
-%description manual
-%{summary}.
-%endif
-
%prep
-cat <<EOT
-
- If you dont want to build with maven,
- give rpmbuild option '--without maven'
-
-EOT
-
-%setup -q -n %{short_name}-%{version}
-gzip -dc %{SOURCE5} | tar xf -
-
-cp %{SOURCE7} .
-
-%patch0 -b .sav
-%patch1 -b .sav
-%patch2 -b .sav
-%patch3
+%setup -q -n %{short_name}-%{version}-src
+mkdir -p .m2/repository/JPP/maven2/default_poms
+cp pom.xml .m2/repository/JPP/maven2/default_poms/org.apache.commons-commons-parent.pom
+mkdir -p target/osgi/
+tar xzf %{SOURCE2}
+cp %{SOURCE1} target/osgi/MANIFEST.MF
# 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)
- /usr/bin/saxon project.xml %{SOURCE1} >> $DEPCAT
- popd
-done
-echo >> $DEPCAT
-echo '</depset>' >> $DEPCAT
-/usr/bin/saxon $DEPCAT %{SOURCE2} > commons-net-1.4.1-depmap.new.xml
-
-for p in $(find . -name project.xml); do
- pushd $(dirname $p)
- cp project.xml project.xml.orig
- /usr/bin/saxon -o project.xml project.xml.orig %{SOURCE3} map=%{SOURCE4}
- popd
-done
-
-export MAVEN_HOME_LOCAL=$(pwd)/.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 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 jar test javadoc
-%endif
-%endif
+ant -Dmaven.mode.offline=true -Dmaven.test.skip=true package javadoc
%install
rm -rf $RPM_BUILD_ROOT
@@ -217,73 +115,39 @@ install -m 644 target/%{short_name}-%{ve
# pom
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
-install -pm 644 %{SOURCE6} \
+install -pm 644 pom.xml \
$RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-%if %{with_maven}
-cp -pr target/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-%else
-cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-%endif
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
-rm -rf target/docs/apidocs
-# manual
-install -d -m 755 $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
+rm -rf target/site/apidocs
%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 %{_docdir}/%{name}-%{version}/LICENSE.txt
+%doc LICENSE.txt
%{_javadir}/*
%{_datadir}/maven2/poms/*
%{_mavendepmapfragdir}
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}
-%endif
%files javadoc
%defattr(0644,root,root,0755)
%doc %{_javadocdir}/*
-%if %{with_maven}
-%files manual
-%defattr(0644,root,root,0755)
-%{_docdir}/%{name}-%{version}
-%endif
-
%changelog
+* Thu Aug 13 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.0-1
+- Update to upstream 2.0.
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.4.1-6.4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-net/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 8 Mar 2007 21:51:14 -0000 1.2
+++ sources 13 Aug 2009 07:47:53 -0000 1.3
@@ -1,2 +1 @@
-6854865ce0272a28261d4dc575595390 commons-build.tar.gz
-ccbb3f67b55e8a7a676499db4386673c commons-net-1.4.1-src.tar.gz
+2c3c56ea569b255f65858971541c2337 commons-net-2.0-src.tar.bz2
--- commons-net-1.4.1-jpp-depmap.xml DELETED ---
--- commons-net-1.4.1-disable-tests.patch DELETED ---
--- pom-maven2jpp-newdepmap.xsl DELETED ---
--- commons-net-1.4.1-project_properties.patch DELETED ---
--- pom-maven2jpp-depcat.xsl DELETED ---
--- MANIFEST.MF DELETED ---
--- commons-net-1.4.1.pom DELETED ---
--- jakarta-commons-net-crosslink.patch DELETED ---
--- commons-net-1.4.1-project_xml.patch DELETED ---
--- jakarta-commons-net-build-xml.patch DELETED ---
--- pom-maven2jpp-mapdeps.xsl DELETED ---
- Previous message (by thread): rpms/translation-filter/EL-5 translation-filter.spec,1.1,1.2
- Next message (by thread): rpms/translation-filter/devel .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 sources, 1.2, 1.3 translation-filter.spec, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list