summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2015-05-20 17:06:19 +0200
committerRemi Collet <fedora@famillecollet.com>2015-05-20 17:06:19 +0200
commit1eee5c6bea51ca3d85a9b420b2f1527b9be07eae (patch)
treee2aac3695550343f48099278722d404fa52f54e4
parentfda6c0260d1e0d51a60213441a01ac04faf16447 (diff)
mongo-c-driver: 1.2.0-dev
-rw-r--r--mongo-c-driver.spec33
1 files changed, 23 insertions, 10 deletions
diff --git a/mongo-c-driver.spec b/mongo-c-driver.spec
index 1344cfc..f47bf2f 100644
--- a/mongo-c-driver.spec
+++ b/mongo-c-driver.spec
@@ -8,18 +8,27 @@
#
%global gh_owner mongodb
%global gh_project mongo-c-driver
+%global gh_commit 38fc65a0f4b2b17d71ee71683c93aa84718a6733
+%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
+%global gh_date 20150413
%global with_tests %{?_without_tests:0}%{!?_without_tests:1}
%global libname libmongoc
%global libver 1.0
Name: mongo-c-driver
Summary: Client library written in C for MongoDB
-Version: 1.1.5
+Version: 1.2.0
+%if 0%{?gh_date}
+Release: 0.1.%{gh_date}git%{gh_short}%{?dist}
+Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz
+BuildRequires: libtool autoconf
+%else
Release: 1%{?dist}
+Source0: https://github.com/%{gh_owner}/%{gh_project}/releases/download/%{version}%{?prever:-%{prever}}/%{gh_project}-%{version}%{?prever:-%{prever}}.tar.gz
+%endif
License: ASL 2.0
Group: System Environment/Libraries
URL: https://github.com/%{gh_owner}/%{gh_project}
-Source0: https://github.com/%{gh_owner}/%{gh_project}/releases/download/%{version}%{?prever:-%{prever}}/%{gh_project}-%{version}%{?prever:-%{prever}}.tar.gz
BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(libbson-1.0)
@@ -35,9 +44,6 @@ BuildRequires: perl
%endif
# From man pages
BuildRequires: python
-%if 0
-BuildRequires: libtool autoconf
-%endif
%description
@@ -69,11 +75,11 @@ a MongoDB Server.
%prep
+%if 0%{?gh_date}
+%setup -q -n %{gh_project}-%{gh_commit}
+autoreconf -fvi -I build/autotools
+%else
%setup -q
-
-%if 0
-# only needed when we have to patch .m4 files
-autoreconf -fi
%endif
# Ensure we are using system library
@@ -118,7 +124,11 @@ make check || ret=1
: Cleanup
[ -s server.pid ] && kill $(cat server.pid)
+%if 0%{?gh_date}
+exit 0
+%else
exit $ret
+%endif
%else
: check disabled, missing '--with tests' option
%endif
@@ -140,7 +150,7 @@ exit $ret
%{_bindir}/mongoc-stat
%files devel
-%doc NEWS README
+%doc NEWS README*
%{_includedir}/%{libname}-%{libver}
%{_libdir}/%{libname}-%{libver}.so
%{_libdir}/%{libname}-priv.so
@@ -149,6 +159,9 @@ exit $ret
%changelog
+* Wed May 20 2015 Remi Collet <remi@fedoraproject.org> - 1.1.6-1
+- Upstream version 1.1.6
+
* Mon May 18 2015 Remi Collet <remi@fedoraproject.org> - 1.1.5-1
- Upstream version 1.1.5