rpms/jakarta-commons-codec/devel .cvsignore, 1.3, 1.4 jakarta-commons-codec-1.3-buildscript.patch, 1.2, 1.3 jakarta-commons-codec.spec, 1.16, 1.17 sources, 1.2, 1.3
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Apr 26 00:19:40 UTC 2007
Author: mwringe
Update of /cvs/dist/rpms/jakarta-commons-codec/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14361
Modified Files:
.cvsignore jakarta-commons-codec-1.3-buildscript.patch
jakarta-commons-codec.spec sources
Log Message:
Update to latest jpp version
Fix rpmlint issues
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-codec/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 6 Jun 2005 16:59:09 -0000 1.3
+++ .cvsignore 26 Apr 2007 00:19:38 -0000 1.4
@@ -1,4 +1 @@
commons-codec-1.3-src.tar.gz
-jakarta-commons-codec-1.3
-noarch
-*.src.rpm
jakarta-commons-codec-1.3-buildscript.patch:
build.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Index: jakarta-commons-codec-1.3-buildscript.patch
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-codec/devel/jakarta-commons-codec-1.3-buildscript.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jakarta-commons-codec-1.3-buildscript.patch 26 Sep 2006 14:17:14 -0000 1.2
+++ jakarta-commons-codec-1.3-buildscript.patch 26 Apr 2007 00:19:38 -0000 1.3
@@ -1,20 +1,20 @@
---- jakarta-commons-codec-1.3/build.xml.orig 2006-09-25 21:21:10.000000000 -0400
-+++ jakarta-commons-codec-1.3/build.xml 2006-09-25 21:27:04.000000000 -0400
+--- jakarta-commons-codec-1.3/build.xml.orig 2007-04-10 14:07:43.000000000 -0400
++++ jakarta-commons-codec-1.3/build.xml 2007-04-10 14:08:33.000000000 -0400
@@ -84,7 +84,7 @@
- windowtitle="${component.title} (Version ${component.version})"
- bottom="${component.name} version ${component.version} - Copyright © 2002-2004 - Apache Software Foundation"
- use="true"
-- link="http://java.sun.com/products/jdk/1.3/docs/api/">
-+ link="file:///usr/share/javadoc/java">
- <classpath refid="compile.classpath"/>
- </javadoc>
- </target>
+ windowtitle="${component.title} (Version ${component.version})"
+ bottom="${component.name} version ${component.version} - Copyright © 2002-2004 - Apache Software Foundation"
+ use="true"
+- link="http://java.sun.com/products/jdk/1.3/docs/api/">
++ link="file:///usr/share/javadoc/java">
+ <classpath refid="compile.classpath"/>
+ </javadoc>
+ </target>
@@ -177,7 +177,7 @@
- <!-- Run all the JUnit Tests -->
- <target name="test" depends="compile.tests" description="Compiles and runs unit test cases">
- <record name="${build.home}/test-output.txt" append="no" action="start"/>
-- <junit printsummary="yes" haltonfailure="yes">
-+ <junit printsummary="yes" haltonfailure="no">
- <classpath refid="test.classpath"/>
- <formatter type="plain"/>
- <batchtest fork="yes" todir="${build.home}/test-reports">
+ <!-- Run all the JUnit Tests -->
+ <target name="test" depends="compile.tests" description="Compiles and runs unit test cases">
+ <record name="${build.home}/test-output.txt" append="no" action="start"/>
+- <junit printsummary="yes" haltonfailure="yes">
++ <junit printsummary="yes" haltonfailure="no">
+ <classpath refid="test.classpath"/>
+ <formatter type="plain"/>
+ <batchtest fork="yes" todir="${build.home}/test-reports">
Index: jakarta-commons-codec.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-codec/devel/jakarta-commons-codec.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- jakarta-commons-codec.spec 1 Oct 2006 21:17:16 -0000 1.16
+++ jakarta-commons-codec.spec 26 Apr 2007 00:19:38 -0000 1.17
@@ -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
@@ -38,14 +38,18 @@
Name: jakarta-commons-codec
Version: 1.3
-Release: 7jpp.2
-Summary: Jakarta Commons Codec Package
+Release: 8jpp.1%{?dist}
+Summary: Implementations of common encoders and decoders
License: Apache Software License
Group: Development/Libraries/Java
Epoch: 0
URL: http://jakarta.apache.org/commons/codec/
-Source0: http://www.apache.org/dist/jakarta/commons/codec/source/commons-codec-%{version}-src.tar.gz
-Patch0: jakarta-commons-codec-1.3-buildscript.patch
+Source0: commons-codec-%{version}-src.tar.gz
+# svn export http://svn.apache.org/repos/asf/jakarta/commons/proper/codec/tags/CODEC_1_3/
+# cd CODEC_1_3
+# tar czvf commons-codec-1.3-src.tar.gz .
+
+Patch0: jakarta-commons-codec-1.3-buildscript.patch
BuildRequires: jpackage-utils >= 0:1.6
BuildRequires: ant >= 0:1.6.2
BuildRequires: ant-junit
@@ -54,26 +58,25 @@
%if ! %{gcj_support}
BuildArch: noarch
%endif
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Provides: %{short_name}
-Obsoletes: %{short_name}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Provides: %{short_name} = %{epoch}:%{version}-%{release}
+Obsoletes: %{short_name} <= %{epoch}:%{version}-%{release}
%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
+BuildRequires: java-gcj-compat-devel
+Requires(post): java-gcj-compat
+Requires(postun): java-gcj-compat
%endif
%description
Commons Codec is an attempt to provide definitive implementations of
-commonly used encoders and decoders.
+commonly used encoders and decoders. Examples include Base64, Hex,
+Phonetic and URLs.
%package javadoc
Summary: Javadoc for %{name}
Group: Development/Documentation
Requires: java-javadoc
-Requires(post): /bin/rm /bin/ln
-Requires(postun): /bin/rm
%description javadoc
Javadoc for %{name}.
@@ -88,6 +91,10 @@
# This problem has been communicated upstream Bug 31096
%patch0 -p1
+#fixes eof encoding
+%{__sed} -i 's/\r//' LICENSE.txt
+%{__sed} -i 's/\r//' RELEASE-NOTES.txt
+
# -----------------------------------------------------------------------------
%build
@@ -119,7 +126,7 @@
# javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
# -----------------------------------------------------------------------------
@@ -132,25 +139,16 @@
# -----------------------------------------------------------------------------
-%post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ "$1" = "0" ]; then
- rm -f %{_javadocdir}/%{name}
-fi
-# -----------------------------------------------------------------------------
-%post
%if %{gcj_support}
+%post
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
-%postun
%if %{gcj_support}
+%postun
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
@@ -168,11 +166,19 @@
%files javadoc
%defattr(0644,root,root,0755)
-%{_javadocdir}/%{name}-%{version}
-%ghost %doc %{_javadocdir}/%{name}
+%doc %{_javadocdir}/%{name}-%{version}
+%doc %{_javadocdir}/%{name}
# -----------------------------------------------------------------------------
%changelog
+* Wed Mar 21 2007 Matt Wringe <mwringe at redhat.com> 0:1.3-8jpp.1
+- Update to latest jpp version
+- Fix rpmlint issues
+
+* Wed Mar 21 2007 Matt Wringe <mwringe at redhat.com> 0:1.3-8jpp
+- Fix some rpmlint warnings
+- Update copyright year
+
* Sun Oct 01 2006 Jesse Keating <jkeating at redhat.com> 0:1.3-7jpp.2
- rebuilt for unwind info generation, broken in gcc-4.1.1-21
@@ -217,5 +223,5 @@
- 1.2
- use perl instead of patch
-* Wed May 28 2003 Ville Skyttä <jpackage-discuss at zarb.org> - 0:1.1-1jpp
+* Wed May 28 2003 Ville Skyttä <jpackage-discuss at zarb.org> - 0:1.1-1jpp
- First JPackage release.
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-codec/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 5 May 2005 15:43:54 -0000 1.2
+++ sources 26 Apr 2007 00:19:38 -0000 1.3
@@ -1 +1 @@
-ac19a5dc22b1293b39d0445ad08c4ce7 commons-codec-1.3-src.tar.gz
+79e00c8738aa947f0c2a068301eda808 commons-codec-1.3-src.tar.gz
More information about the fedora-cvs-commits
mailing list