6:52 p.m.
fix tarball url
add procps to BuildRequires
add a "make check" section
change %(buildroot) to $RPM_BUILD_ROOT
Signed-off-by: Angus Salkeld <asalkeld(a)redhat.com>
---
libqb.spec.in | 84 +++++++++++++++++++++++++++-----------------------------
1 files changed, 41 insertions(+), 43 deletions(-)
diff --git a/libqb.spec.in b/libqb.spec.in
index ee2128c..013847e 100644
--- a/libqb.spec.in
+++ b/libqb.spec.in
@@ -2,71 +2,68 @@
%global numcomm @numcomm@
%global dirty @dirty@
-Name: libqb
-Summary: The Quarterback Client Server Developer Library
-Version: @version@
-Release: 1%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
-License: LGPLv2+
-Group: System Environment/Libraries
-URL: http://www.libqb.org
-Source0:
https://fedorahosted.org/releases/q/u/quarterback/%{name}-%{version}/%{na...
+Name: libqb
+Version: @version@
+Release:
1%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
+Summary: An IPC library for high performance servers.
-BuildRequires: autoconf automake libtool doxygen
+Group: System Environment/Libraries
+License: LGPLv2+
+URL: http://www.libqb.org
+Source0:
https://fedorahosted.org/releases/q/u/quarterback/%{name}-%{version}%{?nu...
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+BuildRequires: autoconf automake libtool doxygen procps check-devel
+
+%description
+libqb provides high performance client server reusable features.
+Initially these are IPC and poll.
+
+%package devel
+Summary: Development files for %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release} pkgconfig
+
+%description devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
%prep
%setup -q -n
%{name}-%{version}%{?numcomm:.%{numcomm}}%{?alphatag:-%{alphatag}}%{?dirty:-%{dirty}}
-./autogen.sh
-
-%{configure}
%build
-make %{_smp_mflags}
-
-%install
-rm -rf %{buildroot}
+./autogen.sh
+%configure --disable-static
+make %{?_smp_mflags}
-make install DESTDIR=%{buildroot}
+%check
+make check
-## tree fixup
-# drop static libs
-rm -f %{buildroot}%{_libdir}/*.a
-# drop docs and html docs for now
-rm -rf %{buildroot}%{_docdir}/*
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+rm -rf $RPM_BUILD_ROOT/%{_docdir}/*
%clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
-%description
-This package contains libqb libraries.
+%post -p /sbin/ldconfig
-%files -n libqb
+%postun -p /sbin/ldconfig
+
+%files
%defattr(-,root,root,-)
%doc COPYING
%{_libdir}/libqb.so.*
-%post -n libqb -p /sbin/ldconfig
-
-%postun -n libqb -p /sbin/ldconfig
-
-%package -n libqb-devel
-Summary: The Quarterback Development Kit
-Group: Development/Libraries
-Requires: libqb = %{version}-%{release}
-Requires: pkgconfig
-
-%description -n libqb-devel
-This package contains include files and man pages used to develop using
-The Quarterback APIs.
-
-%files -n libqb-devel
+%files devel
%defattr(-,root,root,-)
%doc COPYING README
%dir %{_includedir}/qb/
%{_libdir}/libqb.so
-%{_libdir}/libqb.la
%{_libdir}/pkgconfig/libqb.pc
%{_includedir}/qb/qbloop.h
%{_includedir}/qb/qbhdb.h
@@ -81,6 +78,7 @@ The Quarterback APIs.
%{_includedir}/qb/qbarray.h
%{_mandir}/man3/qb*3*
+
%changelog
* @date@ Autotools generated version <nobody(a)nowhere.org> -
@version@-1-@numcomm@.@alphatag@.(a)dirty@
- Autotools generated version
--
1.7.3.4