[Jpackage-commits] dist/tapestry/JPP-6 tapestry.spec,1.1,1.2

David Walluck david at ryu.zarb.org
Sat Feb 21 01:05:11 CET 2009


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

Modified Files:
	tapestry.spec 
Log Message:
- build for JPP-6
- use generic ejb_2_1_api


Index: tapestry.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/tapestry/JPP-6/tapestry.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** tapestry.spec	4 Aug 2008 21:45:53 -0000	1.1
--- tapestry.spec	21 Feb 2009 00:05:09 -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,34 ****
  #
  
  %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
- %define java2 %{?_with_java2:1}%{!?_with_java2:%{?_without_java2:0}%{!?_without_java2:%{?_java2:%{_java2}}%{!?_java2:0}}}
  
  %define section     free
--- 29,40 ----
  #
  
+ %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 java2
+ 
  %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
  
  %define section     free
***************
*** 36,46 ****
  Name:           tapestry
  Version:        4.0.2
! Release:        1jpp
  Epoch:          0
  Summary:        Tapestry Framework
! License:        Apache Software License 2.0
  Group:          Development/Java
- Vendor:         JPackage Project
- Distribution:   JPackage
  URL:            http://tapestry.apache.org/
  Source0:        tapestry-4.0.2.tar.gz
--- 42,50 ----
  Name:           tapestry
  Version:        4.0.2
! Release:        2%{?dist}
  Epoch:          0
  Summary:        Tapestry Framework
! License:        ASL 2.0
  Group:          Development/Java
  URL:            http://tapestry.apache.org/
  Source0:        tapestry-4.0.2.tar.gz
***************
*** 63,72 ****
  Patch15:        tapestry-build-java2.patch
  
- BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
  %if %{gcj_support}
- BuildRequires:    gnu-crypto
  BuildRequires:    java-gcj-compat-devel
- Requires(post):   java-gcj-compat
- Requires(postun): java-gcj-compat
  %endif
  
--- 67,72 ----
***************
*** 76,84 ****
  %endif
  
! %if ! %{java2}
! BuildRequires:  java-devel >= 1.5.0
  %else
! BuildRequires:  java-devel = 1.4.2
  %endif
  BuildRequires:  ant
  BuildRequires:  jpackage-utils >= 0:1.7
--- 76,96 ----
  %endif
  
! %if %without java2
! BuildRequires:  java-devel >= 0:1.5.0
  %else
! BuildRequires:  java-devel = 0:1.4.2
  %endif
+ Requires:       ejb_2_1_api
+ Requires:       hivemind = 0:1.1.1
+ Requires:       hivemind-lib = 0:1.1.1
+ Requires:       jakarta-commons-codec
+ Requires:       jakarta-commons-fileupload
+ Requires:       jakarta-commons-io
+ Requires:       jakarta-commons-logging
+ Requires:       jakarta-oro
+ Requires:       javassist
+ Requires:       ognl
+ Requires:       portlet-1.0-api
+ Requires:       servletapi4
  BuildRequires:  ant
  BuildRequires:  jpackage-utils >= 0:1.7
***************
*** 86,90 ****
  BuildRequires:  easymock
  BuildRequires:  easymock-classextension
! BuildRequires:  geronimo-ejb-2.1-api
  BuildRequires:  hivemind = 0:1.1.1
  BuildRequires:  hivemind-lib = 0:1.1.1
--- 98,102 ----
  BuildRequires:  easymock
  BuildRequires:  easymock-classextension
! BuildRequires:  ejb_2_1_api
  BuildRequires:  hivemind = 0:1.1.1
  BuildRequires:  hivemind-lib = 0:1.1.1
***************
*** 103,119 ****
  BuildRequires:  servletapi4
  BuildRequires:  spring-all
! 
! Requires:  geronimo-ejb-2.1-api
! Requires:  hivemind = 0:1.1.1
! Requires:  hivemind-lib = 0:1.1.1
! Requires:  jakarta-commons-codec
! Requires:  jakarta-commons-fileupload
! Requires:  jakarta-commons-io
! Requires:  jakarta-commons-logging
! Requires:  jakarta-oro
! Requires:  javassist
! Requires:  ognl
! Requires:  portlet-1.0-api
! Requires:  servletapi4
  
  %description
--- 115,119 ----
  BuildRequires:  servletapi4
  BuildRequires:  spring-all
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  %description
***************
*** 150,165 ****
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
- Requires(post):   /bin/rm,/bin/ln
- Requires(postun): /bin/rm
  
  %description javadoc
  %{summary}.
  
! %if ! %{java2}
  %package demo
  Summary:        Examples for %{name}
  Group:          Development/Documentation
! Requires:  %{name} = %{epoch}:%{version}-%{release}
! Requires:  jcharts
  
  %description demo
--- 150,163 ----
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
  
  %description javadoc
  %{summary}.
  
! %if %without java2
  %package demo
  Summary:        Examples for %{name}
  Group:          Development/Documentation
