rpms/jfreechart/EL-6 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 jfreechart.spec, 1.3, 1.4 sources, 1.2, 1.3
Lubomir Rintel
lkundrak at fedoraproject.org
Wed Jul 7 17:59:36 UTC 2010
Author: lkundrak
Update of /cvs/pkgs/rpms/jfreechart/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv5046/EL-6
Modified Files:
.cvsignore import.log jfreechart.spec sources
Log Message:
merge from devel
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jfreechart/EL-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 22 Jul 2008 18:17:47 -0000 1.2
+++ .cvsignore 7 Jul 2010 17:59:35 -0000 1.3
@@ -1 +1 @@
-jfreechart-1.0.10.tar.gz
+jfreechart-1.0.13.tar.gz
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/jfreechart/EL-6/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log 22 Jul 2008 18:17:47 -0000 1.1
+++ import.log 7 Jul 2010 17:59:35 -0000 1.2
@@ -1 +1,2 @@
jfreechart-1_0_10-1_el5:HEAD:jfreechart-1.0.10-1.el5.src.rpm:1216750627
+jfreechart-1_0_13-1_fc14:EL-6:jfreechart-1.0.13-1.fc14.src.rpm:1278561552
Index: jfreechart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jfreechart/EL-6/jfreechart.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- jfreechart.spec 25 Jul 2009 04:00:28 -0000 1.3
+++ jfreechart.spec 7 Jul 2010 17:59:35 -0000 1.4
@@ -1,12 +1,11 @@
# TODO: junit QA tests
# These do fail to link, disabling them
-#define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
-%define with_gcj 0
+%bcond_with gcj
Name: jfreechart
-Version: 1.0.10
-Release: 3%{?dist}
+Version: 1.0.13
+Release: 1%{?dist}
Summary: Java chart library
Group: Development/Libraries
@@ -16,9 +15,9 @@ Source0: http://download.sourcefo
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: servlet jcommon java jpackage-utils
-BuildRequires: %{requires} ant java-devel
+BuildRequires: %{requires} ant java-devel eclipse-swt
-%if %{with_gcj}
+%if %with gcj
BuildRequires: java-gcj-compat-devel >= 1.0.31
Requires(post): java-gcj-compat >= 1.0.31
Requires(postun): java-gcj-compat >= 1.0.31
@@ -31,6 +30,16 @@ JFreeChart is a free 100% Java chart lib
developers to display professional quality charts in their applications.
+%package swt
+Summary: Experimental swt extension for jfreechart
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: eclipse-swt jpackage-utils
+
+%description swt
+Experimental swt extension for jfreechart.
+
+
%package javadoc
Summary: Javadocs for %{name}
Group: Documentation
@@ -50,36 +59,45 @@ This package contains the API documentat
find \( -name '*.jar' -o -name '*.class' \) -exec rm -f '{}' \;
# Build
-cd ant
-ant -Djcommon.jar=$(build-classpath jcommon) -Dservlet.jar=$(build-classpath servlet) compile javadoc
+CLASSPATH=$(build-classpath jcommon servlet) \
+ ant -f ant/build.xml \
+ compile javadoc
+ant -f ant/build-swt.xml \
+ -Dswt.jar=%{_libdir}/java/swt.jar \
+ -Djcommon.jar=$(build-classpath jcommon) \
+ -Djfreechart.jar=lib/jfreechart-%{version}.jar
%install
rm -rf $RPM_BUILD_ROOT
# Directory structure
-install -d $RPM_BUILD_ROOT%{_javadir}
+install -d $RPM_BUILD_ROOT%{_javadir}/%{name}
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}
# JARs and JavaDoc
-install -m 644 jfreechart-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+install -m 644 lib/jfreechart-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-%{version}.jar
+install -m 644 lib/swtgraphics2d.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/swtgraphics2d-%{version}.jar
+install -m 644 lib/jfreechart-%{version}-swt.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-swt-%{version}.jar
+ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}.jar
+ln -s swtgraphics2d-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/swtgraphics2d.jar
+ln -s %{name}-swt-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-swt.jar
cp -rp javadoc/. $RPM_BUILD_ROOT%{_javadocdir}/%{name}
# GCJ AOT bits
-%if %{with_gcj}
+%if %with gcj
%{_bindir}/aot-compile-rpm
%endif
+%if %with gcj
%post
-%if %{with_gcj}
[ -x %{_bindir}/rebuild-gcj-db ] && %{_bindir}/rebuild-gcj-db
%endif
+%if %with gcj
%postun
-%if %{with_gcj}
[ -x %{_bindir}/rebuild-gcj-db ] && %{_bindir}/rebuild-gcj-db
%endif
@@ -90,19 +108,34 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
-%{_javadir}/*
-%if %{with_gcj}
+%dir %{_javadir}/%{name}
+%{_javadir}/%{name}/%{name}.jar
+%{_javadir}/%{name}/%{name}-%{version}.jar
+%if %with gcj
%{_libdir}/gcj/%{name}
%endif
%doc ChangeLog licence-LGPL.txt NEWS README.txt
+%files swt
+%defattr(-,root,root,-)
+%{_javadir}/%{name}/swtgraphics2d*.jar
+%{_javadir}/%{name}/%{name}-swt*.jar
+
+
%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}
%changelog
+* Mon Apr 19 2010 Lubomir Rintel <lkundrak at v3.sk> - 1.0.13-1
+- Update to a later release
+- Cosmetic fixes
+
+* Mon Apr 19 2010 Lubomir Rintel <lkundrak at v3.sk> - 1.0.10-4
+- Enable SWT support (ELMORABITY Mohamed, #583339)
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.10-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jfreechart/EL-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 22 Jul 2008 18:17:47 -0000 1.2
+++ sources 7 Jul 2010 17:59:35 -0000 1.3
@@ -1 +1 @@
-5c903dbef8283961ee8b58355a4a9b18 jfreechart-1.0.10.tar.gz
+c90e2f8f612b9aaf3f24a4afce219076 jfreechart-1.0.13.tar.gz
More information about the scm-commits
mailing list