From e51d747a9373257fa8ae2befa18effbdd527a637 Mon Sep 17 00:00:00 2001
From: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date: Fri, 22 May 2009 20:39:11 +0000
Subject: [PATCH] update for build

---
 m4/pychecker.mk                |  2 +-
 morituri.spec.in               |  4 ++--
 morituri/Makefile.am           |  2 +-
 morituri/common/Makefile.am    |  1 +
 morituri/configure/Makefile.am |  6 +++---
 morituri/extern/Makefile.am    | 11 ++++++-----
 morituri/test/Makefile         |  2 +-
 7 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/m4/pychecker.mk b/m4/pychecker.mk
index d97d639..9151cf2 100644
--- a/m4/pychecker.mk
+++ b/m4/pychecker.mk
@@ -48,4 +48,4 @@ pychecker:
 
 pycheckerverbose:
 	@echo "running pychecker (verbose) ..."
-	$(pychecker) $(pychecker_files)
+	$(pychecker) --limit 1000 $(pychecker_files)
diff --git a/morituri.spec.in b/morituri.spec.in
index bdabb56..5814afa 100644
--- a/morituri.spec.in
+++ b/morituri.spec.in
@@ -33,9 +33,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %doc README morituri.doap NEWS RELEASE ChangeLog
 %{_bindir}/rip
-%{_mandir}/man1/rip.1*
+#%{_mandir}/man1/rip.1*
 %{_libdir}/python*.*/site-packages/morituri
-%{_sysconfdir}/bash_completion.d/morituri
+%{_sysconfdir}/bash_completion.d/rip
 
 %changelog
 * Wed May 20 2009 Thomas Vander Stichele <thomas at apestaart dot org>
diff --git a/morituri/Makefile.am b/morituri/Makefile.am
index 8e2ebb2..5585b83 100644
--- a/morituri/Makefile.am
+++ b/morituri/Makefile.am
@@ -5,4 +5,4 @@ morituridir = $(PYTHONLIBDIR)/morituri
 morituri_PYTHON = \
 	__init__.py
 
-SUBDIRS = common extern image program rip test
+SUBDIRS = common configure extern image program rip test
diff --git a/morituri/common/Makefile.am b/morituri/common/Makefile.am
index 12270a0..1961c83 100644
--- a/morituri/common/Makefile.am
+++ b/morituri/common/Makefile.am
@@ -6,6 +6,7 @@ morituri_PYTHON = \
 	__init__.py \
 	checksum.py \
 	common.py \
+	log.py \
 	logcommand.py \
 	renamer.py \
 	task.py \
diff --git a/morituri/configure/Makefile.am b/morituri/configure/Makefile.am
index 133d96f..4976bb6 100644
--- a/morituri/configure/Makefile.am
+++ b/morituri/configure/Makefile.am
@@ -1,8 +1,8 @@
 CLEANFILES = *.py{c,o}
 
-moapdir = $(PYTHONLIBDIR)/moap/configure
+morituridir = $(PYTHONLIBDIR)/morituri/configure
 
-moap_PYTHON = \
+morituri_PYTHON = \
 	__init__.py \
 	configure.py \
 	installed.py
@@ -15,4 +15,4 @@ TAGS_FILES = installed.py.in uninstalled.py.in
 
 DISTCLEANFILES = installed.pyc installed.pyo uninstalled.pyc uninstalled.pyo
 
-EXTRA_DIST = $(moap_PYTHON) installed.py.in uninstalled.py.in
+EXTRA_DIST = $(morituri_PYTHON) installed.py.in uninstalled.py.in
diff --git a/morituri/extern/Makefile.am b/morituri/extern/Makefile.am
index f695f8c..3a4debc 100644
--- a/morituri/extern/Makefile.am
+++ b/morituri/extern/Makefile.am
@@ -1,17 +1,18 @@
 CLEANFILES = *.py{c,o} command/*.py{c,o} log/*.py{c,o}
 
-moapdir = $(PYTHONLIBDIR)/moap/extern
+morituridir = $(PYTHONLIBDIR)/morituri/extern
 
-moap_PYTHON = \
-	__init__.py
+morituri_PYTHON = \
+	__init__.py \
+	asyncsub.py
 
-logdir = $(PYTHONLIBDIR)/moap/extern/log
+logdir = $(PYTHONLIBDIR)/morituri/extern/log
 
 log_PYTHON = \
 	log/__init__.py \
 	log/log.py
 
-commanddir = $(PYTHONLIBDIR)/moap/extern/command
+commanddir = $(PYTHONLIBDIR)/morituri/extern/command
 
 command_PYTHON = \
 	command/__init__.py \
diff --git a/morituri/test/Makefile b/morituri/test/Makefile
index 959c552..fcc126e 100644
--- a/morituri/test/Makefile
+++ b/morituri/test/Makefile
@@ -75,7 +75,7 @@ PACKAGE_VERSION_MAJOR = 0
 PACKAGE_VERSION_MICRO = 0
 PACKAGE_VERSION_MINOR = 0
 PACKAGE_VERSION_NANO = 1
-PACKAGE_VERSION_RELEASE = 0.20090522.221730
+PACKAGE_VERSION_RELEASE = 0.20090522.223509
 PATH_SEPARATOR = :
 PYCHECKER = yes
 PYTHON = /usr/bin/python