rpms/sanlock
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge with master.

Browse Source
This commit is contained in:
Chris Feist 2011-02-17 13:00:30 -06:00
commit 3f799c6e0a
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1 +1,2 @@
/sanlock-1.0.tar.gz /sanlock-1.0.tar.gz
/sanlock-1.1.0.tar.bz2

19
sanlock.spec
View File

@ -1,12 +1,12 @@
Name: sanlock Name: sanlock
Version: 1.0 Version: 1.1.0
Release: 2%{?dist} Release: 1%{?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.gz Source0: https://fedorahosted.org/releases/s/a/sanlock/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libblkid-devel BuildRequires: libblkid-devel
@ -24,11 +24,12 @@ access to the shared disks.
%build %build
# upstream does not require configure # upstream does not require configure
# upstream does not support _smp_mflags # upstream does not support _smp_mflags
CFLAGS=$RPM_OPT_FLAGS make -C daemon CFLAGS=$RPM_OPT_FLAGS make -C wdmd
CFLAGS=$RPM_OPT_FLAGS make -C src
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
make -C daemon \ make -C src \
install LIB_LIBDIR=%{_libdir} \ install LIB_LIBDIR=%{_libdir} \
DESTDIR=$RPM_BUILD_ROOT DESTDIR=$RPM_BUILD_ROOT
@ -41,7 +42,7 @@ rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc daemon/COPYING %doc COPYING
%{_sbindir}/sanlock %{_sbindir}/sanlock
%{_libdir}/libsanlock.so.* %{_libdir}/libsanlock.so.*
@ -56,12 +57,16 @@ developing applications that use %{name}.
%files devel %files devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc daemon/COPYING %doc COPYING
%{_libdir}/libsanlock.so %{_libdir}/libsanlock.so
%{_includedir}/sanlock.h %{_includedir}/sanlock.h
%{_includedir}/sanlock_resource.h %{_includedir}/sanlock_resource.h
%changelog %changelog
* Thu Feb 17 2011 Chris Feist <cfeist@redhat.com> - 1.1.0-1
- Updated to latest sources
- Now include wdmd
* Tue Feb 8 2011 Angus Salkeld <asalkeld@redhat.com> - 1.0-2 * Tue Feb 8 2011 Angus Salkeld <asalkeld@redhat.com> - 1.0-2
* - SPEC: Add docs and make more consistent with the fedora template. * - SPEC: Add docs and make more consistent with the fedora template.

2
sources
View File

@ -1 +1 @@
d78328d1869f02fd16fd88b7e7609c0a sanlock-1.0.tar.gz 8b54b13b6cdb1918456b57c772609e5c sanlock-1.1.0.tar.bz2