Accepting request 532480 from home:jengelh:branches:Base:System

- Replace old RPM constructs by new equivalents.
  Remove redundant %clean section.

- Replace old RPM constructs by new equivalents.
  Remove redundant %clean section.

OBS-URL: https://build.opensuse.org/request/show/532480
OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=216
This commit is contained in:
Dirk Mueller 2017-10-12 11:25:51 +00:00 committed by Git OBS Bridge
parent 04da95071a
commit 3dee88e430
3 changed files with 15 additions and 6 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Oct 7 23:38:39 UTC 2017 - jengelh@inai.de
- Replace old RPM constructs by new equivalents.
Remove redundant %clean section.
-------------------------------------------------------------------
Fri Oct 6 12:20:02 UTC 2017 - fstrba@suse.com

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Oct 7 23:38:39 UTC 2017 - jengelh@inai.de
- Replace old RPM constructs by new equivalents.
Remove redundant %clean section.
-------------------------------------------------------------------
Fri Oct 6 12:20:02 UTC 2017 - fstrba@suse.com

View File

@ -60,7 +60,7 @@ LC_ALL=POSIX
AREA=%{AREA}
ZONE=%{ZONE}
export AREA LANG LC_ALL ZONE
make %{?_smp_mflags} TZDIR=%{_datadir}/zoneinfo CFLAGS="$RPM_OPT_FLAGS -DHAVE_GETTEXT=1 -DTZDEFAULT='\"/etc/localtime\"' -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone -Dlint" AWK=awk
make %{?_smp_mflags} TZDIR=%{_datadir}/zoneinfo CFLAGS="%{optflags} -DHAVE_GETTEXT=1 -DTZDEFAULT='\"/etc/localtime\"' -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone -Dlint" AWK=awk
make %{?_smp_mflags} TZDIR=zoneinfo AWK=awk zones
# Generate posixrules
./zic -y ./yearistype -d zoneinfo -p %{AREA}/%{ZONE}
@ -86,9 +86,6 @@ install -D -m 755 tzselect %{buildroot}%{_bindir}/tzselect
install -D -m 755 zdump %{buildroot}%{_sbindir}/zdump
install -D -m 755 zic %{buildroot}%{_sbindir}/zic
%clean
rm -rf %{buildroot}
%post
if [ -f /etc/sysconfig/clock ];
then
@ -116,8 +113,8 @@ fi
%files
%defattr(-,root,root)
%verify(not link md5 size mtime) %config(missingok,noreplace) /etc/localtime
%verify(not link md5 size mtime) %{_prefix}/share/zoneinfo/posixrules
%{_prefix}/share/zoneinfo
%verify(not link md5 size mtime) %{_datadir}/zoneinfo/posixrules
%{_datadir}/zoneinfo
%{_bindir}/tzselect
%{_sbindir}/zdump
%{_sbindir}/zic