sanlock.spec | 26 ++++++++++++++++++++++----
1 file changed, 22 insertions(+), 4 deletions(-)
New commits:
commit 0e8285baae4a39bc4db3028390a986e6f608290e
Author: Federico Simoncelli <fsimonce(a)redhat.com>
Date: Mon Apr 4 13:45:31 2011 +0100
rpm: add sanlock_admin.h header
diff --git a/sanlock.spec b/sanlock.spec
index 0e554ca..ce6e46e 100644
--- a/sanlock.spec
+++ b/sanlock.spec
@@ -1,6 +1,6 @@
Name: sanlock
Version: 1.1.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A shared disk lock manager
Group: System Environment/Base
@@ -66,9 +66,13 @@ developing applications that use %{name}.
%doc COPYING
%{_libdir}/libsanlock.so
%{_includedir}/sanlock.h
+%{_includedir}/sanlock_admin.h
%{_includedir}/sanlock_resource.h
%changelog
+* Mon Apr 4 2011 Federico Simoncelli <fsimonce(a)redhat.com> - 1.1.0-3
+- Add sanlock_admin.h header
+
* Fri Feb 18 2011 Chris Feist <cfeist(a)redhat.com> - 1.1.0-2
- Fixed install for wdmd
@@ -77,7 +81,7 @@ developing applications that use %{name}.
- Now include wdmd
* Tue Feb 8 2011 Angus Salkeld <asalkeld(a)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
* Mon Jan 10 2011 Fabio M. Di Nitto <fdinitto(a)redhat.com> - 1.0-1
- first cut at rpm packaging
commit 02bebf96af6e0d69bc3d64f6e3b6a3b2a79381a1
Author: Federico Simoncelli <fsimonce(a)redhat.com>
Date: Mon Apr 4 10:00:10 2011 +0100
rpm: sync specfile with fedora
diff --git a/sanlock.spec b/sanlock.spec
index d69b5a7..0e554ca 100644
--- a/sanlock.spec
+++ b/sanlock.spec
@@ -1,12 +1,12 @@
Name: sanlock
-Version: 1.0
+Version: 1.1.0
Release: 2%{?dist}
Summary: A shared disk lock manager
Group: System Environment/Base
License: GPLv2+
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)
BuildRequires: libblkid-devel
@@ -24,6 +24,7 @@ access to the shared disks.
%build
# upstream does not require configure
# upstream does not support _smp_mflags
+CFLAGS=$RPM_OPT_FLAGS make -C wdmd
CFLAGS=$RPM_OPT_FLAGS make -C src
%install
@@ -31,6 +32,9 @@ rm -rf $RPM_BUILD_ROOT
make -C src \
install LIB_LIBDIR=%{_libdir} \
DESTDIR=$RPM_BUILD_ROOT
+make -C wdmd \
+ install LIB_LIBDIR=%{_libdir} \
+ DESTDIR=$RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
@@ -43,7 +47,10 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%doc COPYING
%{_sbindir}/sanlock
+%{_sbindir}/wdmd
%{_libdir}/libsanlock.so.*
+%{_libdir}/libwdmd.*
+%{_includedir}/wdmd.h
%package devel
Summary: Development files for %{name}
@@ -62,6 +69,13 @@ developing applications that use %{name}.
%{_includedir}/sanlock_resource.h
%changelog
+* Fri Feb 18 2011 Chris Feist <cfeist(a)redhat.com> - 1.1.0-2
+- Fixed install for wdmd
+
+* Thu Feb 17 2011 Chris Feist <cfeist(a)redhat.com> - 1.1.0-1
+- Updated to latest sources
+- Now include wdmd
+
* Tue Feb 8 2011 Angus Salkeld <asalkeld(a)redhat.com> - 1.0-2
* - SPEC: Add docs and make more consistent with the fedora template.