diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..619dae6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/jfreechart-1.0.14.tar.gz diff --git a/.thermostat1-jfreechart.metadata b/.thermostat1-jfreechart.metadata new file mode 100644 index 0000000..3f26e1d --- /dev/null +++ b/.thermostat1-jfreechart.metadata @@ -0,0 +1 @@ +65eb6b35fd9212021a69fb74bd41936355ead480 SOURCES/jfreechart-1.0.14.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index ce46a88..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -\ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/bnd.properties b/SOURCES/bnd.properties new file mode 100644 index 0000000..a547a17 --- /dev/null +++ b/SOURCES/bnd.properties @@ -0,0 +1,3 @@ +Bundle-Name= JFreeChart is a free 100% Java chart library +Bundle-SymbolicName= org.jfree.jfreechart +Bundle-Version= ${jfreechart.bundle.version} \ No newline at end of file diff --git a/SOURCES/remove_itext_dep.patch b/SOURCES/remove_itext_dep.patch new file mode 100644 index 0000000..69b2004 --- /dev/null +++ b/SOURCES/remove_itext_dep.patch @@ -0,0 +1,17 @@ +--- pom.xml.orig 2011-11-20 22:40:12.000000000 +0100 ++++ pom.xml 2012-11-21 16:29:48.291506742 +0100 +@@ -96,11 +96,14 @@ + 2.5 + provided + ++ ++ + + + diff --git a/SPECS/jfreechart.spec b/SPECS/jfreechart.spec new file mode 100644 index 0000000..f0324ad --- /dev/null +++ b/SPECS/jfreechart.spec @@ -0,0 +1,193 @@ +%{?scl:%scl_package jfreechart} +%{!?scl:%global pkg_name %{name}} + +# Exclude generation of osgi() style provides, since they are not +# SCL-namespaced and may conflict with base RHEL packages. +# See: https://bugzilla.redhat.com/show_bug.cgi?id=1045437 +%global __provides_exclude ^osgi(.*)$ + +Name: %{?scl_prefix}jfreechart +Version: 1.0.14 +Release: 14%{?dist} +Summary: Java chart library + +Group: Development/Libraries +License: LGPLv2+ +URL: http://www.jfree.org/jfreechart/ +Source0: http://download.sourceforge.net/sourceforge/jfreechart/%{pkg_name}-%{version}.tar.gz +Source1: bnd.properties + +Requires: servlet java jpackage-utils +Requires: %{?scl_prefix}jcommon >= 1.0.17 +BuildRequires: %{requires} ant java-devel servlet +%if 0%{?fedora} +BuildRequires: eclipse-swt +%endif +# Required for converting jars to OSGi bundles +BuildRequires: aqute-bnd + +%{?scl:Requires: %scl_runtime} + +BuildArch: noarch +Patch0: remove_itext_dep.patch + +%description +JFreeChart is a free 100% Java chart library that makes it easy for +developers to display professional quality charts in their applications. + +%if 0%{?fedora} +%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. +%endif + +%package javadoc +Summary: Javadocs for %{name} +Group: Documentation +Requires: %{name} = %{version}-%{release} +Requires: jpackage-utils + +%description javadoc +This package contains the API documentation for %{name}. + + +%prep +%setup -q -n %{pkg_name}-%{version} +# Erase prebuilt files +find \( -name '*.jar' -o -name '*.class' \) -exec rm -f '{}' \; +%patch0 + +%build +# jcommon comes from the SCL-ized package. That's why we need to source +# the enable scriptlet. +%{?scl:scl enable %{scl} - << "EOF"} +CLASSPATH=$(build-classpath jcommon servlet) \ + ant -f ant/build.xml compile javadoc + +%if 0%{?fedora} +# See RHBZ#912664. There seems to be some dispute about build-classpath. +# So don't use it for swt. +ant -f ant/build-swt.xml \ + -Dswt.jar=%{_libdir}/eclipse/swt.jar \ + -Djcommon.jar=$(build-classpath jcommon) \ + -Djfreechart.jar=lib/jfreechart-%{version}.jar +%endif +# Convert to OSGi bundle +java -Djfreechart.bundle.version="%{version}" -jar $(build-classpath aqute-bnd) \ + wrap -output lib/%{pkg_name}-%{version}.bar -properties %{SOURCE1} lib/%{pkg_name}-%{version}.jar +%{?scl:EOF} + +%install +# Directory structure +install -d $RPM_BUILD_ROOT%{_javadir}/%{pkg_name} +install -d $RPM_BUILD_ROOT%{_javadocdir}/%{pkg_name} +install -d $RPM_BUILD_ROOT%{_mavenpomdir} + +# JARs and JavaDoc +install -m 644 lib/jfreechart-%{version}.bar $RPM_BUILD_ROOT%{_javadir}/%{pkg_name}/%{pkg_name}.jar +%if 0%{?fedora} +install -m 644 lib/swtgraphics2d.jar $RPM_BUILD_ROOT%{_javadir}/%{pkg_name}/swtgraphics2d.jar +install -m 644 lib/jfreechart-%{version}-swt.jar $RPM_BUILD_ROOT%{_javadir}/%{pkg_name}/%{pkg_name}-swt.jar +%endif +cp -rp javadoc/. $RPM_BUILD_ROOT%{_javadocdir}/%{pkg_name} + +# POM +install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{pkg_name}-%{pkg_name}.pom + +# DEPMAP +%add_maven_depmap JPP.%{pkg_name}-%{pkg_name}.pom %{pkg_name}/%{pkg_name}.jar + +%files +%{_mavenpomdir}/* +%{_mavendepmapfragdir}/* +%dir %{_javadir}/%{pkg_name} +%{_javadir}/%{pkg_name}/%{pkg_name}.jar +%doc ChangeLog licence-LGPL.txt NEWS README.txt + +%if 0%{?fedora} +%files swt +%{_javadir}/%{name}/swtgraphics2d*.jar +%{_javadir}/%{name}/%{name}-swt*.jar +%endif + +%files javadoc +%{_javadocdir}/%{pkg_name} + +%changelog +* Fri Dec 20 2013 Severin Gehwolf 1.0.14-14 +- Don't generate osgi() style provides. +- Resolves: RHBZ#1045437. + +* Wed Nov 27 2013 Severin Gehwolf 1.0.14-13 +- Properly enalbe SCL. + +* Mon Nov 11 2013 Severin Gehwolf 1.0.14-12 +- Use build-classpath which now accounts for SCL-ized deps if + properly enabled. + +* Tue Sep 17 2013 Severin Gehwolf 1.0.14-11 +- BR SCL-ized jcommon package. +- SCL-ize ant build command. + +* Wed Aug 28 2013 Severin Gehwolf 1.0.14-10 +- SCL-ize package. + +* Tue Feb 19 2013 Severin Gehwolf 1.0.14-9 +- Fix FTBFS due to build-classpath not finding swt.jar any + longer. See RHBZ#912664. + +* Thu Feb 14 2013 Fedora Release Engineering - 1.0.14-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Nov 21 2012 Severin Gehwolf 1.0.14-7 +- Remove itext dependency in pom. + +* Fri Nov 16 2012 Severin Gehwolf 1.0.14-6 +- Conditionally build jfreechart-swt. + +* Mon Sep 17 2012 Severin Gehwolf 1.0.14-4 +- Set proper Bundle-{Version,SymbolicName,Name} in manifest. + +* Tue Jul 24 2012 Severin Gehwolf 1.0.14-3 +- Add aqute bnd instructions so as to produce OSGi metadata. +- Based on kdaniel's suggestion, use build-classpath script to find swt + +* Thu Jul 19 2012 Fedora Release Engineering - 1.0.14-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Mon Apr 23 2012 Alexander Kurtakov 1.0.14-1 +- Update to new upstream version 1.0.14. +- Use pom.xml file from the tarball. + +* Wed Feb 15 2012 Marek Goldmann 1.0.13-5 +- Added Maven POM: BZ#789586 + +* Fri Jan 13 2012 Fedora Release Engineering - 1.0.13-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Jun 29 2011 Alexander Kurtakov 1.0.13-3 +- Adapt to current guidelines. + +* Wed Feb 09 2011 Fedora Release Engineering - 1.0.13-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Apr 19 2010 Lubomir Rintel - 1.0.13-1 +- Update to a later release +- Cosmetic fixes + +* Mon Apr 19 2010 Lubomir Rintel - 1.0.10-4 +- Enable SWT support (ELMORABITY Mohamed, #583339) + +* Fri Jul 24 2009 Fedora Release Engineering - 1.0.10-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 1.0.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sat Jul 19 2008 Lubomir Rintel (Fedora Astronomy) - 1.0.10-1 +- Initial packaging