rpms/asm2/devel asm-2.2.3.pom, NONE, 1.1 asm-all-2.2.3.pom, NONE, 1.1 asm-analysis-2.2.3.pom, NONE, 1.1 asm-commons-2.2.3.pom, NONE, 1.1 asm-parent-2.2.3.pom, NONE, 1.1 asm-tree-2.2.3.pom, NONE, 1.1 asm-util-2.2.3.pom, NONE, 1.1 asm-xml-2.2.3.pom, NONE, 1.1 asm2-ALLPerfTest.patch, NONE, 1.1 asm2-SerialVersionUIDAdder.patch, NONE, 1.1 asm2-build_xml.patch, NONE, 1.1 asm2-test-build_xml.patch, NONE, 1.1 asm2-test-heap.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 asm2.spec, 1.2, 1.3 sources, 1.2, 1.3

Permaine Cheung (pcheung) fedora-extras-commits at redhat.com
Tue Jan 22 15:45:55 UTC 2008


Author: pcheung

Update of /cvs/pkgs/rpms/asm2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6528

Modified Files:
	.cvsignore asm2.spec sources 
Added Files:
	asm-2.2.3.pom asm-all-2.2.3.pom asm-analysis-2.2.3.pom 
	asm-commons-2.2.3.pom asm-parent-2.2.3.pom asm-tree-2.2.3.pom 
	asm-util-2.2.3.pom asm-xml-2.2.3.pom asm2-ALLPerfTest.patch 
	asm2-SerialVersionUIDAdder.patch asm2-build_xml.patch 
	asm2-test-build_xml.patch asm2-test-heap.patch 
Log Message:
Merge with upstream




--- NEW FILE asm-2.2.3.pom ---
<project>
  <modelVersion>4.0.0</modelVersion>

  <parent>
    <artifactId>asm-parent</artifactId>
    <groupId>asm</groupId>
    <version>2.2.3</version>
  </parent>

  <name>ASM Core</name>
  <artifactId>asm</artifactId>
  <packaging>jar</packaging>
  
</project>


--- NEW FILE asm-all-2.2.3.pom ---
<project>
  <modelVersion>4.0.0</modelVersion>

  <parent>
    <groupId>asm</groupId>
    <artifactId>asm-parent</artifactId>
    <version>2.2.3</version>
  </parent>

  <name>ASM All</name>
  <groupId>asm</groupId>
  <artifactId>asm-all</artifactId>
  <packaging>jar</packaging>
  
</project>


--- NEW FILE asm-analysis-2.2.3.pom ---
<project>
  <modelVersion>4.0.0</modelVersion>

  <parent>
    <artifactId>asm-parent</artifactId>
    <groupId>asm</groupId>
    <version>2.2.3</version>
  </parent>

  <name>ASM Analysis</name>
  <artifactId>asm-analysis</artifactId>
  <packaging>jar</packaging>
  
  <dependencies>
    <dependency>
      <artifactId>asm-tree</artifactId>
      <groupId>asm</groupId>
    </dependency>
  </dependencies>

</project>


--- NEW FILE asm-commons-2.2.3.pom ---
<project>
  <modelVersion>4.0.0</modelVersion>

  <parent>
    <artifactId>asm-parent</artifactId>
    <groupId>asm</groupId>
    <version>2.2.3</version>
  </parent>

  <name>ASM Commons</name>
  <artifactId>asm-commons</artifactId>
  <packaging>jar</packaging>
  
  <dependencies>
    <dependency>
      <artifactId>asm-tree</artifactId>
      <groupId>asm</groupId>
    </dependency>
  </dependencies>

</project>


--- NEW FILE asm-parent-2.2.3.pom ---
<project>
  <modelVersion>4.0.0</modelVersion>

  <artifactId>asm-parent</artifactId>
  <groupId>asm</groupId>
  <version>2.2.3</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>

</project>


