diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a21d1a7 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/jcommon-1.0.18.tar.gz diff --git a/.thermostat1-jcommon.metadata b/.thermostat1-jcommon.metadata new file mode 100644 index 0000000..1a45ffa --- /dev/null +++ b/.thermostat1-jcommon.metadata @@ -0,0 +1 @@ +0d0c40f8839c596827fa89f5852f19ee312ec378 SOURCES/jcommon-1.0.18.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..1c5fcf6 --- /dev/null +++ b/SOURCES/bnd.properties @@ -0,0 +1,3 @@ +Bundle-Name= JCommon is a collection of useful classes used by JFreeChart, JFreeReport and other projects. +Bundle-SymbolicName= org.jfree.jcommon +Bundle-Version= ${jcommon.bundle.version} \ No newline at end of file diff --git a/SPECS/jcommon.spec b/SPECS/jcommon.spec new file mode 100644 index 0000000..6ce36a4 --- /dev/null +++ b/SPECS/jcommon.spec @@ -0,0 +1,149 @@ +%{?scl:%scl_package jcommon} +%{!?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=1045436 +%global __provides_exclude ^osgi(.*)$ + +Name: %{?scl_prefix}jcommon +Version: 1.0.18 +Release: 5%{?dist} +Summary: JFree Java utility classes +License: LGPLv2+ +Group: System Environment/Libraries +Source: http://downloads.sourceforge.net/jfreechart/%{pkg_name}-%{version}.tar.gz +Source2: bnd.properties +URL: http://www.jfree.org/jcommon +BuildRequires: ant, java-devel, jpackage-utils +# Required for converting jars to OSGi bundles +BuildRequires: aqute-bnd +Requires: java, jpackage-utils +BuildArch: noarch + +%{?scl:Requires: %scl_runtime} + +%description +JCommon is a collection of useful classes used by +JFreeChart, JFreeReport and other projects. + +%package javadoc +Summary: Javadoc for %{name} +Group: Development/Documentation +Requires: %{name} = %{version}-%{release} +Requires: jpackage-utils + +%description javadoc +Javadoc for %{name}. + +%package xml +Summary: JFree XML utility classes +Group: System Environment/Libraries +Requires: %{name} = %{version}-%{release} +Requires: java, jpackage-utils + +%description xml +Optional XML utility classes. + +%prep +%setup -q -n %{pkg_name}-%{version} +find . -name "*.jar" -exec rm -f {} \; + +%build +pushd ant +ant compile compile-xml javadoc +popd +# Convert to OSGi bundle +java -Djcommon.bundle.version="%{version}" \ + -jar $(build-classpath aqute-bnd) wrap -output %{pkg_name}-%{version}.bar -properties %{SOURCE2} %{pkg_name}-%{version}.jar + +%install +mkdir -p $RPM_BUILD_ROOT%{_javadir} +cp -p %{pkg_name}-%{version}.bar $RPM_BUILD_ROOT%{_javadir}/%{pkg_name}.jar +cp -p %{pkg_name}-xml-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{pkg_name}-xml.jar + +mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{pkg_name} +cp -rp javadoc $RPM_BUILD_ROOT%{_javadocdir}/%{pkg_name} + +install -d -m 755 %{buildroot}%{_mavenpomdir} +install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{pkg_name}.pom + +%add_maven_depmap JPP-%{pkg_name}.pom %{pkg_name}.jar + +%files +%doc licence-LGPL.txt README.txt +%{_mavenpomdir}/* +%{_mavendepmapfragdir}/* +%{_javadir}/%{pkg_name}.jar + +%files xml +%{_javadir}/%{pkg_name}-xml.jar + +%files javadoc +%{_javadocdir}/%{pkg_name} + +%changelog +* Fri Dec 20 2013 Severin Gehwolf 1.0.18-5 +- Don't generate osgi() style provides. +- Resolves: RHBZ#1045436. + +* Tue Sep 24 2013 Severin Gehwolf 1.0.18-4 +- Bump release for rebuild. + +* Wed Aug 28 2013 Severin Gehwolf 1.0.18-3 +- SCL-ize package. + +* Thu Feb 14 2013 Fedora Release Engineering - 1.0.18-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Oct 25 2012 Severin Gehwolf 1.0.18-1 +- Update to upstream 1.0.18 release. + +* Mon Sep 17 2012 Severin Gehwolf 1.0.17-5 +- Add proper Bundle-{Version,Name,SymbolicName} via + bnd.properties file + +* Tue Jul 24 2012 Severin Gehwolf 1.0.17-4 +- Add aqute bnd instructions so as to produce OSGi metadata. + +* Thu Jul 19 2012 Fedora Release Engineering - 1.0.17-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu May 03 2012 Roman Kennke 1.0.17-2 +- Install pom and maven depmap. + +* Thu Apr 12 2012 Alexander Kurtakov 1.0.17-1 +- Update to latest upstream release. + +* Fri Jan 13 2012 Fedora Release Engineering - 1.0.16-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Fri Oct 28 2011 Caolán McNamara 1.0.16-4 +- Related: rhbz#749103 drop gcj aot + +* Wed Feb 09 2011 Fedora Release Engineering - 1.0.16-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Jul 24 2009 Caolan McNamara 1.0.16-2 +- make javadoc no-arch when building as arch-dependant aot + +* Sat Apr 25 2009 Caolan McNamara 1.0.16-1 +- latest version + +* Mon Mar 09 2009 Caolan McNamara 1.0.15-1 +- latest version + +* Wed Feb 25 2009 Fedora Release Engineering - 1.0.12-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed May 07 2008 Caolan McNamara 1.0.12-4 +- shuffle around + +* Thu May 01 2008 Caolan McNamara 1.0.12-3 +- fix review problems and add jcommon-xml subpackage + +* Wed Apr 30 2008 Caolan McNamara 1.0.12-2 +- take loganjerry's fixes + +* Mon Feb 25 2008 Caolan McNamara 1.0.12-1 +- initial fedora import