[RPM (6.0)] [DIST generic] aspectj-1.6.0-1.jpp6

Ralph Apel <[email protected]>
Newsgroups gmane.linux.jpackage.announce
Message-ID <[email protected]>
Name        : aspectj                      Relocations: (not relocatable)
Version     : 1.6.0                             Vendor: JPackage Project
Release     : 1.jpp6                        Build Date: Wed 11 Jul 2012 09:05:32 PM CEST
Install Date: (not installed)               Build Host: linux.fritz.box
Group       : Development/Compilers         Source RPM: (none)
Size        : 46730357                         License: EPL
Signature   : (none)
Packager    : Ralph Apel <[email protected]>
URL         : http://eclipse.org/aspectj/
Summary     : AspectJ aspect-oriented language extension to Java
Description :
AspectJ is a seamless aspect-oriented language
extension to Java(tm). It can be used to cleanly
modularize the crosscutting structure of concerns
such as exception handling, multi-object protocols,
synchronization, performance optimizations, and
resource sharing. When implemented in a
non-aspect-oriented fashion, the code for these concerns
typically becomes spread out across entire programs.
AspectJ controls such code-tangling and makes the
underlying concerns more apparent, making programs
easier to develop and maintain. The project goal
is to support the AspectJ compiler and core tools.

---------------
Ralph Apel <[email protected]> 0:1.6.0-1
- 1.6.0
---------------
aspectj.src: W: no-signature
aspectj.src: W: name-repeated-in-summary AspectJ
aspectj.src:345: W: libdir-macro-in-noarch-package eclipse-plugins %{_libdir}/eclipse/plugins/org.aspectj.ajde
aspectj.src:346: W: libdir-macro-in-noarch-package eclipse-plugins %{_libdir}/eclipse/plugins/org.aspectj.ajde.doc
aspectj.src:347: W: libdir-macro-in-noarch-package eclipse-plugins %{_libdir}/eclipse/plugins/org.aspectj.ajde.source
aspectj.src:348: W: libdir-macro-in-noarch-package eclipse-plugins %{_libdir}/eclipse/plugins/org.aspectj.aspecjrt
aspectj.src: W: invalid-license EPL
1 packages and 0 specfiles checked; 0 errors, 7 warnings.

---------------
Index: aspectj.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/aspectj/aspectj.spec,v
retrieving revision 1.6
diff -u -r1.6 aspectj.spec
--- aspectj.spec	1 Oct 2009 22:15:14 -0000	1.6
+++ aspectj.spec	11 Jul 2012 19:44:40 -0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2008, JPackage Project
+# Copyright (c) 2000-2012, JPackage Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -29,17 +29,21 @@
 #
 
 %define section free
+%define _binary_payload w9.gzdio
+%define _source_payload w9.gzdio
+%define _binary_filedigest_algorithm 1
+%define _source_filedigest_algorithm 1
 
 Name:           aspectj
-Version:        1.5.4
+Version:        1.6.0
 Release:        1%{?dist}
 Epoch:          0
 Summary:        AspectJ aspect-oriented language extension to Java
 License:        EPL
 URL:            http://eclipse.org/aspectj/
 Group:          Development/Compilers
-# cvs -d:pserver:[email protected]:/cvsroot/tools/ export -r V1_5_4 org.aspectj && tar cjf aspectj-1.5.4.tar.bz2 org.aspectj
-Source0:        aspectj-1.5.4.tar.bz2
+# git clone http://git.eclipse.org/gitroot/aspectj/org.aspectj.git && git archive --prefix="aspectj-1.6.0/" --format=tar V1_6_0 | bzip2 > ../../SOURCES/aspectj-1.6.0.tar.bz2
+Source0:        aspectj-1.6.0.tar.bz2
 Source1:        aspectj-build-build.xml
 Source2:        aspectj-jdtcore4aspectj-build.xml
 Source3:        http://archive.apache.org/dist/jakarta/bcel/source/bcel-5.1-src.zip
@@ -49,67 +53,30 @@
 Source7:        aspectj-1.5.3-script-ajbrowser
 Source8:        aspectj-1.5.3-script-ajc
 Source9:        aspectj-1.5.3-script-ajdoc
