Accepting request 794224 from home:AndreasStieger:branches:Base:System

revert to previous state - factory submission declined due to being a Ring0 package

OBS-URL: https://build.opensuse.org/request/show/794224
OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=245

_multibuild

@@ -1,3 +0,0 @@
-<multibuild>
-  <flavor>java</flavor>
-</multibuild>

pre_checkin.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+# This script is called automatically during autobuild checkin.
+
+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/,/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

timezone-java.keyring

@@ -0,0 +1,58 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: SKS 1.1.5
+Comment: Hostname: pgp.mit.edu
+
+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
+oi8buNcby4U=
+=w6kQ
+-----END PGP PUBLIC KEY BLOCK-----

timezone-java.spec

@@ -0,0 +1,92 @@
+#
+# spec file for package timezone-java
+#
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
+
+
+Name:           timezone-java
+BuildRequires:  java
+BuildRequires:  javazic
+BuildRequires:  tzdb
+Summary:        Time Zone Descriptions
+# COMMON-BEGIN
+# COMMON-BEGIN
+License:        BSD-3-Clause AND SUSE-Public-Domain
+Group:          System/Base
+Version:        2019c
+Release:        0
+Source:         https://www.iana.org/time-zones/repository/releases/tzdata%{version}.tar.gz
+Source1:        https://www.iana.org/time-zones/repository/releases/tzcode%{version}.tar.gz
+Source2:        https://www.iana.org/time-zones/repository/releases/tzdata%{version}.tar.gz.asc
+Source3:        https://www.iana.org/time-zones/repository/releases/tzcode%{version}.tar.gz.asc
+Source4:        %{name}.keyring
+Source5:        %{name}.changes
+Patch0:         tzdata-china.diff
+Patch3:         iso3166-uk.diff
+Patch4:         timezone-2018f-bsc1112310.patch
+# COMMON-END
+# COMMON-END
+Url:            https://www.iana.org/time-zones
+Requires(pre):  filesystem, coreutils
+BuildArch:      noarch
+Provides:       tzdata-java = %{version}-%{release}
+Provides:       tzdata-java8 = %{version}-%{release}
+#!BuildIgnore:  tzdata-java tzdata-java8
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+
+%description
+These are configuration files that describe available time zones - this
+package is intended for Java Virtual Machine based on OpenJDK.
+
+
+
+%prep
+%setup -c  -a 1
+# COMMON-PREP-BEGIN
+# COMMON-PREP-BEGIN
+%patch0 -p1
+%patch3 -p1
+%patch4 -p1
+sed -ri 's@/usr/local/etc/zoneinfo@%{_datadir}/zoneinfo@g' *.[1358]
+# COMMON-PREP-END
+# COMMON-PREP-END
+
+echo "tzdata%{version}" >> VERSION
+
+%build
+# Java 6/7 data
+java -jar %{_javadir}/javazic.jar -V %{version} \
+     -d javazi \
+     africa antarctica asia australasia europe northamerica pacificnew \
+     southamerica backward etcetera systemv  \
+     %{_datadir}/javazic/tzdata_jdk/gmt \
+     %{_datadir}/javazic/tzdata_jdk/jdk11_backward
+# Java 8/9 data
+java -jar %{_javadir}/tzdb.jar \
+     -srcdir . -dstfile javazi/tzdb.dat \
+     africa antarctica asia australasia europe northamerica pacificnew \
+     southamerica backward etcetera systemv  \
+     %{_datadir}/tzdb/tzdata_jdk/gmt \
+     %{_datadir}/tzdb/tzdata_jdk/jdk11_backward
+
+%install
+install -d -m 0755 $RPM_BUILD_ROOT/%{_datadir}
+cp -a javazi $RPM_BUILD_ROOT%{_datadir}
+
+%files
+%defattr(-,root,root)
+%{_datadir}/javazi
+
+%changelog

timezone-java.spec.in

