[bes] Update to 3.13.1

Fri Jul 11 18:19:47 UTC 2014

commit 37ca5bf20e97005cbe768223f99d8dada7784a26
Author: Orion Poplawski <orion at nwra.com>
Date:   Fri Jul 11 12:20:05 2014 -0600

    Update to 3.13.1
    
    - Drop includes patch applied upstream

 .gitignore         |    1 +
 bes-includes.patch |   34 ----------------------------------
 bes-link.patch     |   43 +++++++++++--------------------------------
 bes.spec           |   30 ++++++++++++++++--------------
 sources            |    2 +-
 5 files changed, 29 insertions(+), 81 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index d1a1eb6..fac5af9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ bes-3.8.4.tar.gz
 /bes-3.9.0.tar.gz
 /bes-3.9.2.tar.gz
 /bes-3.11.0.tar.gz
+/bes-3.13.1.tar.gz
diff --git a/bes-link.patch b/bes-link.patch
index b4d75df..722791f 100644
--- a/bes-link.patch
+++ b/bes-link.patch
@@ -1,33 +1,12 @@
-diff -up bes-3.11.0/dispatch/Makefile.in.link bes-3.11.0/dispatch/Makefile.in
---- bes-3.11.0/dispatch/Makefile.in.link	2012-11-02 02:06:34.000000000 -0600
-+++ bes-3.11.0/dispatch/Makefile.in	2013-08-06 14:29:44.409088609 -0600
-@@ -420,7 +420,7 @@ DIST_SUBDIRS = unit-tests
- @LIBDAP_TRUE at pkglib_LTLIBRARIES = libdap_module.la
- libbes_dispatch_la_SOURCES = $(SRCS) $(HDRS)
+diff -up bes-3.13.1/dispatch/Makefile.in.link bes-3.13.1/dispatch/Makefile.in
+--- bes-3.13.1/dispatch/Makefile.in.link	2014-07-10 13:55:55.330926560 -0600
++++ bes-3.13.1/dispatch/Makefile.in	2014-07-10 13:57:26.669489435 -0600
+@@ -415,7 +415,7 @@ DIST_SUBDIRS = unit-tests
+ lib_LTLIBRARIES = libbes_dispatch.la 
+ libbes_dispatch_la_SOURCES = $(SRCS) $(HDRS) 
  libbes_dispatch_la_LDFLAGS = -version-info $(LIBDISPATCH_VERSION)
--libbes_dispatch_la_LIBADD = $(BES_ZLIB_LIBS) $(BES_BZ2_LIBS) $(BES_DL_LIBS)
-+libbes_dispatch_la_LIBADD = $(XML2_LIBS) $(BES_ZLIB_LIBS) $(BES_BZ2_LIBS) $(BES_DL_LIBS)
- libdap_module_la_SOURCES = $(DAP_SRCS) $(DAP_HDRS)
- libdap_module_la_CPPFLAGS = $(DAP_CFLAGS) $(AM_CPPFLAGS)
- libdap_module_la_LDFLAGS = -avoid-version -module
-@@ -428,7 +428,7 @@ libdap_module_la_LIBADD = libbes_dispatc
- libbes_dap_la_SOURCES = $(BES_DAP_SRCS) $(BES_DAP_HDRS)
- libbes_dap_la_CPPFLAGS = $(DAP_CFLAGS) $(AM_CPPFLAGS)
- libbes_dap_la_LDFLAGS = -version-info $(LIBBES_DAP_VERSION)
--libbes_dap_la_LIBADD = libbes_dispatch.la $(DAP_SERVER_LIBS) $(DAP_CLIENT_LIBS)
-+libbes_dap_la_LIBADD = libbes_dispatch.la $(DAP_LIBS)
- besregtest_SOURCES = besregtest.cc
- besregtest_CPPFLAGS = $(AM_CPPFLAGS)
- besregtest_LDADD = libbes_dispatch.la $(XML2_LIBS)
-diff -up bes-3.11.0/xmlcommand/Makefile.in.link bes-3.11.0/xmlcommand/Makefile.in
---- bes-3.11.0/xmlcommand/Makefile.in.link	2012-11-02 02:06:35.000000000 -0600
-+++ bes-3.11.0/xmlcommand/Makefile.in	2013-08-06 14:30:11.257013783 -0600
-@@ -352,7 +352,7 @@ lib_LTLIBRARIES = libbes_xml_command.la
- @LIBDAP_TRUE at pkglib_LTLIBRARIES = libdap_xml_module.la
- libbes_xml_command_la_SOURCES = $(SRCS) $(HDRS)
- libbes_xml_command_la_LDFLAGS = -version-info $(LIBXMLCOMMAND_VERSION)
--libbes_xml_command_la_LIBADD = ../dispatch/libbes_dispatch.la
-+libbes_xml_command_la_LIBADD = ../dispatch/libbes_dispatch.la $(XML2_LIBS)
- libdap_xml_module_la_SOURCES = $(DAP_SRCS) $(DAP_HDRS)
- libdap_xml_module_la_LDFLAGS = -avoid-version -module
- libdap_xml_module_la_LIBADD = libbes_xml_command.la ../dispatch/libbes_dispatch.la
+-libbes_dispatch_la_LIBADD = $(XML2_LIBS) $(BES_ZLIB_LIBS) \
++libbes_dispatch_la_LIBADD = $(BES_ZLIB_LIBS) \
+ 	$(BES_BZ2_LIBS) $(BES_DL_LIBS) $(PTHREAD_LIBS)
+ 
+ 
diff --git a/bes.spec b/bes.spec
index ebc47ab..de6b95b 100644
--- a/bes.spec
+++ b/bes.spec
@@ -5,22 +5,21 @@
 %define besgroup %{name}
 
 Name:           bes
