[cgmanager-devel] [PATCH] don't try to build cgm-concurrent test when doing make dist

Dwight Engen dwight.engen at oracle.com
Mon Mar 24 21:42:10 UTC 2014


making the whole tests dir an EXTRA_DIST means that make will try to
build it even when just doing a make dist which fails if you don't
already have cgmanger installed. Probably tests should be
made DIST_SUBDIRS and SUBDIRS but I was having trouble adding the
right dependency to ensure the library was built before the test.

also remove libnih-dbus from .spec since it is provided by libnih pkg

Signed-off-by: Dwight Engen <dwight.engen at oracle.com>
---
 Makefile.am       | 4 ++--
 cgmanager.spec.in | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index e0c6d6f..5d62ada 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,8 +36,8 @@ libcgmanager.pc: libcgmanager.pc.in
 	sed -e 's|[@]LIBCGMANAGER_VERSION_DOTTED[@]|$(LIBCGMANAGER_VERSION_DOTTED)|g' \
 		$< > $@
 
-EXTRA_DIST = libcgmanager.pc.in.in cgmanager.spec tests cgm cgm.man.add \
-	cgmanager.man.add cgproxy.man.add
+EXTRA_DIST = libcgmanager.pc.in.in cgmanager.spec cgm cgm.man.add \
+	cgmanager.man.add cgproxy.man.add tests/*.sh tests/*.c
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libcgmanager.pc
diff --git a/cgmanager.spec.in b/cgmanager.spec.in
index 35140c5..98f96ec 100644
--- a/cgmanager.spec.in
+++ b/cgmanager.spec.in
@@ -29,7 +29,7 @@ Summary: Linux cgroup manager
 Group: Applications/System
 License: LGPLv2+
 BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Requires: dbus libnih libnih-dbus
+Requires: dbus libnih
 BuildRequires: libnih-devel dbus-devel help2man
 
 %description
@@ -89,6 +89,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Mar 24 2014 Dwight Engen <dwight.engen at oracle.com> - 0.23
+remove libnih-dbus Requires since there is no such package, libnih is sufficient
+
 * Mon Mar 24 2014 Dwight Engen <dwight.engen at oracle.com> - 0.22
 add cgm script
 
-- 
1.8.5.3



More information about the cgmanager-devel mailing list