-Source10:       aspectjlib-1.5.4.pom
-Source11:       http://mirrors.ibiblio.org/pub/mirrors/maven2/org/aspectj/aspectjrt/1.5.4/aspectjrt-1.5.4.pom
-Source12:       http://mirrors.ibiblio.org/pub/mirrors/maven2/org/aspectj/aspectjtools/1.5.4/aspectjtools-1.5.4.pom
-Source13:       http://mirrors.ibiblio.org/pub/mirrors/maven2/org/aspectj/aspectjweaver/1.5.4/aspectjweaver-1.5.4.pom
-
-
-Patch0:         aspectj-1.5.3-bcel-builder-build_xml.patch
-Patch1:         aspectj-1.5.3-PluginModel.patch
-Patch2:         aspectj-1.5.3-PluginFragmentModel.patch
-Patch3:         aspectj-1.5.3-PluginModelObject.patch
-Patch4:         aspectj-1.5.3-PluginRegistryModel.patch
-Patch5:         aspectj-1.5.3-PluginPrerequisiteModel.patch
-Patch6:         aspectj-1.5.3-LibraryModel.patch
-Patch7:         aspectj-1.5.3-ResourceTree.patch
-Patch8:         aspectj-1.5.3-ProjectPreferences.patch
-Patch9:         aspectj-1.5.3-Resource.patch
-Patch10:        aspectj-1.5.3-File.patch
-Patch11:        aspectj-1.5.3-Project.patch
-Patch12:        aspectj-1.5.3-SaveManager.patch
-Patch13:        aspectj-1.5.3-CharsetManager.patch
-Patch14:        aspectj-1.5.3-Workspace.patch
-Patch15:        aspectj-1.5.3-BlobStore.patch
-Patch16:        aspectj-1.5.3-HistoryStore2.patch
-Patch17:        aspectj-1.5.4-JavaCore.patch
-Patch18:        aspectj-1.5.3-Factory.patch
-Patch19:        aspectj-1.5.4-CompilationUnitResolver.patch
-Patch20:        aspectj-1.5.4-CompilationUnitProblemFinder.patch
-
-#Patch1:         aspectj-docs-build_xml.patch
-BuildRequires:  jpackage-utils >= 0:1.7.3
-#BuildRequires:  java-devel >= 0:1.4.2
-#BuildRequires:  java-devel <  0:1.5.0
-#BuildRequires:  java-devel >= 0:1.5.0
-#BuildRequires:  java-devel <  0:1.6.0
-BuildRequires:  java-devel
+Source10:       http://repo1.maven.org/maven2/org/aspectj/aspectjlib/1.6.0/aspectjlib-1.6.0.pom
+Source11:       http://repo1.maven.org/maven2/org/aspectj/aspectjrt/1.6.0/aspectjrt-1.6.0.pom
+Source12:       http://repo1.maven.org/maven2/org/aspectj/aspectjtools/1.6.0/aspectjtools-1.6.0.pom
+Source13:       http://repo1.maven.org/maven2/org/aspectj/aspectjweaver/1.6.0/aspectjweaver-1.6.0.pom
+
+BuildRequires:  jpackage-utils >= 0:1.7.5
+BuildRequires:  java-devel >= 0:1.6.0
 BuildRequires:  junit
-BuildRequires:  ant >= 0:1.6.5
+BuildRequires:  ant >= 0:1.7.1
 BuildRequires:  ant-nodeps
 BuildRequires:  ant-junit
-#BuildRequires:  java-devel >= 0:1.4.2
 BuildRequires:  eclipse-platform 
-BuildRequires:  jakarta-commons-beanutils
-BuildRequires:  jakarta-commons-collections
-BuildRequires:  jakarta-commons-digester
-BuildRequires:  jakarta-commons-logging
-BuildRequires:  regexp
+BuildRequires:  apache-commons-beanutils
+BuildRequires:  apache-commons-collections
+BuildRequires:  apache-commons-digester
+BuildRequires:  apache-commons-logging
 BuildRequires:  saxon
-BuildRequires:  xalan-j2
-BuildRequires:  xerces-j2
-BuildRequires:  xml-commons-apis
-Requires:  jakarta-commons-beanutils
-Requires:  jakarta-commons-collections
-Requires:  jakarta-commons-digester
-Requires:  jakarta-commons-logging
-Requires:  regexp
+Requires:  apache-commons-beanutils
+Requires:  apache-commons-collections
+Requires:  apache-commons-digester
+Requires:  apache-commons-logging
 Requires:  saxon
