[node-patches] Change in ovirt-node[master]: Rework specfile

[fabiand at fedoraproject.org]

Fabian Deutsch has uploaded a new change for review.

Change subject: Rework specfile
......................................................................

Rework specfile

Change-Id: Ic521371480922379a7004707f1f3228d02dffcf4
Signed-off-by: Fabian Deutsch <fabiand at fedoraproject.org>
---
M scripts/tui/Makefile
M scripts/tui/ovirt-node-molch-plugin.spec
M scripts/tui/setup.py
3 files changed, 19 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/35/9935/1

diff --git a/scripts/tui/Makefile b/scripts/tui/Makefile
index d58da28..75fd139 100644
--- a/scripts/tui/Makefile
+++ b/scripts/tui/Makefile
@@ -39,7 +39,7 @@
 	${python} setup.py build
 
 install:
-	${python} setup.py install --prefix=$(prefix)
+	${python} setup.py install --prefix=$(prefix) --root=$(root)
 
 clean: clean-dist
 	-rm -f *~ scm_hash.txt
diff --git a/scripts/tui/ovirt-node-molch-plugin.spec b/scripts/tui/ovirt-node-molch-plugin.spec
index c74a611..49b511e 100644
--- a/scripts/tui/ovirt-node-molch-plugin.spec
+++ b/scripts/tui/ovirt-node-molch-plugin.spec
@@ -19,7 +19,7 @@
 
 BuildRequires:  python2-devel
 Requires:       python-urwid
-Requires:       python-augeas
+#Requires:       python-augeas
 Requires:       python-gudev
 Requires:       libvirt-python
 
@@ -38,9 +38,10 @@
 
 
 %install
-%makeinstall python=%{__python} lib=%{python_sitelib}
+%makeinstall python=%{__python} prefix=%{_prefix} root=%{buildroot}
 # Remove some extra data
 rm -rf %{buildroot}/usr/extra
+
 
 %check
 # Nothing, yet
@@ -51,9 +52,10 @@
 %{python_sitelib}/ovirt_node_molch*.egg-info
 %{python_sitelib}/ovirt/__init__.*
 %{python_sitelib}/ovirt/node/*
-%{_bindir}/ovirt-config-setup-molch
+%{_bindir}/ovirt-config-setup
+#%{_bindir}/ovirt-config-installer
 
 
 %changelog
-* Oct 09 2012 Fabian Deutsch <fabiand at fedoraproject.org> - 0.0.1-1
+* Tue Oct 09 2012 Fabian Deutsch <fabiand at fedoraproject.org> - 0.0.1-1
 - Initial
diff --git a/scripts/tui/setup.py b/scripts/tui/setup.py
index 8cf8659..5f24090 100644
--- a/scripts/tui/setup.py
+++ b/scripts/tui/setup.py
@@ -9,15 +9,24 @@
     author_email='fabiand at fedoraproject.org',
     url='http://example.com',
     license="GPLv2+",
-    scripts=['bin/ovirt-config-setup-molch'],
+    scripts=[
+             "bin/ovirt-config-setup"
+             ],
     package_dir = {'': 'src'},
     packages=[
         'ovirt',
         'ovirt.node',
         'ovirt.node.ui',
         'ovirt.node.utils',
-        'ovirt.node.plugins',
+        'ovirt.node.config',
+        'ovirt.node.setup',
+        'ovirt.node.installer',
         ],
    data_files=[('extra', ['scm_hash.txt',
-                          'Makefile'])]
+                          'Makefile'
+                          ]),
+#               ('libexec', ['libexec/ovirt-config-setup'
+#        '                  ovirt-config-installer']
+#                           ])
+               ]
 )


--
To view, visit http://gerrit.ovirt.org/9935
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic521371480922379a7004707f1f3228d02dffcf4
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Fabian Deutsch <fabiand at fedoraproject.org>