From f5a98777ffc1eb043e4563e2d564973ee8638cd0 Mon Sep 17 00:00:00 2001 From: David Teigland Date: Wed, 30 May 2012 15:58:03 -0500 Subject: [PATCH 1/2] Limit rhel arches --- dlm.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlm.spec b/dlm.spec index 89b01b5..3d2b95c 100644 --- a/dlm.spec +++ b/dlm.spec @@ -1,6 +1,6 @@ Name: dlm Version: 3.99.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 and GPLv2+ and LGPLv2+ # For a breakdown of the licensing, see README.license Group: System Environment/Kernel @@ -13,6 +13,10 @@ BuildRequires: libxml2-devel BuildRequires: systemd-units Source0: http://people.redhat.com/teigland/%{name}-%{version}.tar.gz +%if 0%{?rhel} +ExclusiveArch: i686 x86_64 +%endif + Requires: %{name}-lib = %{version}-%{release} Requires: corosync >= 1.99.9 Requires(post): systemd-units @@ -102,6 +106,9 @@ developing applications that use %{name}. %{_libdir}/pkgconfig/*.pc %changelog +* Wed May 30 2012 David Teigland - 3.99.4-2 +- Limit rhel arches + * Mon May 21 2012 David Teigland - 3.99.4-1 - New upstream release From 18afd5274ea81414f11b35058e1819968be9c838 Mon Sep 17 00:00:00 2001 From: David Teigland Date: Thu, 21 Jun 2012 16:59:20 -0500 Subject: [PATCH 2/2] New upstream release --- .gitignore | 1 + dlm.spec | 10 ++++++++-- sources | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8e485a6..0defa37 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /dlm-3.99.2.tar.gz /dlm-3.99.3.tar.gz /dlm-3.99.4.tar.gz +/dlm-3.99.5.tar.gz diff --git a/dlm.spec b/dlm.spec index 3d2b95c..49a8d4a 100644 --- a/dlm.spec +++ b/dlm.spec @@ -1,6 +1,6 @@ Name: dlm -Version: 3.99.4 -Release: 2%{?dist} +Version: 3.99.5 +Release: 1%{?dist} License: GPLv2 and GPLv2+ and LGPLv2+ # For a breakdown of the licensing, see README.license Group: System Environment/Kernel @@ -19,6 +19,7 @@ ExclusiveArch: i686 x86_64 Requires: %{name}-lib = %{version}-%{release} Requires: corosync >= 1.99.9 +Requires: kernel-modules-extra Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units @@ -42,6 +43,7 @@ make install LIBDIR=%{_libdir} DESTDIR=$RPM_BUILD_ROOT make -C fence install LIBDIR=%{_libdir} DESTDIR=$RPM_BUILD_ROOT install -Dm 0644 init/dlm.service %{buildroot}%{_unitdir}/dlm.service +install -Dm 0644 init/dlm.sysconfig %{buildroot}/etc/sysconfig/dlm %post if [ $1 -eq 1 ] ; then @@ -70,6 +72,7 @@ fi %{_mandir}/man8/dlm* %{_mandir}/man5/dlm* %{_mandir}/man3/*dlm* +%config(noreplace) %{_sysconfdir}/sysconfig/dlm %package lib Summary: Library for %{name} @@ -106,6 +109,9 @@ developing applications that use %{name}. %{_libdir}/pkgconfig/*.pc %changelog +* Thu Jun 21 2012 David Teigland - 3.99.5-1 +- New upstream release + * Wed May 30 2012 David Teigland - 3.99.4-2 - Limit rhel arches diff --git a/sources b/sources index 45fd406..3b39b39 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -23792e7f980591a4a9ca438bb1f1b80e dlm-3.99.4.tar.gz +cad4999d0c42000bf5898af34f587728 dlm-3.99.5.tar.gz