--- NEW FILE asm-tree-2.2.3.pom ---
<project>
  <modelVersion>4.0.0</modelVersion>

  <parent>
    <artifactId>asm-parent</artifactId>
    <groupId>asm</groupId>
    <version>2.2.3</version>
  </parent>

  <name>ASM Tree</name>
  <artifactId>asm-tree</artifactId>
  <packaging>jar</packaging>
  
  <dependencies>
    <dependency>
      <artifactId>asm</artifactId>
      <groupId>asm</groupId>
    </dependency>
  </dependencies>

</project>


--- NEW FILE asm-util-2.2.3.pom ---
<project>
  <modelVersion>4.0.0</modelVersion>

  <parent>
    <artifactId>asm-parent</artifactId>
    <groupId>asm</groupId>
    <version>2.2.3</version>
  </parent>

  <name>ASM Util</name>
  <artifactId>asm-util</artifactId>
  <packaging>jar</packaging>
  
  <dependencies>
    <dependency>
      <artifactId>asm-tree</artifactId>
      <groupId>asm</groupId>
    </dependency>
  </dependencies>

</project>


--- NEW FILE asm-xml-2.2.3.pom ---
<project>
  <modelVersion>4.0.0</modelVersion>

  <parent>
    <artifactId>asm-parent</artifactId>
    <groupId>asm</groupId>
    <version>2.2.3</version>
  </parent>

  <name>ASM XML</name>
  <artifactId>asm-xml</artifactId>
  <packaging>jar</packaging>
  
  <dependencies>
    <dependency>
      <artifactId>asm-util</artifactId>
      <groupId>asm</groupId>
    </dependency>
  </dependencies>

</project>

asm2-ALLPerfTest.patch:

--- NEW FILE asm2-ALLPerfTest.patch ---
--- test/perf/org/objectweb/asm/ALLPerfTest.java.sav	2007-10-12 12:56:59.000000000 +0200
+++ test/perf/org/objectweb/asm/ALLPerfTest.java	2007-10-12 12:59:10.000000000 +0200
@@ -172,9 +172,9 @@
         System.out.println("\nBCEL PERFORMANCES\n");
         new BCELPerfTest().perfs(args);
         double[][] bcelPerfs = perfs;
-        System.out.println("\nSERP PERFORMANCES\n");
-        new SERPPerfTest().perfs(args);
-        double[][] serpPerfs = perfs;
+//      System.out.println("\nSERP PERFORMANCES\n");
+//      new SERPPerfTest().perfs(args);
+//      double[][] serpPerfs = perfs;
         System.out.println("\nJavassist PERFORMANCES\n");
         new JavassistPerfTest().perfs(args);
         double[][] javassistPerfs = perfs;
@@ -212,12 +212,12 @@
                     System.out.print(")");
                 }
                 System.out.print(" ");
-                System.out.print((float) serpPerfs[step][mode] + " ms");
-                if (mode > 0) {
-                    System.out.print(" (*");
-                    System.out.print((float) (serpPerfs[step][mode] / serpPerfs[step][0]));
-                    System.out.print(")");
-                }
+//              System.out.print((float) serpPerfs[step][mode] + " ms");
+//              if (mode > 0) {
+//                  System.out.print(" (*");
+//                  System.out.print((float) (serpPerfs[step][mode] / serpPerfs[step][0]));
+//                  System.out.print(")");
+//              }
                 System.out.print(" ");
                 System.out.print((float) javassistPerfs[step][mode] + " ms");
                 if (mode > 0) {
@@ -258,10 +258,10 @@
                 System.out.print((float) f + " ms (*");
                 System.out.print((float) (f / ref));
                 System.out.print(") ");
-                double g = serpPerfs[step][mode] - serpPerfs[step][base];
-                System.out.print((float) g + " ms (*");
-                System.out.print((float) (g / ref));
-                System.out.print(")");
+//              double g = serpPerfs[step][mode] - serpPerfs[step][base];
+//              System.out.print((float) g + " ms (*");
+//              System.out.print((float) (g / ref));
+//              System.out.print(")");
                 double h = javassistPerfs[step][mode]
                         - javassistPerfs[step][base];
                 System.out.print((float) h + " ms (*");

asm2-SerialVersionUIDAdder.patch:

--- NEW FILE asm2-SerialVersionUIDAdder.patch ---
--- src/org/objectweb/asm/commons/SerialVersionUIDAdder.java.sav	2007-10-12 12:00:53.000000000 +0200
+++ src/org/objectweb/asm/commons/SerialVersionUIDAdder.java	2007-10-12 12:01:59.000000000 +0200
@@ -431,7 +431,7 @@
         try {
             return MessageDigest.getInstance("SHA").digest(value);
         } catch (Exception e) {
-            throw new UnsupportedOperationException(e);
+            throw new UnsupportedOperationException(e.getMessage());
         }
     }
 

