summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xMakefile7
-rw-r--r--func.spec5
-rw-r--r--setup.py2
-rw-r--r--version2
4 files changed, 13 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 37b42f3..7e02fb7 100755
--- a/Makefile
+++ b/Makefile
@@ -85,8 +85,11 @@ pyflakes:
-for d in $(PYDIRS); do ($(MAKE) -C $$d pyflakes ); done
money: clean
- -sloccount --addlang "makefile" $(TOPDIR) $(PYDIRS) $(EXAMPLEDIR) $(INITDIR)
-
+ -sloccount --addlang "makefile" $(TOPDIR) $(PYDIRS) $(EXAMPLEDIR) $(INITDIR)
+
+testit: clean
+ -cd test; sh test-it.sh
+
rpms: build manpage sdist
mkdir -p rpm-build
cp dist/*.gz rpm-build/
diff --git a/func.spec b/func.spec
index 2586c06..e3b3f53 100644
--- a/func.spec
+++ b/func.spec
@@ -74,6 +74,8 @@ rm -fr $RPM_BUILD_ROOT
%dir %{python_sitelib}/func/minion/modules
%{python_sitelib}/func/minion/modules/*.py*
%dir /var/log/func
+%dir /var/lib/func
+%dir /var/lib/func/certmaster
%doc AUTHORS README LICENSE
%{_mandir}/man1/func.1.gz
%{_mandir}/man1/func-inventory.1.gz
@@ -122,6 +124,9 @@ fi
%changelog
+* Tue Dec 18 2007 Adrian Likins <alikins@redhat.com> - 0.0.14-5
+- add /var/lib/ dirs to spec file
+
* Thu Dec 13 2007 Eli Criffield <elicriffield@gmail.com> - 0.0.14-4
- changes for suse integration
diff --git a/setup.py b/setup.py
index 7675ed1..5cd0e07 100644
--- a/setup.py
+++ b/setup.py
@@ -18,6 +18,7 @@ if __name__ == "__main__":
etcmodpath = "/etc/%s/modules" % NAME
initpath = "/etc/init.d/"
logpath = "/var/log/%s/" % NAME
+ certdir = "/var/lib/%s/certmaster" % NAME
pkipath = "/etc/pki/%s" % NAME
rotpath = "/etc/logrotate.d"
aclpath = "%s/minion-acl.d" % etcpath
@@ -54,6 +55,7 @@ if __name__ == "__main__":
(manpath, ["docs/certmaster-ca.1.gz"]),
(rotpath, ['etc/func_rotate']),
(logpath, []),
+ (certdir, []),
(etcpath, []),
(pkipath, []),
(aclpath, [])
diff --git a/version b/version
index 1694a39..2e0811f 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.14 2
+0.14 5