- 1.02.17

Changed files:
    device-mapper-klibc.patch -> 1.7
    device-mapper-linking.patch -> 1.2
    device-mapper.spec -> 1.71

diff --git a/device-mapper-klibc.patch b/device-mapper-klibc.patch
index 544969b66577e052f779da89e2e0793a432d90d9..470890a23212c8bd83fe0f6d45f0eb3a5958e503 100644 (file)
--- a/device-mapper-klibc.patch
+++ b/device-mapper-klibc.patch
@@ -91,7 +91,7 @@
                        if (!strcmp(name, nm)) {
                                if (number) {
                                        *number = num;
-@@ -154,10 +162,8 @@
+@@ -155,10 +163,9 @@
                                }
                                dm_bit_set(_dm_bitset, num);
                        }
@@ -99,11 +99,12 @@
 -                      c = fgetc(fl);
 -              } while (c != EOF && c != '\n');
 -      }
-+              }
++              }
 +      } while (size > 0);
-       fclose(fl);
++      
+       if (fclose(fl))
+               log_error("%s: fclose failed: %s", file, strerror(errno));
  
-       if (number) {
 --- device-mapper.1.02.09.orig/lib/libdm-file.c        2006-05-10 16:23:41.000000000 +0000
 +++ device-mapper.1.02.09.klibc/lib/libdm-file.c       2006-09-27 18:22:22.000000000 +0000
 @@ -16,10 +16,16 @@

diff --git a/device-mapper-linking.patch b/device-mapper-linking.patch
index fdc5964162993762c56f23a68bd21bf5a2cd562f..f46707cf42cb198246707103270504466c20c865 100644 (file)
--- a/device-mapper-linking.patch
+++ b/device-mapper-linking.patch
@@ -1,11 +1,11 @@
---- device-mapper.1.02.09/dmeventd/Makefile.in~        2006-04-19 17:32:05.000000000 +0000
-+++ device-mapper.1.02.09/dmeventd/Makefile.in 2006-09-27 14:15:09.000000000 +0000
-@@ -28,7 +28,7 @@
- 
+--- device-mapper.1.02.09/dmeventd/Makefile.in~ 2006-04-19 17:32:05.000000000 +0000
++++ device-mapper.1.02.09/dmeventd/Makefile.in  2006-09-27 14:15:09.000000000 +0000
+@@ -31,7 +31,7 @@
  include ../make.tmpl
- 
+
+ LDFLAGS += -ldl -ldevmapper -lpthread
 -CLDFLAGS += -ldl -ldevmapper -lpthread
 +LIBS += -ldl ../lib/ioctl/libdevmapper.so -lpthread
- 
- .PHONY: install_dynamic install_static install_include \
-       install_pkgconfig
+
+ dmeventd: $(LIB_SHARED) dmeventd.o
+        $(CC) -o $@ dmeventd.o $(CFLAGS) $(LDFLAGS) \

diff --git a/device-mapper.spec b/device-mapper.spec
index 82005faab31645c01b3360668f6078bc02d5fd77..cff4072c6d720ac8a7f4ae503824d56058f4fc6f 100644 (file)
--- a/device-mapper.spec
+++ b/device-mapper.spec
@@ -8,12 +8,12 @@
 Summary:       Userspace support for the device-mapper
 Summary(pl):   Wsparcie dla mapowania urz±dzeñ w przestrzeni u¿ytkownika
 Name:          device-mapper
-Version:       1.02.13
+Version:       1.02.17
 Release:       0.1
 License:       GPL v2
 Group:         Applications/System
 Source0:       ftp://sources.redhat.com/pub/dm/%{name}.%{version}.tgz
-# Source0-md5: 9ab13083a939ceb26ce5da6b625aeb3c
+# Source0-md5: b7347565dd3deb2b5a963db5fe96394c
 # http://www.redhat.com/archives/dm-devel/2005-March/msg00022.html
 Patch0:                %{name}-disable_dynamic_link.patch
 Patch1:                %{name}-klibc.patch