[bes] - Update to 3.11.0 - Add patches to add missing includes, fix some linking - spec cleanup
Orion Poplawski
orion at fedoraproject.org
Tue Aug 6 20:36:49 UTC 2013
commit e1bfc6f4f3028565f9741dba03c73a84e0869054
Author: Orion Poplawski <orion at nwra.com>
Date: Tue Aug 6 14:36:42 2013 -0600
- Update to 3.11.0
- Add patches to add missing includes, fix some linking
- spec cleanup
.gitignore | 1 +
bes-gcc47.patch | 11 -----------
bes-includes.patch | 34 ++++++++++++++++++++++++++++++++++
bes-link.patch | 33 +++++++++++++++++++++++++++++++++
bes.spec | 31 +++++++++++++++----------------
sources | 2 +-
6 files changed, 84 insertions(+), 28 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index abef404..d1a1eb6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,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
diff --git a/bes-includes.patch b/bes-includes.patch
new file mode 100644
index 0000000..9a7c386
--- /dev/null
+++ b/bes-includes.patch
@@ -0,0 +1,34 @@
+diff -up bes-3.11.0/dispatch/BESCatalogEntry.h.includes bes-3.11.0/dispatch/BESCatalogEntry.h
+--- bes-3.11.0/dispatch/BESCatalogEntry.h.includes 2012-10-09 16:36:07.000000000 -0600
++++ bes-3.11.0/dispatch/BESCatalogEntry.h 2013-08-06 11:36:36.965079984 -0600
+@@ -36,6 +36,7 @@
+ #include <string>
+ #include <list>
+ #include <map>
++#include <sys/types.h>
+
+ using std::string;
+ using std::list;
+diff -up bes-3.11.0/dispatch/BESUncompress3BZ2.cc.includes bes-3.11.0/dispatch/BESUncompress3BZ2.cc
+--- bes-3.11.0/dispatch/BESUncompress3BZ2.cc.includes 2012-10-09 13:18:44.000000000 -0600
++++ bes-3.11.0/dispatch/BESUncompress3BZ2.cc 2013-08-06 11:36:36.966079980 -0600
+@@ -40,6 +40,7 @@
+ #include <cstring>
+ #include <cerrno>
+ #include <sstream>
++#include <unistd.h>
+
+ using std::ostringstream;
+
+diff -up bes-3.11.0/server/ServerApp.cc.includes bes-3.11.0/server/ServerApp.cc
+--- bes-3.11.0/server/ServerApp.cc.includes 2012-10-09 13:18:27.000000000 -0600
++++ bes-3.11.0/server/ServerApp.cc 2013-08-06 11:38:46.981626617 -0600
+@@ -32,6 +32,8 @@
+
+ #include <signal.h>
+ #include <sys/wait.h> // for wait
++#include <sys/types.h>
++#include <unistd.h>
+ #include <iostream>
+ #include <fstream>
+ #include <sstream>
diff --git a/bes-link.patch b/bes-link.patch
new file mode 100644
index 0000000..b4d75df
--- /dev/null
+++ b/bes-link.patch
@@ -0,0 +1,33 @@
+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)
+ 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
diff --git a/bes.spec b/bes.spec
index 23b8fa1..ca67597 100644
--- a/bes.spec
+++ b/bes.spec
@@ -5,19 +5,20 @@
%define besgroup %{name}
Name: bes
-Version: 3.9.2
-Release: 5%{?dist}
+Version: 3.11.0
+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
-Patch0: bes-gcc47.patch
+# Add missing includes
+Patch0: bes-includes.patch
+# Fix linking
+Patch1: bes-link.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: libdap-devel >= 3.10.2
+BuildRequires: libdap-devel >= 3.11.0
BuildRequires: readline-devel
BuildRequires: bzip2-devel
BuildRequires: zlib-devel
@@ -43,7 +44,7 @@ hooks, and more.
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: libdap-devel >= 3.8.0
+Requires: libdap-devel >= 3.11.0
# for the /usr/share/aclocal directory ownership
Requires: automake
Requires: openssl-devel, bzip2-devel, zlib-devel
@@ -64,7 +65,8 @@ Documentation of OPeNDAP BES.
%prep
%setup -q
-%patch0 -p1 -b .gcc47
+%patch0 -p1 -b .includes
+%patch1 -p1 -b .link
chmod a-x dispatch/BESStreamResponseHandler*
%build
@@ -91,7 +93,6 @@ sed -i.dist -e 's:=/tmp:=%{bescachedir}:' \
dispatch/bes/bes.conf
%install
-rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
mkdir -p $RPM_BUILD_ROOT%{bescachedir}
@@ -99,9 +100,6 @@ mkdir -p $RPM_BUILD_ROOT%{bespkidir}/{cacerts,public}
mkdir -p $RPM_BUILD_ROOT%{beslogdir}
mv $RPM_BUILD_ROOT%{_bindir}/bes-config-pkgconfig $RPM_BUILD_ROOT%{_bindir}/bes-config
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%pre
getent group %{besgroup} >/dev/null || groupadd -r %{besgroup}
@@ -110,14 +108,12 @@ useradd -r -g %{besuser} -d %{beslogdir} -s /sbin/nologin \
-c "BES daemon" %{besuser}
exit 0
-
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
-%defattr(-,root,root,-)
%doc ChangeLog COPYING NEWS README
%dir %{_sysconfdir}/bes/
%config(noreplace) %{_sysconfdir}/bes/bes.conf
@@ -142,7 +138,6 @@ exit 0
%attr (-,%{besuser},%{besgroup}) %{beslogdir}
%files devel
-%defattr(-,root,root,-)
%doc __distribution_docs/BES_*.doc
%{_bindir}/besCreateModule
%{_bindir}/bes-config
@@ -153,10 +148,14 @@ exit 0
%{_datadir}/aclocal/bes.m4
%files doc
-%defattr(-,root,root,-)
%doc COPYING __distribution_docs/api-html/
%changelog
+* Tue Aug 6 2013 Orion Poplawski <orion at cora.nwra.com> - 3.11.0-1
+- Update to 3.11.0
+- Add patches to add missing includes, fix some linking
+- spec cleanup
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.9.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index f7f78ef..5a2485e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d5e189201722f23c39ba3ded95f25f8d bes-3.9.2.tar.gz
+961910716750668c1f68a3bd7d4b7532 bes-3.11.0.tar.gz
More information about the scm-commits
mailing list