Build gnome-platform tarballs

.gitignore

@@ -4,14 +4,17 @@ packages/SOURCES/*.tar.xz
 packages/SOURCES/*.tar.bz2
 gnome-continuous-yocto
 yocto-build
-root-sdk
-var-sdk
+root
+var
 packages/BUILD/
 packages/RPMS/
 packages/SRPMS/
 packages/rpmdb/
+packages/BUILDROOT/
+packages/gnome-platform/
+packages/.*
 gnome-sdk.tar.xz
 gnome-sdk-rpmdb.tar.xz
 gnome-platform.tar.xz
-gnome-sdk-rpmdb.tar.xz
-packages/SOURCES/gnomeos-contents-platform-x86_64.tar.gz
+gnome-platform-rpmdb.tar.xz
+gnome-platform-packages

Makefile

@@ -61,10 +61,16 @@ packages/RPMS/noarch/gnome-platform-base-0.1-1.noarch.rpm: packages/SPECS/gnome-
 
 gnome-sdk-base: packages/RPMS/noarch/gnome-sdk-base-0.1-1.noarch.rpm
 
-gnome-platform.tar.xz: packages/RPMS/x86_64/gnome-platform-base-0.1-1.x86_64.rpm packages/RPMS/noarch/gnome-platform-0.1-1.noarch.rpm setup.sh build.sh
+gnome-platform-packages: packages/RPMS/noarch/gnome-platform-0.1-1.noarch.rpm setup.sh build.sh
+	./setup.sh root var yocto-build/x86_64/images/gnomeos-contents-sdk-x86_64.tar.gz
+	rm -f gnome-platform-packages
+	./build.sh root var packages ./list_packages.sh gnome-platform > gnome-platform-packages
+
+gnome-platform.tar.xz: gnome-platform-packages packages/RPMS/noarch/gnome-platform-0.1-1.noarch.rpm setup.sh build.sh
 	echo building gnome-platform
-	./setup.sh root var yocto-build/x86_64/images/gnomeos-contents-platform-x86_64.tar.gz
-	./build.sh root var packages rpm -Uvh $PLATFORM_RPMS
-	tar --transform 's,^packages/gnome-platform/usr/,,S' -cJf gnome-platform.tar.xz packages/gnome-platform/usr --owner=root
+	./setup_root.sh root var yocto-build/x86_64/images/gnomeos-contents-platform-x86_64.tar.gz
+	./build.sh root var packages rpm -Uvh `cat gnome-platform-packages`
+	tar --transform 's,^root/usr/,,S' -cJf gnome-platform.tar.xz root/usr --owner=root
+	tar --transform 's,^var/,,S' -cJf gnome-platform-rpmdb.tar.xz var/lib/rpm --owner=root
 
 -include rpm-dependencies.P

install_rpms.sh

-#!/bin/sh
-
-set -x
-smart install --urls $@ 2> package.list
-FILES=
-for i in `cat package.list | grep -v "warning:" | sed "s#file:///#/#"`; do
-    FILES="$FILES $i"
-    rpm2cpio $i | (cd /self/gnome-platform; cpio -id)
-done
-./generate_script.sh $FILES > /self/gnome-platform/post_install.sh
-mv /self/gnome-platform/etc/* /self/gnome-platform/usr/etc/
-mv /self/gnome-platform/lib/* /self/gnome-platform/usr/lib/
-mv /self/gnome-platform/bin/* /self/gnome-platform/usr/bin/

list_packages.sh

+#!/bin/sh
+smart install --urls $@ 2>&1 >/dev/null |  sed "s#file:///#/#"

packages/SPECS/gdk-pixbuf2.spec

@@ -15,7 +15,7 @@ BuildRequires:  libX11-devel
 BuildRequires:  gobject-introspection-devel
 # gdk-pixbuf does a configure time check which uses the GIO mime
 # layer; we need to actually have the mime type database.
-BuildRequires:  shared-mime-info
+BuildRequires:  shared-mime-info-devel
 
 Requires: glib2%{?_isa} >= %{glib2_version}
 

packages/SPECS/shared-mime-info.spec

@@ -20,6 +20,15 @@ files. Frequently, it is necessary to work out the correct MIME type for
 a file. This is generally done by examining the file's name or contents,
 and looking up the correct MIME type in a database.
 
+%package devel
+Summary: Development files for the shared-mime-info
+Group: Development/Libraries
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description devel
+This package includes libraries, header files, and developer documentation
+needed for shared-mime-info.
+
 %prep
 %setup -q
 
@@ -53,11 +62,11 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/*
 %doc README NEWS HACKING shared-mime-info-spec.xml
 %{_bindir}/*
 %{_datadir}/mime/packages/*
-# better to co-own this dir than to pull in pkgconfig
-%dir %{_datadir}/pkgconfig
-%{_datadir}/pkgconfig/shared-mime-info.pc
 %{_mandir}/man*/*
 
+%files devel
+%{_datadir}/pkgconfig/shared-mime-info.pc
+
 %changelog
 * Tue Nov 11 2014 Alexander Larsson <alexl@redhat.com> - 1.3-1
 - Initial version based on f21

setup_root.sh

+#!/bin/sh
+
+ROOT=`readlink -f $1`
+VAR=`readlink -f $2`
+IMAGE=`readlink -f $3`
+
+rm -rf $ROOT
+mkdir -p $ROOT
+rm -rf $VAR
+mkdir -p $VAR
+(cd $ROOT; tar xvf $IMAGE > /dev/null; mv etc usr; mkdir -p $VAR/lib; mv var/lib/rpm $VAR/lib)