From 5649934558a4df937806aba241e32e82a96d00c0 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Mon, 15 Sep 2008 14:32:55 +0000
Subject: [PATCH] Rev openSUSE:Factory/35 Md5 abb6811f19efecca22d77c418a96d1cb
2008-09-15 14:32:55 unknown None
---
README.SUSE | 28 ----------------------------
README.SUSE.uuidd | 28 ++++++++++++++++++++++++++++
e2fsprogs.changes | 6 ++++++
e2fsprogs.spec | 10 +++++++---
4 files changed, 41 insertions(+), 31 deletions(-)
create mode 100644 README.SUSE.uuidd
diff --git a/README.SUSE b/README.SUSE
index 98992ad..ef2be40 100644
--- a/README.SUSE
+++ b/README.SUSE
@@ -1,31 +1,3 @@
-Using uuidd
------------
-The uuidd is a solution to guarantee unique time-based UUIDs. In the
-past there was the problem that UUIDs created by libuuid have not been
-guaranteed to be unique if you run multiple processes/threads which
-create lots of UUIDs simultaneously. In order to use this daemon you
-have to run this daemon with SUID/SGID bit set:
-
-1. Modify your local permissions setting by adding the following
- line to your /etc/permissions.local
- /usr/sbin/uuidd uuidd:uuidd 6755
-
-2. Set the permissions with
- $ chkstat --set /etc/permissions.local
-
-3. enable the service uuidd either in YaST or with
- $ insserv uuidd
-
-The damon is designed to run on demand by default, this means
-it is started automatically by libuuid when needed and it
-terminates by default after 5 minutes of inactivity.
-However if you wish to run the daemon permanently you can
-set the parameter UUIDD_ON_DEMAND_ONLY in /etc/sysconfig/uuidd
-to "no".
-Note, the damon is not needed in general to create time-based
-UUIDs, it is only needed to assure the uniqueness of UUIDs
-when creating lots of them in a short amount of time.
-
e2fsprogs-devel
---------------
Since the e2fsprogs libraries has been split out into own packages,
diff --git a/README.SUSE.uuidd b/README.SUSE.uuidd
new file mode 100644
index 0000000..74a8332
--- /dev/null
+++ b/README.SUSE.uuidd
@@ -0,0 +1,28 @@
+Using uuidd
+-----------
+The uuidd is a solution to guarantee unique time-based UUIDs. In the
+past there was the problem that UUIDs created by libuuid have not been
+guaranteed to be unique if you run multiple processes/threads which
+create lots of UUIDs simultaneously. In order to use this daemon you
+have to run it with SUID/SGID bit set:
+
+1. Modify your local permissions setting by adding the following
+ line to your /etc/permissions.local
+ /usr/sbin/uuidd uuidd:uuidd 6755
+
+2. Set the permissions with
+ $ chkstat --set /etc/permissions.local
+
+3. enable the service uuidd either in YaST or with
+ $ insserv uuidd
+
+The daemon is designed to run on demand by default, this means
+it is started automatically by libuuid when needed and it
+terminates by default after 5 minutes of inactivity.
+However if you wish to run the daemon permanently you can
+set the parameter UUIDD_ON_DEMAND_ONLY in /etc/sysconfig/uuidd
+to "no".
+Note, the daemon is not needed in general to create time-based
+UUIDs, it is only needed to assure the uniqueness of UUIDs
+when creating lots of them in a short amount of time.
+
diff --git a/e2fsprogs.changes b/e2fsprogs.changes
index 2fc5e20..f63dd16 100644
--- a/e2fsprogs.changes
+++ b/e2fsprogs.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Sep 15 15:23:43 CEST 2008 - mkoenig@suse.de
+
+- remove recommends of uuid-runtime from libuuid [bnc#426278]
+- move uuid hints README.SUSE.uuidd to uuid-runtime package
+
-------------------------------------------------------------------
Fri Sep 5 11:09:48 CEST 2008 - mkoenig@suse.de
diff --git a/e2fsprogs.spec b/e2fsprogs.spec
index 2044e86..57aedbc 100644
--- a/e2fsprogs.spec
+++ b/e2fsprogs.spec
@@ -27,13 +27,14 @@ Supplements: filesystem(ext2) filesystem(ext3)
PreReq: %install_info_prereq
AutoReqProv: on
Version: 1.41.1
-Release: 1
+Release: 8
Summary: Utilities for the Second Extended File System
Url: http://e2fsprogs.sourceforge.net
Source: %{name}-%{version}.tar.bz2
Source2: README.SUSE
Source3: uuidd.rc
Source4: sysconfig.uuidd
+Source5: README.SUSE.uuidd
#
# e2fsprogs patches
#
@@ -207,7 +208,6 @@ License: GPL v2 or later
Summary: Library to generate UUIDs
Group: System/Filesystems
AutoReqProv: on
-Recommends: uuid-runtime
%description -n libuuid1
A library to generate universally unique IDs (UUIDs).
@@ -253,7 +253,7 @@ Authors:
%if %{no_command_hiding}
%patch99 -p1
%endif
-cp %{SOURCE2} .
+cp %{SOURCE2} %{SOURCE5} .
%build
%{?suse_update_config:%{suse_update_config -f}}
@@ -403,6 +403,7 @@ rm -rf $RPM_BUILD_ROOT
%files -n uuid-runtime
%defattr(-, root, root)
+%doc README.SUSE.uuidd
/usr/bin/uuidgen
%verify(not mode) %attr(0755,root,root) /usr/sbin/uuidd
%attr(-,uuidd,uuidd) %dir /var/lib/libuuid
@@ -465,6 +466,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man3/com_err.3.gz
%changelog
+* Mon Sep 15 2008 mkoenig@suse.de
+- remove recommends of uuid-runtime from libuuid [bnc#426278]
+- move uuid hints README.SUSE.uuidd to uuid-runtime package
* Fri Sep 05 2008 mkoenig@suse.de
- update to version 1.41.1
* mke2fs