Hello community, here is the log from the commit of package jakarta-slide-webdavclient for openSUSE:Factory checked in at 2013-09-12 17:06:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jakarta-slide-webdavclient (Old) and /work/SRC/openSUSE:Factory/.jakarta-slide-webdavclient.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "jakarta-slide-webdavclient" Changes: -------- --- /work/SRC/openSUSE:Factory/jakarta-slide-webdavclient/jakarta-slide-webdavclient.changes 2011-09-23 02:03:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.jakarta-slide-webdavclient.new/jakarta-slide-webdavclient.changes 2013-09-12 17:06:59.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Sep 9 11:05:52 UTC 2013 - tchvatal@suse.com + +- Move from jpackage-utils to javapackage-tools + +------------------------------------------------------------------- +Fri Sep 6 10:46:43 UTC 2013 - mvyskocil@suse.com + +- temporary turn off maven depmap + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jakarta-slide-webdavclient.spec ++++++ --- /var/tmp/diff_new_pack.Zlz3Sl/_old 2013-09-12 17:06:59.000000000 +0200 +++ /var/tmp/diff_new_pack.Zlz3Sl/_new 2013-09-12 17:06:59.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package jakarta-slide-webdavclient (Version MACRO) +# spec file for package jakarta-slide-webdavclient # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -28,10 +28,10 @@ Name: jakarta-slide-webdavclient Version: %{jakarta_version} -Release: 2 +Release: 0 Summary: Slide WebDAV client -Group: Development/Libraries/Java License: Apache-2.0 +Group: Development/Libraries/Java Url: http://jakarta.apache.org/slide/ Source0: jakarta-slide-webdavclient-src-2.1.tar.bz2 Source1: %{name}.sh @@ -43,18 +43,18 @@ Patch1: jakarta-slide-webdavclient-build-jdk15.patch Patch2: jakarta-slide-webdavclient-jdk15.patch BuildArch: noarch -BuildRequires: jpackage-utils >= 1.5.32 BuildRequires: ant >= 1.6 -BuildRequires: antlr BuildRequires: ant-antlr +BuildRequires: antlr +BuildRequires: geronimo-j2ee-connector-1_5-api BuildRequires: jakarta-commons-httpclient3 BuildRequires: jakarta-commons-transaction -BuildRequires: geronimo-j2ee-connector-1_5-api +BuildRequires: javapackages-tools BuildRequires: jdom BuildRequires: xml-im-exporter +Requires: geronimo-j2ee-connector-1_5-api Requires: jakarta-commons-httpclient3 Requires: jakarta-commons-transaction -Requires: geronimo-j2ee-connector-1_5-api Requires: jdom Requires: xml-im-exporter BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -68,7 +68,6 @@ %if %{with_repolib} %package repolib -License: Apache-2.0 Summary: Slide WebDAV client Group: Development/Libraries/Java @@ -81,7 +80,6 @@ %endif %package javadoc -License: Apache-2.0 Summary: Slide WebDAV client Group: Development/Libraries/Java @@ -133,10 +131,12 @@ install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} cp -pr dist/doc/clientjavadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} -%add_to_maven_depmap slide %{base_name}-webdavlib %{version} JPP %{name} # poms -install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms -install -pm 644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}.pom +install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} +install -pm 644 %{SOURCE4} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}.pom +#FIXME +# %add_maven_depmap JPP.%{name}.pom %{base_name}/jakarta-slide-webdavlib.jar + %if %{with_repolib} install -d -m 755 $RPM_BUILD_ROOT%{repodir} install -d -m 755 $RPM_BUILD_ROOT%{repodirlib} @@ -151,15 +151,12 @@ cp -p $RPM_BUILD_ROOT%{_javadir}/slide/jakarta-slide-webdavlib.jar $RPM_BUILD_ROOT%{repodirlib} %endif -%clean -rm -rf $RPM_BUILD_ROOT - %files %defattr(0644,root,root,0755) %doc LICENSE %{_javadir}/%{base_name}/*.jar %attr(0755,root,root) %{_bindir}/webdavclient -%{_datadir}/maven2/poms/* +%{_mavenpomdir}/* %config %{_mavendepmapfragdir}/* %dir %{_javadir}/%{base_name} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org