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.

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 \

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
 

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
 

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 $@
 

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":

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")