From 35de55fc9eae78a55e2cba175a5f35f05643d9aa Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bar=C4=B1=C5=9F=20Metin?= Date: Mon, 25 May 2009 13:22:57 +0000 Subject: [PATCH] hack to add installed files to the package. hope this will fix 64bit builds. --- Makefile | 2 +- geniwrapper.spec | 14 +++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 30528702..d07a9fdd 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ subdirs := keyconvert #pyOpenSSL-0.9 all: $(init) $(subdirs) install: all - python setup.py install --root=$(DESTDIR) + python setup.py install --root=$(DESTDIR) --record=GENI_INSTALLED_FILES $(subdirs): $(init) diff --git a/geniwrapper.spec b/geniwrapper.spec index 7212cd75..ac58e961 100644 --- a/geniwrapper.spec +++ b/geniwrapper.spec @@ -43,19 +43,15 @@ make rm -rf $RPM_BUILD_ROOT make install DESTDIR="$RPM_BUILD_ROOT" +# hack to add installed files to the package +python -c "print '\n'.join(['%s*'%i.strip() for i in open('GENI_INSTALLED_FILES').readlines() if not i.strip().endswith('.pyc')])" |uniq > GENI_INSTALLED_FILES.all + + %clean rm -rf $RPM_BUILD_ROOT -%files +%files -f GENI_INSTALLED_FILES.all %defattr(-,root,root) -/etc/init.d/geniwrapper -/etc/geni -/usr/bin/geni-config-tty -/usr/bin/gimport.py* -/usr/bin/plc.py* -/usr/bin/sfi.py* -%(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")/geni - /usr/share/keyconvert %post -- 2.43.0