asm2-build_xml.patch:

--- NEW FILE asm2-build_xml.patch ---
--- build.xml.sav	2007-10-12 11:47:33.000000000 +0200
+++ build.xml	2007-10-12 11:50:34.000000000 +0200
@@ -98,10 +98,10 @@
 
     <path id="cobertura.classpath">
       <fileset dir="test/lib">
-        <include name="cobertura-1.7.jar"/>
-        <include name="log4j-1.2.9.jar"/>
-        <include name="jakarta-oro-2.0.8.jar"/>
-        <include name="asm-2.1.jar"/>
+        <include name="cobertura.jar"/>
+        <include name="log4j.jar"/>
+        <include name="jakarta-oro.jar"/>
+        <include name="asm2.jar"/>
         <include name="ccl.jar"/>
         <include name="javancss.jar"/>
       </fileset>

asm2-test-build_xml.patch:

--- NEW FILE asm2-test-build_xml.patch ---
--- test/build.xml.sav	2007-10-12 12:15:01.000000000 +0200
+++ test/build.xml	2007-10-12 12:15:21.000000000 +0200
@@ -97,7 +97,9 @@
   
   <target name="check" unless="test.paths.configured">
     <echo message="The 'build.properties' file must be configured"/>
+<!--
     <fail/>
+-->
   </target>
   
   <target name="init" depends="properties,check">  

asm2-test-heap.patch:

--- NEW FILE asm2-test-heap.patch ---
--- test/conform/dataflow.xml.sav	2007-10-12 15:01:20.000000000 +0200
+++ test/conform/dataflow.xml	2007-10-12 15:01:51.000000000 +0200
@@ -12,6 +12,8 @@
       </batchtest>
       <formatter type="xml"/>
       <classpath refid="test.classpath"/>
+      <jvmarg value="-Xmx1280m"/>
+      <jvmarg value="-XX:MaxPermSize=128m"/>
       <jvmarg value="-Dasm.test=${asm.test}"/>
       <jvmarg value="-Dasm.test.class=${asm.test.class}"/>
     </junit>  
--- test/conform/asmifier.xml.sav	2006-07-05 17:32:22.000000000 +0200
+++ test/conform/asmifier.xml	2007-10-12 15:08:07.000000000 +0200
@@ -12,6 +12,8 @@
       </batchtest>
       <formatter type="xml"/>
       <classpath refid="test.classpath"/>
+      <jvmarg value="-Xmx1280m"/>
+      <jvmarg value="-XX:MaxPermSize=128m"/>
       <jvmarg value="-Dasm.test=${asm.test}"/>
       <jvmarg value="-Dasm.test.class=${asm.test.class}"/>
     </junit>  
--- test/conform/gasmifier.xml.sav	2006-07-05 17:32:22.000000000 +0200
+++ test/conform/gasmifier.xml	2007-10-12 15:08:07.000000000 +0200
@@ -12,6 +12,8 @@
       </batchtest>
       <formatter type="xml"/>
       <classpath refid="test.classpath"/>
