[Kimchi-devel] [PATCH 2/3] Fix Kimchi RPM spec files

[pvital at linux.vnet.ibm.com]

From: Paulo Vital <pvital at linux.vnet.ibm.com>

Fixed the list of files in %files section for the Fedora and OpenSUSE spec
files to prevent warning message of file duplication, as well, the name of 
build dependency python-devel.

Signed-off-by: Paulo Vital <pvital at linux.vnet.ibm.com>
---
 .../plugins/kimchi/contrib/kimchi.spec.fedora.in   | 21 +++------------------
 src/wok/plugins/kimchi/contrib/kimchi.spec.suse.in | 22 +++-------------------
 2 files changed, 6 insertions(+), 37 deletions(-)

diff --git a/src/wok/plugins/kimchi/contrib/kimchi.spec.fedora.in b/src/wok/plugins/kimchi/contrib/kimchi.spec.fedora.in
index 52bd23e..d1e0046 100644
--- a/src/wok/plugins/kimchi/contrib/kimchi.spec.fedora.in
+++ b/src/wok/plugins/kimchi/contrib/kimchi.spec.fedora.in
@@ -31,7 +31,7 @@ Requires:	libguestfs-tools
 Requires:	python-magic
 BuildRequires:	libxslt
 BuildRequires:	python-lxml
-BuildRequires:	python-dev
+BuildRequires:	python-devel
 BuildRequires:	python-pip
 
 %if 0%{?rhel} >= 6 || 0%{?fedora} >= 19
@@ -75,11 +75,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %attr(-,root,root)
-%{python_sitelib}/wok/plugins/kimchi/*.py*
-%{python_sitelib}/wok/plugins/kimchi/control/*.py*
-%{python_sitelib}/wok/plugins/kimchi/control/vm/*.py*
-%{python_sitelib}/wok/plugins/kimchi/model/*.py*
-%{python_sitelib}/wok/plugins/kimchi/API.json
 %{python_sitelib}/wok/plugins/kimchi/
 %{_datadir}/kimchi/doc/API.md
 %{_datadir}/kimchi/doc/README.md
@@ -87,22 +82,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/kimchi/doc/kimchi-guest.png
 %{_datadir}/kimchi/doc/kimchi-templates.png
 %{_prefix}/share/locale/*/LC_MESSAGES/kimchi.mo
-%{_datadir}/wok/plugins/kimchi/ui/config/*.xml
-%{_datadir}/wok/plugins/kimchi/ui/
-%{_datadir}/wok/plugins/kimchi
+%{_datadir}/wok/plugins/kimchi/
 %{_sysconfdir}/wok/plugins.d/kimchi.conf
 %{_sysconfdir}/wok/plugins.d/template.conf
-%{_sysconfdir}/kimchi/distros.d/debian.json
-%{_sysconfdir}/kimchi/distros.d/fedora.json
-%{_sysconfdir}/kimchi/distros.d/opensuse.json
-%{_sysconfdir}/kimchi/distros.d/ubuntu.json
-%{_sysconfdir}/kimchi/distros.d/gentoo.json
 %{_sysconfdir}/kimchi/
-%{_sharedstatedir}/kimchi/debugreports/
-%{_sharedstatedir}/kimchi/isos/
-%{_sharedstatedir}/kimchi/screenshots/
-%{_sharedstatedir}/kimchi/vnc-tokens/
 %{_sharedstatedir}/kimchi/
+%{_sysconfdir}/systemd/system/wokd.service.d/kimchi.conf
 
 
 %changelog
diff --git a/src/wok/plugins/kimchi/contrib/kimchi.spec.suse.in b/src/wok/plugins/kimchi/contrib/kimchi.spec.suse.in
index 142ff4b..640ade9 100644
--- a/src/wok/plugins/kimchi/contrib/kimchi.spec.suse.in
+++ b/src/wok/plugins/kimchi/contrib/kimchi.spec.suse.in
@@ -31,7 +31,7 @@ Requires:	guestfs-tools
 Requires:	python-magic
 BuildRequires:	libxslt-tools
 BuildRequires:	python-lxml
-BuildRequires:	python-dev
+BuildRequires:	python-devel
 BuildRequires:	python-pip
 
 %if 0%{?suse_version} == 1100
@@ -62,11 +62,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %attr(-,root,root)
-%{python_sitelib}/wok/plugins/kimchi/*.py*
-%{python_sitelib}/wok/plugins/kimchi/control/*.py*
-%{python_sitelib}/wok/plugins/kimchi/control/vm/*.py*
-%{python_sitelib}/wok/plugins/kimchi/model/*.py*
-%{python_sitelib}/wok/plugins/kimchi/API.json
 %{python_sitelib}/wok/plugins/kimchi/
 %{_datadir}/kimchi/doc/API.md
 %{_datadir}/kimchi/doc/README.md
@@ -74,23 +69,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/kimchi/doc/kimchi-guest.png
 %{_datadir}/kimchi/doc/kimchi-templates.png
 %{_prefix}/share/locale/*/LC_MESSAGES/kimchi.mo
-%{_datadir}/wok/plugins/kimchi/ui/config/*.xml
-%{_datadir}/wok/plugins/kimchi/ui/
-%{_datadir}/wok/plugins/kimchi
+%{_datadir}/wok/plugins/kimchi/
 %{_sysconfdir}/wok/plugins.d/kimchi.conf
 %{_sysconfdir}/wok/plugins.d/template.conf
-%{_sysconfdir}/kimchi/distros.d/debian.json
-%{_sysconfdir}/kimchi/distros.d/fedora.json
-%{_sysconfdir}/kimchi/distros.d/opensuse.json
-%{_sysconfdir}/kimchi/distros.d/ubuntu.json
-%{_sysconfdir}/kimchi/distros.d/gentoo.json
 %{_sysconfdir}/kimchi/
-%{_var}/lib/kimchi/debugreports/
-%{_var}/lib/kimchi/isos/
-%{_var}/lib/kimchi/screenshots/
-%{_var}/lib/kimchi/vnc-tokens/
 %{_var}/lib/kimchi/
-
+%{_sysconfdir}/systemd/system/wokd.service.d/kimchi.conf
 
 %changelog
 * Thu Jun 18 2015 Lucio Correia <luciojhc at linux.vnet.ibm.com> 2.0
-- 
2.4.3