forked from pool/timezone
Accepting request 134187 from Base:System
- cleanup stale rpmnew / symlink of posixrules to /etc/localtime (bnc#762210) - remove %config part on posixrules symlink, it is not a config file - update to 2012f (bnc#780276): * Fiji DST is October 21st 2012 -> January 20th, 2013 - Add tzcode-symlink.patch: use a symlink to create /etc/localtime (bnc#773491) - Do not apply tzcode-link.diff on openSUSE >= 12.2 (bnc#773491). - cleanup stale rpmnew / symlink of posixrules to /etc/localtime (bnc#762210) - remove %config part on posixrules symlink, it is not a config file - update to 2012f (bnc#780276): * Fiji DST is October 21st 2012 -> January 20th, 2013 OBS-URL: https://build.opensuse.org/request/show/134187 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/timezone?expand=0&rev=64
This commit is contained in:
commit
92f4b8df90
@ -1,3 +1,19 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Sep 13 15:06:27 UTC 2012 - dmueller@suse.com
|
||||||
|
|
||||||
|
- cleanup stale rpmnew / symlink of posixrules to /etc/localtime (bnc#762210)
|
||||||
|
- remove %config part on posixrules symlink, it is not a config file
|
||||||
|
|
||||||
|
- update to 2012f (bnc#780276):
|
||||||
|
* Fiji DST is October 21st 2012 -> January 20th, 2013
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Aug 20 15:47:57 UTC 2012 - fcrozat@suse.com
|
||||||
|
|
||||||
|
- Add tzcode-symlink.patch: use a symlink to create /etc/localtime
|
||||||
|
(bnc#773491)
|
||||||
|
- Do not apply tzcode-link.diff on openSUSE >= 12.2 (bnc#773491).
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Aug 6 10:52:34 UTC 2012 - dmueller@suse.com
|
Mon Aug 6 10:52:34 UTC 2012 - dmueller@suse.com
|
||||||
|
|
||||||
|
@ -25,7 +25,7 @@ License: BSD-3-Clause and SUSE-Public-Domain
|
|||||||
Group: System/Base
|
Group: System/Base
|
||||||
# COMMON-BEGIN
|
# COMMON-BEGIN
|
||||||
# COMMON-BEGIN
|
# COMMON-BEGIN
|
||||||
Version: 2012e
|
Version: 2012f
|
||||||
Release: 0
|
Release: 0
|
||||||
Source: ftp://ftp.iana.org/tz/releases/tzdata%{version}.tar.gz
|
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
|
||||||
@ -34,6 +34,7 @@ Patch1: tzcode-zic.diff
|
|||||||
Patch2: tzcode-ksh.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
|
||||||
# COMMON-END
|
# COMMON-END
|
||||||
# COMMON-END
|
# COMMON-END
|
||||||
Url: http://www.gnu.org/software/libc/libc.html
|
Url: http://www.gnu.org/software/libc/libc.html
|
||||||
@ -56,7 +57,11 @@ package is intended for Java Virtual Machine based on OpenJDK.
|
|||||||
%patch1
|
%patch1
|
||||||
%patch2
|
%patch2
|
||||||
%patch3
|
%patch3
|
||||||
|
%if 0%{?suse_version} < 1220
|
||||||
%patch4
|
%patch4
|
||||||
|
%else
|
||||||
|
%patch5 -p1
|
||||||
|
%endif
|
||||||
# COMMON-PREP-END
|
# COMMON-PREP-END
|
||||||
# COMMON-PREP-END
|
# COMMON-PREP-END
|
||||||
|
|
||||||
|
@ -1,3 +1,12 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Sep 13 15:06:27 UTC 2012 - dmueller@suse.com
|
||||||
|
|
||||||
|
- cleanup stale rpmnew / symlink of posixrules to /etc/localtime (bnc#762210)
|
||||||
|
- remove %config part on posixrules symlink, it is not a config file
|
||||||
|
|
||||||
|
- update to 2012f (bnc#780276):
|
||||||
|
* Fiji DST is October 21st 2012 -> January 20th, 2013
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Aug 20 15:47:57 UTC 2012 - fcrozat@suse.com
|
Mon Aug 20 15:47:57 UTC 2012 - fcrozat@suse.com
|
||||||
|
|
||||||
|
@ -23,7 +23,7 @@ Group: System/Base
|
|||||||
Url: http://www.gnu.org/software/libc/libc.html
|
Url: http://www.gnu.org/software/libc/libc.html
|
||||||
PreReq: filesystem, coreutils
|
PreReq: filesystem, coreutils
|
||||||
# COMMON-BEGIN
|
# COMMON-BEGIN
|
||||||
Version: 2012e
|
Version: 2012f
|
||||||
Release: 0
|
Release: 0
|
||||||
Source: ftp://ftp.iana.org/tz/releases/tzdata%{version}.tar.gz
|
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
|
||||||
@ -101,11 +101,18 @@ then
|
|||||||
[ ! -f /etc/localtime ] || echo "WARNING: Not updating /etc/localtime with new zone file" >&2
|
[ ! -f /etc/localtime ] || echo "WARNING: Not updating /etc/localtime with new zone file" >&2
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
if [ ! -L /usr/share/zoneinfo/posixrules ]; then
|
||||||
|
rm -f /usr/share/zoneinfo/posixrules
|
||||||
|
ln -sf /etc/localtime /usr/share/zoneinfo/posixrules
|
||||||
|
fi
|
||||||
|
if [ -e /usr/share/zoneinfo/posixrules.rpmnew ]; then
|
||||||
|
rm -f /usr/share/zoneinfo/posixrules.rpmnew
|
||||||
|
fi
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%verify(not link md5 size mtime) %config(missingok,noreplace) /etc/localtime
|
%verify(not link md5 size mtime) %config(missingok,noreplace) /etc/localtime
|
||||||
%verify(not link md5 size mtime) %config(missingok,noreplace) %{_prefix}/share/zoneinfo/posixrules
|
%verify(not link md5 size mtime) %{_prefix}/share/zoneinfo/posixrules
|
||||||
%{_prefix}/share/zoneinfo
|
%{_prefix}/share/zoneinfo
|
||||||
%{_bindir}/tzselect
|
%{_bindir}/tzselect
|
||||||
%{_sbindir}/zdump
|
%{_sbindir}/zdump
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:bf0cb79e8419952ff4c6070394f6d45e809e3543b45944004962d4b4ee33a468
|
|
||||||
size 135542
|
|
3
tzcode2012f.tar.gz
Normal file
3
tzcode2012f.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:f38a096ee1f6c6752946463fdeecf1f0bba422a3e5bdb2eff672d601407ad9d4
|
||||||
|
size 135543
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:061c1c289e792f3661135d5ec542e4f9417d3cd7f232f3d54c1949573aadd0fc
|
|
||||||
size 206251
|
|
3
tzdata2012f.tar.gz
Normal file
3
tzdata2012f.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:afe95a49a445ee55391d2d4beccd4be6d61a090d5d8069c407390ff1502c26cc
|
||||||
|
size 206404
|
Loading…
Reference in New Issue
Block a user