[udev/f14/master] - udev-161 with an upstream quirk for the qemu cdrom and more cdrom handling bugfixes Resolves: rh

[Harald Hoyer]

commit b1f83ec4d248257699e54387b80dd5c22f6e0306
Author: Harald Hoyer <harald at redhat.com>
Date:   Tue Aug 17 11:37:36 2010 +0200

    - udev-161 with an upstream quirk for the qemu cdrom and
      more cdrom handling bugfixes
    Resolves: rhbz#609049 rhbz#624286
    - added floppy group
    Resolves: rhbz#620814

 .gitignore                                         |    2 +
 ...ore-FireWire-IDs-Point-Grey-IIDC-AV-C-ven.patch |   68 -----------
 ...ove-firewire-rules-for-deprecated-drivers.patch |   27 ----
 ...date-firewire-matches-to-recent-rule-chan.patch |   31 -----
 ...x-volume-keys-not-releasing-on-Mivvy-G310.patch |   29 -----
 ...-Logitech-diNovo-MX5500-and-other-keyboar.patch |   28 -----
 ...r-when-a-message-from-the-wrong-version-o.patch |   29 -----
 ...ump-minor-so-version-after-adding-symbols.patch |   29 -----
 ...hci-fix-for-Logitech-diNovo-Edge-keyboard.patch |   30 -----
 0010-udevadm-fix-short-options-in-getopt.patch     |   53 --------
 0011-keymap-Generalize-Samsung-keymaps.patch       |   30 -----
 ...force-release-quirks-for-a-lot-more-Samsu.patch |   26 ----
 ...udevd-fix-some-memory-leaks-in-error-path.patch |   69 -----------
 0014-malloc-memset-calloc.patch                    |   28 -----
 0015-udevd-fix-short-options-in-getopt.patch       |   25 ----
 ...elete_path-only-when-we-actually-deleted-.patch |   85 -------------
 ...operly-handle-CK-change-events-for-root-u.patch |   52 --------
 ...cl-really-fix-ACL-assignment-in-CK-events.patch |  125 --------------------
 sources                                            |    3 +-
 udev.spec                                          |   52 ++-------
 20 files changed, 14 insertions(+), 807 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 22be2f6..ed0e88c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 udev-160.tar.bz2
+udev-161.tar.bz2.sign
+udev-161.tar.bz2
diff --git a/sources b/sources
index c193652..f53200e 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-65459a1f090082c0471bf4e5112208d7  udev-160.tar.bz2
+2f42aff9f8c7258fecde71df321032b7  udev-161.tar.bz2.sign
+95b6a0ffc9913f3e8021c65f51eb4f88  udev-161.tar.bz2
diff --git a/udev.spec b/udev.spec
index 4749942..8b8febb 100644
--- a/udev.spec
+++ b/udev.spec
@@ -6,8 +6,8 @@
 
 Summary: A rule-based device node and kernel event manager
 Name: udev
-Version: 160
-Release: 9%{?dist}
+Version: 161
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -17,26 +17,6 @@ Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.t
 Source1: start_udev
 Source2: udev-post.init
 
-Patch2: 0002-rules-add-more-FireWire-IDs-Point-Grey-IIDC-AV-C-ven.patch
-Patch3: 0003-rules-remove-firewire-rules-for-deprecated-drivers.patch
-Patch4: 0004-udev-acl-update-firewire-matches-to-recent-rule-chan.patch
-Patch5: 0005-Fix-volume-keys-not-releasing-on-Mivvy-G310.patch
-Patch6: 0006-hid2hci-fix-Logitech-diNovo-MX5500-and-other-keyboar.patch
-Patch7: 0007-log-an-error-when-a-message-from-the-wrong-version-o.patch
-Patch8: 0008-libudev-bump-minor-so-version-after-adding-symbols.patch
-Patch9: 0009-hid2hci-fix-for-Logitech-diNovo-Edge-keyboard.patch
-Patch10: 0010-udevadm-fix-short-options-in-getopt.patch
-Patch11: 0011-keymap-Generalize-Samsung-keymaps.patch
-Patch12: 0012-keymap-Add-force-release-quirks-for-a-lot-more-Samsu.patch
-Patch13: 0013-udevd-fix-some-memory-leaks-in-error-path.patch
-Patch14: 0014-malloc-memset-calloc.patch
-Patch15: 0015-udevd-fix-short-options-in-getopt.patch
-Patch16: 0016-call-util_delete_path-only-when-we-actually-deleted-.patch
-Patch17: 0017-udev-acl-properly-handle-CK-change-events-for-root-u.patch
-Patch18: 0018-udev-acl-really-fix-ACL-assignment-in-CK-events.patch
-
-Patch100: udev-qemu-cdrom.patch
-
 ExclusiveOS: Linux
 URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -134,26 +114,6 @@ glib-based applications using libudev functionality.
 %prep 
 %setup -q 
 
-%patch2 -p1 -b .git2
-%patch3 -p1 -b .git3
-%patch4 -p1 -b .git4
-%patch5 -p1 -b .git5
-%patch6 -p1 -b .git6
-%patch7 -p1 -b .git7
-%patch8 -p1 -b .git8
-%patch9 -p1 -b .git9
-%patch10 -p1 -b .git10
-%patch11 -p1 -b .git11
-%patch12 -p1 -b .git12
-%patch13 -p1 -b .git13
-%patch14 -p1 -b .git14
-%patch15 -p1 -b .git15
-%patch16 -p1 -b .git16
-%patch17 -p1 -b .git17
-%patch18 -p1 -b .git18
-%patch100 -p1 -b .qemu
-
-
 %build
 libtoolize -f -c
 %configure --with-selinux  --prefix=%{_prefix} --exec-prefix="" \
@@ -230,6 +190,7 @@ exit 0
 getent group cdrom >/dev/null || /usr/sbin/groupadd -g 11 cdrom || :
 getent group tape >/dev/null || /usr/sbin/groupadd -g 33 tape || :
 getent group dialout >/dev/null || /usr/sbin/groupadd -g 18 dialout || :
+getent group floppy >/dev/null || /usr/sbin/groupadd -g 19 floppy || :
 
 # kill daemon if we are not in a chroot
 if test -f /proc/1/exe -a -d /proc/1/root; then
@@ -388,6 +349,13 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0*
 
 %changelog
+* Tue Aug 17 2010 Harald Hoyer <harald at redhat.com> 161-1
+- udev-161 with an upstream quirk for the qemu cdrom and
+  more cdrom handling bugfixes
+Resolves: rhbz#609049 rhbz#624286
+- added floppy group
+Resolves: rhbz#620814
+
 * Fri Aug 06 2010 Harald Hoyer <harald at redhat.com> 160-9
 - added quirk to cdrom_id, to boot from qemu
 Resolves: rhbz#609049