Hello community,
here is the log from the commit of package dmraid
checked in at Tue Aug 29 16:26:02 CEST 2006.
--------
--- dmraid/dmraid.changes 2006-01-25 21:35:31.000000000 +0100
+++ dmraid/dmraid.changes 2006-08-29 10:11:34.000000000 +0200
@@ -1,0 +2,8 @@
+Tue Aug 29 10:09:10 CEST 2006 - hare@suse.de
+
+- update to 1.0.0-rc11
+- NVidia endianness fixes
+- Add UUID to device-mapper tables
+- Fixup '-cc' argument
+
+-------------------------------------------------------------------
Old:
----
dmraid-1.0.0.rc8.tar.bz2
dmraid_fixup_paths2.diff
dmraid_fixup_pdc_endian.diff
dmraid_fixup_rc_output.diff
New:
----
dmraid-1.0.0.rc11-dupes.patch
dmraid-1.0.0.rc11-format-handler-dos.patch
dmraid-1.0.0.rc11-hpt37x-errorlog.patch
dmraid-1.0.0.rc11-metadata-stride.patch
dmraid-1.0.0.rc11.tar.bz2
dmraid_add_uuid.patch
dmraid_duplicate_args.patch
dmraid_fixup_nvidia.diff
dmraid_fixup_paths3.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dmraid.spec ++++++
--- /var/tmp/diff_new_pack.U7qEgh/_old 2006-08-29 16:22:19.000000000 +0200
+++ /var/tmp/diff_new_pack.U7qEgh/_new 2006-08-29 16:22:19.000000000 +0200
@@ -1,11 +1,11 @@
#
-# spec file for package dmraid (Version 0.99_1.0.0rc8)
+# spec file for package dmraid (Version 1.0.0.rc11)
#
-# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
-# Please submit bugfixes or comments via http://bugs.opensuse.org
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
@@ -17,12 +17,17 @@
Group: System/Base
Autoreqprov: on
Summary: A Device-Mapper Software RAID Support Tool
-Version: 0.99_1.0.0rc8
-Release: 3
-Source0: dmraid-1.0.0.rc8.tar.bz2
-Patch: dmraid_fixup_paths2.diff
-Patch1: dmraid_fixup_rc_output.diff
-Patch2: dmraid_fixup_pdc_endian.diff
+Version: 1.0.0.rc11
+Release: 1
+Source: ftp://people.redhat.com/heinzm/sw/dmraid/src/dmraid-%{version}.tar.bz2
+Patch0: dmraid-1.0.0.rc11-metadata-stride.patch
+Patch1: dmraid-1.0.0.rc11-format-handler-dos.patch
+Patch2: dmraid-1.0.0.rc11-hpt37x-errorlog.patch
+Patch3: dmraid-1.0.0.rc11-dupes.patch
+Patch4: dmraid_fixup_paths3.diff
+Patch5: dmraid_add_uuid.patch
+Patch6: dmraid_fixup_nvidia.diff
+Patch7: dmraid_duplicate_args.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -45,10 +50,15 @@
Heinz Mauelshagen
%prep
-%setup -n dmraid/1.0.0.rc8/
-%patch -p1
-#%patch1 -p2
-%patch2 -p1
+%setup -n dmraid/%{version}
+%patch0 -p2
+%patch1 -p2
+%patch2 -p2
+%patch3 -p2
+%patch4 -p2
+%patch5 -p1
+%patch6 -p2
+%patch7 -p1
%build
#rm -f aclocal.m4
@@ -69,6 +79,8 @@
[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] \
&& rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT/usr/include/dmraid
+rm $RPM_BUILD_ROOT%{_libdir}/libdmraid.a
%clean
[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] \
@@ -82,6 +94,11 @@
%doc LICENSE LICENSE_GPL LICENSE_LGPL README TODO doc/*
%changelog -n dmraid
+* Tue Aug 29 2006 - hare@suse.de
+- update to 1.0.0-rc11
+- NVidia endianness fixes
+- Add UUID to device-mapper tables
+- Fixup '-cc' argument
* Wed Jan 25 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
* Mon Dec 05 2005 - kukuk@suse.de
++++++ dmraid-1.0.0.rc11-dupes.patch ++++++
--- dmraid/1.0.0.rc11/lib/Makefile.in.dupes 2006-07-28 16:13:29.000000000 -0400
+++ dmraid/1.0.0.rc11/lib/Makefile.in 2006-07-28 16:14:19.000000000 -0400
@@ -35,7 +35,6 @@
format/ataraid/pdc.c \
format/ataraid/sil.c \
format/ataraid/via.c \
- format/ataraid/asr.c \
format/partition/dos.c
OBJECTS=$(SOURCES:%.c=%.o)
++++++ dmraid-1.0.0.rc11-format-handler-dos.patch ++++++
--- dmraid/1.0.0.rc11/lib/format/partition/dos.c.orig 2006-01-18 13:55:09.000000000 +0100
+++ dmraid/1.0.0.rc11/lib/format/partition/dos.c 2006-07-07 19:55:15.000000000 +0200
@@ -143,6 +143,17 @@
return rs;
}
+/* Check sector vs. RAID device end */
+static int rd_check_end(struct lib_context *lc,
+ struct raid_dev *rd, uint64_t sector)
+{
+ if (sector > rd->di->sectors)
+ LOG_ERR(lc, 1, "%s: partition address past end of RAID device",
+ handler);
+
+ return 0;
+}
+
/*
* Allocate a DOS RAID device and a set.
* Set the device up and add it to the set.
@@ -173,7 +184,9 @@
r->offset = get_part_start(raw_part, sector);
r->sectors = (uint64_t) raw_part->length;
- if (!(rs = _alloc_raid_set(lc, r)))
+ if (rd_check_end(lc, rd, r->offset) ||
+ rd_check_end(lc, rd, r->offset + r->sectors) ||
+ !(rs = _alloc_raid_set(lc, r)))
goto free_di;
list_add_tail(&r->devs, &rs->devs);
@@ -238,13 +251,13 @@
* An entry pointing to the present logical partition.
* It is an offset from the present partition table location.
*/
- p1 = &dos->partitions[0];
+ p1 = dos->partitions;
/*
* An entry pointing to the next logical partition table.
* It is an offset from the main extended partition start.
*/
- p2 = &dos->partitions[1];
+ p2 = dos->partitions + 1;
/* If it is a partition, add it to the set */
if (is_partition(p1, start_sector) &&
@@ -301,8 +314,12 @@
part_end = part_start + raw_table_entry->length;
/* Avoid infinite recursion (mostly). */
- if (part_start == start_sector ||
- part_end > rd->sectors)
+ if (part_start == start_sector)
+ continue;
+
+ /* Check bogus partition starts + ends */
+ if (rd_check_end(lc, rd, part_start) ||
+ rd_check_end(lc, rd, part_end))
continue;
/*
@@ -365,7 +382,7 @@
.check = dos_check,
.events = NULL, /* Not supported */
#ifdef DMRAID_NATIVE_LOG
- .log = NULL, /* Not supported */
+ .log = NULL, /* Not supported; use fdisk and friends */
#endif
};
++++++ dmraid-1.0.0.rc11-hpt37x-errorlog.patch ++++++
--- dmraid/1.0.0.rc11/lib/format/ataraid/hpt37x.c.errorlog 2006-07-28 15:42:22.000000000 -0400
+++ dmraid/1.0.0.rc11/lib/format/ataraid/hpt37x.c 2006-07-28 15:56:05.000000000 -0400
@@ -124,7 +124,8 @@
CVT32(hpt->boot_mode);
for (l = hpt->errorlog;
- l < hpt->errorlog + hpt->error_log_entries;
+ l < hpt->errorlog + hpt->error_log_entries &&
+ l < &hpt->errorlog[HPT_MAX_ERRORS];
l++) {
CVT32(l->timestamp);
CVT32(l->lba);
--- dmraid/1.0.0.rc11/lib/format/ataraid/hpt37x.h.errorlog 2006-07-28 15:56:20.000000000 -0400
+++ dmraid/1.0.0.rc11/lib/format/ataraid/hpt37x.h 2006-07-28 15:56:30.000000000 -0400
@@ -90,7 +90,8 @@
uint8_t status;
uint8_t sectors;
uint32_t lba;
- } errorlog[32];
+#define HPT_MAX_ERRORS 32
+ } errorlog[HPT_MAX_ERRORS];
uint8_t filler[60];
} __attribute__ ((packed));
#endif
++++++ dmraid-1.0.0.rc11-metadata-stride.patch ++++++
--- dmraid/1.0.0.rc11/lib/metadata/metadata.c.orig 2006-03-28 16:03:13.000000000 +0200
+++ dmraid/1.0.0.rc11/lib/metadata/metadata.c 2006-07-07 19:55:42.000000000 +0200
@@ -120,7 +120,7 @@
static uint64_t add_sectors(struct raid_set *rs, uint64_t sectors,
uint64_t add)
{
- add = round_down(add, rs->stride);
+ add = rs->stride ? round_down(add, rs->stride) : add;
if (T_RAID1(rs)) {
if (!sectors || sectors > add)
++++++ dmraid-1.0.0.rc8.tar.bz2 -> dmraid-1.0.0.rc11.tar.bz2 ++++++
++++ 50614 lines of diff (skipped)
++++++ dmraid_add_uuid.patch ++++++
diff -pur 1.0.0.rc11.orig/lib/activate/devmapper.c 1.0.0.rc11/lib/activate/devmapper.c
--- 1.0.0.rc11.orig/lib/activate/devmapper.c 2006-03-29 15:18:43.000000000 +0200
+++ 1.0.0.rc11/lib/activate/devmapper.c 2006-08-28 12:55:32.000000000 +0200
@@ -153,12 +153,20 @@ int dm_create(struct lib_context *lc, st
{
int ret = 0;
struct dm_task *dmt;
+ char *uuid;
+
+ /* Generate UUID */
+ uuid = malloc(strlen(rs->name) + UUID_PREFIX_LEN + 1);
+ if (!uuid) return 1;
+
+ sprintf(uuid,UUID_PREFIX "%s",rs->name);
_init_dm();
/* Create */
ret = (dmt = dm_task_create(DM_DEVICE_CREATE)) &&
dm_task_set_name(dmt, rs->name) &&
+ dm_task_set_uuid(dmt, uuid) &&
parse_table(lc, dmt, table) &&
dm_task_run(dmt);
@@ -171,6 +179,8 @@ int dm_create(struct lib_context *lc, st
_exit_dm(dmt);
+ free(uuid);
+
return ret;
}
diff -pur 1.0.0.rc11.orig/lib/activate/devmapper.h 1.0.0.rc11/lib/activate/devmapper.h
--- 1.0.0.rc11.orig/lib/activate/devmapper.h 2005-05-23 14:39:55.000000000 +0200
+++ 1.0.0.rc11/lib/activate/devmapper.h 2006-08-28 12:55:01.000000000 +0200
@@ -8,6 +8,9 @@
#ifndef _DEVMAPPER_H_
#define _DEVMAPPER_H
+#define UUID_PREFIX "dmraid-"
+#define UUID_PREFIX_LEN 7
+
char *mkdm_path(struct lib_context *lc, const char *name);
int dm_create(struct lib_context *lc, struct raid_set *rs, char *table);
int dm_remove(struct lib_context *lc, struct raid_set *rs);
++++++ dmraid_duplicate_args.patch ++++++
Nur in 1.0.0.rc11/lib/misc: lib_context.c~.
Nur in 1.0.0.rc11: TAGS.
diff -pur 1.0.0.rc11.orig/tools/commands.c 1.0.0.rc11/tools/commands.c
--- 1.0.0.rc11.orig/tools/commands.c 2006-03-21 10:49:28.000000000 +0100
+++ 1.0.0.rc11/tools/commands.c 2006-08-29 10:06:00.000000000 +0200
@@ -127,10 +127,18 @@ static int check_identifiers(struct lib_
const char delim = *OPT_STR_SEPARATOR(lc);
char *p = optarg;
- p = remove_white_space(lc, p, strlen(p));
- p = collapse_delimiter(lc, p, strlen(p), delim);
- if (!lc_strcat_opt(lc, o, p, delim))
- return 0;
+ if (o == LC_COLUMN) {
+ while (p && *p == 'c') {
+ lc_inc_opt(lc, o);
+ p++;
+ }
+ }
+ if (p && *p) {
+ p = remove_white_space(lc, p, strlen(p));
+ p = collapse_delimiter(lc, p, strlen(p), delim);
+ if (!lc_strcat_opt(lc, o, p, delim))
+ return 0;
+ }
}
lc_inc_opt(lc, o);
Nur in 1.0.0.rc11/tools: commands.c~.
++++++ dmraid_fixup_nvidia.diff ++++++
diff -pur dmraid/1.0.0.rc11.orig/lib/datastruct/byteorder.h dmraid/1.0.0.rc11/lib/datastruct/byteorder.h
--- dmraid/1.0.0.rc11.orig/lib/datastruct/byteorder.h 2006-05-12 14:57:41.000000000 +0200
+++ dmraid/1.0.0.rc11/lib/datastruct/byteorder.h 2006-08-10 16:12:05.000000000 +0200
@@ -18,28 +18,28 @@
static inline uint64_t le64_to_cpu(uint64_t x)
{
- return((((uint64_t)x & 0x00000000000000ffULL) << 56) |
- (((uint64_t)x & 0x000000000000ff00ULL) << 40) |
- (((uint64_t)x & 0x0000000000ff0000ULL) << 24) |
- (((uint64_t)x & 0x00000000ff000000ULL) << 8) |
- (((uint64_t)x & 0x000000ff00000000ULL) >> 8) |
- (((uint64_t)x & 0x0000ff0000000000ULL) >> 24) |
- (((uint64_t)x & 0x00ff000000000000ULL) >> 40) |
- (((uint64_t)x & 0xff00000000000000ULL) >> 56));
+ return((((uint64_t)(x) & 0x00000000000000ffULL) << 56) |
+ (((uint64_t)(x) & 0x000000000000ff00ULL) << 40) |
+ (((uint64_t)(x) & 0x0000000000ff0000ULL) << 24) |
+ (((uint64_t)(x) & 0x00000000ff000000ULL) << 8) |
+ (((uint64_t)(x) & 0x000000ff00000000ULL) >> 8) |
+ (((uint64_t)(x) & 0x0000ff0000000000ULL) >> 24) |
+ (((uint64_t)(x) & 0x00ff000000000000ULL) >> 40) |
+ (((uint64_t)(x) & 0xff00000000000000ULL) >> 56));
}
static inline int32_t le32_to_cpu(int32_t x)
{
- return((((u_int32_t)x & 0x000000ffU) << 24) |
- (((u_int32_t)x & 0x0000ff00U) << 8) |
- (((u_int32_t)x & 0x00ff0000U) >> 8) |
- (((u_int32_t)x & 0xff000000U) >> 24));
+ return((((u_int32_t)(x) & 0x000000ffU) << 24) |
+ (((u_int32_t)(x) & 0x0000ff00U) << 8) |
+ (((u_int32_t)(x) & 0x00ff0000U) >> 8) |
+ (((u_int32_t)(x) & 0xff000000U) >> 24));
}
static inline int16_t le16_to_cpu(int16_t x)
{
- return((((u_int16_t)x & 0x00ff) << 8) |
- (((u_int16_t)x & 0xff00) >> 8));
+ return((((u_int16_t)(x) & 0x00ff) << 8) |
+ (((u_int16_t)(x) & 0xff00) >> 8));
}
#define CVT64(x) do { x = le64_to_cpu(x); } while(0)
Nur in dmraid/1.0.0.rc11/lib/datastruct: byteorder.h~.
diff -pur dmraid/1.0.0.rc11.orig/lib/format/ataraid/nv.c dmraid/1.0.0.rc11/lib/format/ataraid/nv.c
--- dmraid/1.0.0.rc11.orig/lib/format/ataraid/nv.c 2006-03-23 13:33:00.000000000 +0100
+++ dmraid/1.0.0.rc11/lib/format/ataraid/nv.c 2006-08-10 16:20:07.000000000 +0200
@@ -151,7 +151,7 @@ static int set_sort(struct list_head *po
static void to_cpu(void *meta)
{
struct nv *nv = meta;
- unsigned int i = NV_SIGNATURES;
+ unsigned int i;
struct nv_array_base *array = &nv->array;
CVT32(nv->size);
@@ -162,7 +162,7 @@ static void to_cpu(void *meta)
CVT32(nv->unitFlags);
CVT32(array->version);
- while (i--);
+ for (i = 0; i < NV_SIGNATURES; i++);
CVT32(array->signature[i]);
CVT32(array->raidLevel);
@@ -221,15 +221,9 @@ static struct raid_dev *nv_read(struct l
static int nv_write(struct lib_context *lc, struct raid_dev *rd, int erase)
{
int ret;
-#if BYTE_ORDER != LITTLE_ENDIAN
- struct nv *nv = META(rd, nv);
- to_disk(nv);
-#endif
ret = write_metadata(lc, handler, rd, -1, erase);
-#if BYTE_ORDER != LITTLE_ENDIAN
- to_cpu(nv);
-#endif
+
return ret;
}
Nur in dmraid/1.0.0.rc11/lib/format/ataraid: nv.c~.
++++++ dmraid_fixup_paths2.diff -> dmraid_fixup_paths3.diff ++++++
--- dmraid/dmraid_fixup_paths2.diff 2005-07-14 01:30:47.000000000 +0200
+++ dmraid/dmraid_fixup_paths3.diff 2006-08-10 08:38:57.000000000 +0200
@@ -1,7 +1,29 @@
-diff -urN 1.0.0.rc8-orig/lib/Makefile.in 1.0.0.rc8/lib/Makefile.in
---- 1.0.0.rc8-orig/lib/Makefile.in 2005-03-29 14:09:36.000000000 +0200
-+++ 1.0.0.rc8/lib/Makefile.in 2005-07-13 18:22:50.783205020 +0200
-@@ -63,12 +63,12 @@
+diff -pur dmraid/1.0.0.rc10.orig/include/Makefile.in dmraid/1.0.0.rc10/include/Makefile.in
+--- dmraid/1.0.0.rc10.orig/include/Makefile.in 2006-02-17 17:19:25.000000000 +0100
++++ dmraid/1.0.0.rc10/include/Makefile.in 2006-08-08 16:36:21.000000000 +0200
+@@ -17,14 +17,14 @@ include $(top_srcdir)/make.tmpl
+
+ install_dmraid_headers: $(HEADERS)
+ @echo "Installing $(HEADERS) in $(includedir)/dmraid"
+- mkdir -p $(includedir)/dmraid
+- $(INSTALL) $(STRIP) $(HEADERS) $(includedir)/dmraid
++ mkdir -p $(DESTDIR)$(includedir)/dmraid
++ $(INSTALL) $(STRIP) $(HEADERS) $(DESTDIR)$(includedir)/dmraid
+
+ install: install_dmraid_headers
+
+ remove_dmraid_headers:
+ @echo "Removing $(HEADERS) from $(includedir)/dmraid"
+- rm -f $(includedir)/dmraid
++ rm -f $(DESTDIR)$(includedir)/dmraid
+
+ remove: remove_dmraid_headers
+
+Nur in dmraid/1.0.0.rc10/lib/activate: activate.c~.
+diff -pur dmraid/1.0.0.rc10.orig/lib/Makefile.in dmraid/1.0.0.rc10/lib/Makefile.in
+--- dmraid/1.0.0.rc10.orig/lib/Makefile.in 2006-02-17 17:19:25.000000000 +0100
++++ dmraid/1.0.0.rc10/lib/Makefile.in 2006-08-09 10:56:06.000000000 +0200
+@@ -62,16 +62,16 @@ include $(top_srcdir)/make.tmpl
install_dmraid_libs: $(INSTALL_TARGETS)
@echo "Installing $(INSTALL_TARGETS) in $(libdir)"; \
@@ -9,27 +31,35 @@
+ mkdir -p $(DESTDIR)$(libdir); \
for f in $(INSTALL_TARGETS); \
do \
- $(INSTALL) -o $(OWNER) -g $(GROUP) -m 555 $(STRIP) \
-- $$f $(libdir)/$${f}.@DMRAID_LIB_VERSION@; \
-- $(LN_S) -f $${f}.@DMRAID_LIB_VERSION@ $(libdir)/$${f}; \
-+ $$f $(DESTDIR)$(libdir)/$${f}.@DMRAID_LIB_VERSION@; \
-+ $(LN_S) -f $${f}.@DMRAID_LIB_VERSION@ $(DESTDIR)$(libdir)/$${f}; \
+ n=$$(basename $${f}) ; \
+ if [[ "$$n" =~ '.so$$' ]]; then \
+ $(INSTALL) -m 555 $(STRIP) \
+- $$f $(libdir)/$${n}.@DMRAID_LIB_VERSION@; \
+- $(LN_S) -f $${n}.@DMRAID_LIB_VERSION@ $(libdir)/$${n}; \
++ $$f $(DESTDIR)$(libdir)/$${n}.@DMRAID_LIB_VERSION@; \
++ $(LN_S) -f $${n}.@DMRAID_LIB_VERSION@ $(DESTDIR)$(libdir)/$${n}; \
+ else \
+- $(INSTALL) -m 555 $(STRIP) $$f $(libdir)/$${n}; \
++ $(INSTALL) -m 555 $(STRIP) $$f $(DESTDIR)$(libdir)/$${n}; \
+ fi \
done
- install: install_dmraid_libs
-@@ -77,7 +77,7 @@
- @echo "Removing $(INSTALL_TARGETS) from $(libdir)"; \
+@@ -82,8 +82,8 @@ remove_dmraid_libs:
for f in $(INSTALL_TARGETS); \
do \
-- rm -f $(libdir)/$${f}.@DMRAID_LIB_VERSION@; \
-+ rm -f $(DESTDIR)$(libdir)/$${f}.@DMRAID_LIB_VERSION@; \
+ n=$$(basename $${f}) ; \
+- rm -f $(libdir)/$${n}.@DMRAID_LIB_VERSION@; \
+- rm -f $(libdir)/$${n}; \
++ rm -f $(DESTDIR)$(libdir)/$${n}.@DMRAID_LIB_VERSION@; \
++ rm -f $(DESTDIR)$(libdir)/$${n}; \
done
remove: remove_dmraid_libs
-diff -urN 1.0.0.rc8-orig/make.tmpl.in 1.0.0.rc8/make.tmpl.in
---- 1.0.0.rc8-orig/make.tmpl.in 2005-03-11 13:47:28.000000000 +0100
-+++ 1.0.0.rc8/make.tmpl.in 2005-07-13 18:08:02.141065836 +0200
-@@ -21,15 +21,15 @@
+Nur in dmraid/1.0.0.rc10/lib: Makefile.in~.
+diff -pur dmraid/1.0.0.rc10.orig/make.tmpl.in dmraid/1.0.0.rc10/make.tmpl.in
+--- dmraid/1.0.0.rc10.orig/make.tmpl.in 2006-02-17 17:18:27.000000000 +0100
++++ dmraid/1.0.0.rc10/make.tmpl.in 2006-08-08 16:35:32.000000000 +0200
+@@ -21,8 +21,8 @@ LD_DEPS += @LD_DEPS@
SOFLAG += @SOFLAG@
# Setup directory variables
@@ -40,30 +70,34 @@
bindir = @bindir@
ifeq ("@KLIBC@", "no")
libdir = @libdir@
- sbindir = @sbindir@
+@@ -31,9 +31,9 @@ ifeq ("@KLIBC@", "no")
+ infodir = @infodir@
+ mandir = @mandir@
else
- libdir = $(DESTDIR)@KLIBC_LIB_DIR@
- sbindir = $(DESTDIR)@KLIBC_SBIN_DIR@
+- includedir = $(DESTDIR)@KLIBC_INCLUDE_DIR@
+ libdir = @KLIBC_LIB_DIR@
+ sbindir = @KLIBC_SBIN_DIR@
++ includedir = @KLIBC_INCLUDE_DIR@
+ infodir = @infodir@
+ mandir = @mandir@
endif
- infodir = @infodir@
- mandir = @mandir@
-diff -urN 1.0.0.rc8-orig/man/Makefile.in 1.0.0.rc8/man/Makefile.in
---- 1.0.0.rc8-orig/man/Makefile.in 2005-02-01 16:36:56.000000000 +0100
-+++ 1.0.0.rc8/man/Makefile.in 2005-07-13 18:21:23.932380699 +0200
-@@ -20,8 +20,8 @@
+diff -pur dmraid/1.0.0.rc10.orig/man/Makefile.in dmraid/1.0.0.rc10/man/Makefile.in
+--- dmraid/1.0.0.rc10.orig/man/Makefile.in 2006-02-17 17:19:25.000000000 +0100
++++ dmraid/1.0.0.rc10/man/Makefile.in 2006-08-08 16:35:32.000000000 +0200
+@@ -20,8 +20,8 @@ install_dmraid_man:
mkdir -p $(MAN8DIR); \
for f in $(MAN8); \
do \
- $(RM) $(MAN8DIR)/$$f; \
-- @INSTALL@ -D -o $(OWNER) -g $(GROUP) -m 444 $$f $(MAN8DIR)/$$f; \
+- @INSTALL@ -D -m 444 $$f $(MAN8DIR)/$$f; \
+ $(RM) $(DESTDIR)$(MAN8DIR)/$$f; \
-+ @INSTALL@ -D -o $(OWNER) -g $(GROUP) -m 444 $$f $(DESTDIR)$(MAN8DIR)/$$f; \
++ @INSTALL@ -D -m 444 $$f $(DESTDIR)$(MAN8DIR)/$$f; \
done
install: install_dmraid_man
-@@ -30,7 +30,7 @@
+@@ -30,7 +30,7 @@ remove_dmraid_man:
@echo "Removing $(MAN8) in $(MAN8DIR)"; \
for f in $(MAN8); \
do \
@@ -72,21 +106,21 @@
done
remove: remove_dmraid_man
-diff -urN 1.0.0.rc8-orig/tools/Makefile.in 1.0.0.rc8/tools/Makefile.in
---- 1.0.0.rc8-orig/tools/Makefile.in 2005-03-11 13:47:28.000000000 +0100
-+++ 1.0.0.rc8/tools/Makefile.in 2005-07-13 18:28:28.446978169 +0200
-@@ -52,8 +52,8 @@
+diff -pur dmraid/1.0.0.rc10.orig/tools/Makefile.in dmraid/1.0.0.rc10/tools/Makefile.in
+--- dmraid/1.0.0.rc10.orig/tools/Makefile.in 2006-02-17 21:16:32.000000000 +0100
++++ dmraid/1.0.0.rc10/tools/Makefile.in 2006-08-09 11:08:10.000000000 +0200
+@@ -60,8 +60,8 @@ dmraid: $(OBJECTS) $(top_srcdir)/lib/lib
install_dmraid_tools: $(TARGETS)
@echo "Installing $(TARGETS) in $(sbindir)"; \
- mkdir -p $(sbindir); \
+- $(INSTALL) $(STRIP) $(TARGETS) $(sbindir)
+ mkdir -p $(DESTDIR)$(sbindir); \
-- $(INSTALL) -o $(OWNER) -g $(GROUP) $(STRIP) $(TARGETS) $(sbindir)
-+ $(INSTALL) -o $(OWNER) -g $(GROUP) $(STRIP) $(TARGETS) $(DESTDIR)$(sbindir)
++ $(INSTALL) $(STRIP) $(TARGETS) $(DESTDIR)$(sbindir)
install: install_dmraid_tools
-@@ -60,7 +60,7 @@
+@@ -69,7 +69,7 @@ remove_dmraid_tools:
@echo "Removing $(TARGETS) from $(sbindir)"; \
for f in $(TARGETS); \
do \
@@ -95,3 +129,4 @@
done
remove: remove_dmraid_tools
+Nur in dmraid/1.0.0.rc10/tools: Makefile.in~.
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org