! Requires:       %{name} = %{epoch}:%{version}-%{release}
! Requires:       jcharts
  
  %description demo
***************
*** 167,193 ****
  %endif
  
- 
  %prep
! %setup -q -n %{name}-%{version}
! %setup -q -T -D -a 1 -c -n %{name}-%{version}
  
! for j in $(find . -name "*.jar"); do
!     mv $j $j.no
! done
! %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
! %patch9 -b .sav
! %patch10 -b .sav
! %patch11 -b .sav
! %patch12 -b .sav
! %if %{java2}
! %patch13 -b .sav2
  
  rm framework/src/test/org/apache/tapestry/coerce/StringToPropertySelectionModelConverterTest.java
--- 165,192 ----
  %endif
  
  %prep
! %setup -q
! %setup -q -T -D -a 1
  
! # FIXME: (dwalluck): Fails
! rm framework/src/test/org/apache/tapestry/util/io/TestBinaryDumpOutputStream.java
! 
! find . -name "*.jar" | xargs -t rm
! 
! %patch0 -p0
! %patch1 -p0
! %patch2 -p0
! %patch3 -p0
! %patch4 -p0
! %patch5 -p0
! %patch6 -p0
! %patch7 -p0
! %patch8 -p0
! %patch9 -p0
! %patch10 -p0
! %patch11 -p0
! %patch12 -p0
! %if %with java2
! %patch13 -p0
  
  rm framework/src/test/org/apache/tapestry/coerce/StringToPropertySelectionModelConverterTest.java
***************
*** 200,207 ****
  rm framework/src/test/org/apache/tapestry/valid/FieldLabelTest.java
  
! %patch14 -b .sav2
  
  #rm -rf annotations
! %patch15 -b .sav2
  #rm -rf examples/Workbench
  %endif
--- 199,206 ----
  rm framework/src/test/org/apache/tapestry/valid/FieldLabelTest.java
  
! %patch14 -p0
  
  #rm -rf annotations
! %patch15 -p0
  #rm -rf examples/Workbench
  %endif
***************
*** 227,231 ****
  ln -sf $(build-classpath spring) spring-.jar
  ln -sf $(build-classpath portlet-1.0-api) portlet-api-.jar
! ln -sf $(build-classpath geronimo-ejb-2.1-api) geronimo-ejb-2.1-api-.jar
  ln -sf $(build-classpath jcharts) jcharts-.jar
  popd
--- 226,230 ----
  ln -sf $(build-classpath spring) spring-.jar
  ln -sf $(build-classpath portlet-1.0-api) portlet-api-.jar
! ln -sf $(build-classpath ejb_2_1_api) geronimo-ejb-2.1-api-.jar
  ln -sf $(build-classpath jcharts) jcharts-.jar
  popd
***************
*** 235,242 ****
  mkdir -p ext-package/lib
  touch ext-package/download-warning-marker
! %if ! %{java2}
! export JAVA_HOME=%{_jvmdir}/java-1.5.0
! %else
  export JAVA_HOME=%{_jvmdir}/java-1.4.2
  %endif
  export RD=$(pwd)
--- 234,241 ----
  mkdir -p ext-package/lib
  touch ext-package/download-warning-marker
! %if %with java2
  export JAVA_HOME=%{_jvmdir}/java-1.4.2
+ %else
+ export JAVA_HOME=%{java_home}
  %endif
  export RD=$(pwd)
***************
*** 247,251 ****
  popd
  done
! %if ! %{java2}
  pushd annotations
  ant -Dhivebuild.dir=${RD}/hivemind-1.1.1/hivebuild -Dscratch.dir=${RD}/tmp -Droot.dir=${RD} javadoc
--- 246,250 ----
  popd
  done
! %if %without java2
  pushd annotations
  ant -Dhivebuild.dir=${RD}/hivemind-1.1.1/hivebuild -Dscratch.dir=${RD}/tmp -Droot.dir=${RD} javadoc
***************
*** 260,264 ****
  install -m 644 target/%{name}-%{version}.jar \
                    $RPM_BUILD_ROOT%{_javadir}/%{name}/
! %if ! %{java2}
  install -m 644 target/%{name}-annotations-%{version}.jar \
                    $RPM_BUILD_ROOT%{_javadir}/%{name}/
--- 259,263 ----
  install -m 644 target/%{name}-%{version}.jar \
                    $RPM_BUILD_ROOT%{_javadir}/%{name}/
! %if %without java2
  install -m 644 target/%{name}-annotations-%{version}.jar \
                    $RPM_BUILD_ROOT%{_javadir}/%{name}/
***************
*** 268,272 ****
  install -m 644 target/%{name}-portlet-%{version}.jar \
                    $RPM_BUILD_ROOT%{_javadir}/%{name}/
! %if ! %{java2}
  install -m 644 target/vlib/vlibbeans-%{version}.jar \
                    $RPM_BUILD_ROOT%{_javadir}/%{name}/
--- 267,271 ----
  install -m 644 target/%{name}-portlet-%{version}.jar \
                    $RPM_BUILD_ROOT%{_javadir}/%{name}/
