- updated to 1.14.0, PLDified

diff --git a/mongo-c-driver.spec b/mongo-c-driver.spec
index c59d529808ca4dd3e9479c0f80f28aab16a48bda..65413b8e5fa92c81b18beaa161d2799f93f4d98c 100644 (file)
--- a/mongo-c-driver.spec
+++ b/mongo-c-driver.spec
@@ -1,9 +1,9 @@
 #
 # Conditional build:
-%bcond_with    tests           # build with tests
-%bcond_with    doc             # build docs
-%bcond_with    sasl            # Use libsasl for Kerberos.
-%bcond_without ssl             # Enable TLS connections and SCRAM-SHA-1 authentication.
+%bcond_with    tests   # build with tests
+%bcond_without doc     # HTML and man documentation
+%bcond_with    sasl    # SASL authentication (for Kerberos)
+%bcond_without ssl     # TLS connections and SCRAM-SHA-1 authentication
 
 # NOTE about arch:
 # See https://jira.mongodb.org/browse/CDRIVER-1186
@@ -11,29 +11,29 @@
 # in MongoDB 3.2, and support is being removed in 3.4.
 
 Summary:       Client library written in C for MongoDB
+Summary(pl.UTF-8):     Biblioteka kliencka do MongoDB napisana w C
 Name:          mongo-c-driver
-Version:       1.11.0
+Version:       1.14.0
 Release:       1
 License:       Apache v2.0
 Group:         Libraries
+#Source0Download: https://github.com/mongodb/mongo-c-driver/releases/
 Source0:       https://github.com/mongodb/mongo-c-driver/releases/download/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: a1241743ac6c528df0b345560dfd07eb
+# Source0-md5: 374652f8bd68b89616e35885f7077b97
 URL:           https://github.com/mongodb/mongo-c-driver
-BuildRequires: cmake
+BuildRequires: cmake >= 3.1
 %{?with_sasl:BuildRequires:    cyrus-sasl-devel}
+BuildRequires: libicu-devel
 %{?with_ssl:BuildRequires:     openssl-devel}
 BuildRequires: perl-base
 BuildRequires: pkgconfig
 BuildRequires: snappy-devel
+%{?with_doc:BuildRequires:     sphinx-pdg}
 BuildRequires: zlib-devel
 %if %{with tests}
 BuildRequires: mongodb-server
 BuildRequires: openssl
 %endif
-%if %{with doc}
-BuildRequires: python
-BuildRequires: sphinx-pdg
-%endif
 Requires:      %{name}-libs = %{version}-%{release}
 Obsoletes:     mongo-c-driver-tools < 1.3.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -43,36 +43,65 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %description
 mongo-c-driver is a client library written in C for MongoDB.
 
+%description -l pl.UTF-8
+mongo-c-driver to biblioteka kliencka do MongoDB napisana w C.
+
 %package libs
-Summary:       Shared libraries for %{name}
-Group:         Development/Libraries
+Summary:       Shared library for mongo-c-driver
+Summary(pl.UTF-8):     Biblioteka współdzielona mongo-c-driver
+Group:         Libraries
 Requires:      libbson = %{version}-%{release}
 
 %description libs
-This package contains the shared libraries for %{name}.
+This package contains the shared library for mongo-c-driver.
+
+%description libs -l pl.UTF-8
+Ten pakiet zawiera bibliotekę współdzieloną mongo-c-driver.
 
 %package devel
-Summary:       Header files and development libraries for %{name}
+Summary:       Header files for mongo-c-driver library
+Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki mongo-c-driver
 Group:         Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
 
 %description devel
-This package contains the header files and development libraries for
-%{name}.
+This package contains the header files for mongo-c-driver library.
+
+Documentation: http://mongoc.org/libmongoc/%{version}/
+
+%description devel -l pl.UTF-8
+Ten pakiet zawiera pliki nagłówkowe biblioteki mongo-c-driver.
 
-Documentation: http://api.mongodb.org/c/%{version}/
+Dokumentacja: http://mongoc.org/libmongoc/%{version}/
+
+%package apidocs
+Summary:       API documentation for mongo-c-driver library
+Summary(pl.UTF-8):     Dokumentacja API biblioteki mongo-c-driver
+Group:         Documentation
+
+%description apidocs
+API documentation for mongo-c-driver library.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API biblioteki mongo-c-driver.
 
 %package -n libbson
 Summary:       Building, parsing, and iterating BSON documents
-License:       ASL 2.0 and ISC and MIT and zlib
+Summary(pl.UTF-8):     Tworzenie, analiza i przechodzenie dokumentów BSON
+License:       Apache v2.0 and ISC and MIT and zlib
 Group:         Libraries
 
 %description -n libbson
 This is a library providing useful routines related to building,
 parsing, and iterating BSON documents <http://bsonspec.org/>.
 
