Misc small fixes

* Remove the rpmbuild tree with the dist-clean target.
* Move ipa-server-setupssl from /usr/sbin to /usr/share/ipa
* Check in requirement change for generated freeipa-python.spec
* Fix interactive hostname in ipa-server-install.

8 files changed, 11 insertions, 8 deletions

diff --git a/Makefile b/Makefile
index eb5ed89d2..f15c9dea3 100644
--- a/Makefile
+++ b/Makefile
@@ -155,4 +155,4 @@ dist: version-update archive tarballs archive-cleanup rpms
 local-dist: clean version-update local-archive tarballs archive-cleanup rpms
 
 dist-clean: clean
-	rm -fr dist
+	rm -fr rpmbuild dist
diff --git a/ipa-python/freeipa-python.spec b/ipa-python/freeipa-python.spec
index d7185d077..f2403582b 100755
--- a/ipa-python/freeipa-python.spec
+++ b/ipa-python/freeipa-python.spec
@@ -10,7 +10,7 @@ Source0:        %{name}-%{version}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: 	noarch
 
-Requires: python PyKerberos python-krbV
+Requires: python PyKerberos
 
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
diff --git a/ipa-server/Makefile b/ipa-server/Makefile
index 8281a552e..5ca5caf71 100644
--- a/ipa-server/Makefile
+++ b/ipa-server/Makefile
@@ -1,5 +1,9 @@
 SUBDIRS=ipa-install xmlrpc-server ipa-kpasswd ipa-slapi-plugins
-PYTHONDIR=$(DESTDIR)/usr/share/ipa/ipaserver
+
+SHAREDIR=$(DESTDIR)/usr/share/ipa
+PYTHONDIR=$(SHAREDIR)/ipaserver
+SBINDIR=$(DESTDIR)/usr/sbin
+
 
 all:
 	@for subdir in $(SUBDIRS); do \
diff --git a/ipa-server/freeipa-server.spec b/ipa-server/freeipa-server.spec
index a49150795..be16796e1 100755
--- a/ipa-server/freeipa-server.spec
+++ b/ipa-server/freeipa-server.spec
@@ -41,7 +41,6 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %{_sbindir}/ipa-server-install
-%{_sbindir}/ipa-server-setupssl
 %{_sbindir}/ipa_kpasswd
 %attr(755,root,root) %{_initrddir}/ipa-kpasswd
 
diff --git a/ipa-server/freeipa-server.spec.in b/ipa-server/freeipa-server.spec.in
index e5d0ac3b4..ac44e6d9a 100644
--- a/ipa-server/freeipa-server.spec.in
+++ b/ipa-server/freeipa-server.spec.in
@@ -41,7 +41,6 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %{_sbindir}/ipa-server-install
-%{_sbindir}/ipa-server-setupssl
 %{_sbindir}/ipa_kpasswd
 %attr(755,root,root) %{_initrddir}/ipa-kpasswd
 
diff --git a/ipa-server/ipa-install/Makefile b/ipa-server/ipa-install/Makefile
index 2524baf31..40a39b576 100644
--- a/ipa-server/ipa-install/Makefile
+++ b/ipa-server/ipa-install/Makefile
@@ -1,3 +1,4 @@
+SHAREDIR=$(DESTDIR)/usr/share/ipa
 SBINDIR=$(DESTDIR)/usr/sbin
 
 all: ;
@@ -5,7 +6,7 @@ all: ;
 install:
 	-mkdir $(SBINDIR)
 	install -m 755 ipa-server-install $(SBINDIR)
-	install -m 755 ipa-server-setupssl $(SBINDIR)
+	install -m 755 ipa-server-setupssl $(SHAREDIR)
 	$(MAKE) -C share $@
 	$(MAKE) -C test $@
 
diff --git a/ipa-server/ipa-install/ipa-server-install b/ipa-server/ipa-install/ipa-server-install
index d4e55302b..54da6856b 100644
--- a/ipa-server/ipa-install/ipa-server-install
+++ b/ipa-server/ipa-install/ipa-server-install
@@ -134,7 +134,7 @@ def main():
                if host_name == "":
                    print ""
                    host_name = raw_input("Please provide a Fully Qualified name to use for your system [master.example.com]: ")
-                   if host_name != "":
+                   if host_name == "":
                        host_name = "master.example.com"
     
                if len(host_name.split(".")) < 2 or host_name == "localhost.localdomain":
diff --git a/ipa-server/ipaserver/dsinstance.py b/ipa-server/ipaserver/dsinstance.py
index 1f0704486..bb1f021a3 100644
--- a/ipa-server/ipaserver/dsinstance.py
+++ b/ipa-server/ipaserver/dsinstance.py
@@ -156,7 +156,7 @@ class DsInstance:
     def __enable_ssl(self):
         logging.debug("configuring ssl for ds instance")
         dirname = self.config_dirname()
-        args = ["/usr/sbin/ipa-server-setupssl", self.dm_password,
+        args = ["/usr/share/ipa/ipa-server-setupssl", self.dm_password,
                 dirname, self.host_name]
         run(args)
         logging.debug("done configuring ssl for ds instance")