packages: java-jfreechart/java-jfreechart.spec - renamed from jfreechart - ...

Wed Apr 7 18:38:44 CEST 2010

Author: pawelz                       Date: Wed Apr  7 16:38:44 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- renamed from jfreechart
- pldized, adapterized, unified, etc.

---- Files affected:
packages/java-jfreechart:
   java-jfreechart.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/java-jfreechart/java-jfreechart.spec
diff -u packages/java-jfreechart/java-jfreechart.spec:1.3 packages/java-jfreechart/java-jfreechart.spec:1.4

--- packages/java-jfreechart/java-jfreechart.spec:1.3	Tue Jan 15 08:32:45 2008
+++ packages/java-jfreechart/java-jfreechart.spec	Wed Apr  7 18:38:39 2010
@@ -1,28 +1,41 @@
 # $Revision$, $Date$
 # TODO
 # - -demo not built
-#
+
 # Conditional build:
 %bcond_without	javadoc		# don't build javadoc
-#
+
+%if "%{pld_release}" == "ti"
+%bcond_without	java_sun	# build with gcj
+%else
+%bcond_with	java_sun	# build with java-sun
+%endif
+
+%include	/usr/lib/rpm/macros.java
+
+%define		srcname		jfreechart
 Summary:	Charts Generation library
 Summary(pl.UTF-8):	Biblioteka do generowania wykresów
-Name:		jfreechart
+Name:		java-jfreechart
 Version:	1.0.7
 Release:	0.1
 License:	LGPL
 Group:		Development/Languages/Java
-Source0:	http://dl.sourceforge.net/jfreechart/%{name}-%{version}.tar.gz
+Source0:	http://downloads.sourceforge.net/jfreechart/%{srcname}-%{version}.tar.gz
 # Source0-md5:	4967a55ef939ae60a18cd865e846f4cc
 URL:		http://www.jfree.org/jfreechart/
 BuildRequires:	ant
-BuildRequires:	jcommon >= 1.0.12
+%{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
+BuildRequires:	java-jcommon
+BuildRequires:	java-junit
+BuildRequires:	java-servletapi
+%{?with_java_sun:BuildRequires:	java-sun}
+BuildRequires:	java-xml-commons
 BuildRequires:	jpackage-utils >= 0:1.5
-BuildRequires:	junit
+BuildRequires:	rpm >= 4.4.9-56
+BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
-BuildRequires:	servlet
-BuildRequires:	xml-commons-apis
-Requires:	jcommon >= 0.9.1
+Requires:	java-jcommon
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -33,45 +46,50 @@
 Wolnodostępna biblioteka klas Javy do generowania wykresów.
 
 %package demo
-Summary:	Demo for %{name}
-Summary(pl.UTF-8):	Przykład użycia biblioteki %{name}
+Summary:	Demo for %{srcname}
+Summary(pl.UTF-8):	Przykład użycia biblioteki %{srcname}
 Group:		Development/Languages/Java
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{srcname} = %{version}-%{release}
 Requires:	jcommon
 Requires:	servlet
 
 %description demo
-Demo for %{name}.
+Demo for %{srcname}.
 
 %description demo -l pl.UTF-8
-Przykład użycia biblioteki %{name}.
+Przykład użycia biblioteki %{srcname}.
 
 %package javadoc
-Summary:	Javadoc for %{name}
-Summary(pl.UTF-8):	Dokumentacja Javadoc do biblioteki %{name}
+Summary:	Javadoc for %{srcname}
+Summary(pl.UTF-8):	Dokumentacja Javadoc do biblioteki %{srcname}
 Group:		Documentation
 Requires:	jpackage-utils
 
 %description javadoc
-Javadoc for %{name}.
+Javadoc for %{srcname}.
 
 %description javadoc -l fr.UTF-8
-Javadoc pour %{name}.
+Javadoc pour %{srcname}.
 
 %description javadoc -l pl.UTF-8
-Dokumentacja Javadoc do biblioteki %{name}.
+Dokumentacja Javadoc do biblioteki %{srcname}.
 
 %prep
-%setup -q
+%setup -q -n %{srcname}-%{version}
 # remove all binary libs
 find . -name '*.jar' | xargs rm -v
 
 %build
+JUNIT_JAR=$(find-jar junit)
+JCOMMON_JAR=$(find-jar jcommon)
+SERVLET_JAR=$(find-jar servlet-api)
+XML_COMMONS_APIS_JAR=$(find-jar xml-commons-apis)
+
 %ant -f ant/build.xml \
-	-Djunit.jar=%{_javadir}/junit.jar \
-	-Djcommon.jar=%{_javadir}/jcommon.jar \
-	-Dservlet.jar=%{_javadir}/servlet.jar \
-	-Dgnujaxp.jar=%{_javadir}/xml-commons-apis.jar \
+	-Djunit.jar=$JUNIT_JAR \
+	-Djcommon.jar=$JCOMMON_JAR \
+	-Dservlet.jar=$SERVLET_JAR \
+	-Dgnujaxp.jar=$XML_COMMONS_APIS_JAR \
 	-Dbuildstable=true -Dproject.outdir=. -Dbasedir=. \
 	compile %{?with_javadoc:javadoc}
 
@@ -79,42 +97,42 @@
 rm -rf $RPM_BUILD_ROOT
 # jars
 install -d $RPM_BUILD_ROOT%{_javadir}
-install %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-#install %{name}-%{version}-demo.jar $RPM_BUILD_ROOT%{_javadir}
+install %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
+ln -s %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}.jar
+#install %{srcname}-%{version}-demo.jar $RPM_BUILD_ROOT%{_javadir}
 
 # javadoc
 %if %{with javadoc}
-install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
+install -d $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
+cp -pr javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
+ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost symlink
 %endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post javadoc
-ln -nfs %{name}-%{version} %{_javadocdir}/%{name}
+ln -nfs %{srcname}-%{version} %{_javadocdir}/%{srcname}
 
 %files
 %defattr(644,root,root,755)
 %doc README.txt
-%{_javadir}/%{name}.jar
-%{_javadir}/%{name}-%{version}.jar
+%{_javadir}/%{srcname}.jar
+%{_javadir}/%{srcname}-%{version}.jar
 
 %if 0
 #somewhy not built
 %files demo
 %defattr(644,root,root,755)
-%{_javadir}/%{name}-%{version}-demo.jar
-%{_javadir}/%{name}-demo.jar
+%{_javadir}/%{srcname}-%{version}-demo.jar
+%{_javadir}/%{srcname}-demo.jar
 %endif
 
 %if %{with javadoc}
 %files javadoc
 %defattr(644,root,root,755)
-%{_javadocdir}/%{name}-%{version}
-%ghost %{_javadocdir}/%{name}
+%{_javadocdir}/%{srcname}-%{version}
+%ghost %{_javadocdir}/%{srcname}
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -123,6 +141,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2010/04/07 16:38:39  pawelz
+- renamed from jfreechart
+- pldized, adapterized, unified, etc.
+
 Revision 1.3  2008/01/15 07:32:45  qboosh
 - pl
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-jfreechart/java-jfreechart.spec?r1=1.3&r2=1.4&f=u

