Hello community, here is the log from the commit of package apache-commons-codec for openSUSE:Factory checked in at 2012-04-12 09:18:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apache-commons-codec (Old) and /work/SRC/openSUSE:Factory/.apache-commons-codec.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "apache-commons-codec", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-03-17 10:42:43.883537212 +0100 +++ /work/SRC/openSUSE:Factory/.apache-commons-codec.new/apache-commons-codec.changes 2012-04-12 09:18:16.000000000 +0200 @@ -0,0 +1,26 @@ +------------------------------------------------------------------- +Mon Apr 2 13:00:19 UTC 2012 - mvyskocil@suse.cz + +- add junit4 to fix a build fail + +------------------------------------------------------------------- +Tue Feb 28 09:59:47 UTC 2012 - mvyskocil@suse.cz + +- update to 1.6, sync with Fedora + +------------------------------------------------------------------- +Fri Sep 22 13:24:21 CEST 2006 - skh@suse.de + +- don't use icecream +- use target="1.4" for build with java 1.5 + +------------------------------------------------------------------- +Wed Jan 25 21:46:36 CET 2006 - mls@suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Mon Dec 19 11:53:32 CET 2005 - dbornkessel@suse.de + +- Current version 1.3 from JPackage.org + New: ---- MANIFEST.MF apache-commons-codec-component-info.xml apache-commons-codec-jpp-depmap.xml apache-commons-codec-settings.xml apache-commons-codec.changes apache-commons-codec.spec commons-codec-1.6-src.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache-commons-codec.spec ++++++ # # spec file for package apache-commons-codec # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2000-2010, JPackage Project # All rights reserved. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %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 Release: 0 Summary: Apache Commons Codec Package License: Apache-2.0 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 Source4: MANIFEST.MF BuildRequires: ant >= 1.7 BuildRequires: ant-junit >= 1.7 BuildRequires: java-devel >= 1.6.0 BuildRequires: junit4 %if %with maven BuildRequires: apache-commons-parent >= 12 BuildRequires: maven-surefire-maven-plugin BuildRequires: maven-surefire-provider-junit BuildRequires: maven2 >= 2.0.8 BuildRequires: maven2-plugin-antrun BuildRequires: maven2-plugin-assembly BuildRequires: maven2-plugin-compiler BuildRequires: maven2-plugin-idea BuildRequires: maven2-plugin-install BuildRequires: maven2-plugin-jar BuildRequires: maven2-plugin-javadoc BuildRequires: maven2-plugin-resources %endif Requires(post): jpackage-utils >= 1.7.5 Requires(postun): jpackage-utils >= 1.7.5 Requires: java >= 1.6.0 Provides: jakarta-%{short_name} = %{version} Obsoletes: jakarta-%{short_name} < %{version} Provides: %{short_name} = %{version} Obsoletes: %{short_name} < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description Commons Codec is an attempt to provide definitive implementations of commonly used encoders and decoders. %package javadoc Summary: Javadoc for %{name} Group: Development/Libraries/Java Requires: java-javadoc Provides: jakarta-%{short_name}-javadoc = %{version} Obsoletes: jakarta-%{short_name}-javadoc < %{version} Provides: %{short_name}-javadoc = %{version} Obsoletes: %{short_name}-javadoc < %{version} %description javadoc Javadoc for %{name}. %prep %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 mkdir -p ${MAVEN_REPO_LOCAL} export MAVEN_OPTS="-Dmaven2.jpp.mode=true -Dmaven2.jpp.depmap.file=%{SOURCE2} -Dmaven.repo.local=${MAVEN_REPO_LOCAL} -Dproject.build.directory=$(pwd)/target" %{_bindir}/mvn-jpp \ -e \ -s $(pwd)/settings.xml \ install javadoc:javadoc %else export CLASSPATH=$(build-classpath junit4) ant -v -d -Dbuild.sysclasspath=first \ -Dconf.home=src/conf \ -Dbuild.home=build \ -Dsource.home=src/main/java \ -Dtest.home=src/test/java \ -Ddist.home=dist \ -Dcomponent.title=%{short_name} \ -Dcomponent.version=%{version} \ -Dfinal.name=%{name}-%{version} \ -Dextension.name=%{short_name} \ test jar javadoc %endif %install # jars mkdir -p %{buildroot}%{_javadir} %if %with maven cp -p target/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar %else jar umf %{SOURCE4} dist/%{name}-%{version}.jar cp -p dist/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar %endif ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{short_name}-%{version}.jar ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{short_name}.jar ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/jakarta-%{short_name}-%{version}.jar 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 # javadoc mkdir -p %{buildroot}%{_javadocdir}/%{name}-%{version} %if %with maven cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version} %else cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}-%{version} %endif ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/jakarta-%{short_name}-%{version} 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/* %{_mavendepmapfragdir}/* %files javadoc %defattr(0644,root,root,0755) %{_javadocdir}/* %changelog ++++++ MANIFEST.MF ++++++ Manifest-Version: 1.0 Archiver-Version: Plexus Archiver Created-By: 1.6.0_20 (Sun Microsystems Inc.) Built-By: mockbuild Build-Jdk: 1.6.0_20 Implementation-Title: Commons Codec Implementation-Vendor: Apache Software Foundation Implementation-Vendor-Id: org.apache Implementation-Version: 1.4 Specification-Title: Commons Codec Specification-Vendor: Apache Software Foundation Specification-Version: 1.4 X-Compile-Source-JDK: 1.4 X-Compile-Target-JDK: 1.4 Export-Package: org.apache.commons.codec;version="1.4",org.apache.comm ons.codec.net;version="1.4",org.apache.commons.codec.language;version ="1.4",org.apache.commons.codec.digest;version="1.4",org.apache.commo ns.codec.binary;version="1.4" Tool: Bnd-0.0.363 Bundle-Name: Commons Codec Bundle-Vendor: Apache Software Foundation Bundle-Version: 1.4 Bnd-LastModified: 1297297922505 Bundle-ManifestVersion: 2 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt Bundle-Description: The codec package contains simple encoder and deco ders for various formats such as Base64 and Hexadecimal. In addi tion to these widely used encoders and decoders, the codec packag e also maintains a collection of phonetic encoding utilities. Bundle-SymbolicName: org.apache.commons.codec Bundle-DocURL: http://commons.apache.org/codec/ ++++++ apache-commons-codec-jpp-depmap.xml ++++++ <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> ++++++ apache-commons-codec-settings.xml ++++++ <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> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org