[Jpackage-commits] dist/hivemind/JPP-6 hivemind-library-build-no-groovy-jsr.patch, NONE, 1.1 hivemind.spec, 1.1, 1.2

David Walluck david at ryu.zarb.org
Fri Feb 20 22:33:39 CET 2009


Update of /home/projects/jpackage/cvs/dist/hivemind/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv9826

Modified Files:
	hivemind.spec 
Added Files:
	hivemind-library-build-no-groovy-jsr.patch 
Log Message:
- make building with groovy-jsr optional
- fix ant deps


Index: hivemind.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/hivemind/JPP-6/hivemind.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** hivemind.spec	4 Aug 2008 21:40:16 -0000	1.1
--- hivemind.spec	20 Feb 2009 21:33:37 -0000	1.2
***************
*** 1,3 ****
! # Copyright (c) 2000-2007, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2009, JPackage Project
  # All rights reserved.
  #
***************
*** 29,32 ****
--- 29,39 ----
  #
  
+ %define with()          %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
+ %define without()       %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
+ %define bcond_with()    %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
+ %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
+ 
+ %bcond_with             groovy_jsr
+ 
  %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
  
***************
*** 35,44 ****
  Name:           hivemind
  Version:        1.1.1
! Release:        2jpp
  Epoch:          0
  Summary:        HiveMind Microkernel
- 
  Group:          Development/Libraries/Java
! License:        Apache Software License
  URL:            http://hivemind.apache.org/
  Source0:        hivemind-1.1.1.tar.gz
--- 42,50 ----
  Name:           hivemind
  Version:        1.1.1
! Release:        3%{?dist}
  Epoch:          0
  Summary:        HiveMind Microkernel
  Group:          Development/Libraries/Java
! License:        ASL 2.0
  URL:            http://hivemind.apache.org/
  Source0:        hivemind-1.1.1.tar.gz
***************
*** 52,81 ****
  Patch7:         hivemind-examples-build.patch
  Patch8:         hivemind-examples-TestTaskExecutor.patch
! 
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
! Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}}
! Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
! 
! %if ! %{gcj_support}
! BuildArch:      noarch
! %endif
! 
! %if %{gcj_support}
! BuildRequires:    gnu-crypto
! BuildRequires:    java-gcj-compat-devel
! Requires(post):   java-gcj-compat
! Requires(postun): java-gcj-compat
! %endif
! 
! BuildRequires:  jpackage-utils >= 0:1.6
  BuildRequires:  ant >= 0:1.6
  BuildRequires:  easymock
  BuildRequires:  easymock-classextension
  BuildRequires:  junit
- 
  BuildRequires:  aopalliance
  BuildRequires:  cglib
  BuildRequires:  geronimo-ejb-2.1-api
  BuildRequires:  groovy-jsr
  BuildRequires:  jakarta-commons-logging
  BuildRequires:  jakarta-oro
--- 58,84 ----
  Patch7:         hivemind-examples-build.patch
  Patch8:         hivemind-examples-TestTaskExecutor.patch
! Patch9:         hivemind-library-build-no-groovy-jsr.patch
! Requires:       easymock
! Requires:       easymock-classextension
! Requires:       jakarta-commons-logging
! Requires:       jakarta-oro
! Requires:       javassist
! Requires:       junit
! Requires:       log4j
! Requires:       servletapi_2_3_api
! Requires:       xml-commons-jaxp-1.3-apis
  BuildRequires:  ant >= 0:1.6
+ BuildRequires:  ant-junit >= 0:1.6
+ BuildRequires:  ant-trax >= 0:1.6
  BuildRequires:  easymock
  BuildRequires:  easymock-classextension
+ BuildRequires:  jpackage-utils >= 0:1.6
  BuildRequires:  junit
  BuildRequires:  aopalliance
  BuildRequires:  cglib
  BuildRequires:  geronimo-ejb-2.1-api
+ %if %with goovy_jsr
  BuildRequires:  groovy-jsr
+ %endif
  BuildRequires:  jakarta-commons-logging
  BuildRequires:  jakarta-oro
***************
*** 86,100 ****
  BuildRequires:  spring-all
  BuildRequires:  xerces-j2
