Hello community, here is the log from the commit of package dmraid for openSUSE:Factory checked in at Tue Feb 9 22:51:51 CET 2010. -------- --- dmraid/dmraid.changes 2009-10-06 00:32:30.000000000 +0200 +++ /mounts/work_src_done/STABLE/dmraid/dmraid.changes 2010-02-02 04:52:17.000000000 +0100 @@ -1,0 +2,10 @@ +Tue Feb 2 03:46:18 UTC 2010 - nfbrown@novell.com + +- new upstream version, including latest CVS updates. + Both libdmraid-events and dm_dso_reg_tool are not + in the main package. +- dm_dso_reg_tool has been renamed to dmevent_tool in + line with upstream change. + bnc#528796 bnc#511329 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ARM_libdmraid_ldflags.diff dm_dso_reg_tool-1.0.0.rc2.tgz dmraid-1.0.0.rc14-fixup_lsi1068e.patch dmraid-1.0.0.rc15-fix_macro.patch dmraid-1.0.0.rc15-isw-raid10.patch dmraid-1.0.0.rc15-isw-serial.patch dmraid-1.0.0.rc15-rm_partitions.patch dmraid-1.0.0.rc15-scsi_serial_remove_ws.patch dmraid-1.0.0.rc15.tar.bz2 dmraid-fdleak.patch dmraid_duplicate_args.patch dmraid_fixup_paths3.diff libdmraid-events.dif libdmraid-events_DSO-1.0.0.rc4.tgz New: ---- dmraid-1.0.0.rc16-cvs-2010-02-02.patch dmraid-1.0.0.rc16.tar.bz2 lib-install.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dmraid.spec ++++++ --- /var/tmp/diff_new_pack.FeYWIJ/_old 2010-02-09 22:50:59.000000000 +0100 +++ /var/tmp/diff_new_pack.FeYWIJ/_new 2010-02-09 22:50:59.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package dmraid (Version 1.0.0.rc15) +# spec file for package dmraid (Version 1.0.0.rc16) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,33 +23,21 @@ BuildRequires: libselinux-devel Requires: kpartx Url: http://people.redhat.com/~heinzm/sw/dmraid/src/ -License: GPL v2 or later +License: GPLv2+ Group: System/Base AutoReqProv: on Summary: A Device-Mapper Software RAID Support Tool -Version: 1.0.0.rc15 -Release: 9 +Version: 1.0.0.rc16 +Release: 1 Source: ftp://people.redhat.com/heinzm/sw/dmraid/src/dmraid-%{version}.tar.bz2 Source1: sysconfig.dmraid Source2: boot.dmraid Source3: README.SuSE Source4: mkinitrd-setup.sh Source5: mkinitrd-boot.sh -Source6: libdmraid-events_DSO-1.0.0.rc4.tgz -Source7: dm_dso_reg_tool-1.0.0.rc2.tgz -Patch0: dmraid_fixup_paths3.diff -Patch3: dmraid_duplicate_args.patch -Patch4: dmraid-1.0.0.rc13-geometry.patch -Patch6: dmraid-1.0.0.rc15-fix_macro.patch -Patch10: dmraid-1.0.0.rc14-fixup_lsi1068e.patch -Patch11: dmraid-1.0.0.rc15-scsi_serial_remove_ws.patch -Patch13: dmraid-1.0.0.rc15-isw-raid10.patch -Patch14: dmraid-1.0.0.rc15-rm_partitions.patch -Patch15: dmraid-1.0.0.rc15-isw-serial.patch -Patch16: dmraid-fdleak.patch -Patch500: ARM_libdmraid_ldflags.diff -# libdmraid-events -Patch50: libdmraid-events.dif +Patch1: dmraid-1.0.0.rc16-cvs-2010-02-02.patch +Patch2: dmraid-1.0.0.rc13-geometry.patch +Patch3: lib-install.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %fillup_prereq @@ -79,53 +67,11 @@ -------- Heinz Mauelshagen -%package -n libdmraid-events0 -License: GPL v2 or later -Group: System/Base -Summary: A Device-Mapper Software RAID Support Tool - -%description -n libdmraid-events0 -This software discovers, activates, deactivates, and displays -properties of software RAID sets, such as ATARAID, and contained DOS -partitions. - -dmraid uses libdevmapper and the device-mapper kernel runtime to create -devices with respective mappings for the ATARAID sets discovered. - -The following ATARAID types are supported: - -- Highpoint HPT37X - -- Highpoint HPT45X - -- Intel Software RAID - -- Promise FastTrak - -- Silicon Image Medley - - - -Authors: --------- - Heinz Mauelshagen - %prep -%setup -a 6 -a 7 -n dmraid/%{version} -%patch0 -p2 +%setup -n dmraid/%{version} +%patch1 -p1 +%patch2 -p1 %patch3 -p1 -%patch4 -p1 -%patch6 -p1 -%patch10 -p1 -%patch11 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 -%patch16 -pushd libdmraid* -%patch50 -%patch500 -p1 -popd cp %{SOURCE3} . %build @@ -135,26 +81,21 @@ # Update config.{guess,sub} %{?suse_update_config} export CFLAGS="$RPM_OPT_FLAGS" -./configure --prefix=%{_prefix} \ - --infodir=%{_infodir} \ - --libdir=%{_libdir} \ - --mandir=%{_mandir} \ - --sbindir=/sbin \ +./configure --prefix=$RPM_BUILD_ROOT%{_prefix} \ + --infodir=$RPM_BUILD_ROOT%{_infodir} \ + --libdir=$RPM_BUILD_ROOT/%_lib \ + --mandir=$RPM_BUILD_ROOT%{_mandir} \ + --includedir=$RPM_BUILD_ROOT%{_includedir} \ + --sbindir=$RPM_BUILD_ROOT/sbin \ --with-user=`id -nu` --with-group=`id -ng` \ --enable-libselinux --enable-libsepol make -pushd libdmraid-events -CPATH=../include LIBRARY_PATH=../lib make -ln -sf libdmraid-events.so.0 libdmraid-events.so -popd -pushd reg_tool -make -popd %install make install DESTDIR=$RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT/usr/include/dmraid -rm $RPM_BUILD_ROOT%{_libdir}/libdmraid.a +rm $RPM_BUILD_ROOT/%_lib/libdmraid.a +rm $RPM_BUILD_ROOT/%_lib/libdmraid.so mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates install -m644 %{SOURCE1} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.dmraid mkdir -p $RPM_BUILD_ROOT/etc/init.d @@ -162,10 +103,6 @@ install -d $RPM_BUILD_ROOT/lib/mkinitrd/scripts install -m 755 %{S:4} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/setup-dmraid.sh install -m 755 %{S:5} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/boot-dmraid.sh -install -D -m755 libdmraid-events/libdmraid-events.so.0 $RPM_BUILD_ROOT/%{_lib}/libdmraid-events.so.0 -cp -a libdmraid-events/libdmraid-events.so $RPM_BUILD_ROOT/%{_lib}/libdmraid-events.so -install -D -m755 reg_tool/dm_dso_reg_tool $RPM_BUILD_ROOT/sbin/dm_dso_reg_tool -install -D -m644 reg_tool/dm_dso_reg_tool.8 $RPM_BUILD_ROOT/usr/share/man/man8/dm_dso_reg_tool.8 %post [ -x /sbin/mkinitrd_setup ] && mkinitrd_setup @@ -178,18 +115,14 @@ %preun %stop_on_removal -%post -n libdmraid-events0 -p /sbin/ldconfig - -%postun -n libdmraid-events0 -p /sbin/ldconfig - %clean [ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] \ && rm -rf $RPM_BUILD_ROOT %files %defattr(-, root, root) -#%{_libdir}/libdmraid.so /sbin/dmraid +/sbin/dmevent_tool %{_mandir}/man8/* %doc LICENSE LICENSE_GPL LICENSE_LGPL README README.SuSE TODO doc/* /var/adm/fillup-templates/sysconfig.dmraid @@ -198,11 +131,7 @@ %dir /lib/mkinitrd/scripts /lib/mkinitrd/scripts/setup-dmraid.sh /lib/mkinitrd/scripts/boot-dmraid.sh -/%{_lib}/libdmraid-events.so -/sbin/dm_dso_reg_tool - -%files -n libdmraid-events0 -%defattr(-, root, root) -/%{_lib}/libdmraid-events.so.0 +/%{_lib}/libdmraid-events-isw.so +/%{_lib}/libdmraid.so.1.0.0.rc16-3 %changelog ++++++ dmraid-1.0.0.rc13-geometry.patch ++++++ --- /var/tmp/diff_new_pack.FeYWIJ/_old 2010-02-09 22:51:00.000000000 +0100 +++ /var/tmp/diff_new_pack.FeYWIJ/_new 2010-02-09 22:51:00.000000000 +0100 @@ -1,8 +1,10 @@ -Index: 1.0.0.rc15/lib/activate/devmapper.c -=================================================================== ---- 1.0.0.rc15.orig/lib/activate/devmapper.c 2008-06-20 18:03:04.000000000 +0200 -+++ 1.0.0.rc15/lib/activate/devmapper.c 2008-09-24 16:20:58.000000000 +0200 -@@ -207,6 +207,82 @@ run_task(struct lib_context *lc, struct +--- + lib/activate/devmapper.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 80 insertions(+) + +--- 1.0.0.rc16.orig/lib/activate/devmapper.c ++++ 1.0.0.rc16/lib/activate/devmapper.c +@@ -207,6 +207,82 @@ run_task(struct lib_context *lc, struct return ret; } @@ -84,10 +86,10 @@ + /* Create a mapped device. */ int - dm_create(struct lib_context *lc, struct raid_set *rs, char *table) + dm_create(struct lib_context *lc, struct raid_set *rs, char *table, char *name) @@ -216,6 +292,10 @@ dm_create(struct lib_context *lc, struct /* Create <dev_name> */ - ret = run_task(lc, rs, table, DM_DEVICE_CREATE); + ret = run_task(lc, rs, table, DM_DEVICE_CREATE, name); + /* Set geometry */ + if (ret) ++++++ dmraid-1.0.0.rc16-cvs-2010-02-02.patch ++++++ ++++ 6268 lines (skipped) ++++++ dmraid-1.0.0.rc15.tar.bz2 -> dmraid-1.0.0.rc16.tar.bz2 ++++++ ++++ 76922 lines of diff (skipped) ++++++ lib-install.patch ++++++ Fix two issues with installing shared libraries. 1/ the [[ =~ ]] operator only treats the RHS as a regular expression if it isn't quoted. So we need to remove the quotes. 2/ The libdmraid-event-* library is not a shared library in the regular sense. i.e. programs are not linked against it and so do not have the library version number encoded in them. Rather, this is a shared-object that is explicitly loaded by dmeventd on request from dmraid. dmraid asks for "libdmraid-event-ism.so", so that is the only name that the shared object should be stored under. Providing a name with a trailing version number just makes it look like something that it is not. Signed-off-by: NeilBrown <neilb@suse.de> --- lib/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- dmraid.orig/lib/Makefile.in +++ dmraid/lib/Makefile.in @@ -82,7 +82,7 @@ install_dmraid_libs: $(INSTALL_TARGETS) for f in $(INSTALL_TARGETS); \ do \ n=$$(basename $${f}) ; \ - if [[ "$$n" =~ '.so$$' ]]; then \ + if [[ "$$n" =~ .so$$ && ! "$$n" =~ libdmraid-events-.* ]]; then \ $(INSTALL) -m 555 $(STRIP) \ $$f $(libdir)/$${n}.@DMRAID_LIB_VERSION@; \ $(LN_S) -f $${n}.@DMRAID_LIB_VERSION@ $(libdir)/$${n}; \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org