-Requires:  xalan-j2
-Requires:  xerces-j2
-Requires:  xml-commons-apis
-Requires(post):    jpackage-utils >= 0:1.7.2
-Requires(postun):  jpackage-utils >= 0:1.7.2
+Requires(post):    jpackage-utils >= 0:1.7.5
+Requires(postun):  jpackage-utils >= 0:1.7.5
 
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -159,194 +126,107 @@
 %{summary}.
 
 %prep
-%setup -q -n org.%{name}
+%setup -q 
 
-%if 0
-# save local jdiff sources
-export JAVA_HOME=%{java_home}
-export ANT_OPTS="-Xmx512M"
-( cd modules/lib/jdiff
-  unzip -qq jdiff.jar
-  rm jdiff.jar
-  rm -r jdiff
-  %{javac} -d . -sourcepath src `find src -name "*.java"`
-  %{jar} cf jdiff.jar.new jdiff
-)
-mv modules/lib/jdiff/jdiff.jar.new modules/lib/jdiff/jdiff.jar
-
-( cd modules/lib/commons
+####################################
+for j in $(find . -name "*.jar" -a ! -name "aspectj*"); do
+    mv $j $j.no
+done
+( cd lib/commons
   %{jar} xf $(find-jar commons-beanutils)
   %{jar} xf $(find-jar commons-collections)
   %{jar} xf $(find-jar commons-digester)
   %{jar} xf $(find-jar commons-logging)
   %{jar} cf commons.jar org
 )
-%endif
-
-# FIXME: need to remove bundled jars
-%{_bindir}/find -type f -name "*.jar" -a ! -name "aspectj*.jar" | %{_bindir}/xargs -t %{__rm}
+ln -s $(build-classpath junit) lib/junit/junit.jar
+ln -s $(build-classpath ant) lib/ant/lib/ant.jar
+ln -s $(build-classpath saxon) lib/saxon/saxon.jar
+mv lib/ext/jrockit/jrockit.jar.no lib/ext/jrockit/jrockit.jar
+####################################
+
+cp -p %{SOURCE1} build/build-build.xml
+cp -p %{SOURCE2} org.eclipse.jdt.core/build.xml
+cp -p %{SOURCE3} bcel-builder
+cp -p %{SOURCE4} bcel-builder/build-bcel.xml
 
-cp -p %{SOURCE1} modules/build/build-build.xml
-cp -p %{SOURCE3} modules/bcel-builder
-cp -p %{SOURCE4} modules/bcel-builder/build-bcel.xml
-#def##cp -p %{SOURCE3} modules/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip
-#rap#touch modules/build/local.properties
-#rap#rm modules/loadtime/src/org/aspectj/weaver/loadtime/JRockitAgent.java
-cp -p %{SOURCE2} modules/org.eclipse.jdt.core/build.xml
-
-ln -sf $(build-classpath ant) modules/lib/ant/lib/ant.jar
-ln -sf $(build-classpath ant-launcher) modules/lib/ant/lib/ant-launcher.jar
-ln -sf $(build-classpath ant/ant-junit) modules/lib/ant/lib/ant-junit.jar
-ln -sf $(build-classpath ant/ant-nodeps) modules/lib/ant/lib/ant-nodeps.jar
-ln -sf $(build-classpath xerces-j2) modules/lib/ant/lib/xercesImpl.jar
-ln -sf $(build-classpath xml-commons-apis) modules/lib/ant/lib/xml-apis.jar
-
-ln -sf $(build-classpath asm2/asm2) modules/lib/asm/asm-2.2.1.jar
-ln -sf $(build-classpath junit) modules/lib/junit/junit.jar
-ln -sf $(build-classpath regexp) modules/lib/regexp/jakarta-regexp-1.2.jar
-ln -sf $(build-classpath saxon) modules/lib/saxon/saxon.jar
-
-pushd modules/org.eclipse.jdt.core
+pushd org.eclipse.jdt.core
   mkdir src
   pushd src
   unzip -qq -o ../jdtcore-for-aspectj-src.zip
   popd
 popd
-%patch0 -b .sav0
-%if 0
-%patch1 -b .sav1
-%patch2 -b .sav2
-%patch3 -b .sav3
-%patch4 -b .sav4
-%patch5 -b .sav5
-%patch6 -b .sav6
-%patch7 -b .sav7
-%patch8 -b .sav8
-%patch9 -b .sav9
-%patch10 -b .sav10
-%patch11 -b .sav11
-%patch12 -b .sav12
-%patch13 -b .sav13
-%patch14 -b .sav14
-%patch15 -b .sav15
-%patch16 -b .sav16
-%patch18 -b .sav18
-%endif
-%patch17 -b .sav17
-%patch19 -b .sav19
-%patch20 -b .sav20
-
-rm modules/loadtime/src/org/aspectj/weaver/loadtime/JRockitAgent.java
-
-mv modules/build/build-properties.xml modules/build/build-properties.xml.orig
-sed -e 's|"DEVELOPMENT"|"%{version}"|' modules/build/build-properties.xml.orig \
-     > modules/build/build-properties.xml
-
-# Avoid use of eclipse's OperationCanceledException
-for j in $(find . -name "*.java" -exec grep -l "org\.eclipse\.core\.runtime\.OperationCanceledException" {} \;); do
-    sed -i -e '/import org\.eclipse\.core\.runtime\.OperationCanceledException/d' $j
-    sed -i -e 's/org\.eclipse\.core\.runtime\.OperationCanceledException/org\.eclipse\.core\.runtime\.OperationCanceledException/' $j
-    sed -i -e 's/OperationCanceledException/RuntimeException/g' $j
-done
 
 %build
 export JAVA_HOME=%{java_home}
 export ANT_OPTS="-Xmx512M"
 # CLASSPATH needed for rebuilds from sources
-#rap#export OPT_JAR_LIST="ant/ant-junit junit ant/ant-nodeps"
 export CLASSPATH=$(build-classpath \
 ant \
 ant-launcher \
 commons-logging \
 )
 
-# now for eclipse 3.2.X
+# now for eclipse 3.6.X
 CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.osgi_*.jar)