+      <jvmarg value="-Xmx1280m"/>
+      <jvmarg value="-XX:MaxPermSize=128m"/>
       <jvmarg value="-Dasm.test=${asm.test}"/>
       <jvmarg value="-Dasm.test.class=${asm.test.class}"/>
     </junit>  


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/asm2/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Aug 2007 17:33:21 -0000	1.2
+++ .cvsignore	22 Jan 2008 15:45:18 -0000	1.3
@@ -1,2 +1,4 @@
-asm-2.1.tar.gz
+asm-2.2.3.tar.gz
 asm-eng.pdf
+asm-guide.pdf
+asm-transformations.pdf


Index: asm2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asm2/devel/asm2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- asm2.spec	21 Sep 2007 18:33:35 -0000	1.2
+++ asm2.spec	22 Jan 2008 15:45:18 -0000	1.3
@@ -1,5 +1,4 @@
 # Copyright (c) 2000-2007, JPackage Project
-
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -29,27 +28,83 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
+%define gcj_support 0
+# tests need lots of: cpu, mem, time
+%define tests 0
+
 Name:           asm2
-Version:        2.1
-Release:        2jpp.2%{?dist}
+Version:        2.2.3
+Release:        2jpp.1%{?dist}
 Epoch:          0
 Summary:        A code manipulation tool to implement adaptable systems
 License:        BSD
 URL:            http://asm.objectweb.org/
 Group:          Development/Libraries
-Source0:        http://download.forge.objectweb.org/asm/asm-2.1.tar.gz
+Source0:        http://download.forge.objectweb.org/asm/asm-2.2.3.tar.gz
 Source1:        http://asm.objectweb.org/current/asm-eng.pdf
+Source2:        http://asm.objectweb.org/current/asm-transformations.pdf
+Source3:        http://download.forge.objectweb.org/asm/asm-guide.pdf
+Source4:        http://asm.objectweb.org/doc/faq.html
+Source5:        asm-%{version}.pom
+Source6:        asm-all-%{version}.pom
+Source7:        asm-analysis-%{version}.pom
+Source8:        asm-attrs-%{version}.pom
+Source9:        asm-commons-%{version}.pom
+Source10:       asm-parent-%{version}.pom
+Source11:       asm-tree-%{version}.pom
+Source12:       asm-util-%{version}.pom
+Source13:       asm-xml-%{version}.pom
+
+Patch0:         asm2-build_xml.patch
+Patch1:         asm2-SerialVersionUIDAdder.patch
+Patch2:         asm2-test-build_xml.patch
+Patch3:         asm2-ALLPerfTest.patch
+Patch4:         asm2-test-heap.patch
 # Patch out the Class-path in MANIFEST.MF
-Patch0:         %{name}-noclasspathinmanifest.patch
+Patch5:         %{name}-noclasspathinmanifest.patch
+
 BuildRequires:  ant
-BuildRequires:  jpackage-utils >= 0:1.6
+%if %{tests}
+BuildRequires:  ant-junit
+BuildRequires:  asm2
+BuildRequires:  bcel
+BuildRequires:  ccl-util
+BuildRequires:  cobertura
+BuildRequires:  jakarta-oro
+BuildRequires:  janino
+BuildRequires:  javancss
+BuildRequires:  javassist
+BuildRequires:  log4j
+%endif
+BuildRequires:  jpackage-utils >= 0:1.7.2
 BuildRequires:  objectweb-anttask
+%if ! %{gcj_support}
 BuildArch:      noarch
+%endif
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:       jpackage-utils >= 0:1.6
+Requires:       jpackage-utils >= 0:1.7.2
+%if %{gcj_support}
+BuildRequires:    java-gcj-compat-devel
+Requires(post):   java-gcj-compat
+Requires(postun): java-gcj-compat
+%endif
 
 %description