! %if %without java2
  install -m 644 target/vlib/vlibbeans-%{version}.jar \
                    $RPM_BUILD_ROOT%{_javadir}/%{name}/
***************
*** 274,278 ****
  (cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
  
! %if ! %{java2}
  # apps
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
--- 273,277 ----
  (cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
  
! %if %without java2
  # apps
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
***************
*** 290,294 ****
  cp -pr tmp/jakarta-tapestry/target/docs/tapestry/apidocs/* \
                    $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/framework
! %if ! %{java2}
  install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/annotations
  cp -pr tmp/jakarta-tapestry/target/docs/tapestry-annotations/apidocs/* \
--- 289,293 ----
  cp -pr tmp/jakarta-tapestry/target/docs/tapestry/apidocs/* \
                    $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/framework
! %if %without java2
  install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/annotations
  cp -pr tmp/jakarta-tapestry/target/docs/tapestry-annotations/apidocs/* \
***************
*** 303,307 ****
  ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
  
! %if ! %{java2}
  # demo
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/examples
--- 302,306 ----
  ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
  
! %if %without java2
  # demo
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/examples
***************
*** 315,324 ****
  
  %if %{gcj_support}
- export CLASSPATH=$(build-classpath gnu-crypto)
  %{_bindir}/aot-compile-rpm \
!     --exclude /usr/share/java/tapestry/tapestry-contrib-4.0.2.jar \
! %if ! %{java2}
!     --exclude /usr/share/java/tapestry/vlibbeans-4.0.2.jar \
!     --exclude /usr/share/java/tapestry/tapestry-annotations-4.0.2.jar \
      --exclude /usr/share/tapestry-4.0.2/vlib.war \
      --exclude /usr/share/tapestry-4.0.2/workbench.war \
--- 314,322 ----
  
  %if %{gcj_support}
  %{_bindir}/aot-compile-rpm \
!     --exclude /usr/share/java/tapestry/tapestry-contrib-%{version}.jar \
! %if %without java2
!     --exclude /usr/share/java/tapestry/vlibbeans-%{version}.jar \
!     --exclude /usr/share/java/tapestry/tapestry-annotations-%{version}.jar \
      --exclude /usr/share/tapestry-4.0.2/vlib.war \
      --exclude /usr/share/tapestry-4.0.2/workbench.war \
***************
*** 331,343 ****
  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
--- 329,332 ----
***************
*** 357,377 ****
  
  %files
! %defattr(-,root,root,-)
! %{_javadir}/%{name}/*
  %dir %{_datadir}/%{name}-%{version}
  %{_datadir}/%{name}-%{version}/config
  %if %{gcj_support}
! %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
  %attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}*-%{version}.jar.*
  %endif
  
  %files javadoc
! %defattr(-,root,root,-)
! %doc %{_javadocdir}/%{name}-%{version}
! %ghost %doc %{_javadocdir}/%{name}
  
! %if ! %{java2}
  %files demo
! %defattr(-,root,root,-)
  %{_datadir}/%{name}-%{version}/*.?ar
  %{_datadir}/%{name}-%{version}/examples
--- 346,376 ----
  
  %files
! %defattr(0644,root,root,0755)
! %dir %{_javadir}/%{name}
! %{_javadir}/%{name}/%{name}-%{version}.jar
! %{_javadir}/%{name}/%{name}-annotations-%{version}.jar
! %{_javadir}/%{name}/%{name}-annotations.jar
! %{_javadir}/%{name}/%{name}-contrib-%{version}.jar
! %{_javadir}/%{name}/%{name}-contrib.jar
! %{_javadir}/%{name}/%{name}-portlet-%{version}.jar
! %{_javadir}/%{name}/%{name}-portlet.jar
! %{_javadir}/%{name}/%{name}.jar
! %{_javadir}/%{name}/vlibbeans-%{version}.jar
! %{_javadir}/%{name}/vlibbeans.jar
  %dir %{_datadir}/%{name}-%{version}
  %{_datadir}/%{name}-%{version}/config
  %if %{gcj_support}
! %dir %{_libdir}/gcj/%{name}
  %attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}*-%{version}.jar.*
  %endif
  
  %files javadoc
! %defattr(0644,root,root,0755)
! %{_javadocdir}/%{name}-%{version}
! %{_javadocdir}/%{name}
  
! %if %without java2
  %files demo
! %defattr(0644,root,root,0755)
  %{_datadir}/%{name}-%{version}/*.?ar
  %{_datadir}/%{name}-%{version}/examples
***************
*** 379,382 ****
--- 378,385 ----
  
  %changelog
+ * Fri Feb 20 2009 David Walluck <dwalluck at redhat.com> 0:4.0.2-2
+ - build for JPP-6
+ - use generic ejb_2_1_api
+ 
  * Thu May 03 2007 Ralph Apel <r.apel at r-apel.de> - 0:4.0.2-1jpp
  - First JPP release




More information about the JPackage-commits mailing list