install keyconvert to /usr/bin

diff --git a/geniwrapper.spec b/geniwrapper.spec
index 8d83734..161040e 100644 (file)
--- a/geniwrapper.spec
+++ b/geniwrapper.spec
@@ -65,7 +65,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %{python_sitelib}/*
-/usr/share/keyconvert/
+/usr/bin/keyconvert
 /var/www/html/wsdl/sfa.wsdl
 
 %files plc

diff --git a/keyconvert/Makefile b/keyconvert/Makefile
index 60c76cf..4b39432 100644 (file)
--- a/keyconvert/Makefile
+++ b/keyconvert/Makefile
@@ -5,9 +5,8 @@ keyconvert:
        gcc -o keyconvert -lcrypto -ldl keyconvert.c keyconvertmain.c b64decode.c
 
 install: keyconvert
-       install -d -m 0755 $(DESTDIR)/usr/share/keyconvert
-       install -c -m 0755 keyconvert $(DESTDIR)/usr/share/keyconvert/keyconvert
+       install -c -m 0755 keyconvert $(DESTDIR)/usr/bin/keyconvert
  
 clean:
        rm -rf keyconvert
-       rm -rf $(DESTDIR)/usr/share/keyconvert/
+       rm -f $(DESTDIR)/usr/bin/keyconvert

diff --git a/sfa/trust/certificate.py b/sfa/trust/certificate.py
index 4815ebc..58486ec 100644 (file)
--- a/sfa/trust/certificate.py
+++ b/sfa/trust/certificate.py
@@ -26,7 +26,7 @@ from M2Crypto import EVP
 from sfa.util.faults import *
 
 def convert_public_key(key):
-    keyconvert_path = "/usr/share/keyconvert/keyconvert"
+    keyconvert_path = "/usr/bin/keyconvert"
     if not os.path.isfile(keyconvert_path):
         raise IOError, "Could not find keyconvert in %s" % keyconvert_path