rpm/timezone
SHA256
1
0
Fork 0
forked from pool/timezone
Code Pull Requests Activity

- tzcode-ksh.diff: Obsolete, upstream uses bash now by default

Browse Source 
- tzcode-ksh.diff: Obsolete, upstream uses bash now by default

OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=95
This commit is contained in:
Dirk Mueller 2012-11-05 12:10:32 +00:00 committed by Git OBS Bridge
parent 6b9f9c6f19
commit aca20b1080
5 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
timezone-java.changes
View File

@ -3,6 +3,7 @@ Mon Nov 5 12:06:12 UTC 2012 - dmueller@suse.com
- update to 2012i: - update to 2012i:
* Cuba switches DST on November 4th * Cuba switches DST on November 4th
- tzcode-ksh.diff: Obsolete, upstream uses bash now by default
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Oct 27 10:38:41 UTC 2012 - dmueller@suse.com Sat Oct 27 10:38:41 UTC 2012 - dmueller@suse.com

2
timezone-java.spec
View File

@ -31,7 +31,6 @@ Source: ftp://ftp.iana.org/tz/releases/tzdata%{version}.tar.gz
Source1: ftp://ftp.iana.org/tz/releases/tzcode%{version}.tar.gz Source1: ftp://ftp.iana.org/tz/releases/tzcode%{version}.tar.gz
Patch0: tzdata-china.diff Patch0: tzdata-china.diff
Patch1: tzcode-zic.diff Patch1: tzcode-zic.diff
Patch2: tzcode-ksh.diff
Patch3: iso3166-uk.diff Patch3: iso3166-uk.diff
Patch4: tzcode-link.diff Patch4: tzcode-link.diff
Patch5: tzcode-symlink.patch Patch5: tzcode-symlink.patch
@ -55,7 +54,6 @@ package is intended for Java Virtual Machine based on OpenJDK.
# COMMON-PREP-BEGIN # COMMON-PREP-BEGIN
%patch0 %patch0
%patch1 %patch1
%patch2
%patch3 %patch3
%if 0%{?suse_version} < 1220 %if 0%{?suse_version} < 1220
%patch4 %patch4

1
timezone.changes
View File

@ -3,6 +3,7 @@ Mon Nov 5 12:06:12 UTC 2012 - dmueller@suse.com
- update to 2012i: - update to 2012i:
* Cuba switches DST on November 4th * Cuba switches DST on November 4th
- tzcode-ksh.diff: Obsolete, upstream uses bash now by default
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Oct 27 10:38:41 UTC 2012 - dmueller@suse.com Sat Oct 27 10:38:41 UTC 2012 - dmueller@suse.com

2
timezone.spec
View File

@ -29,7 +29,6 @@ Source: ftp://ftp.iana.org/tz/releases/tzdata%{version}.tar.gz
Source1: ftp://ftp.iana.org/tz/releases/tzcode%{version}.tar.gz Source1: ftp://ftp.iana.org/tz/releases/tzcode%{version}.tar.gz
Patch0: tzdata-china.diff Patch0: tzdata-china.diff
Patch1: tzcode-zic.diff Patch1: tzcode-zic.diff
Patch2: tzcode-ksh.diff
Patch3: iso3166-uk.diff Patch3: iso3166-uk.diff
Patch4: tzcode-link.diff Patch4: tzcode-link.diff
Patch5: tzcode-symlink.patch Patch5: tzcode-symlink.patch
@ -49,7 +48,6 @@ can select an appropriate time zone for your system with YaST.
# COMMON-PREP-BEGIN # COMMON-PREP-BEGIN
%patch0 %patch0
%patch1 %patch1
%patch2
%patch3 %patch3
%if 0%{?suse_version} < 1220 %if 0%{?suse_version} < 1220
%patch4 %patch4

12
tzcode-ksh.diff
View File

@ -1,12 +0,0 @@
Index: Makefile
===================================================================
--- Makefile.orig
+++ Makefile
@@ -385,6 +385,7 @@ date: $(DATEOBJS)
tzselect: tzselect.ksh
sed \
+ -e 's|#! /bin/ksh|#! /bin/sh|g' \
-e 's|AWK=[^}]*|AWK=$(AWK)|g' \
-e 's|TZDIR=[^}]*|TZDIR=$(TZDIR)|' \
-e 's|\(TZVERSION\)=.*|\1=tz$(VERSION)|' \