-#CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.osgi.util_*.jar)
-#CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.jface.text_*.jar)
 CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.text_*.jar)
 CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.update.configurator_*.jar)
 CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.core.runtime_*.jar)
 CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.core.resources_*.jar)
-#rap#CLASSPATH=${CLASSPATH}:%{java_home}-bea/jre/lib/managementserver.jar
 CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.equinox.common_*.jar)
 CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.core.contenttype_*.jar)
 CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.equinox.preferences_*.jar)
 CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.equinox.registry_*.jar)
 CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.core.jobs_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.core.filesystem_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.equinox.app_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.core.runtime_*.jar)
 
-# rebuild jdtcore-for-aspectj.jar from sources
-pushd modules/org.eclipse.jdt.core
-export ASPECTJ_HOME=$RPM_BUILD_DIR/org.aspectj/modules/lib/aspectj
-"%{java}" -classpath "$ASPECTJ_HOME/lib/aspectjtools.jar:$ASPECTJ_HOME/lib/aspectjrt.jar:$JAVA_HOME/lib/tools.jar:$CLASSPATH" -Xmx512M org.aspectj.tools.ajc.Main -sourceroots src -d build-classes
-%{ant} jar
-popd
-
-#cp modules/org.eclipse.jdt.core/jdtcore-for-aspectj.jar.no modules/org.eclipse.jdt.core/jdtcore-for-aspectj.jar 
-
-pushd modules/bcel-builder
+pushd bcel-builder
 %{ant} -f build-bcel.xml
 cp bin/bcel.jar .
 %{ant} extractAndPatchAndJar
 %{ant} push
 popd
 
+# rebuild jdtcore-for-aspectj.jar from sources
+pushd org.eclipse.jdt.core
+export ASPECTJ_HOME=$RPM_BUILD_DIR/aspectj-%{version}/lib/aspectj
+"%{java}" -classpath "$ASPECTJ_HOME/lib/aspectjtools.jar:$ASPECTJ_HOME/lib/aspectjrt.jar:$JAVA_HOME/lib/tools.jar:$CLASSPATH" -Xmx512M org.aspectj.tools.ajc.Main -sourceroots src -d build-classes
+%{ant} jar
+popd
+
 # rebuild the build-module from sources
