[cfengine/el6] Update to 3.3.0

[Jeff Sheltren]

commit 1b1f049f9e9dea1d587cda5b30d3b482ceb693cf
Author: Jeff Sheltren <jeff at tag1consulting.com>
Date:   Wed Apr 25 11:04:35 2012 -0700

    Update to 3.3.0

 .gitignore    |    4 +++-
 cfengine.spec |   34 +++++++++++++++++-----------------
 sources       |    2 +-
 3 files changed, 21 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2582653..d09f2a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
-cfengine-3.0.5p1.tar.gz
+cfengine-2.2.10.tar.gz
+/cfengine-3.0.5p1.tar.gz
+/cfengine-3.3.0.tar.gz
diff --git a/cfengine.spec b/cfengine.spec
index ae45b0e..f8e1549 100644
--- a/cfengine.spec
+++ b/cfengine.spec
@@ -1,15 +1,16 @@
 Summary: A systems administration tool for networks
 Name: cfengine
-Version: 3.0.5p1
+Version: 3.3.0
 Release: 1%{?dist}
 License: GPLv3
 Group: Applications/System
-Source0: http://www.cfengine.org/tarballs/cfengine-3.0.5p1.tar.gz
+#Source0: http://cfengine.com/source-code/download?file=cfengine-3.3.0.tar.gz
+Source0: %{name}-%{version}.tar.gz
 Source1: cf-execd
 Source2: cf-serverd
 Source3: cf-monitord
 URL: http://www.cfengine.org/
-BuildRequires: db4-devel,openssl-devel,bison,flex,m4,libacl-devel
+BuildRequires: tokyocabinet-devel,openssl-devel,bison,flex,m4,libacl-devel
 BuildRequires: libselinux-devel,tetex-dvips,texinfo-tex,pcre-devel
 Requires(post): /sbin/chkconfig, /sbin/install-info
 Requires(preun): /sbin/chkconfig, /sbin/install-info, /sbin/service
@@ -40,8 +41,10 @@ This package contains the documentation for cfengine.
 
 
 %build
-%configure BERKELEY_DB_LIB=-ldb \
-    --with-docs --docdir=%{_defaultdocdir}/%{name}-%{version} \
+%configure \
+    --docdir=%{_defaultdocdir}/%{name}-%{version} \
+    --enable-fhs \
+    --libexecdir=%{_libdir} \
     --enable-selinux
 make
 
@@ -52,12 +55,6 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_sbindir}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
 make DESTDIR=$RPM_BUILD_ROOT install
-# make directory tree for cfengine configs
-mkdir -p $RPM_BUILD_ROOT%{_var}/%{name}
-for i in ppkeys inputs outputs
-do
-    mkdir -m 0700 $RPM_BUILD_ROOT%{_var}/%{name}/$i
-done
 
 # It's ugly, but thats the way Mark wants to have it. :(
 # If we don't create this link, cfexecd will not be able to start
@@ -78,7 +75,6 @@ done
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 # All this stuff is pushed into doc/contrib directories
-rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} 
 rm -f $RPM_BUILD_ROOT%{_sbindir}/cfdoc
 
 
@@ -121,24 +117,28 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
+%doc AUTHORS ChangeLog README
 %{_sbindir}/*
-%{_libdir}/libpromises*
+%{_libdir}/%{name}
 %{_mandir}/man8/*
 %{_initrddir}/cf-monitord
 %{_initrddir}/cf-execd
 %{_initrddir}/cf-serverd
 %{_var}/%{name}
+%{_datadir}/%{name}
 
 
 %files doc
 %defattr(-,root,root,-)
-%doc inputs
-%doc docs/*html
-%doc docs/*pdf
+%{_defaultdocdir}/%{name}
 
 
 %changelog
+* Wed Apr 25 2012 Jeff Sheltren <jeff at tag1consulting.com> - 3.3.0-1
+- Bump to the lateset release
+- Multiple changes to get it building, now using tokyocabinet instead of bdb
+- Multiple path changes to match upstream
+
 * Thu Sep 30 2010 Jeff Sheltren <jeff at osuosl.org> - 3.0.5p1-1
 - Update for cfengine 3
 - Now buildrequires pcre-devel
diff --git a/sources b/sources
index eb97ec5..d9a29e1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b74af23928253e11dcce3d98510f1066  cfengine-3.0.5p1.tar.gz
+d40426fcc447e6f1581a6abd6116ea20  cfengine-3.3.0.tar.gz