Hello community, here is the log from the commit of package apache-commons-cli for openSUSE:Factory checked in at 2014-06-30 22:49:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apache-commons-cli (Old) and /work/SRC/openSUSE:Factory/.apache-commons-cli.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "apache-commons-cli" Changes: -------- --- /work/SRC/openSUSE:Factory/apache-commons-cli/apache-commons-cli.changes 2014-05-28 10:01:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.apache-commons-cli.new/apache-commons-cli.changes 2014-06-30 22:49:40.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jun 27 11:14:46 UTC 2014 - tchvatal@suse.com + +- Fix the pom providing on 13.2 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache-commons-cli.spec ++++++ --- /var/tmp/diff_new_pack.aT9dUP/_old 2014-06-30 22:49:41.000000000 +0200 +++ /var/tmp/diff_new_pack.aT9dUP/_new 2014-06-30 22:49:41.000000000 +0200 @@ -18,7 +18,6 @@ %global base_name cli %global short_name commons-%{base_name} -%global _mavenpomdir %{_datadir}/maven2/poms %global with_maven 0 Name: apache-commons-cli @@ -34,13 +33,11 @@ BuildArch: noarch BuildRequires: ant BuildRequires: java-devel >= 1.6.0 -BuildRequires: jpackage-utils +BuildRequires: javapackages-tools Requires: java >= 1.6.0 -Requires: jpackage-utils -Requires(post): jpackage-utils -Requires(postun): jpackage-utils - -# This should go away with F-17 +Requires: javapackages-tools +Requires(post): javapackages-tools +Requires(postun): javapackages-tools Provides: jakarta-%{short_name} = %{version}-%{release} Obsoletes: jakarta-%{short_name} < 1.1-6 Provides: apache-cli @@ -54,8 +51,7 @@ %package javadoc Summary: Javadoc for %{name} Group: Development/Libraries/Java -Requires: jpackage-utils -# This should go away with F-17 +Requires: javapackages-tools Obsoletes: jakarta-%{short_name}-javadoc < 1.1-6 %description javadoc @@ -80,37 +76,22 @@ (cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|apache-||g"`; done) (cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) -%if 0%{?suse_version} < 1310 # pom install -d -m 755 %{buildroot}%{_mavenpomdir} install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom -%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name} -# following line is only for backwards compatibility. New packages -# should use proper groupid org.apache.commons and also artifactid -%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name} -%endif +%add_maven_depmap JPP-%{short_name}.pom %{short_name}.jar # javadoc install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version} cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/ ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} -%if 0%{?suse_version} < 1310 -%post -%update_maven_depmap - -%postun -%update_maven_depmap -%endif - %files %defattr(-,root,root) %doc LICENSE.txt NOTICE.txt README.txt RELEASE-NOTES.txt %{_javadir}/* -%if 0%{?suse_version} < 1310 %{_mavenpomdir}/* %config %{_mavendepmapfragdir}/* -%endif %files javadoc %defattr(-,root,root) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org