rpms/objectweb-asm/devel asm-3.1.pom, NONE, 1.1 asm-all-3.1.pom, NONE, 1.1 asm-analysis-3.1.pom, NONE, 1.1 asm-commons-3.1.pom, NONE, 1.1 asm-parent-3.1.pom, NONE, 1.1 asm-tree-3.1.pom, NONE, 1.1 asm-util-3.1.pom, NONE, 1.1 asm-xml-3.1.pom, NONE, 1.1 objectweb-asm-no-classpath-in-manifest.patch, NONE, 1.1 objectweb-asm.spec, 1.4, 1.5
David Walluck
dwalluck at fedoraproject.org
Thu Oct 23 19:08:49 UTC 2008
Author: dwalluck
Update of /cvs/pkgs/rpms/objectweb-asm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7915
Modified Files:
objectweb-asm.spec
Added Files:
asm-3.1.pom asm-all-3.1.pom asm-analysis-3.1.pom
asm-commons-3.1.pom asm-parent-3.1.pom asm-tree-3.1.pom
asm-util-3.1.pom asm-xml-3.1.pom
objectweb-asm-no-classpath-in-manifest.patch
Log Message:
- sync with latest JPackage version
--- NEW FILE asm-3.1.pom ---
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>asm-parent</artifactId>
<groupId>org.objectweb.asm</groupId>
<version>3.1</version>
</parent>
<name>ASM Core</name>
<artifactId>asm</artifactId>
<packaging>jar</packaging>
</project>
--- NEW FILE asm-all-3.1.pom ---
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.objectweb.asm</groupId>
<artifactId>asm-parent</artifactId>
<version>3.1</version>
</parent>
<name>ASM All</name>
<groupId>org.objectweb.asm</groupId>
<artifactId>asm-all</artifactId>
<packaging>jar</packaging>
</project>
--- NEW FILE asm-analysis-3.1.pom ---
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>asm-parent</artifactId>
<groupId>org.objectweb.asm</groupId>
<version>3.1</version>
</parent>
<name>ASM Analysis</name>
<artifactId>asm-analysis</artifactId>
<packaging>jar</packaging>
<dependencies>
<dependency>
<artifactId>asm-tree</artifactId>
<groupId>org.objectweb.asm</groupId>
</dependency>
</dependencies>
</project>
--- NEW FILE asm-commons-3.1.pom ---
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>asm-parent</artifactId>
<groupId>org.objectweb.asm</groupId>
<version>3.1</version>
</parent>
<name>ASM Commons</name>
<artifactId>asm-commons</artifactId>
<packaging>jar</packaging>
<dependencies>
<dependency>
<artifactId>asm-tree</artifactId>
<groupId>org.objectweb.asm</groupId>
</dependency>
</dependencies>
</project>
--- NEW FILE asm-parent-3.1.pom ---
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>asm-parent</artifactId>
<groupId>org.objectweb.asm</groupId>
<version>3.1</version>
<packaging>pom</packaging>
<name>ASM</name>
<description>A very small and fast Java bytecode manipulation framework</description>
<url>http://asm.objectweb.org/</url>
<organization>
<name>ObjectWeb</name>
<url>http://www.objectweb.org/</url>
</organization>
<inceptionYear>2000</inceptionYear>
<developers>
<developer>
<name>Eric Bruneton</name>
<id>ebruneton</id>
<email>Eric.Bruneton at rd.francetelecom.com</email>
<roles>
<role>Creator</role>
<role>Java Developer</role>
</roles>
</developer>
<developer>
<name>Eugene Kuleshov</name>
<id>eu</id>
<email>eu at javatx.org</email>
<roles>
<role>Java Developer</role>
</roles>
</developer>
</developers>
<scm>
<connection>scm:cvs:pserver:anonymous at cvs.forge.objectweb.org:/cvsroot/asm:asm</connection>
<developerConnection>scm:cvs:ext:${maven.username}@cvs.forge.objectweb.org:/cvsroot/asm:asm</developerConnection>
<url>http://cvs.forge.objectweb.org/cgi-bin/viewcvs.cgi/asm/asm/</url>
</scm>
<issueManagement>
<url>http://forge.objectweb.org/tracker/?group_id=23</url>
</issueManagement>
<dependencyManagement>
<dependencies>
<dependency>
<artifactId>asm</artifactId>
<groupId>${project.groupId}</groupId>
<version>${project.version}</version>
</dependency>
<dependency>
<artifactId>asm-tree</artifactId>
<groupId>${project.groupId}</groupId>
<version>${project.version}</version>
</dependency>
<dependency>
<artifactId>asm-analysis</artifactId>
<groupId>${project.groupId}</groupId>
<version>${project.version}</version>
</dependency>
<dependency>
<artifactId>asm-commons</artifactId>
<groupId>${project.groupId}</groupId>
<version>${project.version}</version>
</dependency>
<dependency>
<artifactId>asm-util</artifactId>
<groupId>${project.groupId}</groupId>
<version>${project.version}</version>
</dependency>
<dependency>
<artifactId>asm-xml</artifactId>
<groupId>${project.groupId}</groupId>
<version>${project.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<mailingLists>
<mailingList>
<name>ASM Users List</name>
<subscribe>sympa at ow2.org?subject=subscribe%20asm</subscribe>
<unsubscribe>sympa at ow2.org?subject=unsubscribe%20asm</unsubscribe>
<post>asm at ow2.org</post>
<archive>http://www.ow2.org/wws/arc/asm</archive>
</mailingList>
<mailingList>
<name>ASM Team List</name>
<subscribe>sympa at ow2.org?subject=subscribe%20asm-team</subscribe>
<unsubscribe>sympa at ow2.org?subject=unsubscribe%20asm-team</unsubscribe>
<post>asm-team at ow2.org</post>
<archive>http://www.ow2.org/wws/arc/asm-team</archive>
</mailingList>
</mailingLists>
<distributionManagement>
<downloadUrl>http://mojo.codehaus.org/my-project</downloadUrl>
<repository>
<id>objectweb</id>
<uniqueVersion>false</uniqueVersion>
<name>ObjectWeb Maven 2.0 Repository</name>
<url>dav:https://maven.forge.objectweb.org:8002/maven2/</url>
<layout>default</layout>
</repository>
<snapshotRepository>
<id>objectweb.snapshots</id>
<uniqueVersion>false</uniqueVersion>
<name>ObjectWeb Maven 2.0 Snapshot Repository</name>
<url>dav:https://maven.forge.objectweb.org:8002/maven2-snapshot/</url>
<layout>default</layout>
</snapshotRepository>
</distributionManagement>
</project>
--- NEW FILE asm-tree-3.1.pom ---
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>asm-parent</artifactId>
<groupId>org.objectweb.asm</groupId>
<version>3.1</version>
</parent>
<name>ASM Tree</name>
<artifactId>asm-tree</artifactId>
<packaging>jar</packaging>
<dependencies>
<dependency>
<artifactId>asm</artifactId>
<groupId>org.objectweb.asm</groupId>
</dependency>
</dependencies>
</project>
--- NEW FILE asm-util-3.1.pom ---
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>asm-parent</artifactId>
<groupId>org.objectweb.asm</groupId>
<version>3.1</version>
</parent>
<name>ASM Util</name>
<artifactId>asm-util</artifactId>
<packaging>jar</packaging>
<dependencies>
<dependency>
<artifactId>asm-tree</artifactId>
<groupId>org.objectweb.asm</groupId>
</dependency>
</dependencies>
</project>
--- NEW FILE asm-xml-3.1.pom ---
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>asm-parent</artifactId>
<groupId>org.objectweb.asm</groupId>
<version>3.1</version>
</parent>
<name>ASM XML</name>
<artifactId>asm-xml</artifactId>
<packaging>jar</packaging>
<dependencies>
<dependency>
<artifactId>asm-util</artifactId>
<groupId>org.objectweb.asm</groupId>
</dependency>
</dependencies>
</project>
objectweb-asm-no-classpath-in-manifest.patch:
--- NEW FILE objectweb-asm-no-classpath-in-manifest.patch ---
--- asm-3.1/archive/asm-xml.xml.orig 2008-10-20 15:35:03.716137723 -0400
+++ asm-3.1/archive/asm-xml.xml 2008-10-20 15:35:12.071115378 -0400
@@ -10,7 +10,6 @@
<attribute name="Implementation-Title" value="ASM XML classes"/>
<attribute name="Implementation-Version" value="${product.artifact}"/>
<attribute name="Implementation-Vendor" value="Eugene Kuleshov"/>
- <attribute name="Class-path" value="asm-${product.artifact}.jar asm-util-${product.artifact}.jar asm-attrs-${product.artifact}.jar"/>
<attribute name="Main-class" value="org.objectweb.asm.xml.Processor"/>
</manifest>
</jar>
Index: objectweb-asm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/objectweb-asm/devel/objectweb-asm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- objectweb-asm.spec 14 Jul 2008 15:58:46 -0000 1.4
+++ objectweb-asm.spec 23 Oct 2008 19:08:19 -0000 1.5
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2007, JPackage Project
+# Copyright (c) 2000-2008, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -32,23 +32,35 @@
Name: objectweb-asm
Version: 3.1
-Release: 2.3%{dist}
+Release: 5.1%{?dist}
Epoch: 0
Summary: A code manipulation tool to implement adaptable systems
License: BSD
URL: http://asm.objectweb.org/
Group: Development/Libraries/Java
Source0: http://download.forge.objectweb.org/asm/asm-3.1.tar.gz
-Source1: asm-MANIFEST.MF
-BuildRequires: jpackage-utils >= 0:1.6
-BuildRequires: ant
-BuildRequires: objectweb-anttask
-BuildRequires: xml-commons-jaxp-1.3-apis
+Source1: http://repo1.maven.org/maven2/asm/asm/3.1/asm-3.1.pom
+Source2: http://repo1.maven.org/maven2/asm/asm-analysis/3.1/asm-analysis-3.1.pom
+Source3: http://repo1.maven.org/maven2/asm/asm-commons/3.1/asm-commons-3.1.pom
+Source4: http://repo1.maven.org/maven2/asm/asm-tree/3.1/asm-tree-3.1.pom
+Source5: http://repo1.maven.org/maven2/asm/asm-util/3.1/asm-util-3.1.pom
+Source6: http://repo1.maven.org/maven2/asm/asm-xml/3.1/asm-xml-3.1.pom
+Source7: http://repo1.maven.org/maven2/asm/asm-all/3.1/asm-all-3.1.pom
+Source8: http://repo1.maven.org/maven2/asm/asm-parent/3.1/asm-parent-3.1.pom
+Source9: asm-MANIFEST.MF
+Patch0: objectweb-asm-no-classpath-in-manifest.patch
# Needed by asm-xml.jar
Requires: xml-commons-jaxp-1.3-apis
-
+Requires(post): jpackage-utils >= 0:1.7.4
+Requires(postun): jpackage-utils >= 0:1.7.4
+BuildRequires: jpackage-utils >= 0:1.7.4
+BuildRequires: java-devel >= 0:1.5.0
+BuildRequires: ant >= 0:1.6.5
+BuildRequires: objectweb-anttask
+BuildRequires: xml-commons-jaxp-1.3-apis
+BuildRequires: zip
BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
%description
ASM is a code manipulation tool to implement adaptable systems.
@@ -62,16 +74,17 @@
%prep
%setup -q -n asm-%{version}
-find . -name "*.jar" -exec rm -f {} \;
+%patch0 -p1
+perl -pi -e 's/\r$//g' LICENSE.txt README.txt
+
+mkdir META-INF
+cp -p %{SOURCE9} META-INF/MANIFEST.MF
%build
+export CLASSPATH=
+export OPT_JAR_LIST=:
ant -Dobjectweb.ant.tasks.path=$(build-classpath objectweb-anttask) jar jdoc
-# inject OSGi manifests
-mkdir -p META-INF
-cp %{SOURCE1} META-INF/MANIFEST.MF
-zip -u output/dist/lib/all/asm-all-%{version}.jar META-INF/MANIFEST.MF
-
%install
rm -rf $RPM_BUILD_ROOT
@@ -83,46 +96,79 @@
$RPM_BUILD_ROOT%{_javadir}/%{name}/`basename ${jar}`
done
-install -m 644 output/dist/lib/all/asm-all-%{version}.jar \
-$RPM_BUILD_ROOT%{_javadir}/%{name}/asm-all-%{version}.jar
+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)
-
+# 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
# 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}
-
-#Fix EOL
-sed -i 's/\r//' README.txt LICENSE.txt
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%clean
rm -rf $RPM_BUILD_ROOT
+%post
+%update_maven_depmap
+
+%postun
+%update_maven_depmap
+
%files
%defattr(0644,root,root,0755)
-%doc README.txt LICENSE.txt
+%doc LICENSE.txt README.txt
%dir %{_javadir}/%{name}
%{_javadir}/%{name}/*.jar
+%{_datadir}/maven2/*
+%{_mavendepmapfragdir}/*
%files javadoc
%defattr(0644,root,root,0755)
-%dir %{_javadocdir}/%{name}-%{version}
-%{_javadocdir}/%{name}-%{version}/*
+%{_javadocdir}/%{name}-%{version}
+%{_javadocdir}/%{name}
%changelog
-* Mon Jul 14 2008 Andrew Overholt <overholt at redhat.com> 0:3.1-2.3
-- Build and ship asm-all.jar with OSGi manifest (Alexander Kurtakov)
+* Tue Oct 23 2008 David Walluck <dwalluck at redhat.com> 0:3.1-5.1
+- build for Fedora
-* Wed Jul 9 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0:3.1-2.2
-- drop repotag
+* Tue Oct 23 2008 David Walluck <dwalluck at redhat.com> 0:3.1-5
+- add OSGi manifest (Alexander Kurtakov)
-* Tue Dec 04 2007 Fernando Nasser <fnasser at redhat.com> - 0:3.1-2jpp.1
-- First Fedora build
-- Replace uses of dos2unix with sed
+* Mon Oct 20 2008 David Walluck <dwalluck at redhat.com> 0:3.1-4
+- remove Class-Path from MANIFEST.MF
+- add unversioned javadoc symlink
+- remove javadoc scriptlets
+- fix directory ownership
+- remove build requirement on dos2unix
+
+* Fri Feb 08 2008 Ralph Apel <r.apel at r-apel.de> - 0:3.1-3jpp
+- Add poms and depmap frags with groupId of org.objectweb.asm !
+- Add asm-all.jar
+- Add -javadoc Requires post and postun
+- Restore Vendor, Distribution
* Thu Nov 22 2007 Fernando Nasser <fnasser at redhat.com> - 0:3.1-2jpp
- Fix EOL of txt files
More information about the fedora-extras-commits
mailing list