[ostree] gnomeos: Fix hwdata install
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ostree] gnomeos: Fix hwdata install
- Date: Sat, 4 Feb 2012 15:47:08 +0000 (UTC)
commit 1aaf74651b1e1c67c276cc2e98f6b8ca6ac32774
Author: Colin Walters <walters verbum org>
Date: Sat Feb 4 10:44:46 2012 -0500
gnomeos: Fix hwdata install
gnomeos/3.4/hwdata-no-spec-file.patch | 27 +++++++++++++++++++++++++++
gnomeos/3.4/manifest.json | 3 ++-
2 files changed, 29 insertions(+), 1 deletions(-)
---
diff --git a/gnomeos/3.4/hwdata-no-spec-file.patch b/gnomeos/3.4/hwdata-no-spec-file.patch
new file mode 100644
index 0000000..ea29a42
--- /dev/null
+++ b/gnomeos/3.4/hwdata-no-spec-file.patch
@@ -0,0 +1,27 @@
+From 33040ba93f2b6d0d8a83248ed90b390eddd5b7bf Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Sat, 4 Feb 2012 10:18:22 -0500
+Subject: [PATCH] build: Don't depend on hwdata.spec for 'make install'
+
+It's really not necessary to parse "hwdata.spec" to tell us our
+package name is "hwdata".
+
+The other targets still do depend on the version/release in
+hwdata.spec.
+---
+ Makefile | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index e360181..b995e64 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,4 +1,4 @@
+-NAME=$(shell awk '/Name:/ { print $$2 }' hwdata.spec)
++NAME=hwdata
+ VERSION=$(shell awk '/Version:/ { print $$2 }' hwdata.spec)
+ RELEASE=$(shell rpm -q --specfile --qf "%{release}" hwdata.spec)
+ SOURCEDIR := $(shell pwd)
+--
+1.7.6.5
+
diff --git a/gnomeos/3.4/manifest.json b/gnomeos/3.4/manifest.json
index cb0778e..2a9f7e3 100644
--- a/gnomeos/3.4/manifest.json
+++ b/gnomeos/3.4/manifest.json
@@ -304,7 +304,8 @@
"patches": ["usbutils-autogen.patch"]},
{"src": "fedora:hwdata.git",
- "patches": ["hwdata-buildapi.patch"]},
+ "patches": ["hwdata-buildapi.patch",
+ "hwdata-no-spec-file.patch"]},
{"src": "cgwalters:texinfo-git-mirror",
"branch": "TEXI2HTML_1_82",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]