@@ -0,0 +1,73 @@
+#
+# spec file for package timezone-java
+#
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+
+Name:           timezone-java
+BuildRequires:  java
+BuildRequires:  javazic
+BuildRequires:  tzdb
+Summary:        Time Zone Descriptions
+License:        BSD-3-Clause and SUSE-Public-Domain
+Group:          System/Base
+# COMMON-BEGIN
+# COMMON-END
+Url:            https://www.iana.org/time-zones
+Requires(pre):  filesystem, coreutils
+BuildArch:      noarch
+Provides:       tzdata-java = %{version}-%{release}
+Provides:       tzdata-java8 = %{version}-%{release}
+#!BuildIgnore:  tzdata-java tzdata-java8
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+
+%description
+These are configuration files that describe available time zones - this
+package is intended for Java Virtual Machine based on OpenJDK.
+
+
+
+%prep
+%setup -c  -a 1
+# COMMON-PREP-BEGIN
+# COMMON-PREP-END
+
+echo "tzdata%{version}" >> VERSION
+
+%build
+# Java 6/7 data
+java -jar %{_javadir}/javazic.jar -V %{version} \
+     -d javazi \
+     africa antarctica asia australasia europe northamerica pacificnew \
+     southamerica backward etcetera systemv  \
+     %{_datadir}/javazic/tzdata_jdk/gmt \
+     %{_datadir}/javazic/tzdata_jdk/jdk11_backward
+# Java 8/9 data
+java -jar %{_javadir}/tzdb.jar \
+     -srcdir . -dstfile javazi/tzdb.dat \
+     africa antarctica asia australasia europe northamerica pacificnew \
+     southamerica backward etcetera systemv  \
+     %{_datadir}/tzdb/tzdata_jdk/gmt \
+     %{_datadir}/tzdb/tzdata_jdk/jdk11_backward
+
+%install
+install -d -m 0755 $RPM_BUILD_ROOT/%{_datadir}
+cp -a javazi $RPM_BUILD_ROOT%{_datadir}
+
+%files
+%defattr(-,root,root)
+%{_datadir}/javazi
+
+%changelog

timezone.changes

@@ -1,8 +1,3 @@
--------------------------------------------------------------------
-Tue Apr 14 23:17:41 UTC 2020 - Andreas Stieger <andreas.stieger@gmx.de>
-
-- convert to singlespec
-
 -------------------------------------------------------------------
 Thu Sep 12 06:58:19 UTC 2019 - Marketa Calabkova <mcalabkova@suse.com>
 

timezone.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package timezone
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,142 +16,94 @@
 #
 
 
-%global flavor @BUILD_FLAVOR@%{nil}
+Name:           timezone
-%if "%{flavor}" == "java"
-%define psuffix -java
-%endif
-%global AREA    Etc
-%global ZONE    UTC
-Name:           timezone%{?psuffix}
-Version:        2019c
-Release:        0
 Summary:        Time Zone Descriptions
 License:        BSD-3-Clause AND SUSE-Public-Domain
 Group:          System/Base
-URL:            https://www.iana.org/time-zones
+Url:            http://www.iana.org/time-zones
+PreReq:         filesystem, coreutils
+# COMMON-BEGIN
+Version:        2019c
+Release:        0
 Source:         https://www.iana.org/time-zones/repository/releases/tzdata%{version}.tar.gz
 Source1:        https://www.iana.org/time-zones/repository/releases/tzcode%{version}.tar.gz
 Source2:        https://www.iana.org/time-zones/repository/releases/tzdata%{version}.tar.gz.asc
 Source3:        https://www.iana.org/time-zones/repository/releases/tzcode%{version}.tar.gz.asc
-Source4:        timezone.keyring
+Source4:        %{name}.keyring
-Source5:        timezone.changes
+Source5:        %{name}.changes
 Patch0:         tzdata-china.diff
 Patch3:         iso3166-uk.diff
 Patch4:         timezone-2018f-bsc1112310.patch
