From 86b7ae68486b57efbcd554adb9c7e6bb27e6e587a83776c36f198d0d3eec5b5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 9 Sep 2013 11:59:37 +0000 Subject: [PATCH 1/2] Replace jpackage-utils by javapackages-tools OBS-URL: https://build.opensuse.org/package/show/Java:packages/objectweb-asm?expand=0&rev=25 --- objectweb-asm.changes | 5 +++++ objectweb-asm.spec | 13 ++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/objectweb-asm.changes b/objectweb-asm.changes index 2b71534..58b78f8 100644 --- a/objectweb-asm.changes +++ b/objectweb-asm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Sep 9 11:06:16 UTC 2013 - tchvatal@suse.com + +- Move from jpackage-utils to javapackage-tools + ------------------------------------------------------------------- Sun Dec 18 00:42:38 UTC 2011 - nlminhtl@gmail.com diff --git a/objectweb-asm.spec b/objectweb-asm.spec index ea52cf7..4d76239 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -1,7 +1,7 @@ # # spec file for package objectweb-asm # -# Copyright (c) 2012 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,11 +20,11 @@ Name: objectweb-asm Version: 3.3.1 -Release: 1 +Release: 0 Summary: A code manipulation tool to implement adaptable systems License: BSD-3-Clause -Url: http://asm.objectweb.org/ Group: Development/Libraries/Java +Url: http://asm.objectweb.org/ Source0: http://download.forge.objectweb.org/asm/asm-3.3.1.tar.gz Source1: http://repo1.maven.org/maven2/asm/asm/3.3.1/asm-3.3.1.pom Source2: http://repo1.maven.org/maven2/asm/asm-analysis/3.3.1/asm-analysis-3.3.1.pom @@ -38,10 +38,10 @@ Source9: asm-MANIFEST.MF Patch0: objectweb-asm-no-classpath-in-manifest.patch # Needed by asm-xml.jar Requires: xml-commons-apis -PreReq: jpackage-utils >= 1.7.4 -BuildRequires: jpackage-utils >= 1.7.4 -BuildRequires: java-devel +PreReq: javapackages-tools BuildRequires: ant >= 1.6.5 +BuildRequires: java-devel +BuildRequires: javapackages-tools BuildRequires: objectweb-anttask BuildRequires: xml-commons-apis BuildRequires: zip @@ -60,7 +60,6 @@ ASM offers similar functionalities as BCEL or SERP, but is much smaller. %package javadoc -License: BSD-3-Clause Summary: Javadoc for %{name} Group: Development/Libraries/Java From 5b6de454f21f12f0e13e7254fd704890cad8948b2c89098a8223940ff3a8d89b Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Wed, 11 Sep 2013 07:32:59 +0000 Subject: [PATCH 2/2] - use add_maven_depmap from javapackages-tools OBS-URL: https://build.opensuse.org/package/show/Java:packages/objectweb-asm?expand=0&rev=26 --- objectweb-asm.changes | 5 ++++ objectweb-asm.spec | 68 ++++++++++++++++++++----------------------- 2 files changed, 37 insertions(+), 36 deletions(-) diff --git a/objectweb-asm.changes b/objectweb-asm.changes index 58b78f8..653d577 100644 --- a/objectweb-asm.changes +++ b/objectweb-asm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 11 07:32:22 UTC 2013 - mvyskocil@suse.com + +- use add_maven_depmap from javapackages-tools + ------------------------------------------------------------------- Mon Sep 9 11:06:16 UTC 2013 - tchvatal@suse.com diff --git a/objectweb-asm.spec b/objectweb-asm.spec index 4d76239..3b99d1d 100644 --- a/objectweb-asm.spec +++ b/objectweb-asm.spec @@ -88,59 +88,55 @@ ant -Dobjectweb.ant.tasks.path=$(build-classpath objectweb-anttask) jar jdoc %install # jars -install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name} +install -d -m 755 %{buildroot}%{_javadir}/%{name} for jar in output/dist/lib/*.jar; do install -m 644 ${jar} \ -$RPM_BUILD_ROOT%{_javadir}/%{name}/`basename ${jar}` +%{buildroot}%{_javadir}/%{name}/`basename ${jar} | sed 's/-%{version}//g'` done touch META-INF/MANIFEST.MF zip -u output/dist/lib/all/asm-all-%{version}.jar META-INF/MANIFEST.MF -install -m 644 output/dist/lib/all/asm-all-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/ -(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}*; do \ -ln -sf ${jar} ${jar/-%{version}/}; done) +install -m 644 output/dist/lib/all/asm-all-%{version}.jar %{buildroot}%{_javadir}/%{name}/asm-all.jar + # pom -install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms -install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.objectweb-asm-asm.pom -%add_to_maven_depmap org.objectweb.asm asm %{version} JPP/objectweb-asm asm -install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.objectweb-asm-asm-analysis.pom -%add_to_maven_depmap org.objectweb.asm asm-analysis %{version} JPP/objectweb-asm asm-analysis -install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.objectweb-asm-asm-commons.pom -%add_to_maven_depmap org.objectweb.asm asm-commons %{version} JPP/objectweb-asm asm-commons -install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.objectweb-asm-asm-tree.pom -%add_to_maven_depmap org.objectweb.asm asm-tree %{version} JPP/objectweb-asm asm-tree -install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.objectweb-asm-asm-util.pom -%add_to_maven_depmap org.objectweb.asm asm-util %{version} JPP/objectweb-asm asm-util -install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.objectweb-asm-asm-xml.pom -%add_to_maven_depmap org.objectweb.asm asm-xml %{version} JPP/objectweb-asm asm-xml -install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.objectweb-asm-asm-all.pom -%add_to_maven_depmap org.objectweb.asm asm-all %{version} JPP/objectweb-asm asm-all -install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.objectweb-asm-asm-parent.pom -%add_to_maven_depmap org.objectweb.asm asm-parent %{version} JPP/objectweb-asm asm-parent +install -d -m 755 %{buildroot}%{_mavenpomdir} +install -m 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP.objectweb-asm-asm.pom +%add_maven_depmap JPP.objectweb-asm-asm.pom %{name}/asm.jar + +install -m 644 %{SOURCE2} %{buildroot}%{_mavenpomdir}/JPP.objectweb-asm-asm-analysis.pom +%add_maven_depmap JPP.objectweb-asm-asm-analysis.pom %{name}/asm-analysis.jar + +install -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP.objectweb-asm-asm-commons.pom +%add_maven_depmap JPP.objectweb-asm-asm-commons.pom %{name}/asm-commons.jar + +install -m 644 %{SOURCE4} %{buildroot}%{_mavenpomdir}/JPP.objectweb-asm-asm-tree.pom +%add_maven_depmap JPP.objectweb-asm-asm-tree.pom %{name}/asm-tree.jar + +install -m 644 %{SOURCE5} %{buildroot}%{_mavenpomdir}/JPP.objectweb-asm-asm-util.pom +%add_maven_depmap JPP.objectweb-asm-asm-util.pom %{name}/asm-util.jar + +install -m 644 %{SOURCE6} %{buildroot}%{_mavenpomdir}/JPP.objectweb-asm-asm-xml.pom +%add_maven_depmap JPP.objectweb-asm-asm-xml.pom %{name}/asm-xml.jar + +install -m 644 %{SOURCE7} %{buildroot}%{_mavenpomdir}/JPP.objectweb-asm-asm-all.pom +%add_maven_depmap JPP.objectweb-asm-asm-all.pom %{name}/asm-all.jar + +install -m 644 %{SOURCE8} %{buildroot}%{_mavenpomdir}/JPP.objectweb-asm-asm-parent.pom +%add_maven_depmap JPP.objectweb-asm-asm-all.pom %{name}/asm-all.jar + # javadoc -install -p -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr output/dist/doc/javadoc/user/* $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 - -%postun -%update_maven_depmap +install -p -d -m 755 %{buildroot}%{_javadocdir}/%{name} +cp -pr output/dist/doc/javadoc/user/* %{buildroot}%{_javadocdir}/%{name} %files %defattr(0644,root,root,0755) %doc LICENSE.txt README.txt %dir %{_javadir}/%{name} %{_javadir}/%{name}/*.jar -%{_datadir}/maven2/* +%{_mavenpomdir}/* %config %{_mavendepmapfragdir}/* %files javadoc %defattr(0644,root,root,0755) -%{_javadocdir}/%{name}-%{version} %{_javadocdir}/%{name} %changelog