From 297b6490048aaa4c4d0fe685df6b191287a7ca8d8724cba66ebab6cec23b4f76 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 15 Oct 2012 13:16:06 +0000 Subject: [PATCH 1/4] Accepting request 138171 from home:a_jaeger:FactoryFix Follow aaa_base change: Remove /usr/lib/tmpfiles.d again. OBS-URL: https://build.opensuse.org/request/show/138171 OBS-URL: https://build.opensuse.org/package/show/Base:System/filesystem?expand=0&rev=94 --- directory.list | 1 - filesystem.changes | 4 ++++ filesystem.spec | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/directory.list b/directory.list index 6c8646e..d86e169 100644 --- a/directory.list +++ b/directory.list @@ -87,7 +87,6 @@ 0755 root root /usr/include 0755 root root /usr/include/X11 0755 root root /usr/lib -0755 root root /usr/lib/tmpfiles.d 0755 root root /usr/lib/X11 0755 root root /usr/lib/lsb 0755 root root /usr/lib/news diff --git a/filesystem.changes b/filesystem.changes index d4e5b35..0195f81 100644 --- a/filesystem.changes +++ b/filesystem.changes @@ -1,3 +1,7 @@ +Mon Oct 15 10:47:36 UTC 2012 - aj@suse.de + +- Revert last change since aaa_base removed /usr/lib/tmpfiles.d. + ------------------------------------------------------------------- Fri Oct 12 14:25:04 UTC 2012 - coolo@suse.com diff --git a/filesystem.spec b/filesystem.spec index b5ad304..b14c078 100644 --- a/filesystem.spec +++ b/filesystem.spec @@ -167,7 +167,7 @@ NON_EXISTING_DIR= for FILE in `rpm -ql aaa_base` ; do test -d $FILE && continue case $FILE in - /sbin/init.d*|/usr/share/doc/support/*|/lib/mkinitrd/scripts/*|/lib/udev/devices/*) + /sbin/init.d*|/usr/share/doc/support/*|/lib/mkinitrd/scripts/*) continue ;; /usr/share/doc/packages/aaa_base/*|/lib/aaa_base/*) From d051b5120fbf1eed88a39925a20878bcd3bbb2a32d631c269e199d9194eb3d6c Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 17 Oct 2012 08:45:58 +0000 Subject: [PATCH 2/4] Updating link to change in openSUSE:Factory/filesystem revision 104.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/filesystem?expand=0&rev=dfae5d97e241f538f79a3105b32029f6 --- filesystem.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/filesystem.spec b/filesystem.spec index b14c078..87dbb48 100644 --- a/filesystem.spec +++ b/filesystem.spec @@ -187,10 +187,10 @@ test -n "$NON_EXISTING_DIR" && { %pre -p os.remove ("/usr/include/X11") os.remove ("/usr/lib/X11") -os.execute ("mountpoint -q /var/lock && umount -l /var/lock") -os.rename ("/var/lock","/var/lock.migrated") -os.execute ("mountpoint -q /var/run && umount -l /var/run") -os.rename ("/var/run","/var/run.migrated") +#os.execute ("mountpoint -q /var/lock && umount -l /var/lock") +#os.rename ("/var/lock","/var/lock.migrated") +#os.execute ("mountpoint -q /var/run && umount -l /var/run") +#os.rename ("/var/run","/var/run.migrated") %files -f filesystem.list From 962ba794d7f003caed4b8057f6c1353a54db7c271ee7f161b6189679fee1604e Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 17 Oct 2012 12:03:42 +0000 Subject: [PATCH 3/4] readd them here OBS-URL: https://build.opensuse.org/package/show/Base:System/filesystem?expand=0&rev=95 --- filesystem.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/filesystem.spec b/filesystem.spec index 87dbb48..b14c078 100644 --- a/filesystem.spec +++ b/filesystem.spec @@ -187,10 +187,10 @@ test -n "$NON_EXISTING_DIR" && { %pre -p os.remove ("/usr/include/X11") os.remove ("/usr/lib/X11") -#os.execute ("mountpoint -q /var/lock && umount -l /var/lock") -#os.rename ("/var/lock","/var/lock.migrated") -#os.execute ("mountpoint -q /var/run && umount -l /var/run") -#os.rename ("/var/run","/var/run.migrated") +os.execute ("mountpoint -q /var/lock && umount -l /var/lock") +os.rename ("/var/lock","/var/lock.migrated") +os.execute ("mountpoint -q /var/run && umount -l /var/run") +os.rename ("/var/run","/var/run.migrated") %files -f filesystem.list From ca05f23f7a42e0971224e0324ff7bc655edb6e981aee463220d898f96c975540 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sat, 20 Oct 2012 09:04:06 +0000 Subject: [PATCH 4/4] - remove get_version_number.sh, it's unused since ages OBS-URL: https://build.opensuse.org/package/show/Base:System/filesystem?expand=0&rev=97 --- filesystem.changes | 7 +++++++ get_version_number.sh | 3 --- 2 files changed, 7 insertions(+), 3 deletions(-) delete mode 100644 get_version_number.sh diff --git a/filesystem.changes b/filesystem.changes index 0195f81..0af9943 100644 --- a/filesystem.changes +++ b/filesystem.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Oct 20 09:03:48 UTC 2012 - coolo@suse.com + +- remove get_version_number.sh, it's unused since ages + +------------------------------------------------------------------- + Mon Oct 15 10:47:36 UTC 2012 - aj@suse.de - Revert last change since aaa_base removed /usr/lib/tmpfiles.d. diff --git a/get_version_number.sh b/get_version_number.sh deleted file mode 100644 index 30a2aa1..0000000 --- a/get_version_number.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -echo ${BUILD_DISTRIBUTION_VERSION%-*} -