[Jpackage-commits] dist/jcharts/JPP-5 jcharts.spec,1.1,1.2

David Walluck david at ryu.zarb.org
Thu Feb 19 00:51:22 CET 2009


Update of /home/projects/jpackage/cvs/dist/jcharts/JPP-5
In directory ryu.zarb.org:/tmp/cvs-serv9438

Modified Files:
	jcharts.spec 
Log Message:
- rebuild for servlet_2_4_api and xmlgraphics-batik

Index: jcharts.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jcharts/JPP-5/jcharts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** jcharts.spec	18 Feb 2009 23:23:13 -0000	1.1
--- jcharts.spec	18 Feb 2009 23:51:20 -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.
  #
***************
*** 31,66 ****
  %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
  
  Name:           jcharts
  Version:        0.7.5
! Release:        2jpp
  Epoch:          0
  Summary:        Charting utility
- 
  Group:          Development/Libraries/Java
! License:        BSD-style Software License
  URL:            http://jcharts.sourceforge.net/
  Source0:        http://prdownloads.sourceforge.net/jcharts/jCharts-0.7.5.zip
! 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
! 
  BuildRequires:  jpackage-utils >= 0:1.6
  BuildRequires:  ant >= 0:1.6
! BuildRequires:  batik
! BuildRequires:  servletapi4
  %if %{gcj_support}
! BuildRequires:    gnu-crypto
! BuildRequires:    java-gcj-compat-devel
! Requires(post):   java-gcj-compat
! Requires(postun): java-gcj-compat
  %endif
! Requires:  batik
! Requires:  servlet
  
  %description
--- 31,57 ----
  %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
  
  Name:           jcharts
  Version:        0.7.5
! Release:        3%{?dist}
  Epoch:          0
  Summary:        Charting utility
  Group:          Development/Libraries/Java
! License:        BSD
  URL:            http://jcharts.sourceforge.net/
  Source0:        http://prdownloads.sourceforge.net/jcharts/jCharts-0.7.5.zip
! Requires:       xmlgraphics-batik
! Requires:       servlet_2_3_api
  BuildRequires:  jpackage-utils >= 0:1.6
  BuildRequires:  ant >= 0:1.6
! BuildRequires:  xmlgraphics-batik
! BuildRequires:  servlet_2_3_api
  %if %{gcj_support}
! BuildRequires:  java-gcj-compat-devel
! %else
! BuildArch:      noarch
  %endif
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  %description
***************
*** 70,98 ****
  Servlets, JSP's, and Swing apps.
  
! %package        javadoc
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
  
! %description    javadoc
! Javadoc for %{name}
! 
  
  %prep
  %setup -q -n jCharts-%{version}
! for j in $(find . -name "*.jar"); do
!     mv $j $j.no
! done
  pushd lib
! ln -sf $(build-classpath batik/awt-util) batik-awt-util.jar
! ln -sf $(build-classpath batik/dom) batik-dom.jar
! ln -sf $(build-classpath batik/svggen) batik-svggen.jar
! ln -sf $(build-classpath batik/util) batik-util.jar
! ln -sf $(build-classpath batik/xml) batik-xml.jar
  popd
  
  %build
  cd build
! export CLASSPATH=$(build-classpath servletapi4)
! ant -Dbuild.sysclasspath=first jar javadocs
  
  %install
--- 61,86 ----
  Servlets, JSP's, and Swing apps.
  
! %package javadoc
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
  
! %description javadoc
! Javadoc for %{name}.
  
  %prep
  %setup -q -n jCharts-%{version}
! find . -name "*.jar" | xargs -t rm
  pushd lib
! ln -sf $(build-classpath xmlgraphics-batik/awt-util) batik-awt-util.jar
! ln -sf $(build-classpath xmlgraphics-batik/dom) batik-dom.jar
! ln -sf $(build-classpath xmlgraphics-batik/svggen) batik-svggen.jar
! ln -sf $(build-classpath xmlgraphics-batik/util) batik-util.jar
! ln -sf $(build-classpath xmlgraphics-batik/xml) batik-xml.jar
  popd
  
  %build
  cd build
! export CLASSPATH=$(build-classpath servlet_2_3_api)
! %{ant} -Dant.build.javac.source=1.4 -Dbuild.sysclasspath=first jar javadocs
  
  %install
***************
*** 108,115 ****
  install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
  cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! 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
--- 96,102 ----
  install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
  cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
  
  %if %{gcj_support}
  %{_bindir}/aot-compile-rpm
  %endif
***************
*** 118,130 ****
  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
--- 105,108 ----
***************
*** 144,161 ****
  
  %files
! %defattr(-,root,root,-)
! %{_javadir}/*.jar
  %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}
! 
  
  %changelog
  * Tue May 15 2007 Ralph Apel <r.apel at r-apel.de> - 0:0.7.5-2jpp
  - Make Vendor, Distribution based on macro
--- 122,142 ----
  
  %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 javadoc
! %defattr(0644,root,root,0755)
! %{_javadocdir}/%{name}-%{version}
! %{_javadocdir}/%{name}
  
  %changelog
+ * Wed Feb 18 2009 David Walluck <dwalluck at redhat.com> 0:0.7.5-3
+ - rebuild for servlet_2_4_api and xmlgraphics-batik
+ 
  * Tue May 15 2007 Ralph Apel <r.apel at r-apel.de> - 0:0.7.5-2jpp
  - Make Vendor, Distribution based on macro




More information about the JPackage-commits mailing list