-pushd modules/build
+pushd build
 %{ant} -f build-build.xml
-# do the product build
-touch local.properties
-%{ant} -Dbuild.sysclasspath=first
-# do the release build
-%{ant} -f release/build.xml \
-       -Dversion=%{version} -Dskip.cvs=true \
-       -Daspectj.modules.dir=$(pwd)/.. \
-       -Djava13.home=%{java_home} \
-       -Djava14.home=%{java_home} \
-       -Djava15.home=%{java_home} \
-       -Drun.14.only=false \
-       -Dmin.vm=14 \
-       -Dmax.vm=15 \
-       install \
-    | tee build-log-release-aspectj-%{version}.txt
-# do the test build
-%{ant} -f release/build.xml \
-       -Dversion=%{version} -Dskip.cvs=true \
-       -Daspectj.modules.dir=$(pwd)/.. \
-       -Djava13.home=%{java_home} \
-       -Djava14.home=%{java_home} \
-       -Djava15.home=%{java_home} \
-       -Dskip.build=true \
-       -Drun.14.only=false \
-       -Dmin.vm=14 \
-       -Dmax.vm=15 \
-       product-tests \
-    | tee test-log-release-aspectj-%{version}.txt
 popd
 
+touch build/local.properties
+%{ant} -Dbuild.sysclasspath=first
 
 %install
 rm -rf %{buildroot}
 # jars, poms, depmap frags
 install -d -m 0755 %{buildroot}%{_javadir}
 install -d -m 0755 %{buildroot}%{_datadir}/maven2/poms
-install -m 0644 modules/aj-build/dist/tools/lib/aspectjlib.jar \
+
+install -m 0644 aj-build/dist/tools/lib/aspectjlib.jar \
         %{buildroot}%{_javadir}/%{name}lib-%{version}.jar
 install -m 0644 %{SOURCE10} %{buildroot}%{_datadir}/maven2/poms/JPP-aspectjlib.pom
 %add_to_maven_depmap org.aspectj aspectjlib %{version} JPP %{name}lib
-install -m 0644 modules/aj-build/dist/tools/lib/aspectjrt.jar \
+install -m 0644 aj-build/dist/tools/lib/aspectjrt.jar \
         %{buildroot}%{_javadir}/%{name}rt-%{version}.jar
 install -m 0644 %{SOURCE11} %{buildroot}%{_datadir}/maven2/poms/JPP-aspectjrt.pom
 %add_to_maven_depmap org.aspectj aspectjrt %{version} JPP %{name}rt
-install -m 0644 modules/aj-build/dist/tools/lib/aspectjtools.jar \
+install -m 0644 aj-build/dist/tools/lib/aspectjtools.jar \
         %{buildroot}%{_javadir}/%{name}tools-%{version}.jar
 install -m 0644 %{SOURCE12} %{buildroot}%{_datadir}/maven2/poms/JPP-aspectjtools.pom
 %add_to_maven_depmap org.aspectj aspectjtools %{version} JPP %{name}tools
-install -m 0644 modules/aj-build/dist/tools/lib/aspectjweaver.jar \
+install -m 0644 aj-build/dist/tools/lib/aspectjweaver.jar \
         %{buildroot}%{_javadir}/%{name}weaver-%{version}.jar
 install -m 0644 %{SOURCE13} %{buildroot}%{_datadir}/maven2/poms/JPP-aspectjweaver.pom
 %add_to_maven_depmap org.aspectj aspectjweaver %{version} JPP %{name}weaver
