Hello community, here is the log from the commit of package jarjar for openSUSE:Factory checked in at 2013-09-11 13:38:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jarjar (Old) and /work/SRC/openSUSE:Factory/.jarjar.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "jarjar" Changes: -------- --- /work/SRC/openSUSE:Factory/jarjar/jarjar.changes 2011-09-23 02:04:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.jarjar.new/jarjar.changes 2013-09-11 13:38:51.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Sep 10 11:31:41 UTC 2013 - mvyskocil@suse.com + +- use add_maven_depmap from javapackages-tools + +------------------------------------------------------------------- +Mon Sep 9 11:05:53 UTC 2013 - tchvatal@suse.com + +- Move from jpackage-utils to javapackage-tools + +------------------------------------------------------------------- New: ---- jarjar-util.pom ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jarjar.spec ++++++ --- /var/tmp/diff_new_pack.J6qX94/_old 2013-09-11 13:38:51.000000000 +0200 +++ /var/tmp/diff_new_pack.J6qX94/_new 2013-09-11 13:38:51.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package jarjar (Version 0.9) +# spec file for package jarjar # -# 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 @@ -20,28 +20,30 @@ Name: jarjar Version: 0.9 -Release: 2 +Release: 0 Summary: Repackage Java libraries License: GPL-2.0+ -Url: http://tonicsystems.com/products/jarjar/ Group: Development/Libraries/Java +Url: http://tonicsystems.com/products/jarjar/ Source0: http://downloads.sourceforge.net/jarjar/jarjar-src-0.9.zip Source1: jarjar-0.9.pom +Source2: jarjar-util.pom + BuildRequires: ant >= 1.6 BuildRequires: ant-junit >= 1.6 -BuildRequires: jpackage-utils >= 1.7.2 -BuildRequires: junit BuildRequires: asm2 BuildRequires: gnu-regexp +BuildRequires: javapackages-tools +BuildRequires: junit %if 0 BuildRequires: maven2 %endif -BuildRequires: unzip BuildRequires: java-devel +BuildRequires: unzip Requires: asm2 Requires: gnu-regexp -Requires(post): jpackage-utils >= 1.7.2 -Requires(postun): jpackage-utils >= 1.7.2 +Requires(post): javapackages-tools +Requires(postun): javapackages-tools BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -61,8 +63,8 @@ Summary: Maven2 plugin for %{name} Group: Utilities -Requires: maven2 Requires: %{name} = %{version}-%{release} +Requires: maven2 %description maven2-plugin @@ -70,7 +72,6 @@ %endif %package javadoc -License: GPL-2.0+ Summary: Repackage Java libraries Group: Development/Libraries/Java @@ -107,51 +108,41 @@ %install # jars -mkdir -p $RPM_BUILD_ROOT%{_javadir} +mkdir -p %{buildroot}%{_javadir} install -m 644 dist/%{name}-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar + %{buildroot}%{_javadir}/%{name}.jar install -m 644 dist/%{name}-util-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-util-%{version}.jar + %{buildroot}%{_javadir}/%{name}-util.jar %if 0 install -m 644 dist/%{name}-plugin-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-maven2-plugin-%{version}.jar + %{buildroot}%{_javadir}/%{name}-maven2-plugin.jar %endif -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) -%add_to_maven_depmap tonic jarjar %{version} JPP %{name} -%add_to_maven_depmap com.tonicsystems jarjar %{version} JPP %{name} -%add_to_maven_depmap tonic jarjar-util %{version} JPP %{name}-util -%add_to_maven_depmap com.tonicsystems jarjar-util %{version} JPP %{name}-util -%add_to_maven_depmap tonic jarjar-plugin %{version} JPP %{name}-plugin -%add_to_maven_depmap com.tonicsystems jarjar-plugin %{version} JPP %{name}-plugin -# poms -install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms -install -pm 644 %{SOURCE1} \ - $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}.pom -# javadoc -mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr dist/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} - -%clean -rm -rf $RPM_BUILD_ROOT -%post -%update_maven_depmap +# poms +mkdir -p %{buildroot}/%{_mavenpomdir} +install -pD -T -m 644 %{SOURCE1} \ + %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom +install -pD -T -m 644 %{SOURCE2} \ + %{buildroot}%{_mavenpomdir}/JPP-%{name}-util.pom + +# depmaps +%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "jarjar:%{name},com.tonicsystems:%{name}" +%add_maven_depmap JPP-%{name}-util.pom %{name}-util.jar -a "jarjar:%{name}-util,com.tonicsystems:%{name}-util" +#% add_maven_depmap JPP-%{name}-plugin.pom %{name}-plugin.jar -a "jarjar:%{name}-plugin,tonic:%{name}-plugin,com.tonicsystems:%{name}-plugin" -f "plugin" -%postun -%update_maven_depmap +# javadoc +mkdir -p %{buildroot}%{_javadocdir}/%{name} +cp -pr dist/javadoc/* %{buildroot}%{_javadocdir}/%{name} %files %defattr(0644,root,root,0755) %doc COPYING -%{_javadir}/%{name}-%{version}.jar -%{_javadir}/%{name}-util-%{version}.jar %{_javadir}/%{name}.jar %{_javadir}/%{name}-util.jar -%{_datadir}/maven2/poms/* +%{_mavenpomdir}/* %{_mavendepmapfragdir}/* -%if 0 +%if 0 %files maven2-plugin %defattr(0644,root,root,0755) %{_javadir}/%{name}-maven2-plugin-%{version}.jar @@ -160,7 +151,6 @@ %files javadoc %defattr(0644,root,root,0755) -%{_javadocdir}/%{name}-%{version} %{_javadocdir}/%{name} %changelog ++++++ jarjar-util.pom ++++++ <project> <modelVersion>4.0.0</modelVersion> <groupId>tonic</groupId> <artifactId>jarjar-util</artifactId> <version>0.9</version> <distributionManagement> <relocation> <groupId>com.tonicsystems</groupId> <artifactId>jarjar-util</artifactId> <version>0.9</version> </relocation> </distributionManagement> </project> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org