Hello community, here is the log from the commit of package libdlm for openSUSE:13.1 checked in at 2013-09-26 11:47:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1/libdlm (Old) and /work/SRC/openSUSE:13.1/.libdlm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libdlm" Changes: -------- --- /work/SRC/openSUSE:13.1/libdlm/libdlm.changes 2013-09-23 10:56:59.000000000 +0200 +++ /work/SRC/openSUSE:13.1/.libdlm.new/libdlm.changes 2013-09-26 11:47:03.000000000 +0200 @@ -1,0 +2,33 @@ +Sat Sep 7 09:40:54 CDT 2013 - rgold...@suse.com + +- Build dlm_stonith to prox fencing for pacemaker + + build-dlm_stonith.patch +- Remove patch to use default fscontrol using sysconfig + - libdlm-enable-fscontrol.patch + +------------------------------------------------------------------- +Thu Aug 1 04:33:51 UTC 2013 - lzh...@suse.com + +- Update to V4.0.2 + +------------------------------------------------------------------- +Tue Jul 23 01:44:05 UTC 2013 - lzh...@suse.com + +- Update to V4.0.1(openSuse13.1) + + file a patch for opensuse build service +- Remove patches from sle11sp3 for either merged in the upstream + or obsoleted. + - bnc804707-reduce-RR-priority.patch + - bnc777137-fix-plock-dev_write_no_op.patch + - libdlm-gcc47.patch + - libdlm-pacemaker.patch + +------------------------------------------------------------------- +Mon Jun 24 07:59:44 UTC 2013 - y...@suse.com + +- dl_controld: libdlm-pacemaker.patch + * Replace use of send_ais_text() with send_cluster_text() + * Replace use of ais_dispatch() with plugin_dispatch() + * Replace use of crm_peer_id_cache with crm_peer_cache + +------------------------------------------------------------------- Old: ---- bnc777137-fix-plock-dev_write-no-op.patch bnc798263-fix-opensuse123-compile-error.patch bnc804707-reduce-RR-priority.patch libdlm-gcc47.patch libdlm-pacemaker.patch libdlm.tar.bz2 use-symlink-in-udev-rules.patch New: ---- Makefile-for-diff-arch.patch _service_error build-dlm_stonith.patch libdlm-4.0.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdlm.spec ++++++ --- /var/tmp/diff_new_pack.xCU2DM/_old 2013-09-26 11:47:03.000000000 +0200 +++ /var/tmp/diff_new_pack.xCU2DM/_new 2013-09-26 11:47:03.000000000 +0200 @@ -19,9 +19,6 @@ %if 0%{?suse_version} %define _libexecdir %{_libdir} %endif -%define with_extra_warnings 0 -%define with_debugging 0 -%define without_fatal_warnings 1 %if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} %define pkg_group System Environment/Daemons %else @@ -32,25 +29,19 @@ Summary: Application interface to the kernel's distributed lock manager License: GPL-2.0 and GPL-2.0+ and LGPL-2.1+ Group: Productivity/Clustering/HA -Version: 3.00.01 +Version: 4.0.2 Release: 0 Url: http://sources.redhat.com/cluster/wiki -Source: libdlm.tar.bz2 -Patch0: libdlm-pacemaker.patch -Patch1: libdlm-gcc47.patch -Patch2: bnc777137-fix-plock-dev_write-no-op.patch -Patch3: bnc798263-fix-opensuse123-compile-error.patch -Patch4: bnc804707-reduce-RR-priority.patch -Patch5: use-symlink-in-udev-rules.patch +Source: libdlm-4.0.2.tar.gz +Patch1: Makefile-for-diff-arch.patch +Patch2: build-dlm_stonith.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: pacemaker BuildRequires: glib2-devel -BuildRequires: kernel-source >= 2.6.26 BuildRequires: libcorosync-devel -BuildRequires: libopenais-devel BuildRequires: libpacemaker-devel BuildRequires: libtool BuildRequires: libxml2-devel +BuildRequires: systemd-devel %description Libraries and tools that allow applications, particularly filesystems @@ -79,71 +70,45 @@ %prep ########################################################### -%setup -n libdlm -%patch0 -p1 +%setup -n %{name}-%{version} %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 ########################################################### %build -modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")" -DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\"" -TIME="\"$(date -d "${modified}" "+%%R")\"" -find . -name '*.[ch]' -exec sed -i "s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g" {} + - -# TODO: revisit -all -CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}" -# Feature-dependent CFLAGS: -%if %with_extra_warnings -# CFLAGS="${CFLAGS} -Wshadow -Wfloat-equal -Waggregate-return -Wnested-externs -Wunreachable-code -Wendif-labels -Winline" -CFLAGS="${CFLAGS} -Wfloat-equal -Wendif-labels -Winline" -%endif -%if %with_debugging -CFLAGS="${CFLAGS} -O0" -%endif -# Distribution specific settings: -%if 0%{?suse_version} > 1001 -CFLAGS="${CFLAGS} -fstack-protector-all" -%endif -%if 0%{?suse_version} > 1020 -CFLAGS="$CFLAGS -fgnu89-inline" -%endif -%if 0%{?fedora_version} > 6 -CFLAGS="$CFLAGS -fgnu89-inline" -%endif -export CFLAGS -./autogen.sh -%configure --enable-pacemaker --disable-cman -export MAKE="make %{?jobs:-j%jobs}" -make %{?jobs:-j%jobs} +make all ########################################################### %install ########################################################### make DESTDIR=$RPM_BUILD_ROOT install -mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/packages/ -mv $RPM_BUILD_ROOT%{_datadir}/doc/{dlm,packages/libdlm-%{version}} -# Cleanup -[ -d $RPM_BUILD_ROOT/usr/share/libtool ] && rm -rf $RPM_BUILD_ROOT/usr/share/libtool -find $RPM_BUILD_ROOT -name '*.a' -type f -print0 | xargs -0 rm -f -find $RPM_BUILD_ROOT -name '*.la' -type f -print0 | xargs -0 rm -f +mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/packages/libdlm-%{version} +mv $RPM_BUILD_ROOT/lib $RPM_BUILD_ROOT/etc + +install -Dm 0644 init/dlm.service $RPM_BUILD_ROOT%{_unitdir}/dlm.service +install -Dm 0644 init/dlm.sysconfig $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.dlm + ########################################################### +%post +%fillup_only -n dlm +%service_add_post dlm.service + +%preun +%service_del_preun dlm.service + %clean ########################################################### -if - [ -n "${RPM_BUILD_ROOT}" -a "${RPM_BUILD_ROOT}" != "/" ] -then - rm -rf $RPM_BUILD_ROOT -fi +make clean ########################################################### -%post -n libdlm3 -p /sbin/ldconfig +%post -n libdlm3 +/sbin/ldconfig +exit 0 -%postun -n libdlm3 -p /sbin/ldconfig +%postun -n libdlm3 +/sbin/ldconfig +exit 0 %files ########################################################### @@ -152,11 +117,15 @@ %dir %{_sysconfdir}/udev/rules.d %dir %{_datadir}/doc/packages/libdlm-%{version} %config %{_sysconfdir}/udev/rules.d/51-dlm.rules -%{_sbindir}/dlm_controld.pcmk +%{_sbindir}/dlm_controld +%{_sbindir}/dlm_stonith %{_sbindir}/dlm_tool -%{_datadir}/man/man8/dlm_tool.8.gz -%{_datadir}/man/man8/dlm_controld.8.gz +%{_datadir}/man/man8/*.gz +%{_datadir}/man/man3/*.gz +%{_datadir}/man/man5/*.gz %{_datadir}/doc/packages/libdlm-%{version} +%{_unitdir}/dlm.service +/var/adm/fillup-templates/sysconfig.dlm %files -n libdlm3 %defattr(-,root,root) @@ -170,10 +139,7 @@ %{_libdir}/libdlm*.so %{_libdir}/pkgconfig/libdlm.pc %{_libdir}/pkgconfig/libdlm_lt.pc -%{_libdir}/pkgconfig/libdlmcontrol.pc %{_includedir}/libdlm.h %{_includedir}/libdlmcontrol.h -%{_datadir}/man/man3/dlm_*.3.gz -%{_datadir}/man/man3/libdlm.3.gz %changelog ++++++ Makefile-for-diff-arch.patch ++++++ Index: libdlm-4.0.2/dlm_controld/Makefile =================================================================== --- libdlm-4.0.2.orig/dlm_controld/Makefile +++ libdlm-4.0.2/dlm_controld/Makefile @@ -1,6 +1,11 @@ DESTDIR= PREFIX=/usr -LIBNUM=/lib64 +cpu_bit=$(shell getconf LONG_BIT) +ifeq ($(cpu_bit),64) + LIBNUM=/lib64 +else + LIBNUM=/lib +endif BINDIR=$(PREFIX)/sbin LIBDIR=$(PREFIX)/$(LIBNUM) HDRDIR=$(PREFIX)/include Index: libdlm-4.0.2/libdlm/Makefile =================================================================== --- libdlm-4.0.2.orig/libdlm/Makefile +++ libdlm-4.0.2/libdlm/Makefile @@ -1,6 +1,11 @@ DESTDIR= PREFIX=/usr -LIBNUM=/lib64 +cpu_bit=$(shell getconf LONG_BIT) +ifeq ($(cpu_bit),64) + LIBNUM=/lib64 +else + LIBNUM=/lib +endif LIBDIR=$(PREFIX)/$(LIBNUM) HDRDIR=$(PREFIX)/include MANDIR=$(PREFIX)/share/man ++++++ _service_error ++++++ service daemon error: connect to source-service:5152: Connection refused ++++++ build-dlm_stonith.patch ++++++ Index: libdlm-4.0.2/Makefile =================================================================== --- libdlm-4.0.2.orig/Makefile 2013-07-31 10:50:26.000000000 -0500 +++ libdlm-4.0.2/Makefile 2013-09-07 09:39:28.252488981 -0500 @@ -2,14 +2,17 @@ all: make -C libdlm $@ make -C dlm_controld $@ make -C dlm_tool $@ + make -C fence $@ install: make -C libdlm $@ make -C dlm_controld $@ make -C dlm_tool $@ + make -C fence $@ clean: make -C libdlm $@ make -C dlm_controld $@ make -C dlm_tool $@ + make -C fence $@ -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org