-install -m 0644 modules/aj-build/dist/aspectj-%{version}.jar \
+install -m 0644 aj-build/dist/aspectj-DEVELOPMENT.jar \
         %{buildroot}%{_javadir}/%{name}installer-%{version}.jar
 (cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
 
@@ -355,7 +235,7 @@
 install -d -m 0755 %{buildroot}%{_javadir}/aspectj-eclipse
 
 install -d -m 0755 %{buildroot}%{_javadir}/aspectj-eclipse/org.aspectj.ajde
-cp -pr modules/aj-build/dist/ide/eclipse/org.aspectj.ajde/* %{buildroot}%{_javadir}/aspectj-eclipse/org.aspectj.ajde
+cp -pr aj-build/dist/ide/eclipse/org.aspectj.ajde/* %{buildroot}%{_javadir}/aspectj-eclipse/org.aspectj.ajde
 pushd %{buildroot}%{_javadir}/aspectj-eclipse/org.aspectj.ajde
 rm aspectjrt.jar
 ln -sf ../../aspectjrt.jar .
@@ -365,15 +245,15 @@
 ln -sf %{_javadir}/aspectj-eclipse/org.aspectj.ajde %{buildroot}%{_libdir}/eclipse/plugins/org.aspectj.ajde
 
 install -d -m 0755 %{buildroot}%{_javadir}/aspectj-eclipse/org.aspectj.ajde.doc
-cp -pr modules/aj-build/dist/ide/eclipse/org.aspectj.ajde.doc/* %{buildroot}%{_javadir}/aspectj-eclipse/org.aspectj.ajde.doc
+cp -pr aj-build/dist/ide/eclipse/org.aspectj.ajde.doc/* %{buildroot}%{_javadir}/aspectj-eclipse/org.aspectj.ajde.doc
 ln -sf %{_javadir}/aspectj-eclipse/org.aspectj.ajde.doc %{buildroot}%{_libdir}/eclipse/plugins/org.aspectj.ajde.doc
 
 install -d -m 0755 %{buildroot}%{_javadir}/aspectj-eclipse/org.aspectj.ajde.source
-cp -pr modules/aj-build/dist/ide/eclipse/org.aspectj.ajde.source/* %{buildroot}%{_javadir}/aspectj-eclipse/org.aspectj.ajde.source
+cp -pr aj-build/dist/ide/eclipse/org.aspectj.ajde.source/* %{buildroot}%{_javadir}/aspectj-eclipse/org.aspectj.ajde.source
 ln -sf %{_javadir}/aspectj-eclipse/org.aspectj.ajde.source %{buildroot}%{_libdir}/eclipse/plugins/org.aspectj.ajde.source
 
 install -d -m 0755 %{buildroot}%{_javadir}/aspectj-eclipse/org.aspectj.aspectjrt
-cp -pr modules/aj-build/dist/ide/eclipse/org.aspectj.aspectjrt/* %{buildroot}%{_javadir}/aspectj-eclipse/org.aspectj.aspectjrt
+cp -pr aj-build/dist/ide/eclipse/org.aspectj.aspectjrt/* %{buildroot}%{_javadir}/aspectj-eclipse/org.aspectj.aspectjrt
 pushd %{buildroot}%{_javadir}/aspectj-eclipse/org.aspectj.aspectjrt
 rm aspectjrt.jar
 ln -sf ../../aspectjrt.jar .
@@ -382,18 +262,18 @@
 
 # javadoc
 install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr modules/aj-build/dist/docs/doc/runtime-api \
+cp -pr aj-build/dist/docs/doc/runtime-api \
         %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr modules/aj-build/dist/docs/doc/weaver-api \
+cp -pr aj-build/dist/docs/doc/weaver-api \
         %{buildroot}%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} # ghost symlink
 
-rm -rf modules/aj-build/dist/docs/doc/runtime-api
-rm -rf modules/aj-build/dist/docs/doc/weaver-api
+rm -rf aj-build/dist/docs/doc/runtime-api
+rm -rf aj-build/dist/docs/doc/weaver-api
 
 # manual
 install -d -m 0755 %{buildroot}%{_docdir}/%{name}-%{version}
-cp -pr modules/aj-build/dist/docs/* \
+cp -pr aj-build/dist/docs/* \
         %{buildroot}%{_docdir}/%{name}-%{version}
 ln -s %{_javadocdir}/%{name}/runtime-api \
         %{buildroot}%{_docdir}/%{name}-%{version}
@@ -482,6 +362,9 @@
 %{_docdir}/%{name}-%{version}
 
 %changelog
+* Wed Jul 11 2012 Ralph Apel <[email protected]> 0:1.6.0-1
+- 1.6.0
+
 * Thu Oct 01 2009 David Walluck <[email protected]> 0:1.5.4-1
 - 1.5.4
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.