From 0797c26ed46f61a3ed93cb719698c0aebae67ded Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bar=C4=B1=C5=9F=20Metin?= Date: Tue, 7 Jul 2009 13:43:48 +0000 Subject: [PATCH] install keyconvert to /usr/bin --- geniwrapper.spec | 2 +- keyconvert/Makefile | 5 ++--- sfa/trust/certificate.py | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/geniwrapper.spec b/geniwrapper.spec index 8d837345..161040e0 100644 --- 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 60c76cf0..4b394329 100644 --- 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 4815ebc8..58486ecf 100644 --- 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 -- 2.43.0