-ASM is a code manipulation tool to implement adaptable systems.
+ASM is a Java bytecode manipulation framework. It can be 
+used to dynamically generate stub classes or other proxy 
+classes, directly in binary form, or to dynamically modify 
+classes at load time, i.e., just before they are loaded into
+the Java Virtual Machine.
+ASM offers similar functionalities as BCEL or SERP, but is 
+much smaller (33KB instead of 350KB for BCEL and 150KB for 
+SERP) and faster than these tools (the overhead of a load 
+time class transformation is of the order of 60% with ASM, 
+700% or more with BCEL, and 1100% or more with SERP). Indeed 
+ASM was designed to be used in a dynamic way* and was 
+therefore designed and implemented to be as small and 
+as fast as possible.
+(* ASM can of course be used in a static way too.)
+
 
 %package        javadoc
 Summary:        Javadoc for %{name}
@@ -58,14 +113,81 @@
 %description    javadoc
 Javadoc for %{name}.
 
+%package        manual
+Summary:        Documents for %{name}
+Group:          Development/Documentation
+
+%description    manual
+%{summary}.
+
+%package        demo
+Summary:        Examples for %{name}
+Group:          Development/Documentation
+Requires:       %{name} = %{version}
+
+%description    demo
+%{summary}.
+
 %prep
 %setup -q -n asm-%{version}
-%patch0
+%patch5
 find . -name "*.jar" -exec rm -f {} \;
-install -m 644 %{SOURCE1} .
+mkdir test/lib
+%if %{tests}
+pushd test/lib
+ln -sf $(build-classpath asm2/asm2)
+ln -sf $(build-classpath cobertura)
+ln -sf $(build-classpath log4j)
+ln -sf $(build-classpath jakarta-oro)
+ln -sf $(build-classpath ccl-util) ccl.jar
+ln -sf $(build-classpath javancss)
+popd
+%endif
+
+%patch0 -b .sav
+%patch1 -b .sav
+%patch2 -b .sav
+%patch3 -b .sav
+%patch4 -b .sav
+
+rm test/perf/org/objectweb/asm/SERPPerfTest.java
+rm test/conform/adviceadapter2.xml
 
 %build
-ant -Dobjectweb.ant.tasks.path=$(build-classpath objectweb-anttask) jar jdoc
+%if %{tests}
+export CLASSPATH=$(build-classpath asm2/asm2 asm2/asm2-tree)
+%endif
+ant \
+  -Dbcel.path=$(build-classpath bcel) \
+  -Djanino.path=$(build-classpath janino) \
+  -Djavassist.path=$(build-classpath javassist) \
+  -Dobjectweb.ant.tasks.path=$(build-classpath objectweb-anttask) \
+  jar \
+  jdoc \
+  examples \
+%if %{tests}
+  coverage \
+  test \
+  coverage.report \
+  test.report \
+%endif
+
+# compile
+# compile-debug
+# coverage
+# coverage.report
+# dist
+# dist.init
+# dist.version
+# example
+# examples
+# jar
+# jdoc
+# noshrink
+# properties
+# shrink
+# test
+# test.report
 
 # fix encoding
 sed -i 's/\r//g' README.txt LICENSE.txt
