SPECS: aspectwerkz.spec - unify java package; disable deps that d...

glen glen at pld-linux.org
Wed Apr 18 01:43:06 CEST 2007


Author: glen                         Date: Tue Apr 17 23:43:06 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
-  unify java package; disable deps that don't exist; not building

---- Files affected:
SPECS:
   aspectwerkz.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SPECS/aspectwerkz.spec
diff -u SPECS/aspectwerkz.spec:1.7 SPECS/aspectwerkz.spec:1.8
--- SPECS/aspectwerkz.spec:1.7	Mon Feb 12 23:09:09 2007
+++ SPECS/aspectwerkz.spec	Wed Apr 18 01:43:01 2007
@@ -1,4 +1,5 @@
 # $Revision$, $Date$
+%include	/usr/lib/rpm/macros.java
 Summary:	AOP for Java
 Summary(pl.UTF-8):	AOP dla Javy
 Name:		aspectwerkz
@@ -13,18 +14,20 @@
 URL:		http://aspectwerkz.codehaus.org/
 BuildRequires:	ant >= 1.6
 BuildRequires:	asm
-BuildRequires:	concurrent
-BuildRequires:	dom4j
-BuildRequires:	gnu.trove
-BuildRequires:	jarjar
-BuildRequires:	java-1.4.2-bea
-BuildRequires:	java-1.5.0-sun-devel
-BuildRequires:	javassist
-BuildRequires:	jrexx
+#BuildRequires:	concurrent
+#BuildRequires:	dom4j
+#BuildRequires:	gnu.trove
+BuildRequires:	rpm-javaprov
+#BuildRequires:	jarjar
+#BuildRequires:	javassist
+BuildRequires:	jdk
+BuildRequires:	jpackage-utils
+#BuildRequires:	jrexx
 BuildRequires:	junit
-BuildRequires:	junitperf
-BuildRequires:	piccolo
-BuildRequires:	qdox
+#BuildRequires:	junitperf
+#BuildRequires:	piccolo
+#BuildRequires:	qdox
+BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	concurrent
 Requires:	dom4j
 Requires:	gnu.trove
@@ -61,6 +64,7 @@
 %package javadoc
 Summary:	Javadoc for %{name}
 Summary(pl.UTF-8):	Dokumentacja javadoc dla pakietu %{name}
+Requires:	jpackage-utils
 Group:		Documentation
 
 %description javadoc
@@ -93,12 +97,8 @@
 
 %prep
 %setup -q
-# remove all binary libs
-for j in $(find . -name "*.jar"); do
-	mv $j $j.no
-done
+find -name '*.jar' | xargs rm -vf
 chmod +x bin/aspectwerkz
-
 %patch0
 %patch1
 
@@ -106,9 +106,9 @@
 export ASPECTWERKZ_HOME=$RPM_BUILD_DIR/%{name}-%{version}
 build-jar-repository -s -p lib \
 jarjar \
-asm/asm \
-asm/asm-attrs \
-asm/asm-util \
+asm \
+asm-attrs \
+asm-util \
 dom4j \
 gnu.trove \
 concurrent \
@@ -123,7 +123,7 @@
 ln -sf %{_prefix}/lib/jvm/java-1.4.2-bea/jre/lib/managementserver.jar lib
 
 export JAVA_HOME=%{_prefix}/lib/jvm/java-1.5.0
-ant test cleandist
+%ant test cleandist
 #export JAVA_HOME=%{_prefix}/lib/jvm/java-1.5.0
 #ant test
 
@@ -180,23 +180,17 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ "$1" = "0" ]; then
-	rm -f %{_javadocdir}/%{name}
-fi
+ln -sf %{name}-%{version} %{_javadocdir}/%{name}
 
 %files
 %defattr(644,root,root,755)
 %doc %{_docdir}/%{name}-%{version}/LICENSE.txt
-%{_javadir}/*.jar
 %attr(755,root,root) %{_bindir}/aspectwerkz
+%{_javadir}/*.jar
 
 %files javadoc
 %defattr(644,root,root,755)
-%doc %{_javadocdir}/%{name}-%{version}
+%{_javadocdir}/%{name}-%{version}
 %ghost %{_javadocdir}/%{name}
 
 %files manual
@@ -213,6 +207,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2007/04/17 23:43:01  glen
+-  unify java package; disable deps that don't exist; not building
+
 Revision 1.7  2007/02/12 22:09:09  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/aspectwerkz.spec?r1=1.7&r2=1.8&f=u



More information about the pld-cvs-commit mailing list