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

- apply patches also for timezone-java

Browse Source 
- add patch to fix Tiraspol split

- apply patches also for timezone-java
- add patch to fix Tiraspol split

OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=62
This commit is contained in:
Dirk Mueller 2011-10-25 12:48:33 +00:00 committed by Git OBS Bridge
parent 91bc790b14
commit 862d9cb81b
7 changed files with 49 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
chisinau-split-fix.diff Normal file
View File

@ -0,0 +1,11 @@
--- a/zone.tab
+++ b/zone.tab
@@ -257,7 +257,7 @@
LY +3254+01311 Africa/Tripoli
MA +3339-00735 Africa/Casablanca
MC +4342+00723 Europe/Monaco
-MD +4700+02850 Europe/Chisinau
+MD +4700+02850 Europe/Chisinau most locations
MD +4651+02938 Europe/Tiraspol Pridnestrovie
ME +4226+01916 Europe/Podgorica
MF +1804-06305 America/Marigot

4
pre_checkin.sh
View File

@ -6,5 +6,7 @@ ln -f timezone.changes timezone-java.changes
for spec in timezone-java.spec; do
{ sed -n -e '1,/COMMON-BEGIN/p' $spec.in
sed -n -e '/COMMON-BEGIN/,/COMMON-END/p' timezone.spec
sed -n -e '/COMMON-END/,$p' $spec.in; } > $spec.tmp && mv $spec.tmp $spec
sed -n -e '/COMMON-END/,/COMMON-PREP-BEGIN/p' $spec.in
sed -n -e '/COMMON-PREP-BEGIN/,/COMMON-PREP-END/p' timezone.spec
sed -n -e '/COMMON-PREP-END/,$p' $spec.in; } > $spec.tmp && mv $spec.tmp $spec
done

6
timezone-java.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Oct 25 14:48:15 CEST 2011 - dmueller@suse.de
- apply patches also for timezone-java
- add patch to fix Tiraspol split
-------------------------------------------------------------------
Mon Oct 24 19:19:45 CEST 2011 - dmueller@suse.de

16
timezone-java.spec
View File

@ -29,6 +29,12 @@ Version: 2011m
Release: 1
Source: ftp://munnari.oz.au/pub/tzdata%{version}.tar.gz
Source1: ftp://munnari.oz.au/pub/tzcode2011i.tar.gz
Patch0: tzdata-china.diff
Patch1: tzcode-zic.diff
Patch2: tzcode-ksh.diff
Patch3: iso3166-uk.diff
Patch4: tzcode-link.diff
Patch5: chisinau-split-fix.diff
# COMMON-END
# COMMON-END
Url: http://www.gnu.org/software/libc/libc.html
@ -45,6 +51,16 @@ package is intended for Java Virtual Machine based on OpenJDK.
%prep
%setup -c
# COMMON-PREP-BEGIN
# COMMON-PREP-BEGIN
%patch0
%patch1
%patch2
%patch3
%patch4
%patch5 -p1
# COMMON-PREP-END
# COMMON-PREP-END
%build
gij -jar %{_javadir}/javazic.jar -V %{version} \

2
timezone-java.spec.in
View File

@ -39,6 +39,8 @@ package is intended for Java Virtual Machine based on OpenJDK.
%prep
%setup -c
# COMMON-PREP-BEGIN
# COMMON-PREP-END
%build
gij -jar %{_javadir}/javazic.jar -V %{version} \

6
timezone.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Oct 25 14:48:15 CEST 2011 - dmueller@suse.de
- apply patches also for timezone-java
- add patch to fix Tiraspol split
-------------------------------------------------------------------
Mon Oct 24 19:19:45 CEST 2011 - dmueller@suse.de

6
timezone.spec
View File

@ -29,12 +29,13 @@ Version: 2011m
Release: 1
Source: ftp://munnari.oz.au/pub/tzdata%{version}.tar.gz
Source1: ftp://munnari.oz.au/pub/tzcode2011i.tar.gz
# COMMON-END
Patch0: tzdata-china.diff
Patch1: tzcode-zic.diff
Patch2: tzcode-ksh.diff
Patch3: iso3166-uk.diff
Patch4: tzcode-link.diff
Patch5: chisinau-split-fix.diff
# COMMON-END
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%global AREA Etc
%global ZONE UTC
@ -47,11 +48,14 @@ can select an appropriate time zone for your system with YaST.
%prep
%setup -c -a 1
# COMMON-PREP-BEGIN
%patch0
%patch1
%patch2
%patch3
%patch4
%patch5 -p1
# COMMON-PREP-END
%build
unset ${!LC_*}