! BuildRequires:  xml-commons-apis
! 
! Requires:  easymock
! Requires:  easymock-classextension
! Requires:  jakarta-commons-logging
! Requires:  jakarta-oro
! Requires:  javassist
! Requires:  junit
! Requires:  log4j
! Requires:  servletapi4
! Requires:  xml-commons-apis
  
  %description
--- 89,99 ----
  BuildRequires:  spring-all
  BuildRequires:  xerces-j2
! BuildRequires:  xml-commons-jaxp-1.3-apis
! %if %{gcj_support}
! BuildRequires:  java-gcj-compat-devel
! %else
! BuildArch:      noarch
! %endif
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  %description
***************
*** 106,110 ****
  reusability. 
  
! %package        lib
  Summary:        Library extensions for %{name}
  Group:          Development/Libraries
--- 105,109 ----
  reusability. 
  
! %package lib
  Summary:        Library extensions for %{name}
  Group:          Development/Libraries
***************
*** 112,167 ****
  Requires:       aopalliance
  Requires:       ejb
  Requires:       groovy-jsr
- Requires:       spring-all
- %if %{gcj_support}
- Requires(post):   java-gcj-compat
- Requires(postun): java-gcj-compat
  %endif
  
! 
! %description    lib
  %{summary}.
  
! %package        jmx
  Summary:        JMX extensions for %{name}
  Group:          Development/Libraries
  Requires:       %{name} = %{epoch}:%{version}-%{release}
  Requires:       mx4j
- %if %{gcj_support}
- Requires(post):   java-gcj-compat
- Requires(postun): java-gcj-compat
- %endif
  
! %description    jmx
  %{summary}.
  
! %package        demo
  Summary:        Examples for %{name}
  Group:          Development/Libraries
  Requires:       %{name} = %{epoch}:%{version}-%{release}
  Requires:       ejb
- %if %{gcj_support}
- Requires(post):   java-gcj-compat
- Requires(postun): java-gcj-compat
- %endif
  
! %description    demo
  %{summary}.
  
! %package        javadoc
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
- Requires(post):   /bin/rm,/bin/ln
- Requires(postun): /bin/rm
  
  %description    javadoc
  %{summary}.
  
- 
  %prep
! %setup -q -n %{name}-%{version}
  for j in $(find . -name "*.jar"); do
      mv $j $j.no
  done
  mv framework/src/test-data/TestConstructRegistry/empty.jar.no \
               framework/src/test-data/TestConstructRegistry/empty.jar
--- 111,180 ----
  Requires:       aopalliance
  Requires:       ejb
+ %if %with groovy_jsr
  Requires:       groovy-jsr
  %endif
+ Requires:       spring-all
  
! %description lib
  %{summary}.
+ %if %without groovy_jsr
  
! Note: This version of %{name} is compiled without support for groovy-jsr.
! %endif
! 
! %package jmx
  Summary:        JMX extensions for %{name}
  Group:          Development/Libraries
  Requires:       %{name} = %{epoch}:%{version}-%{release}
  Requires:       mx4j
  
! %description jmx
  %{summary}.
  
! %package demo
  Summary:        Examples for %{name}
  Group:          Development/Libraries
  Requires:       %{name} = %{epoch}:%{version}-%{release}
  Requires:       ejb
  
! %description demo
  %{summary}.
  
! %package javadoc
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
  
  %description    javadoc
  %{summary}.
  
  %prep
! %setup -q
! %patch0 -p0
! %patch1 -p0
! %patch2 -p0
! %patch3 -p0
! %if %with groovy_jsr
! %patch4 -p0
! %else
! %patch9 -p0
! %endif
! %patch5 -p0
! %patch6 -p0
! %patch7 -p0
! %patch8 -p0
! 
! %if %without groovy_jsr
! rm -r library/src/java/org/apache/hivemind/lib/groovy/
! rm -r library/src/test/org/apache/hivemind/lib/groovy/
! %endif
! 
! # FIXME: (dwalluck): Failing tests
! rm framework/src/test/hivemind/test/services/TestBuilderFactory.java
! rm framework/src/test/org/apache/hivemind/service/impl/TestBuilderFactory.java
! 
  for j in $(find . -name "*.jar"); do
      mv $j $j.no
  done
