Hello community, here is the log from the commit of package wsdl4j for openSUSE:Factory checked in at 2014-06-25 06:57:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wsdl4j (Old) and /work/SRC/openSUSE:Factory/.wsdl4j.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wsdl4j" Changes: -------- --- /work/SRC/openSUSE:Factory/wsdl4j/wsdl4j.changes 2013-09-13 14:45:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.wsdl4j.new/wsdl4j.changes 2014-06-25 06:57:28.000000000 +0200 @@ -1,0 +2,13 @@ +Tue Jun 17 15:39:38 UTC 2014 - tchvatal@suse.com + +- Cleanup with spec-cleaner. + +------------------------------------------------------------------- +Tue Jun 17 15:36:50 UTC 2014 - tchvatal@suse.com + +- Version bump to 1.6.3 to match upstream code. + * Package done to match fedora one. +- Delete no longer needed patch: + * wsdl4j-java14compat.patch + +------------------------------------------------------------------- Old: ---- wsdl4j-1.5.1-src.tar.gz wsdl4j-java14compat.patch New: ---- wsdl4j-1.6.3.pom wsdl4j-MANIFEST.MF wsdl4j-src-1.6.3.zip ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wsdl4j.spec ++++++ --- /var/tmp/diff_new_pack.W6b8kg/_old 2014-06-25 06:57:29.000000000 +0200 +++ /var/tmp/diff_new_pack.W6b8kg/_new 2014-06-25 06:57:29.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package wsdl4j # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -14,34 +14,27 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# icecream 0 Name: wsdl4j -BuildRequires: ant-junit -BuildRequires: java2-devel-packages -BuildRequires: xml-commons-apis -%define name wsdl4j -%define version 1.5.1 -%define release 1jpp -%define section free -# ----------------------------------------------------------------------------- +Version: 1.6.3 +Release: 0 Summary: Web Services Description Language Toolkit for Java License: IPL-1.0 Group: Development/Libraries/Java -Version: 1.5.1 -Release: 0 -Url: http://www-124.ibm.com/developerworks/projects/wsdl4j/ -BuildArch: noarch -Source0: wsdl4j-%{version}-src.tar.gz -##cvs -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/wsdl4j login -##cvs -z3 -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/wsdl4j export -r wsdl4j-1_5_1 wsdl4j -Patch: %{name}-java14compat.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Url: http://sourceforge.net/projects/wsdl4j +Source0: http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.zip +Source1: %{name}-MANIFEST.MF +Source2: http://repo1.maven.org/maven2/wsdl4j/wsdl4j/%{version}/wsdl4j-%{version}.pom +BuildRequires: ant-junit +BuildRequires: java2-devel-packages +BuildRequires: unzip +BuildRequires: xml-commons-apis +BuildRequires: zip Requires: java Requires: jaxp_parser_impl -#XXX: temporary fix to make axis auto dependencies work, need to revork package -Provides: osgi(javax.wsdl) +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description The Web Services Description Language for Java Toolkit (WSDL4J) allows @@ -49,10 +42,7 @@ describing services. This codebase will eventually serve as a reference implementation of the standard created by JSR110. - - %package javadoc -PreReq: coreutils Summary: Javadoc for wsdl4j Group: Development/Libraries/Java @@ -65,48 +55,42 @@ This package contains the javadoc documentation for the Web Services Description Language for Java. - - %prep -%setup -q -n %{name}-%{version} -%patch +%setup -q -n %{name}-1_6_3 %build -export OPT_JAR_LIST="ant/ant-junit junit" -[ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java -#ant -Dbuild.compiler=modern compile -#ant -Dbuild.compiler=modern javadocs -ant -Dbuild.compiler=modern compile test javadocs +ant compile javadocs %install +# inject OSGi manifests +mkdir -p META-INF +cp -p %{SOURCE1} META-INF/MANIFEST.MF +touch META-INF/MANIFEST.MF +zip -u build/lib/%{name}.jar META-INF/MANIFEST.MF + # jars -install -d -m 0755 $RPM_BUILD_ROOT%{_javadir} -for jar in %{name}.jar qname.jar ; do - vjar=$(echo $jar | sed s+.jar+-%{version}.jar+g) - install -m 644 build/lib/$jar $RPM_BUILD_ROOT%{_javadir}/$vjar - pushd $RPM_BUILD_ROOT%{_javadir} - ln -fs $vjar $jar - popd -done -# javadoc -install -d -m 0755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ +install -d -m 0755 %{buildroot}%{_javadir} +install -m 644 build/lib/%{name}.jar %{buildroot}%{_javadir}/%{name}.jar +install -m 644 build/lib/qname.jar %{buildroot}%{_javadir}/qname.jar + +# POMs +install -d -m 0755 %{buildroot}%{_mavenpomdir} +install -p -m 0644 %{SOURCE2} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom +%add_maven_depmap JPP-%{name}.pom %{name}.jar -%clean -rm -rf $RPM_BUILD_ROOT +# javadoc +install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version} +cp -pr build/javadocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}/ -%post javadoc -rm -f %{_javadocdir}/%{name} -ln -s %{name}-%{version} %{_javadocdir}/%{name} - -%postun javadoc -if [ "$1" = "0" ]; then - rm -f %{_javadocdir}/%{name} -fi +install -d -m 755 %{buildroot}%{_javadir}/javax.wsdl/ +ln -sf ../%{name}.jar %{buildroot}%{_javadir}/javax.wsdl/ +ln -sf ../qname.jar %{buildroot}%{_javadir}/javax.wsdl/ %files %defattr(0644,root,root,0755) %doc license.html +%{_mavenpomdir}/JPP-%{name}.pom +%config %{_mavendepmapfragdir}/* %{_javadir}/* %files javadoc ++++++ wsdl4j-MANIFEST.MF ++++++ Manifest-Version: 1.0 Bundle-SymbolicName: javax.wsdl Specification-Version: 1.2 Bundle-ManifestVersion: 2 Specification-Title: JWSDL Bundle-Version: 1.6.3 Bundle-Vendor: IBM Implementation-Vendor: IBM Bundle-RequiredExecutionEnvironment: J2SE-1.2 Bundle-Localization: plugin Bundle-Name: WSDL4J Specification-Vendor: IBM (Java Community Process) Implementation-Version: 1.6 Bundle-ClassPath: . Implementation-Title: WSDL4J Export-Package: com.ibm.wsdl,com.ibm.wsdl.extensions,com.ibm.wsdl.exte nsions.http,com.ibm.wsdl.extensions.mime,com.ibm.wsdl.extensions.sche ma,com.ibm.wsdl.extensions.soap,com.ibm.wsdl.extensions.soap12,com.ib m.wsdl.factory,com.ibm.wsdl.util,com.ibm.wsdl.util.xml,com.ibm.wsdl.x ml,javax.wsdl,javax.wsdl.extensions,javax.wsdl.extensions.http,javax. wsdl.extensions.mime,javax.wsdl.extensions.schema,javax.wsdl.extensio ns.soap,javax.wsdl.extensions.soap12,javax.wsdl.factory,javax.wsdl.xm l -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org