diff --git a/qemu-tools-rpmlintrc b/qemu-tools-rpmlintrc deleted file mode 100644 index 712d57d8..00000000 --- a/qemu-tools-rpmlintrc +++ /dev/null @@ -1,4 +0,0 @@ -# This line is mandatory to access the configuration functions -from Config import * - -setBadness('permissions-file-setuid-bit', 0) diff --git a/qemu.changes b/qemu.changes index 14f56bd2..7aef729f 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jun 14 14:39:57 UTC 2012 - afaerber@suse.de + +- revert qemu-bridge-helper mode change (cf. BNC#765948) + ------------------------------------------------------------------- Mon Jun 13 13:44:28 UTC 2012 - brogers@suse.com diff --git a/qemu.spec b/qemu.spec index c64b7c1d..4492d5b2 100644 --- a/qemu.spec +++ b/qemu.spec @@ -49,7 +49,6 @@ Patch0022: 0022-use-libexecdir-instead-of-ignoring-.patch Patch0023: 0023-linux-user-Ignore-broken-loop-ioctl.patch # this is to make lint happy Source300: rpmlintrc -Source301: qemu-tools-rpmlintrc Source302: bridge.conf Source400: update_git.sh BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -250,7 +249,7 @@ rm -rf ${RPM_BUILD_ROOT} %files tools %defattr(-, root, root) %_bindir/qemu-io -%verify(not mode) %attr(4755, root, root) %_libexecdir/qemu-bridge-helper +%verify(not mode) %_libexecdir/qemu-bridge-helper %config %_sysconfdir/%name/bridge.conf %files linux-user diff --git a/qemu.spec.in b/qemu.spec.in index 5d8c037b..d3239b0b 100644 --- a/qemu.spec.in +++ b/qemu.spec.in @@ -27,7 +27,6 @@ Source: %name-%version-1.tar.bz2 PATCH_FILES # this is to make lint happy Source300: rpmlintrc -Source301: qemu-tools-rpmlintrc Source302: bridge.conf Source400: update_git.sh BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -206,7 +205,7 @@ rm -rf ${RPM_BUILD_ROOT} %files tools %defattr(-, root, root) %_bindir/qemu-io -%verify(not mode) %attr(4755, root, root) %_libexecdir/qemu-bridge-helper +%verify(not mode) %_libexecdir/qemu-bridge-helper %config %_sysconfdir/%name/bridge.conf %files linux-user