- update to 1.8

* Add DigestUtils.updateDigest(MessageDigest, InputStream). Thanks to Daniel Cassidy.
  * Add JUnit to test our decode with pad character in the middle.
  * Add Match Rating Approach (MRA) phonetic algorithm encoder. Thanks to crice.
  * ColognePhonetic encoder unnecessarily creates many char arrays on every loop run. Thanks to leo141.
  * Base64.encodeBase64URLSafeString doesn't add padding characters at the end.
- temporary add mozilla-nss to BR: to pass tests
- drop unecessary source files
- add signature verification
- use newer add_maven_depmap

OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-codec?expand=0&rev=7
This commit is contained in:
Michal Vyskocil 2013-08-26 14:10:34 +00:00 committed by Git OBS Bridge
parent a7b15251fd
commit 23264f4cda
9 changed files with 77 additions and 125 deletions

View File

@ -1,19 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="">
<component id="apache-codec"
licenseType=""
version="@VERSION@"
tag="@TAG@"
description=""
>
<artifact id="commons-codec.jar"/>
<export>
<include input="commons-codec.jar"/>
</export>
</component>
</project>

View File

@ -1,14 +0,0 @@
<dependencies>
<dependency>
<maven>
<groupId>xmlpull</groupId>
<artifactId>xmlpull</artifactId>
<version>1.1.3.1</version>
</maven>
<jpp>
<groupId>JPP</groupId>
<artifactId>xpp3</artifactId>
<version>1.1.3.8</version>
</jpp>
</dependency>
</dependencies>

View File

@ -1,47 +0,0 @@
<settings>
<profiles>
<profile>
<id>JPP</id>
<repositories>
<repository>
<id>internal</id>
<layout>jpp</layout>
<url>__JPP_URL_PLACEHOLDER__</url>
</repository>
<repository>
<id>external</id>
<layout>jpp</layout>
<url>__JAVADIR_PLACEHOLDER__</url>
</repository>
<repository>
<id>local</id>
<layout>jpp</layout>
<url>__MAVENREPO_DIR_PLACEHOLDER__</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>plugins-internal</id>
<name>plugins-internal</name>
<layout>jpp</layout>
<url>__JPP_URL_PLACEHOLDER__</url>
</pluginRepository>
<pluginRepository>
<id>plugins-external</id>
<name>plugins-external</name>
<layout>jpp</layout>
<url>__JAVADIR_PLACEHOLDER__</url>
</pluginRepository>
<pluginRepository>
<id>plugins-maven</id>
<name>plugins-maven</name>
<layout>jpp</layout>
<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>
</pluginRepository>
</pluginRepositories>
</profile>
</profiles>
<activeProfiles>
<activeProfile>JPP</activeProfile>
</activeProfiles>
</settings>

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Mon Aug 26 14:06:06 UTC 2013 - mvyskocil@suse.com
- update to 1.8
* Add DigestUtils.updateDigest(MessageDigest, InputStream). Thanks to Daniel Cassidy.
* Add JUnit to test our decode with pad character in the middle.
* Add Match Rating Approach (MRA) phonetic algorithm encoder. Thanks to crice.
* ColognePhonetic encoder unnecessarily creates many char arrays on every loop run. Thanks to leo141.
* Base64.encodeBase64URLSafeString doesn't add padding characters at the end.
- temporary add mozilla-nss to BR: to pass tests
- drop unecessary source files
- add signature verification
- use newer add_maven_depmap
-------------------------------------------------------------------
Mon Apr 2 13:00:19 UTC 2012 - mvyskocil@suse.cz

View File

