Merge branch 'f17'
Conflicts: dlm.spec
This commit is contained in:
commit
d666a2660a
1
.gitignore
vendored
1
.gitignore
vendored
@ -3,3 +3,4 @@
|
|||||||
/dlm-3.99.2.tar.gz
|
/dlm-3.99.2.tar.gz
|
||||||
/dlm-3.99.3.tar.gz
|
/dlm-3.99.3.tar.gz
|
||||||
/dlm-3.99.4.tar.gz
|
/dlm-3.99.4.tar.gz
|
||||||
|
/dlm-3.99.5.tar.gz
|
||||||
|
10
dlm.spec
10
dlm.spec
@ -1,6 +1,6 @@
|
|||||||
Name: dlm
|
Name: dlm
|
||||||
Version: 3.99.4
|
Version: 3.99.5
|
||||||
Release: 2%{?dist}
|
Release: 1%{?dist}
|
||||||
License: GPLv2 and GPLv2+ and LGPLv2+
|
License: GPLv2 and GPLv2+ and LGPLv2+
|
||||||
# For a breakdown of the licensing, see README.license
|
# For a breakdown of the licensing, see README.license
|
||||||
Group: System Environment/Kernel
|
Group: System Environment/Kernel
|
||||||
@ -19,6 +19,7 @@ ExclusiveArch: i686 x86_64
|
|||||||
|
|
||||||
Requires: %{name}-lib = %{version}-%{release}
|
Requires: %{name}-lib = %{version}-%{release}
|
||||||
Requires: corosync >= 1.99.9
|
Requires: corosync >= 1.99.9
|
||||||
|
Requires: kernel-modules-extra
|
||||||
Requires(post): systemd-units
|
Requires(post): systemd-units
|
||||||
Requires(preun): systemd-units
|
Requires(preun): systemd-units
|
||||||
Requires(postun): 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
|
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.service %{buildroot}%{_unitdir}/dlm.service
|
||||||
|
install -Dm 0644 init/dlm.sysconfig %{buildroot}/etc/sysconfig/dlm
|
||||||
|
|
||||||
%post
|
%post
|
||||||
if [ $1 -eq 1 ] ; then
|
if [ $1 -eq 1 ] ; then
|
||||||
@ -70,6 +72,7 @@ fi
|
|||||||
%{_mandir}/man8/dlm*
|
%{_mandir}/man8/dlm*
|
||||||
%{_mandir}/man5/dlm*
|
%{_mandir}/man5/dlm*
|
||||||
%{_mandir}/man3/*dlm*
|
%{_mandir}/man3/*dlm*
|
||||||
|
%config(noreplace) %{_sysconfdir}/sysconfig/dlm
|
||||||
|
|
||||||
%package lib
|
%package lib
|
||||||
Summary: Library for %{name}
|
Summary: Library for %{name}
|
||||||
@ -106,6 +109,9 @@ developing applications that use %{name}.
|
|||||||
%{_libdir}/pkgconfig/*.pc
|
%{_libdir}/pkgconfig/*.pc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jun 21 2012 David Teigland <teigland@redhat.com> - 3.99.5-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
* Wed May 30 2012 David Teigland <teigland@redhat.com> - 3.99.4-2
|
* Wed May 30 2012 David Teigland <teigland@redhat.com> - 3.99.4-2
|
||||||
- Limit rhel arches
|
- Limit rhel arches
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user