+ 
  mv framework/src/test-data/TestConstructRegistry/empty.jar.no \
               framework/src/test-data/TestConstructRegistry/empty.jar
***************
*** 171,183 ****
               framework/src/test-data/TestRegistryBuilder.jar
  
! %patch0 -b .sav
! %patch1 -b .sav
! %patch2 -b .sav
! %patch3 -b .sav
! %patch4 -b .sav
! %patch5 -b .sav
! %patch6 -b .sav
! %patch7 -b .sav
! %patch8 -b .sav
  mkdir -p repository/JPP/jars
  pushd repository/JPP/jars
--- 184,189 ----
               framework/src/test-data/TestRegistryBuilder.jar
  
! find . -name "*.jar.no" | xargs -t rm
! 
  mkdir -p repository/JPP/jars
  pushd repository/JPP/jars
***************
*** 195,199 ****
--- 201,207 ----
  ln -sf $(build-classpath geronimo-ejb-2.1-api) geronimo-ejb-2.1-api-.jar
  ln -sf $(build-classpath spring) spring-full-.jar
+ %if %with groovy_jsr
  ln -sf $(build-classpath groovy-jsr-all) groovy-jsr-all-.jar
+ %endif
  ln -sf $(build-classpath aopalliance) aopalliance-.jar
  ln -sf $(build-classpath mx4j/mx4j) mx4j-.jar
***************
*** 206,213 ****
  mkdir -p ext-package/lib
  touch ext-package/download-warning-marker
! ln -sf $(build-classpath xml-commons-apis) ext-package/lib/xml-apis-.jar
! export OPT_JAR_LIST="ant/ant-nodeps ant/ant-junit junit ant/ant-trax"
  export RD=$(pwd)
! ant -Dscratch.dir=${RD}/tmp -Droot.dir=${RD} install run-reports
  pushd framework
  ant -Dscratch.dir=${RD}/tmp -Droot.dir=${RD} javadoc
--- 214,221 ----
  mkdir -p ext-package/lib
  touch ext-package/download-warning-marker
! ln -sf $(build-classpath xml-commons-jaxp-1.3-apis) ext-package/lib/xml-apis-.jar
! export OPT_JAR_LIST="`%{__cat} %{_sysconfdir}/ant.d/{junit,trax}`"
  export RD=$(pwd)
! %{ant} -Dscratch.dir=${RD}/tmp -Droot.dir=${RD} install run-reports
  pushd framework
  ant -Dscratch.dir=${RD}/tmp -Droot.dir=${RD} javadoc
