From d3cbd4a15075eaa469cb16291faa9e88d97441cf72dfa925ac0897ed78ff9ded Mon Sep 17 00:00:00 2001 From: Robert Milasan Date: Wed, 12 Jun 2013 10:03:45 +0000 Subject: [PATCH] Accepting request 178623 from home:fcrozat:branches:Base:System - Only apply 1007-add-msft-compability-rules.patch when not building systemd-mini. OBS-URL: https://build.opensuse.org/request/show/178623 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=392 --- 1007-add-msft-compability-rules.patch | 21 --------------------- systemd-mini.changes | 6 ++++++ systemd-mini.spec | 3 +++ systemd.changes | 6 ++++++ systemd.spec | 3 +++ 5 files changed, 18 insertions(+), 21 deletions(-) diff --git a/1007-add-msft-compability-rules.patch b/1007-add-msft-compability-rules.patch index 289bc7eb..d24b7694 100644 --- a/1007-add-msft-compability-rules.patch +++ b/1007-add-msft-compability-rules.patch @@ -13,27 +13,6 @@ Index: systemd-204/Makefile.am if ENABLE_GUDEV if ENABLE_GTK_DOC SUBDIRS += \ -Index: systemd-204/Makefile.in -=================================================================== ---- systemd-204.orig/Makefile.in -+++ systemd-204/Makefile.in -@@ -2609,6 +2609,7 @@ am__dist_udevrules_DATA_DIST = rules/99- - rules/95-udev-late.rules rules/50-firmware.rules \ - rules/80-drivers.rules rules/60-cdrom_id.rules \ - rules/60-persistent-v4l.rules rules/61-accelerometer.rules \ -+ rules/61-msft.rules \ - src/udev/keymap/95-keymap.rules \ - src/udev/keymap/95-keyboard-force-release.rules \ - rules/75-probe_mtd.rules src/login/70-uaccess.rules \ -@@ -3341,7 +3342,7 @@ dist_udevrules_DATA = rules/99-systemd.r - rules/78-sound-card.rules rules/80-net-name-slot.rules \ - rules/95-udev-late.rules $(am__append_53) $(am__append_55) \ - rules/60-cdrom_id.rules rules/60-persistent-v4l.rules \ -- rules/61-accelerometer.rules $(am__append_71) \ -+ rules/61-accelerometer.rules rules/61-msft.rules $(am__append_71) \ - rules/75-probe_mtd.rules $(am__append_173) - nodist_udevrules_DATA = $(am__append_174) - dist_pkgsysconf_DATA = src/core/system.conf src/core/user.conf \ Index: systemd-204/rules/61-msft.rules =================================================================== --- /dev/null diff --git a/systemd-mini.changes b/systemd-mini.changes index fa6ce837..1237adb4 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 12 10:00:53 UTC 2013 - fcrozat@suse.com + +- Only apply 1007-add-msft-compability-rules.patch when not + building systemd-mini. + ------------------------------------------------------------------- Tue Jun 11 11:01:46 UTC 2013 - rmilasan@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index 531bff1d..48a2ed0b 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -417,7 +417,10 @@ cp %{SOURCE7} m4/ %patch1004 -p1 %patch1005 -p1 %patch1006 -p1 +# don't apply when bootstrapping to not modify Makefile.am +%if ! 0%{?bootstrap} %patch1007 -p1 +%endif %build autoreconf -fiv diff --git a/systemd.changes b/systemd.changes index fa6ce837..1237adb4 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 12 10:00:53 UTC 2013 - fcrozat@suse.com + +- Only apply 1007-add-msft-compability-rules.patch when not + building systemd-mini. + ------------------------------------------------------------------- Tue Jun 11 11:01:46 UTC 2013 - rmilasan@suse.com diff --git a/systemd.spec b/systemd.spec index d05c71db..d4413e2b 100644 --- a/systemd.spec +++ b/systemd.spec @@ -412,7 +412,10 @@ cp %{SOURCE7} m4/ %patch1004 -p1 %patch1005 -p1 %patch1006 -p1 +# don't apply when bootstrapping to not modify Makefile.am +%if ! 0%{?bootstrap} %patch1007 -p1 +%endif %build autoreconf -fiv