From 9094804a3600848fec67ea3dc67621fca12acd9c Mon Sep 17 00:00:00 2001 From: jlh Date: Tue, 10 Feb 2009 22:34:36 +0100 Subject: [PATCH] utils/makerpm: Fix building RPMs again --- skype-call-recorder.spec | 8 +++++--- utils/makerpm | 5 ++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/skype-call-recorder.spec b/skype-call-recorder.spec index 96f43c2..8bfc51f 100644 --- a/skype-call-recorder.spec +++ b/skype-call-recorder.spec @@ -1,4 +1,6 @@ +BuildRoot: @buildroot@ + Summary: Recording tool for Skype Calls Name: skype-call-recorder Version: @version@ @@ -25,9 +27,9 @@ make DESTDIR="%{buildroot}" install %files %defattr(-,root,root) -%{buildroot}/usr/local/bin/skype-call-recorder -%{buildroot}/usr/local/share/applications/skype-call-recorder.desktop -%{buildroot}/usr/local/share/icons/hicolor/128x128/apps/skype-call-recorder.png +/usr/local/bin/skype-call-recorder +/usr/local/share/applications/skype-call-recorder.desktop +/usr/local/share/icons/hicolor/128x128/apps/skype-call-recorder.png %clean rm -rf "%{buildroot}" diff --git a/utils/makerpm b/utils/makerpm index 31b2643..8fb0df7 100755 --- a/utils/makerpm +++ b/utils/makerpm @@ -33,7 +33,10 @@ mkdir "$tmp"/SOURCES "$tmp"/BUILD "$tmp"/RPMS || exit 1 $BASE/utils/snapshot $v "$tmp/SOURCES/$scr-$v.tar.gz" || exit 1 -git show -p $v:$scr.spec | sed -e "s/@version@/$v/g" > "$tmp/spec" || exit 1 +git show -p $v:$scr.spec | sed \ + -e "s+@version@+$v+g" \ + -e "s+@buildroot@+$tmp/destdir+g" \ + > "$tmp/spec" || exit 1 rpmbuild -bb --define "_topdir $tmp" --define "buildroot $tmp/destdir" "$tmp/spec" || exit 1 -- 2.11.4.GIT