Updated to 1.3

This commit is contained in:
Chris Feist 2011-06-14 17:26:27 -05:00
parent 0a87f164cf
commit 3c5a0c11bd
3 changed files with 15 additions and 9 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
/sanlock-1.0.tar.gz /sanlock-1.0.tar.gz
/sanlock-1.1.0.tar.bz2 /sanlock-1.1.0.tar.bz2
/sanlock-1.2.0.tar.bz2 /sanlock-1.2.0.tar.bz2
/sanlock-1.3.tar.gz

View File

@ -1,15 +1,17 @@
Name: sanlock Name: sanlock
Version: 1.2.0 Version: 1.3
Release: 3%{?dist} Release: 6%{?dist}
Summary: A shared disk lock manager Summary: A shared disk lock manager
Group: System Environment/Base Group: System Environment/Base
License: GPLv2+ License: GPLv2+
URL: https://fedorahosted.org/sanlock/ URL: https://fedorahosted.org/sanlock/
Source0: https://fedorahosted.org/releases/s/a/sanlock/%{name}-%{version}.tar.bz2 Source0: https://fedorahosted.org/releases/s/a/sanlock/%{name}-%{version}.tar.gz
Patch0: sanlock-wdmd-shut-up-warnings.patch
Patch1: sanlock-fix-libwdmd-linking.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExclusiveArch: i686 x86_64
BuildRequires: libblkid-devel python python-devel BuildRequires: libblkid-devel libaio-devel python python-devel
Requires: %{name}-lib = %{version}-%{release} Requires: %{name}-lib = %{version}-%{release}
@ -20,6 +22,8 @@ access to the shared disks.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .sanlock-wdmd-shut-up-warnings
%patch1 -p1 -b .sanlock-fix-libwdmd-linking
%build %build
# upstream does not require configure # upstream does not require configure
@ -46,7 +50,7 @@ install -D -m 755 init.d/wdmd $RPM_BUILD_ROOT/%{_initddir}/wdmd
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%pre %pre
/usr/sbin/useradd -c "Sanlock" -s /sbin/nologin -r \ /usr/sbin/useradd -c "sanlock" -s /sbin/nologin -r \
-d /var/run/sanlock sanlock 2> /dev/null || : -d /var/run/sanlock sanlock 2> /dev/null || :
%post %post
@ -91,7 +95,6 @@ access to the shared disks.
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc COPYING %doc COPYING
%{_libdir}/libsanlock.so.* %{_libdir}/libsanlock.so.*
%{_libdir}/libsanlock_direct.so.*
%{_libdir}/libwdmd.so.* %{_libdir}/libwdmd.so.*
%package python %package python
@ -125,7 +128,6 @@ developing applications that use %{name}.
%{_libdir}/libwdmd.so %{_libdir}/libwdmd.so
%{_includedir}/wdmd.h %{_includedir}/wdmd.h
%{_libdir}/libsanlock.so %{_libdir}/libsanlock.so
%{_libdir}/libsanlock_direct.so
%{_includedir}/sanlock.h %{_includedir}/sanlock.h
%{_includedir}/sanlock_rv.h %{_includedir}/sanlock_rv.h
%{_includedir}/sanlock_admin.h %{_includedir}/sanlock_admin.h
@ -133,6 +135,9 @@ developing applications that use %{name}.
%{_includedir}/sanlock_direct.h %{_includedir}/sanlock_direct.h
%changelog %changelog
* Tue Jun 14 2011 Chris Feist <cfeist@redhat.com> - 1.3.0-6
- Update to 1.3.0
* Mon May 09 2011 Chris Feist <cfeist@redhat.com> - 1.2.0-3 * Mon May 09 2011 Chris Feist <cfeist@redhat.com> - 1.2.0-3
- Add python and python-devel to build requires - Add python and python-devel to build requires

View File

@ -1 +1 @@
416377e65147801e3576122fd45cdfa6 sanlock-1.2.0.tar.bz2 daa9cf16bf30a8fd8ce988861be123d3 sanlock-1.3.tar.gz