@ -0,0 +1,35 @@
pub 2048R/A11262CB 2011-04-12
uid Gary David Gregory (Code signing key) <ggregory@apache.org>
sub 2048R/AD3D7F94 2011-04-12
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.19 (GNU/Linux)
mQENBE2kzuwBCACYV+G9yxNkSjAKSji0B5ipMGM74JAL1Ogtcu+993pLHHYsdXri
WWXi37x9PLjeHxw63mN26SFyrbMJ4A8erLB03PDjw0DEzAwiu9P2vSvL/RFxGBbk
cM0BTNXNR1rk8DpIzvXtejp8IHtD1qcDLTlJ8D0W3USebShDPo6NmMxTNuH0u99B
WHCMAdSa34wsg0ZpffwQmRxeA+ebrf2ydKupGkeZsKjkLlaXNkTVp1ghn5ts/lvg
KeHv1SJivWKCRmFlbPhBK4+mxSUSOPdoBNAfxA51QzZoPizSk0VbRz3YufYRVLFy
9vqPSorDmYJhCvn3f6+A38FS/j8VE+8obQ2rABEBAAG0O0dhcnkgRGF2aWQgR3Jl
Z29yeSAoQ29kZSBzaWduaW5nIGtleSkgPGdncmVnb3J5QGFwYWNoZS5vcmc+iQE4
BBMBAgAiBQJNpM7sAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRCG/cfi
oRJiy2vXCACU6jW2+XIWuWBKSmeowBMxlUMJFSq7QjLt+o6B1ZYClbzBLDKcxlnS
dF6v0jLhp71LozTde+HFI4/qIv6OO4UaGHin8Z1rNU/i5L07HkhLxcrbDoWhaSGD
buRsWCv9ljm5GCXyK9s6Uj7d4af9mDWaGhNFJJFIs+yqOvTwffoaB7y+2a1YWStZ
ZXDJ0KiHdY7xQ7bbYR/61MgvJslF1uX+u4jLTNmbU0tCXLtUrLd2VbJiAMFezqy6
hV/ZxQLZoBPpr3FYhR2SIzNhQ30nj9AVcPgCCuLD49nx6Ad5CpcP8sTwb4aWk9GK
+Uu3Bfz4jTAvd9Q7TsRMt3NV+7sOGD4vuQENBE2kzuwBCACzeGpkd6X/xTfKDBWv
XgHOOKIJ2pht9XmtZZKiIj7LIiSwvSds/ZkoZKxAm7AY+KPh8Xjf968FtoUBQJvH
AG4rbowEqT7OOrJae2JcenH5qzaod7TpIPQVv+Ysz8I1wLlC6LzKRj1X99Hng6X+
obsEasnPbmEEkuiZ/Sgi4vVC8SHkDmYt1Dx8jDgm53oUeWkEJO9LSI2zcrZhSgvg
1xa4Q4gY5UUK7gE4LbmGCjFlATuuW/0sryxu8zxph15gkn4Nqgk0CPMSjesMYEGO
sdDzfQXl2tXbt+Pe6mBoWh67MZ1v5zOq3EDtoSqDpWPxponAeaCuNDDFX44vGjfx
GE0tABEBAAGJAR8EGAECAAkFAk2kzuwCGwwACgkQhv3H4qESYsvEMAf/VGyqIEcw
4T2D3gZZ3ITkeoBevQdxBT/27xNvoWOZyGSzGYlRbRQrlo+uZsjfMc9MNvaSmxyy
4gLVbcdvQr3PF//GxphJ98W8pk9l+M57jfyHnnCumn7MO4o9ed+WuigN5oeuNJ6B
Iq3ff2o1DsrEvDChYOJEOeFuWxv+u7I2ABJJep7NbByM2n9PE8vlGU3zUBgWUBsk
6jT+klKnEyHE76WzegPLz3jtElTuyB7jRhjyQJu1yiJEMbs2zH8aJGObi5f8Jum4
tILZuEAdoI0M3c3VRq12cz/vLy+9VXa/s//8IsGn88kjyyYqOy8WJEjoOXFh++dp
WiM7nZkgQcNi5A==
=0UFs
-----END PGP PUBLIC KEY BLOCK-----

View File