-Requires(pre):  coreutils
+# COMMON-END
-Requires(pre):  filesystem
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if "%{flavor}" == "java"
+
-BuildRequires:  java
+%global AREA    Etc
-BuildRequires:  javazic
+%global ZONE    UTC
-BuildRequires:  tzdb
-#!BuildIgnore:  tzdata-java
-#!BuildIgnore:  tzdata-java8
-Provides:       tzdata-java = %{version}-%{release}
-Provides:       tzdata-java8 = %{version}-%{release}
-BuildArch:      noarch
-%endif # java flavor
 
 %description
-%if "%{flavor}" == ""
 These are configuration files that describe available time zones. You
 can select an appropriate time zone for your system with YaST.
-%endif
+
-%if "%{flavor}" == "java"
+
-These are configuration files that describe available time zones - this
-package is intended for Java Virtual Machine based on OpenJDK.
-%endif
 
 %prep
 %setup -q -c -a 1
+# COMMON-PREP-BEGIN
 %patch0 -p1
 %patch3 -p1
 %patch4 -p1
-sed -ri 's@%{_prefix}/local%{_sysconfdir}/zoneinfo@%{_datadir}/zoneinfo@g' *.[1358]
+sed -ri 's@/usr/local/etc/zoneinfo@%{_datadir}/zoneinfo@g' *.[1358]
-%if "%{flavor}" == "java"
+# COMMON-PREP-END
-echo "tzdata%{version}" >> VERSION
-%endif
 
 %build
-%if "%{flavor}" == ""
 unset ${!LC_*}
 LANG=POSIX
 LC_ALL=POSIX
 AREA=%{AREA}
 ZONE=%{ZONE}
 export AREA LANG LC_ALL ZONE
-%make_build TZDIR=%{_datadir}/zoneinfo CFLAGS="%{optflags} -DHAVE_GETTEXT=1 -DTZDEFAULT='\"%{_sysconfdir}/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_build TZDIR=zoneinfo AWK=awk zones
+make %{?_smp_mflags} TZDIR=zoneinfo AWK=awk zones
 # Generate posixrules
 ./zic -y ./yearistype -d zoneinfo -p %{AREA}/%{ZONE}
-%endif # flavor
-
-%if "%{flavor}" == "java"
-# Java 6/7 data
-java -jar %{_javadir}/javazic.jar -V %{version} \
-     -d javazi \
-     africa antarctica asia australasia europe northamerica pacificnew \
-     southamerica backward etcetera systemv  \
-     %{_datadir}/javazic/tzdata_jdk/gmt \
-     %{_datadir}/javazic/tzdata_jdk/jdk11_backward
-# Java 8/9 data
-java -jar %{_javadir}/tzdb.jar \
-     -srcdir . -dstfile javazi/tzdb.dat \
-     africa antarctica asia australasia europe northamerica pacificnew \
-     southamerica backward etcetera systemv  \
-     %{_datadir}/tzdb/tzdata_jdk/gmt \
-     %{_datadir}/tzdb/tzdata_jdk/jdk11_backward
-%endif # java flavor
 
 %install
-%if "%{flavor}" == ""
+mkdir -p %{buildroot}%{_prefix}/share/zoneinfo
-mkdir -p %{buildroot}%{_datadir}/zoneinfo
+cp -a zoneinfo %{buildroot}%{_prefix}/share/zoneinfo/posix
-cp -a zoneinfo %{buildroot}%{_datadir}/zoneinfo/posix
+cp -al %{buildroot}%{_prefix}/share/zoneinfo/posix/. %{buildroot}%{_prefix}/share/zoneinfo
-cp -al %{buildroot}%{_datadir}/zoneinfo/posix/. %{buildroot}%{_datadir}/zoneinfo
+cp -a zoneinfo-leaps %{buildroot}%{_prefix}/share/zoneinfo/right
-cp -a zoneinfo-leaps %{buildroot}%{_datadir}/zoneinfo/right
+mkdir -p %{buildroot}/etc
-mkdir -p %{buildroot}%{_sysconfdir}
+rm -f  %{buildroot}/etc/localtime
-rm -f  %{buildroot}%{_sysconfdir}/localtime
+rm -f  %{buildroot}%{_prefix}/share/zoneinfo/posixrules
-rm -f  %{buildroot}%{_datadir}/zoneinfo/posixrules
 %if 0%{?suse_version} >= 1230
