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

@@ -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

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
 

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

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
 

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