From 1efe3d62a6c287e3330294b82f19b3f670dd98203d92e3b34de7b8df740cd1ef Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 10 Nov 2015 09:00:36 +0000 Subject: [PATCH] Revert to rev 20, the wodim drop is too early OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/zisofs-tools?expand=0&rev=22 --- zisofs-tools.changes | 9 --------- zisofs-tools.spec | 4 ++-- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/zisofs-tools.changes b/zisofs-tools.changes index 835e984..6cd371d 100644 --- a/zisofs-tools.changes +++ b/zisofs-tools.changes @@ -1,12 +1,3 @@ -------------------------------------------------------------------- -Fri Oct 30 11:04:38 UTC 2015 - jkeil@suse.de - -- require mkisofs package instead of /usr/bin/mkisofs - * Depending on the binary results in a conflict between - the cdrkit-cdrtools-compat and mkisofs packages. - * cdrkit-cdrtools-compat is to be replaced by cdrtools, - which provides the mkisofs package - ------------------------------------------------------------------- Sun Oct 5 20:22:19 UTC 2014 - jengelh@inai.de diff --git a/zisofs-tools.spec b/zisofs-tools.spec index 77add63..5df8083 100644 --- a/zisofs-tools.spec +++ b/zisofs-tools.spec @@ -1,7 +1,7 @@ # # spec file for package zisofs-tools # -# Copyright (c) 2015 SUSE LINUX 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 @@ -28,7 +28,7 @@ Url: http://www.kernel.org/pub/linux/utils/fs/zisofs/ Source: http://mirror.linux.org.au/linux/utils/fs/zisofs/%name-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: zlib-devel -Requires: mkisofs +Requires: /usr/bin/mkisofs %description Zisofs-tools, in conjunction with a zisofs-enabled system, allows the