-ln -sf %{_datadir}/zoneinfo/%{AREA}/%{ZONE} %{buildroot}%{_sysconfdir}/localtime
+ln -sf %{_prefix}/share/zoneinfo/%{AREA}/%{ZONE} %{buildroot}/etc/localtime
 %else
-cp -fp %{buildroot}%{_datadir}/zoneinfo/%{AREA}/%{ZONE} %{buildroot}%{_sysconfdir}/localtime
+cp -fp %{buildroot}%{_prefix}/share/zoneinfo/%{AREA}/%{ZONE} %{buildroot}/etc/localtime
 %endif
-ln -sf %{_sysconfdir}/localtime      %{buildroot}%{_datadir}/zoneinfo/posixrules
+ln -sf /etc/localtime      %{buildroot}%{_prefix}/share/zoneinfo/posixrules
-install -m 644 iso3166.tab %{buildroot}%{_datadir}/zoneinfo/iso3166.tab
+install -m 644 iso3166.tab %{buildroot}%{_prefix}/share/zoneinfo/iso3166.tab
-install -m 644 zone.tab    %{buildroot}%{_datadir}/zoneinfo/zone.tab
+install -m 644 zone.tab    %{buildroot}%{_prefix}/share/zoneinfo/zone.tab
-install -m 644 zone1970.tab %{buildroot}%{_datadir}/zoneinfo/zone1970.tab
+install -m 644 zone1970.tab %{buildroot}%{_prefix}/share/zoneinfo/zone1970.tab
 install -D -m 755 tzselect %{buildroot}%{_bindir}/tzselect
 install -D -m 755 zdump    %{buildroot}%{_sbindir}/zdump
 install -D -m 755 zic      %{buildroot}%{_sbindir}/zic
-%endif # flavor
 
-%if "%{flavor}" == "java"
-install -d -m 0755 %{buildroot}/%{_datadir}
-cp -a javazi %{buildroot}%{_datadir}
-%endif # java flavor
-
-%if "%{flavor}" == ""
 %post
-if [ ! -L %{_datadir}/zoneinfo/posixrules ]; then
+if [ ! -L /usr/share/zoneinfo/posixrules ]; then
-   rm -f %{_datadir}/zoneinfo/posixrules
+   rm -f /usr/share/zoneinfo/posixrules
-   ln -sf %{_sysconfdir}/localtime %{_datadir}/zoneinfo/posixrules
+   ln -sf /etc/localtime /usr/share/zoneinfo/posixrules
 fi
-if [ -e %{_datadir}/zoneinfo/posixrules.rpmnew ]; then
+if [ -e /usr/share/zoneinfo/posixrules.rpmnew ]; then
-   rm -f %{_datadir}/zoneinfo/posixrules.rpmnew
+   rm -f /usr/share/zoneinfo/posixrules.rpmnew
 fi
-%endif # flavor
 
 %files
-%if "%{flavor}" == ""
+%defattr(-,root,root)
-%verify(not link md5 size mtime) %config(missingok,noreplace) %{_sysconfdir}/localtime
+%verify(not link md5 size mtime) %config(missingok,noreplace) /etc/localtime
 %verify(not link md5 size mtime) %{_datadir}/zoneinfo/posixrules
 %{_datadir}/zoneinfo
 %{_bindir}/tzselect
 %{_sbindir}/zdump
 %{_sbindir}/zic
-%endif # flavor
-%if "%{flavor}" == "java"
-%{_datadir}/javazi
-%endif # java flavor
 
 %changelog