From 20d035befa85cba7a895264c02f91dc1de6e05cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
Date: Mon, 24 Oct 2016 13:22:51 +0200
Subject: [PATCH] spec: Add a separate subpackage for extra utils
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This subpackage currently includes:

 * pungi-config-validate
 * pungi-create-unified-isos
 * pungi-fedmsg-notification

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
---
 MANIFEST.in |  1 +
 pungi.spec  | 25 ++++++++++++++++++++++---
 setup.py    |  3 ++-
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 8328800b..b2876f36 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -8,6 +8,7 @@ include share/*
 include share/multilib/*
 include doc/*
 include tests/*
+exclude tests/*.pyc
 include tests/data/*
 include tests/data/*/*
 recursive-include tests/fixtures *.json *.xml *.bz2 *.gz *.iso *.log MD5SUM SHA1SUM SHA256SUM treeinfo
diff --git a/pungi.spec b/pungi.spec
index 6000213a..cb7bc394 100644
--- a/pungi.spec
+++ b/pungi.spec
@@ -44,6 +44,16 @@ BuildArch:      noarch
 %description
 A tool to create anaconda based installation trees/isos of a set of rpms.
 
+%package utils
+Summary:    Utilities for working with finished composes
+Requires:   pungi = %{version}-%{release}
+
+%description utils
+These utilities work with finished composes produced by Pungi. They can be used
+for creating unified ISO images, validating config file or sending progress
+notification to Fedora Message Bus.
+
+
 %prep
 %setup -q
 
@@ -62,9 +72,18 @@ rm -rf %{buildroot}
 %doc AUTHORS
 %{python_sitelib}/%{name}
 %{python_sitelib}/%{name}-%{version}-py?.?.egg-info
-%{_bindir}/*
-%{_datadir}/pungi
-/var/cache/pungi
+%{_bindir}/%{name}
+%{_bindir}/%{name}-koji
+%{_bindir}/comps_filter
+%{_bindir}/%{name}-make-ostree
+%{_datadir}/%{name}
+/var/cache/%{name}
+
+%files utils
+%{python_sitelib}/%{name}_utils
+%{_bindir}/%{name}-create-unified-isos
+%{_bindir}/%{name}-config-validate
+%{_bindir}/%{name}-fedmsg-notification
 
 %check
 ./tests/data/specs/build.sh
diff --git a/setup.py b/setup.py
index 1600ba83..9ff76818 100755
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@ distutils.command.sdist.sdist.default_format = {"posix": "bztar"}
 
 
 # recursively scan for python modules to be included
-package_root_dirs = ["pungi"]
+package_root_dirs = ["pungi", "pungi_utils"]
 packages = set()
 for package_root_dir in package_root_dirs:
     for root, dirs, files in os.walk(package_root_dir):
@@ -37,6 +37,7 @@ setup(
         'bin/comps_filter',
         'bin/pungi',
         'bin/pungi-config-validate',
+        'bin/pungi-create-unified-isos',
         'bin/pungi-fedmsg-notification',
         'bin/pungi-koji',
         'bin/pungi-make-ostree',