[Freeipa-devel] [PATCH] Misc small fixes

[Karl MacMillan]

* 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.

Signed-off-by: User "Karl MacMillan <kmacmillan at mentalrootkit.com>"
---

diff -r 219dd6d19458 -r b1273ecc5164 Makefile
--- a/Makefile	Mon Sep 24 15:26:35 2007 -0400
+++ b/Makefile	Tue Sep 25 13:52:24 2007 -0400
@@ -155,4 +155,4 @@ local-dist: clean version-update local-a
 local-dist: clean version-update local-archive tarballs archive-cleanup rpms
 
 dist-clean: clean
-	rm -fr dist
+	rm -fr rpmbuild dist
diff -r 219dd6d19458 -r b1273ecc5164 ipa-python/freeipa-python.spec
--- a/ipa-python/freeipa-python.spec	Mon Sep 24 15:26:35 2007 -0400
+++ b/ipa-python/freeipa-python.spec	Tue Sep 25 13:52:24 2007 -0400
@@ -10,7 +10,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 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 -r 219dd6d19458 -r b1273ecc5164 ipa-server/Makefile
--- a/ipa-server/Makefile	Mon Sep 24 15:26:35 2007 -0400
+++ b/ipa-server/Makefile	Tue Sep 25 13:52:24 2007 -0400
@@ -1,5 +1,9 @@ SUBDIRS=ipa-install xmlrpc-server ipa-kp
 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 -r 219dd6d19458 -r b1273ecc5164 ipa-server/freeipa-server.spec
--- a/ipa-server/freeipa-server.spec	Mon Sep 24 15:26:35 2007 -0400
+++ b/ipa-server/freeipa-server.spec	Tue Sep 25 13:52:24 2007 -0400
@@ -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 -r 219dd6d19458 -r b1273ecc5164 ipa-server/freeipa-server.spec.in
--- a/ipa-server/freeipa-server.spec.in	Mon Sep 24 15:26:35 2007 -0400
+++ b/ipa-server/freeipa-server.spec.in	Tue Sep 25 13:52:24 2007 -0400
@@ -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 -r 219dd6d19458 -r b1273ecc5164 ipa-server/ipa-install/Makefile
--- a/ipa-server/ipa-install/Makefile	Mon Sep 24 15:26:35 2007 -0400
+++ b/ipa-server/ipa-install/Makefile	Tue Sep 25 13:52:24 2007 -0400
@@ -1,3 +1,4 @@ SBINDIR=$(DESTDIR)/usr/sbin
+SHAREDIR=$(DESTDIR)/usr/share/ipa
 SBINDIR=$(DESTDIR)/usr/sbin
 
 all: ;
@@ -5,7 +6,7 @@ install:
 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 -r 219dd6d19458 -r b1273ecc5164 ipa-server/ipa-install/ipa-server-install
--- a/ipa-server/ipa-install/ipa-server-install	Mon Sep 24 15:26:35 2007 -0400
+++ b/ipa-server/ipa-install/ipa-server-install	Tue Sep 25 13:52:24 2007 -0400
@@ -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 -r 219dd6d19458 -r b1273ecc5164 ipa-server/ipaserver/dsinstance.py
--- a/ipa-server/ipaserver/dsinstance.py	Mon Sep 24 15:26:35 2007 -0400
+++ b/ipa-server/ipaserver/dsinstance.py	Tue Sep 25 13:52:24 2007 -0400
@@ -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")