@ -1,7 +1,7 @@
#
# spec file for package apache-commons-codec
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2000-2010, JPackage Project
# All rights reserved.
#
@ -18,26 +18,13 @@
#
%define with() %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
%define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
%define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
# % bcond_without maven
%bcond_with gcj_support
# % bcond_without repolib
%define repodir %{_javadir}/repository.jboss.com/apache-%{base_name}/%{version}-brew
%define repodirlib %{repodir}/lib
%define repodirres %{repodir}/resources
%define repodirsrc %{repodir}/src
%define base_name codec
%define short_name commons-%{base_name}
%define section free
Name: apache-commons-codec
Version: 1.6
Version: 1.8
Release: 0
Summary: Apache Commons Codec Package
License: Apache-2.0
@ -45,15 +32,18 @@ Group: Development/Libraries/Java
Url: http://commons.apache.org/codec/
Source0: http://www.apache.org/dist/jakarta/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
Source1: %{name}-settings.xml
Source2: %{name}-jpp-depmap.xml
Source3: %{name}-component-info.xml
Source1: http://www.apache.org/dist/jakarta/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz.asc
Source2: apache-commons-codec.keyring
Source4: MANIFEST.MF
BuildRequires: ant >= 1.7
BuildRequires: ant-junit >= 1.7
BuildRequires: java-devel >= 1.6.0
# FIXME: mozilla-nss is necessary in order to use crypto, which is tested via junit tests
# this should be a dependency of openjdk itself
BuildRequires: gpg-offline
BuildRequires: junit4
BuildRequires: mozilla-nss
%if %with maven
BuildRequires: apache-commons-parent >= 12
@ -98,23 +88,12 @@ Obsoletes: %{short_name}-javadoc < %{version}
Javadoc for %{name}.
%prep
%gpg_verify %{SOURCE1}
%setup -q -n %{short_name}-%{version}-src
#fixes eof encoding
sed -i 's/\r//' RELEASE-NOTES*.txt LICENSE.txt NOTICE.txt
%if %with maven
cp -p %{SOURCE1} settings.xml
sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" settings.xml
sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
sed -i -e "s|<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/maven2/plugins</url>|g" settings.xml
sed -i -e "s|<url>__ECLIPSEDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/eclipse/plugins</url>|g" settings.xml
mkdir external_repo
ln -s %{_javadir} external_repo/JPP
%endif
%build
%if %with maven
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
@ -127,7 +106,7 @@ export MAVEN_OPTS="-Dmaven2.jpp.mode=true -Dmaven2.jpp.depmap.file=%{SOURCE2} -D
%else
export CLASSPATH=$(build-classpath junit4)
ant -v -d -Dbuild.sysclasspath=first \
ant -Dbuild.sysclasspath=first \
-Dconf.home=src/conf \
-Dbuild.home=build \
-Dsource.home=src/main/java \
@ -157,10 +136,9 @@ ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/jakarta-%{short_name}-%{ver
ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/jakarta-%{short_name}.jar
# Install pom file
install -dm 755 %{buildroot}%{_datadir}/maven2/poms
cp -p pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP-apache-commons-codec.pom
%add_to_maven_depmap commons-codec commons-codec %{version} JPP apache-commons-codec
%add_to_maven_depmap org.apache.commons commons-codec %{version} JPP apache-commons-codec
install -d -m 755 %{buildroot}%{_mavenpomdir}
install -p -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
%add_maven_depmap JPP-%{short_name}.pom %{short_name}.jar -a "%{short_name}:%{short_name}"
# javadoc
mkdir -p %{buildroot}%{_javadocdir}/%{name}-%{version}
@ -173,17 +151,11 @@ ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/jakarta-%{short_name}-%{vers
ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/jakarta-%{short_name}
ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
%post
%update_maven_depmap
%postun
%update_maven_depmap
%files
%defattr(0644,root,root,0755)
%doc LICENSE.txt RELEASE-NOTES.txt
%{_javadir}/*.jar
%{_datadir}/maven2/poms/*
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%files javadoc

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ae7bc26118cf1b58d8bed62ed364612d5a2380ad14acb03ca88ff3bab22b2e8b
size 262206

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:388397bc09b4086d045906fc19cf10cb091feb3c7c115e644359b8e378d7ed61
size 299286

View File

@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (MingW32)
iQEcBAABAgAGBQJRduk7AAoJEIb9x+KhEmLLzQEH/jbGCqCTzZlFdSFWotLOB9By
BnU0ooaZEB7TjN0JeSegCtH8VO5KWHGrm8swa2lc/iO3sYfULnddlZzH+nYADBBn
VTvVjio/1XJ1HAdZOKPGVHHdUqAiQWiovzdLWJIF+hENBuW8ZX2fCOAzMLsoSArk
R3MAVnwFj1AIDRxGarhc0ta5mbNpZOIZk8KquiSY9/p5Z7SYBhOSNfadic/481wO
hhL+YlJk6tyvbGohFHrQG64qxRkUzjfLJBYZjCeju9hVDdWSotZa5HxGtmLCVjnI
nn86DatTC3zAphK/HamU1m1YEi/bDmg8ZH9iOd9iEz2wpT1ZNf6jbklII1zRq3o=
=HkET
-----END PGP SIGNATURE-----