rpms/beakerlib
6
0
Fork 0
Code Issues Pull Requests Releases Activity

These patches are not needed anymore

Browse Source
This commit is contained in:
Petr Muller 2013-04-30 15:49:33 +02:00
parent 4ba7cbfd70
commit 70d5cb801b
2 changed files with 0 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
0001-install-dir.patch
View File

@ -1,40 +0,0 @@
From 9faaca049ddf4724aa5a02b4917717f478cc348a Mon Sep 17 00:00:00 2001
From: Petr Muller <muller@redhat.com>
Date: Wed, 25 Jul 2012 17:30:57 +0200
Subject: [PATCH] Revert the configurable default BL installation dir
(it broke RPMs building)
---
src/Makefile | 2 --
src/beakerlib.sh | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/Makefile b/src/Makefile
index 70f51eb..7a309dd 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -60,8 +60,6 @@ install: $(FILES) docsman gendict
install -p -m 644 examples/apache/* $(DESTDIR)/usr/share/doc/$(PKGNAME)-$(PKGVERSION)/examples/apache
install -p -m 644 $(FILES) $(DESTDIR)/usr/share/beakerlib
- sed -i -e 's|INSTALLPATH|$(DESTDIR)|' $(DESTDIR)/usr/share/beakerlib/beakerlib.sh
-
install -p -m 644 dictionary.vim $(DESTDIR)/usr/share/beakerlib
install -p python/rlMemAvg.py $(DESTDIR)/usr/bin/beakerlib-rlMemAvg
diff --git a/src/beakerlib.sh b/src/beakerlib.sh
index 67e4ae0..4cf7441 100644
--- a/src/beakerlib.sh
+++ b/src/beakerlib.sh
@@ -273,7 +273,7 @@ fi
test -f /etc/profile.d/cobbler.sh && . /etc/profile.d/cobbler.sh
set -e
-export BEAKERLIB=${BEAKERLIB:-"INSTALLPATH"}
+export BEAKERLIB=${BEAKERLIB:-"/usr/share/beakerlib"}
. $BEAKERLIB/infrastructure.sh
. $BEAKERLIB/journal.sh
. $BEAKERLIB/logging.sh
--
1.7.11.2

25
0002-install-more-docs.patch
View File

@ -1,25 +0,0 @@
From 9cb0ceb625061cc4704ca765dfbf80809bed4ef8 Mon Sep 17 00:00:00 2001
From: Petr Muller <muller@redhat.com>
Date: Wed, 25 Jul 2012 17:50:02 +0200
Subject: [PATCH] Install also few more files (README & friends) to docs
---
Makefile | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Makefile b/Makefile
index 6b91a43..edfd47b 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,8 @@ build:
install:
mkdir -p $(DESTDIR)/usr/share/doc/$(PKGNAME)-$(PKGVERSION)/
install -m 644 -p LICENSE $(DESTDIR)/usr/share/doc/$(PKGNAME)-$(PKGVERSION)/
+ install -m 644 -p README $(DESTDIR)/usr/share/doc/$(PKGNAME)-$(PKGVERSION)/
+ install -m 644 -p VERSION $(DESTDIR)/usr/share/doc/$(PKGNAME)-$(PKGVERSION)/
for i in $(SUBDIRS); do $(MAKE) -C $$i install; done
--
1.7.11.2