***************
*** 241,248 ****
  cp -pr tmp/jakarta-hivemind/target/docs/hivemind-lib/apidocs/* \
                  $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/library
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
  
  %if %{gcj_support}
- export CLASSPATH=$(build-classpath gnu-crypto)
  %{_bindir}/aot-compile-rpm
  %endif
--- 249,255 ----
  cp -pr tmp/jakarta-hivemind/target/docs/hivemind-lib/apidocs/* \
                  $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/library
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
  
  %if %{gcj_support}
  %{_bindir}/aot-compile-rpm
  %endif
***************
*** 251,263 ****
  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
- 
  %if %{gcj_support}
  %post
--- 258,261 ----
***************
*** 325,338 ****
  
  %files
! %defattr(-,root,root,-)
  %{_javadir}/%{name}-%{version}.jar
  %{_javadir}/%{name}.jar
  %if %{gcj_support}
! %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
  %attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
  %endif
  
  %files jmx
! %defattr(-,root,root,-)
  %{_javadir}/%{name}-jmx-%{version}.jar
  %{_javadir}/%{name}-jmx.jar
--- 323,336 ----
  
  %files
! %defattr(0644,root,root,0755)
  %{_javadir}/%{name}-%{version}.jar
  %{_javadir}/%{name}.jar
  %if %{gcj_support}
! %dir %{_libdir}/gcj/%{name}
  %attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
  %endif
  
  %files jmx
! %defattr(0644,root,root,0755)
  %{_javadir}/%{name}-jmx-%{version}.jar
  %{_javadir}/%{name}-jmx.jar
***************
*** 342,346 ****
  
  %files lib
! %defattr(-,root,root,-)
  %{_javadir}/%{name}-lib-%{version}.jar
  %{_javadir}/%{name}-lib.jar
--- 340,344 ----
  
  %files lib
! %defattr(0644,root,root,0755)
  %{_javadir}/%{name}-lib-%{version}.jar
  %{_javadir}/%{name}-lib.jar
***************
*** 350,354 ****
  
  %files demo
! %defattr(-,root,root,-)
  %{_javadir}/%{name}-examples-%{version}.jar
  %{_javadir}/%{name}-examples.jar
--- 348,352 ----
  
  %files demo
! %defattr(0644,root,root,0755)
  %{_javadir}/%{name}-examples-%{version}.jar
  %{_javadir}/%{name}-examples.jar
***************
*** 358,367 ****
  
  %files javadoc
! %defattr(-,root,root,-)
! %doc %{_javadocdir}/%{name}-%{version}
! %ghost %doc %{_javadocdir}/%{name}
! 
  
  %changelog
  * Mon May 14 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.1.1-2jpp
  - Make Vendor, Distribution based on macro
--- 356,368 ----
  
  %files javadoc
! %defattr(0644,root,root,0755)
! %{_javadocdir}/%{name}-%{version}
! %{_javadocdir}/%{name}
  
  %changelog
+ * Fri Feb 20 2009 David Walluck <dwalluck at redhat.com> 0:1.1.1-3
+ - make building with groovy-jsr optional
+ - fix ant deps
+ 
  * Mon May 14 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.1.1-2jpp
  - Make Vendor, Distribution based on macro

--- NEW FILE: hivemind-library-build-no-groovy-jsr.patch ---
--- library/build.xml.sav	2007-04-18 14:45:54.000000000 +0200
+++ library/build.xml	2007-04-18 14:49:34.000000000 +0200
@@ -33,19 +33,19 @@
     
     <!-- Dammit, just need access to javax.ejb -->
     
-    <ibiblio-dependency artifact="jboss-j2ee" version="3.2.1" group="jboss"/>
+    <ibiblio-dependency artifact="geronimo-ejb-2.1-api" version="" group="JPP"/>
         
-		<ibiblio-dependency artifact="spring-full" version="1.0.1" group="springframework"/>
-		<ibiblio-dependency artifact="commons-logging" version="1.0.3" group="commons-logging"/>
+    <ibiblio-dependency artifact="spring-full" version="" group="JPP"/>
+    <ibiblio-dependency artifact="commons-logging" version="" group="JPP"/>
 		
-		<ibiblio-dependency artifact="groovy-all" version="1.0-jsr-03" group="groovy"/>
+    <!-- <ibiblio-dependency artifact="groovy-jsr-all" version="" group="JPP"/> -->
 
-		<ibiblio-dependency artifact="log4j" version="1.2.7" group="log4j" use="test"/>				
-		<ibiblio-dependency artifact="javassist" version="${javassist.version}" group="javassist" use="test"/>
-		<ibiblio-dependency artifact="servletapi" version="2.3" group="servletapi" use="test"/>				
-		<ibiblio-dependency artifact="oro" version="2.0.6" group="oro" use="test"/>			
-		<ibiblio-dependency artifact="easymock" version="1.1" group="easymock" use="test"/>
-		<ibiblio-dependency artifact="aopalliance" version="1.0" group="aopalliance" />
+    <ibiblio-dependency artifact="log4j" version="" group="JPP" use="test"/>				
+    <ibiblio-dependency artifact="javassist" version="" group="JPP" use="test"/>
+    <ibiblio-dependency artifact="servletapi" version="" group="JPP" use="test"/>				
+    <ibiblio-dependency artifact="oro" version="" group="JPP" use="test"/>			
+    <ibiblio-dependency artifact="easymock" version="" group="JPP" use="test"/>
+    <ibiblio-dependency artifact="aopalliance" version="" group="JPP" />
 		<project-dependency artifact="hivemind"/>
 	</target>
 	
@@ -55,4 +55,4 @@
 	  <clover-report/> 
 	</target>
 
-</project>
\ No newline at end of file
+</project>




More information about the JPackage-commits mailing list