rpms/joda-time/F-8 joda-time-use-system-junit.patch, NONE, 1.1 joda-time.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Conrad Meyer (konradm)]

Author: konradm

Update of /cvs/pkgs/rpms/joda-time/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4301/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	joda-time-use-system-junit.patch joda-time.spec 
Log Message:
Initial import of joda-time 1.5.2-5.tzdata2008b into F-8 branch.


joda-time-use-system-junit.patch:

--- NEW FILE joda-time-use-system-junit.patch ---
--- joda-time-1.5.2-src/build.xml.debug	2008-01-26 22:16:33.000000000 +0900
+++ joda-time-1.5.2-src/build.xml	2008-03-17 01:55:02.000000000 +0900
@@ -127,29 +127,9 @@
 
 <!-- ====================================================================== -->
 
-  <target name="getjunit" unless="junit.present">
-    <echo message="Getting junit from http://www.ibiblio.org/maven/junit"/>
-    <setproxy />
-    <mkdir dir="${lib}"/>
-    <get dest="${junit.jar}" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar" />
-  </target>
-
-<!-- ====================================================================== -->
-
-  <target name="installjunit" unless="junit.ant">
-    <echo message="Installing junit in ${ant.home}/lib"/>
-  	<copy file="${junit.jar}" todir="${ant.home}/lib" />
-    <echo message="***************************************************************"/>
-    <echo message="*  A copy of junit has been installed in your ant directory   *"/>
-    <echo message="*                                                             *"/>
-    <echo message="* You will need to restart the ant build to pickup the change *"/>
-    <echo message="***************************************************************"/>
-  	<fail message="Please restart ant"/>
-  </target>
-
 <!-- ====================================================================== -->
 
-  <target name="prepare" depends="init,getjunit,installjunit"
+  <target name="prepare" depends="init"
           description="Prepare build directory">
     <mkdir dir="${build}"/>
     <mkdir dir="${build.classes}"/>



--- NEW FILE joda-time.spec ---
%define tzversion tzdata2008b


Name:           joda-time
Version:        1.5.2
Release:        5.%{tzversion}%{?dist}
Summary:        Java date and time API

Group:          Development/Libraries
License:        ASL 2.0
URL:            http://joda-time.sourceforge.net/index.html
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tar.gz
Source1:        ftp://elsie.nci.nih.gov/pub/%{tzversion}.tar.gz
Patch0:         joda-time-use-system-junit.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  java-devel > 1.5.0
BuildRequires:  ant
BuildRequires:  ant-nodeps
BuildRequires:  jpackage-utils
BuildRequires:  junit
Requires:       java > 1.5.0
Requires:       jpackage-utils

%description
Joda-Time provides a quality replacement for the Java date
and time classes. The design allows for multiple calendar
systems, while still providing a simple API. The 'default'
calendar is the ISO8601 standard which is used by XML. The
Gregorian, Julian, Buddhist, Coptic and Ethiopic systems
are also included, and we welcome further additions.
Supporting classes include time zone, duration, format
and parsing.


%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 %{name}-%{version}-src
%patch0 -p1

# all java binaries must be removed from the sources
find . -name '*.jar' -exec rm -f '{}' \;
find . -name '*.class' -exec rm -f '{}' \;

# prove that these binaries aren't used in building joda-time
rm -rf src/testdata/

# replace internal tzdata
rm -f src/java/org/joda/time/tz/src/*
tar -xzf %{SOURCE1} -C src/java/org/joda/time/tz/src/


%build
ant
ant javadoc


%install
rm -rf %{buildroot}

# jars
install -d -m 755 %{buildroot}%{_javadir}
# Don't install a versioned jar and symlink to it, instead install
# the unversioned jar as per Java Packaging Guidelines
install -m 644 build/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar

# javadocs
install -p -d -m 755 %{buildroot}%{_javadocdir}/%{name}
cp -a build/docs/* %{buildroot}%{_javadocdir}/%{name}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc LICENSE.txt RELEASE-NOTES.txt ToDo.txt
%{_javadir}/%{name}.jar


%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}


%changelog
* Sun Apr 6 2008 Conrad Meyer <konrad at tylerc.org> - 1.5.2-5.tzdata2008b
- Don't compile GCJ bits yet as we hit some GCJ bug.

* Sat Apr 5 2008 Conrad Meyer <konrad at tylerc.org> - 1.5.2-4.tzdata2008b
- Update to tzdata2008b.
- Use unversioned jar.
- Some small things to comply with Java Packaging Guidelines.
- GCJ support.

* Mon Mar 17 2008 Conrad Meyer <konrad at tylerc.org> - 1.5.2-3.tzdata2008a
- Many small changes from bz# 436239 comment 6.
- Change -javadocs to -javadoc in accordance with java packaging
  guidelines draft.

* Sun Mar 16 2008 Conrad Meyer <konrad at tylerc.org> - 1.5.2-2
- Use system junit via Mamoru Tasaka's patch.

* Mon Mar 3 2008 Conrad Meyer <konrad at tylerc.org> - 1.5.2-1
- Initial package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/joda-time/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Apr 2008 03:52:25 -0000	1.1
+++ .cvsignore	7 Apr 2008 21:25:05 -0000	1.2
@@ -0,0 +1,2 @@
+joda-time-1.5.2-src.tar.gz
+tzdata2008b.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/joda-time/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Apr 2008 03:52:25 -0000	1.1
+++ sources	7 Apr 2008 21:25:05 -0000	1.2
@@ -0,0 +1,2 @@
+56408d4f4328556d897f8dc06ae3bdcf  joda-time-1.5.2-src.tar.gz
+dbeb9a327bbff77ab4078488b8c5323a  tzdata2008b.tar.gz