gnome-common: restructure recipes to use gnome-common.inc, add 2.26.0

5 files changed, 31 insertions, 56 deletions

diff --git a/recipes/gnome/gnome-common.inc b/recipes/gnome/gnome-common.inc
new file mode 100644
index 0000000000..9d1cdb00bf
--- /dev/null
+++ b/recipes/gnome/gnome-common.inc
@@ -0,0 +1,28 @@
+LICENSE = "GPL"
+SECTION = "x11/gnome"
+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_BINDIR_NATIVE}
+	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/recipes/gnome/gnome-common-2.20.0/omf.patch b/recipes/gnome/gnome-common/omf.patch
index 0d85b001e0..0d85b001e0 100644
--- a/recipes/gnome/gnome-common-2.20.0/omf.patch
+++ b/recipes/gnome/gnome-common/omf.patch
diff --git a/recipes/gnome/gnome-common_2.18.0.bb b/recipes/gnome/gnome-common_2.18.0.bb
index 41c25b69c2..252b1c25a9 100644
--- a/recipes/gnome/gnome-common_2.18.0.bb
+++ b/recipes/gnome/gnome-common_2.18.0.bb
@@ -1,28 +1 @@
-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_BINDIR_NATIVE}
-	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}
-}
+require gnome-common.inc
diff --git a/recipes/gnome/gnome-common_2.20.0.bb b/recipes/gnome/gnome-common_2.20.0.bb
index 41c25b69c2..252b1c25a9 100644
--- a/recipes/gnome/gnome-common_2.20.0.bb
+++ b/recipes/gnome/gnome-common_2.20.0.bb
@@ -1,28 +1 @@
-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_BINDIR_NATIVE}
-	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}
-}
+require gnome-common.inc
diff --git a/recipes/gnome/gnome-common_2.26.0.bb b/recipes/gnome/gnome-common_2.26.0.bb
new file mode 100644
index 0000000000..252b1c25a9
--- /dev/null
+++ b/recipes/gnome/gnome-common_2.26.0.bb
@@ -0,0 +1 @@
+require gnome-common.inc