From ee36a2d7d001e2a6c47b2bf0147890e013396844a1a75755aed9faf281321f78 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 23 Sep 2014 16:54:26 +0000 Subject: [PATCH 1/3] Drop gpg-offline OBS-URL: https://build.opensuse.org/package/show/utilities/parkverbot?expand=0&rev=14 --- parkverbot.changes | 6 ++++++ parkverbot.spec | 15 ++++----------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/parkverbot.changes b/parkverbot.changes index ee4cc1a..fe91a10 100644 --- a/parkverbot.changes +++ b/parkverbot.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Sep 23 16:54:21 UTC 2014 - jengelh@inai.de + +- Drop gpg-offline build-time requirement; this is now handled by + the local source validator + ------------------------------------------------------------------- Thu Jan 31 00:40:00 UTC 2013 - jengelh@inai.de diff --git a/parkverbot.spec b/parkverbot.spec index 2ccf41f..25e57dc 100644 --- a/parkverbot.spec +++ b/parkverbot.spec @@ -1,7 +1,7 @@ # # spec file for package parkverbot # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,19 +29,15 @@ Group: System/Base Source: %name-%version.tar.xz Source2: %name-%version.tar.xz.asc Source3: %name.keyring -#BuildRequires: autoconf >= 2.60, automake >= 1.10 -%if 0%{?suse_version} > 1220 -BuildRequires: gpg-offline -%endif BuildRequires: pkgconfig >= 0.23 BuildRequires: xz -%if 0%{?sles_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1130 BuildRequires: libHX-devel >= 3.12 %else BuildRequires: pkgconfig(libHX) >= 3.12 %endif -%if 0%{?suse_version} >= 1220 -BuildRequires: systemd +%if 0%{?suse_version} >= 1310 +BuildRequires: systemd-rpm-macros %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -57,9 +53,6 @@ order to keep the hardware from going to its head-unloaded idle state. %prep -%if 0%{?gpg_verify:1} -%gpg_verify %{S:2} -%endif %setup -q %build From f39e56416a18d0724cfa73c3edf439880cd75c0402141e9a893731b691461879 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 23 Sep 2014 20:39:42 +0000 Subject: [PATCH 2/3] Empty condition on openSUSE_12.3: fix that OBS-URL: https://build.opensuse.org/package/show/utilities/parkverbot?expand=0&rev=15 --- parkverbot.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parkverbot.spec b/parkverbot.spec index 25e57dc..41fe260 100644 --- a/parkverbot.spec +++ b/parkverbot.spec @@ -69,7 +69,7 @@ make install DESTDIR="%buildroot"; %defattr(-,root,root) %_sbindir/parkverbot %_mandir/man*/parkverbot* -%if %{?_unitdir:1} +%if 0%{?_unitdir:1} %_unitdir/parkverbot@.service %_unitdir/parkverbot.service %endif From fe0ccf929bfba2d3134b8836b06724967c6f2695876b810948b95afcd50abb7e Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 23 Sep 2014 21:28:01 +0000 Subject: [PATCH 3/3] Put systemd support back (for 12.x) OBS-URL: https://build.opensuse.org/package/show/utilities/parkverbot?expand=0&rev=16 --- parkverbot.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/parkverbot.spec b/parkverbot.spec index 41fe260..2e3f67d 100644 --- a/parkverbot.spec +++ b/parkverbot.spec @@ -39,6 +39,9 @@ BuildRequires: pkgconfig(libHX) >= 3.12 %if 0%{?suse_version} >= 1310 BuildRequires: systemd-rpm-macros %endif +%if 0%{?suse_version} >= 1220 && 0%{?suse_version} < 1310 +BuildRequires: systemd +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description