-Version:        3.11.0
-Release:        2%{?dist}
+Version:        3.13.1
+Release:        1%{?dist}
 Summary:        Back-end server software framework for OPeNDAP
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.opendap.org/BES_software
 Source0:        http://www.opendap.org/pub/source/bes-%{version}.tar.gz
-# Add missing includes
-Patch0:         bes-includes.patch
 # Fix linking
 Patch1:         bes-link.patch
 
-BuildRequires:  libdap-devel >= 3.11.0
-BuildRequires:  readline-devel
+BuildRequires:  libdap-devel >= 3.13.0
 BuildRequires:  bzip2-devel
+BuildRequires:  libuuid-devel
+BuildRequires:  readline-devel
 BuildRequires:  zlib-devel
 # needed by ppt
 BuildRequires:  openssl-devel
@@ -43,11 +42,13 @@ hooks, and more.
 %package        devel
 Summary:        Development files for %{name}
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:       libdap-devel >= 3.11.0
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       libdap-devel%{?_isa} >= 3.13.0
 # for the /usr/share/aclocal directory ownership
 Requires:       automake
-Requires:       openssl-devel, bzip2-devel, zlib-devel
+Requires:       bzip2-devel%{?_isa}
+Requires:       openssl-devel%{?_isa}
+Requires:       zlib-devel%{?_isa}
 Requires:       pkgconfig
 
 %description    devel
@@ -65,7 +66,6 @@ Documentation of OPeNDAP BES.
 
 %prep
 %setup -q
-%patch0 -p1 -b .includes
 %patch1 -p1 -b .link
 chmod a-x dispatch/BESStreamResponseHandler*
 
@@ -117,16 +117,14 @@ exit 0
 %doc ChangeLog COPYING NEWS README
 %dir %{_sysconfdir}/bes/
 %config(noreplace) %{_sysconfdir}/bes/bes.conf
-%dir %{_sysconfdir}/bes/modules/
-%config(noreplace) %{_sysconfdir}/bes/modules/dap.conf
-%dir %{_datadir}/bes/
+%config(noreplace) %{_sysconfdir}/bes/modules/
+%dir %{_datadir}/bes
 %{_datadir}/bes/*.html
 %{_datadir}/bes/*.txt
 %{_datadir}/bes/*.xml
 %{_bindir}/beslistener
 %{_bindir}/besd
 %{_bindir}/besdaemon
-%{_bindir}/besregtest
 %{_bindir}/besstandalone
 %{_bindir}/besctl
 %{_bindir}/hyraxctl
@@ -151,6 +149,10 @@ exit 0
 %doc COPYING __distribution_docs/api-html/
 
 %changelog
+* Thu Jul 10 2014 Orion Poplawski <orion at cora.nwra.com> - 3.13.1-1
+- Update to 3.13.1
+- Drop includes patch applied upstream
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.11.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index 5a2485e..59ecaf5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-961910716750668c1f68a3bd7d4b7532  bes-3.11.0.tar.gz
+17da4130eafc56ece37dc904cbb5b73f  bes-3.13.1.tar.gz
