orion pushed to bes (master). "Update to 3.14.0 (..more)"

notifications at fedoraproject.org notifications at fedoraproject.org
Fri Apr 17 20:46:56 UTC 2015


>From d0602a7742e3acd3abd4d1b5acb12ea76217dfec Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion at cora.nwra.com>
Date: Fri, 17 Apr 2015 14:46:45 -0600
Subject: Update to 3.14.0

- Add patch to fix getopt() usage
- Add systemd unit file

diff --git a/.gitignore b/.gitignore
index fac5af9..b2c450a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ bes-3.8.4.tar.gz
 /bes-3.9.2.tar.gz
 /bes-3.11.0.tar.gz
 /bes-3.13.1.tar.gz
+/bes-3.14.0.tar.gz
diff --git a/bes-getopt.patch b/bes-getopt.patch
new file mode 100644
index 0000000..21e3c3a
--- /dev/null
+++ b/bes-getopt.patch
@@ -0,0 +1,284 @@
+diff -up bes-3.14.0/cmdln/CmdApp.cc.getopt bes-3.14.0/cmdln/CmdApp.cc
+--- bes-3.14.0/cmdln/CmdApp.cc.getopt	2014-11-17 21:13:18.000000000 -0700
++++ bes-3.14.0/cmdln/CmdApp.cc	2015-04-17 09:25:54.873111843 -0600
+@@ -216,7 +216,7 @@ int CmdApp::initialize(int argc, char **
+ 
+ 	int c;
+ 
+-	while ((c = getopt(argc, argv, "?vd:h:p:t:u:x:f:i:r:")) != EOF) {
++	while ((c = getopt(argc, argv, "?vd:h:p:t:u:x:f:i:r:")) != -1) {
+ 		switch (c) {
+ 		case 't':
+ 			timeoutStr = optarg;
+diff -up bes-3.14.0/dap/unit-tests/ResponseBuilderTest.cc.getopt bes-3.14.0/dap/unit-tests/ResponseBuilderTest.cc
+--- bes-3.14.0/dap/unit-tests/ResponseBuilderTest.cc.getopt	2015-04-06 09:19:40.000000000 -0600
++++ bes-3.14.0/dap/unit-tests/ResponseBuilderTest.cc	2015-04-17 09:25:55.658127459 -0600
+@@ -757,8 +757,8 @@ int main(int argc, char*argv[]) {
+     runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+ 
+     GetOpt getopt(argc, argv, "dD");
+-    char option_char;
+-    while ((option_char = getopt()) != EOF)
++    int option_char;
++    while ((option_char = getopt()) != -1)
+         switch (option_char) {
+         case 'd':
+             debug = 1;  // debug is a static global
+diff -up bes-3.14.0/dap/unit-tests/ResponseCacheTest.cc.getopt bes-3.14.0/dap/unit-tests/ResponseCacheTest.cc
+--- bes-3.14.0/dap/unit-tests/ResponseCacheTest.cc.getopt	2015-02-12 20:17:35.000000000 -0700
++++ bes-3.14.0/dap/unit-tests/ResponseCacheTest.cc	2015-04-17 09:25:55.660127499 -0600
+@@ -398,8 +398,8 @@ int main(int argc, char*argv[]) {
+     runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+ 
+     GetOpt getopt(argc, argv, "dk");
+-    char option_char;
+-    while ((option_char = getopt()) != EOF)
++    int option_char;
++    while ((option_char = getopt()) != -1)
+         switch (option_char) {
+         case 'd':
+             debug = 1;  // debug is a static global
+diff -up bes-3.14.0/dispatch/unit-tests/debugT.cc.getopt bes-3.14.0/dispatch/unit-tests/debugT.cc
+--- bes-3.14.0/dispatch/unit-tests/debugT.cc.getopt	2014-11-17 21:13:19.000000000 -0700
++++ bes-3.14.0/dispatch/unit-tests/debugT.cc	2015-04-17 09:25:55.593126166 -0600
+@@ -218,7 +218,7 @@ int
+ main( int argC, char **argV )
+ {
+     int c = 0 ;
+-    while( ( c = getopt( argC, argV, "d:" ) ) != EOF )
++    while( ( c = getopt( argC, argV, "d:" ) ) != -1 )
+     {
+ 	switch( c )
+ 	{
+diff -up bes-3.14.0/functions/unit-tests/BBoxFunctionTest.cc.getopt bes-3.14.0/functions/unit-tests/BBoxFunctionTest.cc
+--- bes-3.14.0/functions/unit-tests/BBoxFunctionTest.cc.getopt	2015-03-12 23:56:09.000000000 -0600
++++ bes-3.14.0/functions/unit-tests/BBoxFunctionTest.cc	2015-04-17 09:25:55.464123600 -0600
+@@ -389,8 +389,8 @@ int main(int argc, char*argv[]) {
+     runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+ 
+     GetOpt getopt(argc, argv, "dD");
+-    char option_char;
+-    while ((option_char = getopt()) != EOF)
++    int option_char;
++    while ((option_char = getopt()) != -1)
+         switch (option_char) {
+         case 'd':
+             debug = 1;  // debug is a static global
+diff -up bes-3.14.0/functions/unit-tests/BBoxUnionFunctionTest.cc.getopt bes-3.14.0/functions/unit-tests/BBoxUnionFunctionTest.cc
+--- bes-3.14.0/functions/unit-tests/BBoxUnionFunctionTest.cc.getopt	2015-03-12 23:56:09.000000000 -0600
++++ bes-3.14.0/functions/unit-tests/BBoxUnionFunctionTest.cc	2015-04-17 09:25:55.463123580 -0600
+@@ -617,8 +617,8 @@ int main(int argc, char*argv[]) {
+     runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+ 
+     GetOpt getopt(argc, argv, "dD");
+-    char option_char;
+-    while ((option_char = getopt()) != EOF)
++    int option_char;
++    while ((option_char = getopt()) != -1)
+         switch (option_char) {
+         case 'd':
+             debug = 1;  // debug is a static global
+diff -up bes-3.14.0/functions/unit-tests/CEFunctionsTest.cc.getopt bes-3.14.0/functions/unit-tests/CEFunctionsTest.cc
+--- bes-3.14.0/functions/unit-tests/CEFunctionsTest.cc.getopt	2015-04-06 09:19:40.000000000 -0600
++++ bes-3.14.0/functions/unit-tests/CEFunctionsTest.cc	2015-04-17 09:25:55.470123719 -0600
+@@ -789,8 +789,8 @@ int main(int argc, char*argv[]) {
+     runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+ 
+     GetOpt getopt(argc, argv, "d");
+-    char option_char;
+-    while ((option_char = getopt()) != EOF)
++    int option_char;
++    while ((option_char = getopt()) != -1)
+         switch (option_char) {
+         case 'd':
+             debug = 1;  // debug is a static global
+diff -up bes-3.14.0/functions/unit-tests/Dap4_CEFunctionsTest.cc.getopt bes-3.14.0/functions/unit-tests/Dap4_CEFunctionsTest.cc
+--- bes-3.14.0/functions/unit-tests/Dap4_CEFunctionsTest.cc.getopt	2015-04-06 09:19:40.000000000 -0600
++++ bes-3.14.0/functions/unit-tests/Dap4_CEFunctionsTest.cc	2015-04-17 09:25:55.467123660 -0600
+@@ -746,8 +746,8 @@ int main(int argc, char*argv[]) {
+     runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+ 
+     GetOpt getopt(argc, argv, "d");
+-    char option_char;
+-    while ((option_char = getopt()) != EOF)
++    int option_char;
++    while ((option_char = getopt()) != -1)
+         switch (option_char) {
+         case 'd':
+             debug = 1;  // debug is a static global
+diff -up bes-3.14.0/functions/unit-tests/GridGeoConstraintTest.cc.getopt bes-3.14.0/functions/unit-tests/GridGeoConstraintTest.cc
+--- bes-3.14.0/functions/unit-tests/GridGeoConstraintTest.cc.getopt	2015-04-06 09:19:40.000000000 -0600
++++ bes-3.14.0/functions/unit-tests/GridGeoConstraintTest.cc	2015-04-17 09:25:55.478123879 -0600
+@@ -1291,8 +1291,8 @@ int main(int argc, char*argv[]) {
+     runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+ 
+     GetOpt getopt(argc, argv, "dD");
+-    char option_char;
+-    while ((option_char = getopt()) != EOF)
++    int option_char;
++    while ((option_char = getopt()) != -1)
+         switch (option_char) {
+         case 'd':
+             debug = 1;  // debug is a static global
+diff -up bes-3.14.0/functions/unit-tests/OdometerTest.cc.getopt bes-3.14.0/functions/unit-tests/OdometerTest.cc
+--- bes-3.14.0/functions/unit-tests/OdometerTest.cc.getopt	2015-03-12 23:56:10.000000000 -0600
++++ bes-3.14.0/functions/unit-tests/OdometerTest.cc	2015-04-17 09:25:55.480123918 -0600
+@@ -236,8 +236,8 @@ int main(int argc, char*argv[]) {
+     runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+ 
+     GetOpt getopt(argc, argv, "dD");
+-    char option_char;
+-    while ((option_char = getopt()) != EOF)
++    int option_char;
++    while ((option_char = getopt()) != -1)
+         switch (option_char) {
+         case 'd':
+             debug = 1;  // debug is a static global
+diff -up bes-3.14.0/functions/unit-tests/RoiFunctionTest.cc.getopt bes-3.14.0/functions/unit-tests/RoiFunctionTest.cc
+--- bes-3.14.0/functions/unit-tests/RoiFunctionTest.cc.getopt	2015-03-12 23:56:10.000000000 -0600
++++ bes-3.14.0/functions/unit-tests/RoiFunctionTest.cc	2015-04-17 09:25:55.479123898 -0600
+@@ -333,8 +333,8 @@ int main(int argc, char*argv[]) {
+     runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+ 
+     GetOpt getopt(argc, argv, "dD");
+-    char option_char;
+-    while ((option_char = getopt()) != EOF)
++    int option_char;
++    while ((option_char = getopt()) != -1)
+         switch (option_char) {
+         case 'd':
+             debug = 1;  // debug is a static global
+diff -up bes-3.14.0/functions/unit-tests/TabularFunctionTest.cc.getopt bes-3.14.0/functions/unit-tests/TabularFunctionTest.cc
+--- bes-3.14.0/functions/unit-tests/TabularFunctionTest.cc.getopt	2015-03-16 22:01:22.000000000 -0600
++++ bes-3.14.0/functions/unit-tests/TabularFunctionTest.cc	2015-04-17 09:25:55.473123779 -0600
+@@ -826,8 +826,8 @@ int main(int argc, char*argv[]) {
+     runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+ 
+     GetOpt getopt(argc, argv, "dD");
+-    char option_char;
+-    while ((option_char = getopt()) != EOF)
++    int option_char;
++    while ((option_char = getopt()) != -1)
+         switch (option_char) {
+         case 'd':
+             debug = 1;  // debug is a static global
+diff -up bes-3.14.0/modules/fileout_json/unit-tests/FoJsonTest.cc.getopt bes-3.14.0/modules/fileout_json/unit-tests/FoJsonTest.cc
+--- bes-3.14.0/modules/fileout_json/unit-tests/FoJsonTest.cc.getopt	2015-03-18 01:08:16.000000000 -0600
++++ bes-3.14.0/modules/fileout_json/unit-tests/FoJsonTest.cc	2015-04-17 09:25:54.938113136 -0600
+@@ -669,8 +669,8 @@ int main(int argc, char*argv[])
+ {
+ 
+     GetOpt getopt(argc, argv, "d");
+-    char option_char;
+-    while ((option_char = getopt()) != EOF)
++    int option_char;
++    while ((option_char = getopt()) != -1)
+         switch (option_char) {
+         case 'd':
+             debug = 1;  // debug is a static global
+diff -up bes-3.14.0/modules/ugrid_functions/unit-tests/BindTest.cc.getopt bes-3.14.0/modules/ugrid_functions/unit-tests/BindTest.cc
+--- bes-3.14.0/modules/ugrid_functions/unit-tests/BindTest.cc.getopt	2014-12-31 21:22:34.000000000 -0700
++++ bes-3.14.0/modules/ugrid_functions/unit-tests/BindTest.cc	2015-04-17 09:25:55.010114569 -0600
+@@ -297,8 +297,8 @@ int main(int argc, char*argv[]) {
+     runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+ 
+     GetOpt getopt(argc, argv, "d");
+-    char option_char;
+-    while ((option_char = getopt()) != EOF)
++    int option_char;
++    while ((option_char = getopt()) != -1)
+         switch (option_char) {
+         case 'd':
+             debug = 1;  // debug is a static global
+diff -up bes-3.14.0/modules/ugrid_functions/unit-tests/GFTests.cc.getopt bes-3.14.0/modules/ugrid_functions/unit-tests/GFTests.cc
+--- bes-3.14.0/modules/ugrid_functions/unit-tests/GFTests.cc.getopt	2014-12-31 21:22:34.000000000 -0700
++++ bes-3.14.0/modules/ugrid_functions/unit-tests/GFTests.cc	2015-04-17 09:25:55.009114549 -0600
+@@ -303,8 +303,8 @@ int main(int argc, char*argv[]) {
+     runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+ 
+     GetOpt getopt(argc, argv, "d");
+-    char option_char;
+-    while ((option_char = getopt()) != EOF)
++    int option_char;
++    while ((option_char = getopt()) != -1)
+         switch (option_char) {
+         case 'd':
+             debug = 1;  // debug is a static global
+diff -up bes-3.14.0/modules/ugrid_functions/unit-tests/NDimArrayTest.cc.getopt bes-3.14.0/modules/ugrid_functions/unit-tests/NDimArrayTest.cc
+--- bes-3.14.0/modules/ugrid_functions/unit-tests/NDimArrayTest.cc.getopt	2014-12-31 21:22:34.000000000 -0700
++++ bes-3.14.0/modules/ugrid_functions/unit-tests/NDimArrayTest.cc	2015-04-17 09:25:55.008114529 -0600
+@@ -316,8 +316,8 @@ int main(int argc, char*argv[]) {
+     runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+ 
+     GetOpt getopt(argc, argv, "d");
+-    char option_char;
+-    while ((option_char = getopt()) != EOF)
++    int option_char;
++    while ((option_char = getopt()) != -1)
+         switch (option_char) {
+         case 'd':
+             debug = 1;  // debug is a static global
+diff -up bes-3.14.0/modules/ugrid_functions/unit-tests/possibly_lost.cc.getopt bes-3.14.0/modules/ugrid_functions/unit-tests/possibly_lost.cc
+--- bes-3.14.0/modules/ugrid_functions/unit-tests/possibly_lost.cc.getopt	2014-12-31 21:22:34.000000000 -0700
++++ bes-3.14.0/modules/ugrid_functions/unit-tests/possibly_lost.cc	2015-04-17 09:25:55.007114509 -0600
+@@ -245,8 +245,8 @@ int main(int argc, char*argv[]) {
+     runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+ 
+     GetOpt getopt(argc, argv, "d");
+-    char option_char;
+-    while ((option_char = getopt()) != EOF)
++    int option_char;
++    while ((option_char = getopt()) != -1)
+         switch (option_char) {
+         case 'd':
+             debug = 1;  // debug is a static global
+diff -up bes-3.14.0/modules/w10n_handler/unit-tests/W10nTest.cc.getopt bes-3.14.0/modules/w10n_handler/unit-tests/W10nTest.cc
+--- bes-3.14.0/modules/w10n_handler/unit-tests/W10nTest.cc.getopt	2015-02-21 19:35:59.000000000 -0700
++++ bes-3.14.0/modules/w10n_handler/unit-tests/W10nTest.cc	2015-04-17 09:25:55.384122009 -0600
+@@ -231,8 +231,8 @@ CPPUNIT_TEST_SUITE_REGISTRATION(W10nTest
+ int main(int argc, char*argv[]) {
+ 
+     GetOpt getopt(argc, argv, "db");
+-    char option_char, *debugopt;
+-    while ((option_char = getopt()) != EOF)
++    int option_char, *debugopt;
++    while ((option_char = getopt()) != -1)
+         switch (option_char) {
+         case 'd':
+             debug = true;  // debug is a static global
+diff -up bes-3.14.0/server/daemon.cc.getopt bes-3.14.0/server/daemon.cc
+--- bes-3.14.0/server/daemon.cc.getopt	2014-11-17 21:13:19.000000000 -0700
++++ bes-3.14.0/server/daemon.cc	2015-04-17 09:25:55.489124097 -0600
+@@ -960,7 +960,7 @@ int main(int argc, char *argv[])
+     // If you change the getopt statement below, be sure to make the
+     // corresponding change in ServerApp.cc and besctl.in
+     int c = 0;
+-    while ((c = getopt(argc, argv, "hvsd:c:p:u:i:r:")) != EOF) {
++    while ((c = getopt(argc, argv, "hvsd:c:p:u:i:r:")) != -1) {
+         switch (c) {
+             case 'v': // version
+                 BESServerUtils::show_version(daemon_name);
+diff -up bes-3.14.0/server/ServerApp.cc.getopt bes-3.14.0/server/ServerApp.cc
+--- bes-3.14.0/server/ServerApp.cc.getopt	2014-11-17 21:13:19.000000000 -0700
++++ bes-3.14.0/server/ServerApp.cc	2015-04-17 09:25:55.492124157 -0600
+@@ -240,7 +240,7 @@ int ServerApp::initialize(int argc, char
+ 
+ 	// If you change the getopt statement below, be sure to make the
+ 	// corresponding change in daemon.cc and besctl.in
+-	while ((c = getopt(argc, argv, "hvsd:c:p:u:i:r:")) != EOF) {
++	while ((c = getopt(argc, argv, "hvsd:c:p:u:i:r:")) != -1) {
+ 		switch (c) {
+ 		case 'i':
+ 			dashi = optarg;
+diff -up bes-3.14.0/standalone/StandAloneApp.cc.getopt bes-3.14.0/standalone/StandAloneApp.cc
+--- bes-3.14.0/standalone/StandAloneApp.cc.getopt	2014-11-17 21:13:19.000000000 -0700
++++ bes-3.14.0/standalone/StandAloneApp.cc	2015-04-17 09:25:55.628126862 -0600
+@@ -127,7 +127,7 @@ StandAloneApp::initialize( int argc, cha
+     };
+     int option_index = 0;
+ 
+-    while( ( c = getopt_long( argc, argv, "?vc:d:x:f:i:r:", longopts, &option_index) ) != EOF )
++    while( ( c = getopt_long( argc, argv, "?vc:d:x:f:i:r:", longopts, &option_index) ) != -1 )
+     {
+ 	switch( c )
+ 	{
diff --git a/bes-link.patch b/bes-link.patch
index 722791f..ee110cd 100644
--- a/bes-link.patch
+++ b/bes-link.patch
@@ -1,7 +1,7 @@
-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
+diff -up bes-3.14.0/dispatch/Makefile.in.link bes-3.14.0/dispatch/Makefile.in
+--- bes-3.14.0/dispatch/Makefile.in.link	2015-04-06 23:55:22.000000000 -0600
++++ bes-3.14.0/dispatch/Makefile.in	2015-04-16 14:43:31.971682223 -0600
+@@ -462,7 +462,7 @@ SUBDIRS = . unit-tests
  lib_LTLIBRARIES = libbes_dispatch.la 
  libbes_dispatch_la_SOURCES = $(SRCS) $(HDRS) 
  libbes_dispatch_la_LDFLAGS = -version-info $(LIBDISPATCH_VERSION)
diff --git a/bes-tmpfiles.conf b/bes-tmpfiles.conf
new file mode 100644
index 0000000..8195a02
--- /dev/null
+++ b/bes-tmpfiles.conf
@@ -0,0 +1 @@
+d /var/run/bes 0755 root root -
diff --git a/bes.service b/bes.service
new file mode 100644
index 0000000..49012c0
--- /dev/null
+++ b/bes.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=BES Service
+After=network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/besctl start
+ExecStop=/usr/bin/besctl stop
+ExecReload=/usr/bin/besctl reload
+PIDFile=/var/run/bes/bes.pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/bes.spec b/bes.spec
index 13ebe61..8326fa8 100644
--- a/bes.spec
+++ b/bes.spec
@@ -5,18 +5,22 @@
 %define besgroup %{name}
 
 Name:           bes
-Version:        3.13.1
-Release:        2%{?dist}
+Version:        3.14.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
+Source1:        bes.service
+Source2:        bes-tmpfiles.conf
 # Fix linking
 Patch1:         bes-link.patch
+# Fix getopt()
+Patch2:         bes-getopt.patch
 
-BuildRequires:  libdap-devel >= 3.13.0
+BuildRequires:  libdap-devel >= 3.14.0
 BuildRequires:  bzip2-devel
 BuildRequires:  libuuid-devel
 BuildRequires:  readline-devel
@@ -25,7 +29,11 @@ BuildRequires:  zlib-devel
 BuildRequires:  openssl-devel
 BuildRequires:  pkgconfig
 BuildRequires:  doxygen graphviz
+BuildRequires:  systemd
 Requires(pre): shadow-utils
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
 
 %description
 BES is a new, high-performance back-end server software framework for 
@@ -67,10 +75,11 @@ Documentation of OPeNDAP BES.
 %prep
 %setup -q
 %patch1 -p1 -b .link
+%patch2 -p1 -b .getopt
 chmod a-x dispatch/BESStreamResponseHandler*
 
 %build
-%configure --disable-static --disable-dependency-tracking
+%configure --disable-static --disable-dependency-tracking LDFLAGS=-L%{_libdir}/libdap
 make %{?_smp_mflags}
 
 make docs
@@ -99,6 +108,12 @@ mkdir -p $RPM_BUILD_ROOT%{bescachedir}
 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
+# Use systemd instead
+rm -r ${RPM_BUILD_ROOT}/etc/rc.d
+mkdir -p $RPM_BUILD_ROOT%{_unitdir}
+cp -p %SOURCE1 $RPM_BUILD_ROOT%{_unitdir}/bes.service
+mkdir -p $RPM_BUILD_ROOT%{_tmpfilesdir}
+cp -p %SOURCE2 $RPM_BUILD_ROOT%{_tmpfilesdir}/bes.conf
 
 
 %pre
@@ -108,9 +123,16 @@ useradd -r -g %{besuser} -d %{beslogdir} -s /sbin/nologin \
     -c "BES daemon" %{besuser}
 exit 0
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+%systemd_post bes.service
 
-%postun -p /sbin/ldconfig
+%preun
+%systemd_preun bes.service
+
+%postun
+/sbin/ldconfig
+%systemd_postun_with_restart bes.service 
 
 
 %files
@@ -118,12 +140,14 @@ exit 0
 %dir %{_sysconfdir}/bes/
 %config(noreplace) %{_sysconfdir}/bes/bes.conf
 %config(noreplace) %{_sysconfdir}/bes/modules/
+%{_unitdir}/bes.service
+%{_tmpfilesdir}/bes.conf
 %dir %{_datadir}/bes
 %{_datadir}/bes/*.html
 %{_datadir}/bes/*.txt
 %{_datadir}/bes/*.xml
+%{_datadir}/hyrax/
 %{_bindir}/beslistener
-%{_bindir}/besd
 %{_bindir}/besdaemon
 %{_bindir}/besstandalone
 %{_bindir}/besctl
@@ -149,6 +173,11 @@ exit 0
 %doc COPYING __distribution_docs/api-html/
 
 %changelog
+* 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
+- Add systemd unit file
+
 * Fri Aug 15 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.13.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index 59ecaf5..1db52df 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-17da4130eafc56ece37dc904cbb5b73f  bes-3.13.1.tar.gz
+29ae41ae777af0595a3fbaf1e9d5b924  bes-3.14.0.tar.gz
-- 
cgit v0.10.2


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


More information about the scm-commits mailing list