From 784976ef994e0f3e3e1492c7fbd177e01b307299 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross@openedhand.com>
Date: Tue, 28 Aug 2007 20:49:58 +0000
Subject: gnome-common: upgrade from 2.4.0 to 2.18.0

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2583 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/gnome/gnome-common-2.18/omf.patch | 13 ++++++++++++
 meta/packages/gnome/gnome-common/omf.patch      | 13 ------------
 meta/packages/gnome/gnome-common_2.18.0.bb      | 28 +++++++++++++++++++++++++
 meta/packages/gnome/gnome-common_2.4.0.bb       | 28 -------------------------
 4 files changed, 41 insertions(+), 41 deletions(-)
 create mode 100644 meta/packages/gnome/gnome-common-2.18/omf.patch
 delete mode 100644 meta/packages/gnome/gnome-common/omf.patch
 create mode 100644 meta/packages/gnome/gnome-common_2.18.0.bb
 delete mode 100644 meta/packages/gnome/gnome-common_2.4.0.bb

diff --git a/meta/packages/gnome/gnome-common-2.18/omf.patch b/meta/packages/gnome/gnome-common-2.18/omf.patch
new file mode 100644
index 000000000..0d85b001e
--- /dev/null
+++ b/meta/packages/gnome/gnome-common-2.18/omf.patch
@@ -0,0 +1,13 @@
+--- gnome-common-2.4.0/doc-build/omf.make	2003-05-24 08:16:25.000000000 -0700
++++ gnome-common-2.4.0.new/doc-build/omf.make	2004-11-15 14:01:12.185155192 -0700
+@@ -43,7 +43,9 @@
+ install-data-hook-omf:
+ 	$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
+ 	for file in $(omffile); do \
+-		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
++		if [ -f $$file.out ]; then \
++			$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
++		fi; \
+ 	done
+ 	-scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
+ 
diff --git a/meta/packages/gnome/gnome-common/omf.patch b/meta/packages/gnome/gnome-common/omf.patch
deleted file mode 100644
index 334425e4b..000000000
--- a/meta/packages/gnome/gnome-common/omf.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- gnome-common-2.4.0/doc-build/omf.make	2003-05-24 08:16:25.000000000 -0700
-+++ gnome-common-2.4.0.new/doc-build/omf.make	2004-11-15 14:01:12.185155192 -0700
-@@ -43,7 +43,9 @@
- install-data-hook-omf:
- 	$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
- 	for file in $(omffile); do \
--		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
-+		if [ -f $$file.out ]; then \
-+			$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
-+		fi; \
- 	done
- 	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
- 
diff --git a/meta/packages/gnome/gnome-common_2.18.0.bb b/meta/packages/gnome/gnome-common_2.18.0.bb
new file mode 100644
index 000000000..2991db81c
--- /dev/null
+++ b/meta/packages/gnome/gnome-common_2.18.0.bb
@@ -0,0 +1,28 @@
+LICENSE = "GPL"
+SECTION = "x11/gnome"
+PR = "r0"
+DESCRIPTION = "Common macros for building GNOME applications"
+inherit gnome
+
+# The omf.make file failed if scrollkeeper doesn't happen to be
+# installed
+
+SRC_URI += "file://omf.patch;patch=1"
+
+EXTRA_AUTORECONF = ""
+DEPENDS = ""
+
+FILES_${PN} += "${datadir}/aclocal"
+FILES_${PN}-dev = ""
+
+do_stage () {
+	rm -rf ${STAGE_TEMP}
+	mkdir -p ${STAGE_TEMP}
+	make DESTDIR="${STAGE_TEMP}" install
+	cp -pPR ${STAGE_TEMP}${bindir}/* ${STAGING_DIR}/${BUILD_SYS}/bin
+	install -d ${STAGING_DATADIR}/gnome-common
+	install -d ${STAGING_DATADIR}/aclocal
+	cp -pPR ${STAGE_TEMP}${datadir}/gnome-common/* ${STAGING_DATADIR}/gnome-common
+	cp -pPR ${STAGE_TEMP}${datadir}/aclocal/* ${STAGING_DATADIR}/aclocal
+	rm -rf ${STAGE_TEMP}
+}
diff --git a/meta/packages/gnome/gnome-common_2.4.0.bb b/meta/packages/gnome/gnome-common_2.4.0.bb
deleted file mode 100644
index 2991db81c..000000000
--- a/meta/packages/gnome/gnome-common_2.4.0.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-LICENSE = "GPL"
-SECTION = "x11/gnome"
-PR = "r0"
-DESCRIPTION = "Common macros for building GNOME applications"
-inherit gnome
-
-# The omf.make file failed if scrollkeeper doesn't happen to be
-# installed
-
-SRC_URI += "file://omf.patch;patch=1"
-
-EXTRA_AUTORECONF = ""
-DEPENDS = ""
-
-FILES_${PN} += "${datadir}/aclocal"
-FILES_${PN}-dev = ""
-
-do_stage () {
-	rm -rf ${STAGE_TEMP}
-	mkdir -p ${STAGE_TEMP}
-	make DESTDIR="${STAGE_TEMP}" install
-	cp -pPR ${STAGE_TEMP}${bindir}/* ${STAGING_DIR}/${BUILD_SYS}/bin
-	install -d ${STAGING_DATADIR}/gnome-common
-	install -d ${STAGING_DATADIR}/aclocal
-	cp -pPR ${STAGE_TEMP}${datadir}/gnome-common/* ${STAGING_DATADIR}/gnome-common
-	cp -pPR ${STAGE_TEMP}${datadir}/aclocal/* ${STAGING_DATADIR}/aclocal
-	rm -rf ${STAGE_TEMP}
-}
-- 
cgit v1.2.3