From 742c697535b955bd6464092fb5b0df5dfce8b3565068c90f4ab507272019b731 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 26 Feb 2015 12:59:38 +0000 Subject: [PATCH] Stomp %patch line OBS-URL: https://build.opensuse.org/package/show/filesystems/cdemu-daemon?expand=0&rev=36 --- cdemu-daemon.spec | 5 ++--- cdemu_daemon_typo_in_mmc_packet_commands_h.patch | 5 +---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/cdemu-daemon.spec b/cdemu-daemon.spec index cfd9d3b..1a4bb85 100644 --- a/cdemu-daemon.spec +++ b/cdemu-daemon.spec @@ -1,7 +1,7 @@ # # spec file for package cdemu-daemon # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -53,8 +53,7 @@ that can be used by clients to control it. %prep %setup -q -%patch -P 1 -p1 -%patch2 -p1 +%patch -P 1 -P 2 -p1 %build cmake . \ diff --git a/cdemu_daemon_typo_in_mmc_packet_commands_h.patch b/cdemu_daemon_typo_in_mmc_packet_commands_h.patch index 4c3f3e9..d81bad2 100644 --- a/cdemu_daemon_typo_in_mmc_packet_commands_h.patch +++ b/cdemu_daemon_typo_in_mmc_packet_commands_h.patch @@ -1,6 +1,7 @@ From: Michel Normand Subject: cdemu daemon typo in mmc packet commands h Date: Thu, 26 Feb 2015 13:21:14 +0100 +References: https://sourceforge.net/p/cdemu/patches/22/ cdemu daemon typo in mmc packet commands h that make build failure for ppc/ppc64 archi: @@ -13,10 +14,6 @@ In file included from /home/abuild/rpmbuild/BUILD/cdemu-daemon-3.0.2/src/cdemu.h ^ === -associated to upstream ticket -https://sourceforge.net/p/cdemu/patches/22/ - - Signed-off-by: Michel Normand --- src/mmc-packet-commands.h | 2 +-