Attachment 889379 Details for Bug 1091029 – patch for spec file

[patch] patch for spec file

openjdk8.patch (text/plain), 1.87 KB, created by Omair Majid on 2014-04-24 16:33:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Omair Majid

Created: 2014-04-24 16:33:40 UTC

Size: 1.87 KB

patch

obsolete

>diff --git a/tzdata.spec b/tzdata.spec
>index e72a239..0472b4c 100644
>--- a/tzdata.spec
>+++ b/tzdata.spec
>@@ -27,6 +27,7 @@ the world.
> Summary: Timezone data for Java
> Group: System Environment/Base
> Source3: javazic.tar.gz
>+Source4: javazic-1.8-37392f2f5d59.tar.xz
> Patch100: javazic-fixup.patch
> Patch101: javazic-exclusion-fix.patch
> 
>@@ -57,6 +58,10 @@ find . -type f -name '*.java' -print0 \
>                          -e 's:sun\.util\.:rht.util.:g'
> popd
> 
>+tar xf %{SOURCE4}
>+
>+echo "%{name}%{tzdata_version}" >> VERSION
>+
> %build
> FILES="africa antarctica asia australasia europe northamerica southamerica
>        pacificnew etcetera backward"
>@@ -68,6 +73,7 @@ zic -y ./yearistype -d zoneinfo/right -L leapseconds $FILES
> 
> grep -v tz-art.htm tz-link.htm > tz-link.html
> 
>+# Java 6/7 tzdata
> pushd javazic
> javac -source 1.5 -target 1.5 -classpath . `find . -name \*.java`
> popd
>@@ -76,12 +82,24 @@ java -classpath javazic/ rht.tools.javazic.Main -V %{version} \
>   -d javazi \
>   $FILES javazic/tzdata_jdk/gmt javazic/tzdata_jdk/jdk11_backward
> 
>+# Java 8 tzdata
>+pushd javazic-1.8
>+javac -source 1.7 -target 1.7 -classpath . `find . -name \*.java`
>+popd
>+
>+java -classpath javazic-1.8 build.tools.tzdb.TzdbZoneRulesCompiler \
>+    -srcdir . -dstfile tzdb.dat \
>+    $FILES `find -type f javazic-1.8/tzdata_jdk/`
>+
>+
> %install
> rm -fr $RPM_BUILD_ROOT
> install -d $RPM_BUILD_ROOT%{_datadir}
> cp -prd zoneinfo $RPM_BUILD_ROOT%{_datadir}
> install -p -m 644 zone.tab iso3166.tab $RPM_BUILD_ROOT%{_datadir}/zoneinfo
> cp -prd javazi $RPM_BUILD_ROOT%{_datadir}/javazi
>+mkdir -p $RPM_BUILD_ROOT%{_datadir}/javazi-1.8
>+install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
> 
> %clean
> rm -rf $RPM_BUILD_ROOT
>@@ -96,6 +114,7 @@ rm -rf $RPM_BUILD_ROOT
> %files java
> %defattr(-,root,root)
> %{_datadir}/javazi
>+%{_datadir}/javazi-1.8
> 
> %changelog
> * Wed Mar 26 2014 Patsy Franklin <pfrankli@redhat.com> 2014b-1

Actions: View | Diff

Attachments on bug 1091029: 889379 | 906654