+%description -n libbson -l pl.UTF-8
+Ta biblioteka udostępnia przydatne funkcje związane z budowaniem,
+analizą i przechodzeniem dokumentów BSON (<http://bsonspec.org/>).
+
 %package -n libbson-devel
 Summary:       Development files for libbson
+Summary(pl.UTF-8):     Pliki programistyczne biblioteki libbson
 License:       Apache v2.0
 Group:         Development/Libraries
 Requires:      libbson = %{version}-%{release}
@@ -81,23 +110,39 @@ Requires:  libbson = %{version}-%{release}
 This package contains libraries and header files needed for developing
 applications that use libbson.
 
+%description -n libbson-devel -l pl.UTF-8
+Ten pakiet zawiera pliki nagłówkowe do tworzenia aplikacji
+wykorzystujących bibliotekę libbson.
+
+%package -n libbson-apidocs
+Summary:       API documentation for libbson library
+Summary(pl.UTF-8):     Dokumentacja API biblioteki libbson
+Group:         Documentation
+
+%description -n libbson-apidocs
+API documentation for libbson library.
+
+%description -n libbson-apidocs -l pl.UTF-8
+Dokumentacja API biblioteki libbson.
+
 %prep
 %setup -q
 
 %build
 install -d cmake-build
 cd cmake-build
-%cmake \
+%cmake .. \
        -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
+       -DENABLE_BSON=ON \
        -DENABLE_EXAMPLES=ON \
-       -DENABLE_HTML_DOCS=OFF \
+       -DENABLE_HTML_DOCS=%{!?with_doc:OFF}%{?with_doc:ON} \
        -DENABLE_MAN_PAGES=%{!?with_doc:OFF}%{?with_doc:ON} \
-       -DENABLE_SASL=%{!?with_sasl:OFF}%{?with_sasl:ON} \
+       -DENABLE_SASL=%{!?with_sasl:OFF}%{?with_sasl:CYRUS} \
        -DENABLE_SHM_COUNTERS=ON \
        -DENABLE_SSL=%{!?with_ssl:OFF}%{?with_ssl:OPENSSL -DENABLE_CRYPTO_SYSTEM_PROFILE=ON} \
        -DENABLE_STATIC=OFF \
        -DENABLE_TESTS=%{!?with_tests:OFF}%{?with_tests:ON} \
-       ..
+       -DENABLE_ZLIB=SYSTEM
 
 %{__make}
 
@@ -108,9 +153,9 @@ mongod \
        --journal \
        --ipv6 \
        --unixSocketPrefix /tmp \
-       --logpath        $PWD/server.log \
+       --logpath $PWD/server.log \
        --pidfilepath $PWD/server.pid \
-       --dbpath          $PWD/dbtest \
+       --dbpath $PWD/dbtest \
        --fork
 
 : Run the test suite
@@ -128,9 +173,16 @@ exit $ret
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 %{__make} -C cmake-build install \
        DESTDIR=$RPM_BUILD_ROOT
 
+# packaged as %doc / unneeded in rpm
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/{COPYING,NEWS,README.rst,THIRD_PARTY_NOTICES,uninstall.sh}
+%if %{with doc}
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/{mongo-c-driver,libbson}/html
+%endif
+
 install -d $RPM_BUILD_ROOT%{_examplesdir}/libmongoc-%{version}
 cp -a src/libmongoc/examples/* $RPM_BUILD_ROOT%{_examplesdir}/libmongoc-%{version}
 
@@ -152,33 +204,47 @@ rm -rf $RPM_BUILD_ROOT
 
 %files libs
 %defattr(644,root,root,755)
-%doc THIRD_PARTY_NOTICES COPYING
+%doc NEWS README.rst THIRD_PARTY_NOTICES
 %attr(755,root,root) %{_libdir}/libmongoc-%{libver}.so.*.*.*
-%ghost %{_libdir}/libmongoc-%{libver}.so.0
+%attr(755,root,root) %ghost %{_libdir}/libmongoc-%{libver}.so.0
 
 %files devel
 %defattr(644,root,root,755)
-%doc NEWS
+%attr(755,root,root) %{_libdir}/libmongoc-%{libver}.so
 %{_includedir}/libmongoc-%{libver}
-%{_libdir}/libmongoc-%{libver}.so
-%{_pkgconfigdir}/libmongoc-*.pc
+%{_pkgconfigdir}/libmongoc-%{libver}.pc
+%{_pkgconfigdir}/libmongoc-ssl-%{libver}.pc
 %{_libdir}/cmake/libmongoc-%{libver}
 %if %{with doc}
-%{_mandir}/man3/mongoc*
+%{_mandir}/man3/mongoc_*.3*
 %endif
 %{_examplesdir}/libmongoc-%{version}
 
+%if %{with doc}
+%files apidocs
+%defattr(644,root,root,755)
+%doc cmake-build/src/libmongoc/doc/html/{_images,_static,*.html,*.js}
+%endif
+
 %files -n libbson
 %defattr(644,root,root,755)
-%doc COPYING THIRD_PARTY_NOTICES
+%doc src/libbson/{NEWS,THIRD_PARTY_NOTICES}
 %attr(755,root,root) %{_libdir}/libbson-%{libver}.so.*.*.*
-%ghost %{_libdir}/libbson-%{libver}.so.0
+%attr(755,root,root) %ghost %{_libdir}/libbson-%{libver}.so.0
 
 %files -n libbson-devel
 %defattr(644,root,root,755)
-%doc src/libbson/NEWS
+%attr(755,root,root) %{_libdir}/libbson-%{libver}.so
 %{_includedir}/libbson-%{libver}
-%{_libdir}/libbson-%{libver}.so
-%{_libdir}/cmake/libbson-%{libver}
 %{_pkgconfigdir}/libbson-%{libver}.pc
+%{_libdir}/cmake/libbson-%{libver}
+%if %{with doc}
+%{_mandir}/man3/bson_*.3*
+%endif
 %{_examplesdir}/libbson-%{version}
+
+%if %{with doc}
+%files -n libbson-apidocs
+%defattr(644,root,root,755)
+%doc cmake-build/src/libbson/doc/html/{_static,*.html,*.js}
+%endif