rpms/bes/devel bes.spec,1.4,1.5

[Patrice Dumas (pertusus)]

Author: pertusus

Update of /cvs/extras/rpms/bes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24077

Modified Files:
	bes.spec 
Log Message:
* Mon Dec 17 2007 Patrice Dumas <pertusus at free.fr> 3.5.3-1
- update to 3.5.3



Index: bes.spec
===================================================================
RCS file: /cvs/extras/rpms/bes/devel/bes.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bes.spec	6 Dec 2007 15:29:22 -0000	1.4
+++ bes.spec	1 Jan 2008 22:50:30 -0000	1.5
@@ -1,22 +1,29 @@
+%define bescachedir %{_localstatedir}/cache/%{name}
+%define bespkidir %{_sysconfdir}/pki/%{name}
+%define beslogdir %{_localstatedir}/log/%{name}
+%define besuser %{name}
+%define besgroup %{name}
+
 Name:           bes
-Version:        3.5.1
-Release:        4%{?dist}
+Version:        3.5.3
+Release:        1%{?dist}
 Summary:        Back-end server software framework for OPeNDAP
 
 Group:          System Environment/Libraries
-License:        LGPL
+License:        LGPLv2+
 URL:            http://www.opendap.org/download/BES.html
 Source0:        http://www.opendap.org/pub/source/bes-%{version}.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libdap-devel >= 3.7.7
+BuildRequires:  libdap-devel >= 3.7.10
 BuildRequires:  readline-devel
 # needed by ppt
 BuildRequires:  openssl-devel
-BuildRequires:  krb5-devel
 BuildRequires:  doxygen graphviz
+BuildRequires:  pkgconfig
 Requires:       bzip2 gzip
+Requires(pre): shadow-utils
 
 %description
 BES is a new, high-performance back-end server software framework for 
@@ -34,7 +41,10 @@
 Summary:        Development files for %{name}
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       libdap-devel >= 3.7.7
+Requires:       libdap-devel >= 3.7.10
+# for the /usr/share/aclocal directory ownership
+Requires:       automake
+Requires:       pkgconfig
 
 %description    devel
 The %{name}-devel package contains libraries and header files for
@@ -56,14 +66,25 @@
 %build
 %configure --disable-static --disable-dependency-tracking
 make %{?_smp_mflags}
+
 make docs
-rm -rf __fedora_docs
-cp -pr docs __fedora_docs
-mv __fedora_docs/html __fedora_docs/api-html
+rm -rf __distribution_docs
+cp -pr docs __distribution_docs
+mv __distribution_docs/html __distribution_docs/api-html
 # .map and .md5 files are of dubious use
-rm __fedora_docs/api-html/*.map
-rm __fedora_docs/api-html/*.md5
-chmod a-x __fedora_docs/BES_*.doc
+rm __distribution_docs/api-html/*.map
+rm __distribution_docs/api-html/*.md5
+chmod a-x __distribution_docs/BES_*.doc
+
+sed -i.dist -e 's:=/tmp:=%{bescachedir}:' \
+  -e 's:=.*/bes.log:=%{beslogdir}/bes.log:' \
+  -e 's:=/full/path/to/serverside/certificate/file.pem:=%{bespkidir}/cacerts/file.pem:' \
+  -e 's:=/full/path/to/serverside/key/file.pem:=%{bespkidir}/public/file.pem:' \
+  -e 's:=/full/path/to/clientside/certificate/file.pem:=%{bespkidir}/cacerts/file.pem:' \
+  -e 's:=/full/path/to/clientside/key/file.pem:=%{bespkidir}/public/file.pem:' \
+  -e 's:=user_name:=%{besuser}:' \
+  -e 's:=group_name:=%{besgroup}:' \
+  dispatch/bes/bes.conf
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -72,11 +93,22 @@
 for file in config.guess depcomp missing config.sub install-sh ltmain.sh mkinstalldirs; do
   chmod a+x $RPM_BUILD_ROOT%{_datadir}/bes/templates/conf/$file
 done
+mkdir -p $RPM_BUILD_ROOT%{bescachedir}
+mkdir -p $RPM_BUILD_ROOT%{bespkidir}/{cacerts,public}
+mkdir -p $RPM_BUILD_ROOT%{beslogdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%pre
+getent group %{besgroup} >/dev/null || groupadd -r %{besgroup}
+getent passwd %{besuser} >/dev/null || \
+useradd -r -g %{besuser} -d %{beslogdir} -s /sbin/nologin \
+    -c "BES daemon" %{besuser}
+exit 0
+
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -93,24 +125,36 @@
 %{_bindir}/beslistener
 %{_bindir}/besdaemon
 %{_bindir}/besctl
+%{_bindir}/hyraxctl
+%{_bindir}/besregtest
 %{_bindir}/bescmdln
 %{_libdir}/*.so.*
 %{_libdir}/bes/
+%{bescachedir}
+%{bespkidir}/
+%attr (-,%{besuser},%{besgroup}) %{beslogdir}
 
 %files devel
 %defattr(-,root,root,-)
-%doc __fedora_docs/BES_*.doc
+%doc __distribution_docs/BES_*.doc
 %{_bindir}/besCreateModule
 %{_bindir}/bes-config
 %{_includedir}/bes/
 %{_libdir}/*.so
 %{_datadir}/bes/templates/
+%{_datadir}/aclocal/bes.m4
 
 %files doc
 %defattr(-,root,root,-)
-%doc __fedora_docs/api-html/
+%doc __distribution_docs/api-html/
 
 %changelog
+* Mon Dec 17 2007 Patrice Dumas <pertusus at free.fr> 3.5.3-1
+- update to 3.5.3
+
+* Fri Nov 16 2007 Patrice Dumas <pertusus at free.fr> 3.5.2-1
+- update to 3.5.2
+
 * Thu Dec 06 2007 Release Engineering <rel-eng at fedoraproject dot org> - 3.5.1-4
  - Rebuild for deps