@@ -79,31 +201,125 @@
 for jar in output/dist/lib/*.jar; do
 newjar=${jar/asm-/asm2-}
 install -m 644 ${jar} \
-$RPM_BUILD_ROOT%{_javadir}/%{name}/`basename ${newjar}`
+    $RPM_BUILD_ROOT%{_javadir}/%{name}/`basename ${newjar}`
 done
+install -m 644 output/dist/lib/all/asm-all-%{version}.jar \
+    $RPM_BUILD_ROOT%{_javadir}/%{name}-all-%{version}.jar
 
-(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in %{name}*; do \
+(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do \
 ln -sf ${jar} ${jar/-%{version}/}; done)
+(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}*; do \
+ln -sf ${jar} ${jar/-%{version}/}; done)
+
+%add_to_maven_depmap asm asm-parent %{version} JPP asm2-parent
+%add_to_maven_depmap asm asm-all %{version} JPP asm2-all
+%add_to_maven_depmap asm asm-analysis %{version} JPP/asm2 asm2-analysis
+%add_to_maven_depmap asm asm-attrs %{version} JPP/asm2 asm2-attrs
+%add_to_maven_depmap asm asm-commons %{version} JPP/asm2 asm2-commons
+%add_to_maven_depmap asm asm-tree %{version} JPP/asm2 asm2-tree
+%add_to_maven_depmap asm asm-util %{version} JPP/asm2 asm2-util
+%add_to_maven_depmap asm asm-xml %{version} JPP/asm2 asm2-xml
+%add_to_maven_depmap asm asm %{version} JPP/asm2 asm2
+
+# pom
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}.pom
+install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}-all.pom
+install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-analysis.pom
+install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-attrs.pom
+install -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-commons.pom
+install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}-parent.pom
+install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-tree.pom
+install -m 644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-util.pom
+install -m 644 %{SOURCE13} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-xml.pom
 
 # 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}
 (cd $RPM_BUILD_ROOT%{_javadocdir} && ln -sf %{name}-%{version} %{name})
+# manual
+install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+install -m 644 README.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+install -m 644 LICENSE.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+
+# demo
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
+cp -pr output/dist/examples $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
+
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+%update_maven_depmap
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%update_maven_depmap
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files
 %defattr(0644,root,root,0755)
-%doc README.txt LICENSE.txt asm-eng.pdf
+%doc %{_docdir}/%{name}-%{version}/README.txt
+%doc %{_docdir}/%{name}-%{version}/LICENSE.txt
+%doc %{_docdir}/%{name}-%{version}/asm-eng.pdf
+%dir %{_datadir}/%{name}-%{version}
 %dir %{_javadir}/%{name}
 %{_javadir}/%{name}/*.jar
+%{_javadir}/*.jar
+%{_datadir}/maven2/poms/*
+%{_mavendepmapfragdir}
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}
+%endif
+
 
 %files javadoc
 %defattr(0644,root,root,0755)
 %doc %{_javadocdir}/*
 
+%files manual
+%defattr(0644,root,root,0755)
+%doc %{_docdir}/%{name}-%{version}/faq.html
+%doc %{_docdir}/%{name}-%{version}/*.pdf
+
+%files demo
+%defattr(0644,root,root,0755)
+%{_datadir}/%{name}-%{version}/examples
+
 %changelog
+* Tue Jan 22 2008 Permaine Cheung <pcheung at redhat.com> - 0:2.2.3-2jpp.1
+- Merge with upstream
+
+* Tue Dec 18 2007 Ralph Apel <r.apel at r-apel.de> 0:2.2.3-2jpp
+- Fix parent pom filename
+
+* Fri Oct 12 2007 Ralph Apel <r.apel at r-apel.de> 0:2.2.3-1jpp
+- Upgrade to 2.2.3
+- Add asm2-all jar file
+- Add manual subpackage
+- Optionally run tests (need lots of time, cpu, mem)
+- Add maven2 poms and depmap frags
+- Add gcj_support option
+- Make Vendor, Distribution based on macro
+
 * Fri Sep 21 2007 Permaine Cheung <pcheung at redhat.com> - 0:2.1-2jpp.2
 - Fix Source0 URL, License tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asm2/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Aug 2007 17:33:21 -0000	1.2
+++ sources	22 Jan 2008 15:45:18 -0000	1.3
@@ -1,2 +1,4 @@
-dfd62160a88f13e236f9da7d2485c9ec  asm-2.1.tar.gz
+7a92c87bf067925685cf68dcc0dd8998  asm-2.2.3.tar.gz
 5f17bfac3563feb108793575f74ce27c  asm-eng.pdf
+0a49b23844bb0b8a8a8880de45db36e5  asm-guide.pdf
+991a1ccdb3e79fe393aed7477f4f7ca5  asm-transformations.pdf




More information about the fedora-extras-commits mailing list