orion pushed to bes (master). "Run tests (..more)"

[notifications at fedoraproject.org]

>From a7fc6d889ce419ce204611e74b8cf4ccf185f5ef Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion at cora.nwra.com>
Date: Sun, 19 Apr 2015 22:18:49 -0600
Subject: Run tests

- Add patch to not build netcdf dependent modules
- Filter modules from provides

diff --git a/bes-modules.patch b/bes-modules.patch
new file mode 100644
index 0000000..f3cddfa
--- /dev/null
+++ b/bes-modules.patch
@@ -0,0 +1,15 @@
+diff -up bes-3.14.0/modules/Makefile.in.modules bes-3.14.0/modules/Makefile.in
+--- bes-3.14.0/modules/Makefile.in.modules	2015-04-06 23:55:23.000000000 -0600
++++ bes-3.14.0/modules/Makefile.in	2015-04-19 21:41:16.184156619 -0600
+@@ -362,9 +362,9 @@ AUTOMAKE_OPTIONS = foreign check-news
+ 
+ # Same deal as above, but this uses HDF4/5 too... jhrg 12/12/14
+ SUBDIRS = csv_handler dap-server freeform_handler $(am__append_1) \
+-	fileout_json gateway_module w10n_handler $(am__append_2) \
++	$(am__append_2) \
+ 	$(am__append_3) $(am__append_4) $(am__append_5) \
+-	xml_data_handler $(am__append_6) $(am__append_7)
++	$(am__append_6) $(am__append_7)
+ all: all-recursive
+ 
+ .SUFFIXES:
diff --git a/bes.spec b/bes.spec
index 8326fa8..5495f99 100644
--- a/bes.spec
+++ b/bes.spec
@@ -1,12 +1,12 @@
-%define bescachedir %{_localstatedir}/cache/%{name}
-%define bespkidir %{_sysconfdir}/pki/%{name}
-%define beslogdir %{_localstatedir}/log/%{name}
-%define besuser %{name}
-%define besgroup %{name}
+%global bescachedir %{_localstatedir}/cache/%{name}
+%global bespkidir %{_sysconfdir}/pki/%{name}
+%global beslogdir %{_localstatedir}/log/%{name}
+%global besuser %{name}
+%global besgroup %{name}
 
 Name:           bes
 Version:        3.14.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Back-end server software framework for OPeNDAP
 
 Group:          System Environment/Libraries
@@ -19,6 +19,8 @@ Source2:        bes-tmpfiles.conf
 Patch1:         bes-link.patch
 # Fix getopt()
 Patch2:         bes-getopt.patch
+# Do not build netcdf dependent modules
+Patch3:         bes-modules.patch
 
 BuildRequires:  libdap-devel >= 3.14.0
 BuildRequires:  bzip2-devel
@@ -34,9 +36,11 @@ Requires(pre): shadow-utils
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
+# Don't provide modules
+%global __provides_exclude_from ^%{_libdir}/bes/.*\\.so$
 
 %description
-BES is a new, high-performance back-end server software framework for 
+BES is a high-performance back-end server software framework for 
 OPeNDAP that allows data providers more flexibility in providing end 
 users views of their data. The current OPeNDAP data objects (DAS, DDS, 
 and DataDDS) are still supported, but now data providers can add new data 
@@ -76,10 +80,12 @@ Documentation of OPeNDAP BES.
 %setup -q
 %patch1 -p1 -b .link
 %patch2 -p1 -b .getopt
+%patch3 -p1 -b .modules
 chmod a-x dispatch/BESStreamResponseHandler*
 
 %build
 %configure --disable-static --disable-dependency-tracking LDFLAGS=-L%{_libdir}/libdap
+# This fails currently: --without-dap-modules
 make %{?_smp_mflags}
 
 make docs
@@ -116,6 +122,10 @@ mkdir -p $RPM_BUILD_ROOT%{_tmpfilesdir}
 cp -p %SOURCE2 $RPM_BUILD_ROOT%{_tmpfilesdir}/bes.conf
 
 
+%check
+make check
+
+
 %pre
 getent group %{besgroup} >/dev/null || groupadd -r %{besgroup}
 getent passwd %{besuser} >/dev/null || \
@@ -173,6 +183,11 @@ exit 0
 %doc COPYING __distribution_docs/api-html/
 
 %changelog
+* Sun Apr 19 2015 Orion Poplawski <orion at cora.nwra.com> - 3.14.0-2
+- Filter modules from provides
+- Add patch to not build netcdf dependent modules
+- Run tests
+
 * Thu Apr 16 2015 Orion Poplawski <orion at cora.nwra.com> - 3.14.0-1
 - Update to 3.14.0
 - Add patch to fix getopt() usage
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/bes.git/commit/?h=master&id=a7fc6d889ce419ce204611e74b8cf4ccf185f5ef