From 3dee88e430e39d40dae985a4bf9d9097649594806f727e94e02c49da6be9c367 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Thu, 12 Oct 2017 11:25:51 +0000
Subject: [PATCH] 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
---
 timezone-java.changes | 6 ++++++
 timezone.changes      | 6 ++++++
 timezone.spec         | 9 +++------
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/timezone-java.changes b/timezone-java.changes
index 58c6f52..16626b0 100644
--- a/timezone-java.changes
+++ b/timezone-java.changes
@@ -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
 
diff --git a/timezone.changes b/timezone.changes
index 58c6f52..16626b0 100644
--- a/timezone.changes
+++ b/timezone.changes
@@ -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
 
diff --git a/timezone.spec b/timezone.spec
index daf89fb..ada2f51 100644
--- a/timezone.spec
+++ b/timezone.spec
@@ -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