[gnome-sdk-images] Switch to using freedesktop-sdk-images as base
- From: Alexander Larsson <alexl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-sdk-images] Switch to using freedesktop-sdk-images as base
- Date: Fri, 11 Sep 2015 14:25:44 +0000 (UTC)
commit fb0d8e34c3dbf99a5eec046edabc39b0ce1b8dd6
Author: Alexander Larsson <alexl redhat com>
Date: Wed Sep 2 15:33:08 2015 +0200
Switch to using freedesktop-sdk-images as base
Makefile | 282 +--------------
bin | 1 +
build.sh | 53 ---
buildhome | 1 +
cd.sh | 3 -
clear_root.sh | 7 -
commit.sh | 79 ----
find_prov.sh | 17 -
generate_script.sh | 27 --
list_packages.sh | 2 -
makedeps.sh | 52 ---
metadata.freedesktop-platform | 17 -
metadata.freedesktop-sdk | 23 --
packages/.rpmmacros | 27 --
...92-dbus-gproxy-Verify-sender-of-NameOwner.patch | 51 ---
...ix-XNextRequest-after-direct-usage-of-XCB.patch | 87 -----
.../30-0-google-crosextra-caladea-fontconfig.conf | 17 -
.../30-0-google-crosextra-carlito-fontconfig.conf | 17 -
.../62-google-crosextra-caladea-fontconfig.conf | 17 -
.../62-google-crosextra-carlito-fontconfig.conf | 17 -
packages/SOURCES/69-gnu-free-mono.conf | 16 -
packages/SOURCES/69-gnu-free-sans.conf | 43 ---
packages/SOURCES/69-gnu-free-serif.conf | 43 ---
.../adwaita-icon-theme-3.14.1.tar.xz.sha256 | 1 -
packages/SOURCES/at-spi2-atk-2.14.1.tar.xz.sha256 | 1 -
packages/SOURCES/at-spi2-core-2.14.1.tar.xz.sha256 | 1 -
packages/SOURCES/atk-2.14.0.tar.xz.sha256 | 1 -
packages/SOURCES/bigreqsproto-1.1.2.tar.bz2.sha256 | 1 -
packages/SOURCES/cairo-1.14.0.tar.xz.sha256 | 1 -
.../SOURCES/compositeproto-0.4.2.tar.bz2.sha256 | 1 -
packages/SOURCES/damageproto-1.2.1.tar.bz2.sha256 | 1 -
packages/SOURCES/dbus-1.8.6.tar.gz.sha256 | 1 -
packages/SOURCES/dbus-glib-0.100.2.tar.gz.sha256 | 1 -
packages/SOURCES/dmxproto-2.3.1.tar.bz2.sha256 | 1 -
packages/SOURCES/dont-forward-keycode-0.patch | 53 ---
packages/SOURCES/dri2proto-2.8.tar.bz2.sha256 | 1 -
packages/SOURCES/dri3proto-1.0.tar.bz2.sha256 | 1 -
packages/SOURCES/en_GB-singleletters.patch | 56 ---
packages/SOURCES/en_GB.two_initial_caps.patch | 20 -
packages/SOURCES/en_IE.supplemental.patch | 16 -
packages/SOURCES/en_US-strippedabbrevs.patch | 8 -
packages/SOURCES/evieext-1.1.1.tar.bz2.sha256 | 1 -
packages/SOURCES/fixesproto-5.0.tar.bz2.sha256 | 1 -
packages/SOURCES/fontconfig-2.11.1.tar.bz2.sha256 | 1 -
packages/SOURCES/fontconfig-fix-broken-cache.patch | 158 --------
packages/SOURCES/fontconfig-fix-fccache-fail.patch | 29 --
packages/SOURCES/fontconfig-sleep-less.patch | 12 -
packages/SOURCES/fontconfig-xdg-app.conf | 12 -
packages/SOURCES/fontsproto-2.1.3.tar.bz2.sha256 | 1 -
packages/SOURCES/freetype-2.2.1-enable-valid.patch | 20 -
packages/SOURCES/freetype-2.3.0-enable-spr.patch | 11 -
packages/SOURCES/freetype-2.4.12-pkgconfig.patch | 14 -
.../freetype-2.5.3-freetype-config-libs.patch | 96 -----
packages/SOURCES/freetype-2.5.3.tar.bz2.sha256 | 1 -
packages/SOURCES/gdk-pixbuf-2.31.1.tar.xz.sha256 | 1 -
packages/SOURCES/glib-2.42.0.tar.xz.sha256 | 1 -
packages/SOURCES/glproto-1.4.17.tar.bz2.sha256 | 1 -
packages/SOURCES/gnome-common-3.14.0.tar.xz.sha256 | 1 -
.../gobject-introspection-1.42.0.tar.xz.sha256 | 1 -
.../SOURCES/gstreamer-inspect-rpm-format.patch | 374 --------------------
packages/SOURCES/gstreamer1.attr | 2 -
packages/SOURCES/gstreamer1.prov | 44 ---
packages/SOURCES/gtk+-3.14.5.tar.xz.sha256 | 1 -
packages/SOURCES/gtk-doc-stub.tar.gz | Bin 13369 -> 0 bytes
packages/SOURCES/gtk-doc-stub.tar.gz.sha256 | 1 -
packages/SOURCES/harfbuzz-0.9.34.tar.bz2.sha256 | 1 -
.../SOURCES/hicolor-icon-theme-0.13.tar.gz.sha256 | 1 -
packages/SOURCES/hunspell-en-SI_and_IEC.patch | 78 ----
...hunspell-en-allow-non-typographical.marks.patch | 21 --
packages/SOURCES/hunspell-en-calender.patch | 37 --
packages/SOURCES/index.theme | 2 -
packages/SOURCES/inputproto-2.3.1.tar.bz2.sha256 | 1 -
packages/SOURCES/itstool-2.0.2.tar.bz2.sha256 | 1 -
packages/SOURCES/kbproto-1.0.6.tar.bz2.sha256 | 1 -
packages/SOURCES/libICE-1.0.9.tar.bz2.sha256 | 1 -
packages/SOURCES/libSM-1.2.2.tar.bz2.sha256 | 1 -
packages/SOURCES/libX11-1.6.2.tar.bz2.sha256 | 1 -
packages/SOURCES/libXau-1.0.8.tar.bz2.sha256 | 1 -
.../SOURCES/libXcomposite-0.4.4.tar.bz2.sha256 | 1 -
packages/SOURCES/libXcursor-1.1.14.tar.bz2.sha256 | 1 -
packages/SOURCES/libXdamage-1.1.4.tar.bz2.sha256 | 1 -
packages/SOURCES/libXdmcp-1.1.1.tar.bz2.sha256 | 1 -
packages/SOURCES/libXext-1.3.3.tar.bz2.sha256 | 1 -
packages/SOURCES/libXfixes-5.0.1.tar.bz2.sha256 | 1 -
packages/SOURCES/libXft-2.3.2.tar.bz2.sha256 | 1 -
packages/SOURCES/libXi-1.7.4.tar.bz2.sha256 | 1 -
packages/SOURCES/libXinerama-1.1.3.tar.bz2.sha256 | 1 -
packages/SOURCES/libXpm-3.5.11.tar.bz2.sha256 | 1 -
packages/SOURCES/libXrandr-1.4.2.tar.bz2.sha256 | 1 -
packages/SOURCES/libXrender-0.9.8.tar.bz2.sha256 | 1 -
packages/SOURCES/libXtst-1.2.2.tar.bz2.sha256 | 1 -
packages/SOURCES/libXv-1.0.10.tar.bz2.sha256 | 1 -
packages/SOURCES/libXvMC-1.0.8.tar.bz2.sha256 | 1 -
packages/SOURCES/libXxf86vm-1.1.3.tar.bz2.sha256 | 1 -
packages/SOURCES/libcroco-0.6.8.tar.xz.sha256 | 1 -
packages/SOURCES/libdatrie-0.2.8.tar.xz.sha256 | 1 -
packages/SOURCES/liberation-fonts-mono.conf | 18 -
packages/SOURCES/liberation-fonts-narrow.conf | 16 -
packages/SOURCES/liberation-fonts-sans.conf | 18 -
packages/SOURCES/liberation-fonts-serif.conf | 18 -
packages/SOURCES/libpciaccess-rom-size.patch | 73 ----
packages/SOURCES/libpciaccess-sysfs.patch | 243 -------------
packages/SOURCES/libproxy-0.4.11-crash.patch | 41 ---
packages/SOURCES/libproxy-0.4.11-fdleak.patch | 20 -
packages/SOURCES/librsvg-2.40.5.tar.xz.sha256 | 1 -
packages/SOURCES/libthai-0.1.21.tar.xz.sha256 | 1 -
packages/SOURCES/libxcb-1.11.tar.bz2.sha256 | 1 -
packages/SOURCES/libxkbfile-1.0.8.tar.bz2.sha256 | 1 -
packages/SOURCES/libxshmfence-1.1.tar.bz2.sha256 | 1 -
packages/SOURCES/llvm-3.5.0-build-fix.patch | 43 ---
packages/SOURCES/mesa-no-typeid.patch | 12 -
packages/SOURCES/mozilla_words.patch | 62 ----
packages/SOURCES/pango-1.36.8.tar.xz.sha256 | 1 -
packages/SOURCES/pixman-0.32.6.tar.bz2.sha256 | 1 -
...indow-and-Pixmap-to-be-CARD32-on-the-wire.patch | 41 ---
packages/SOURCES/presentproto-1.0.tar.bz2.sha256 | 1 -
packages/SOURCES/pthread-stubs.pc.in | 8 -
.../randrproto-0001-Add-a-GUID-property.patch | 60 ----
packages/SOURCES/randrproto-1.4.0.tar.bz2.sha256 | 1 -
packages/SOURCES/recordproto-1.14.2.tar.bz2.sha256 | 1 -
packages/SOURCES/renderproto-0.11.1.tar.bz2.sha256 | 1 -
.../SOURCES/resourceproto-1.2.0.tar.bz2.sha256 | 1 -
.../SOURCES/scrnsaverproto-1.2.2.tar.bz2.sha256 | 1 -
.../SOURCES/shared-mime-info-1.3.tar.xz.sha256 | 1 -
packages/SOURCES/util-macros-1.19.0.tar.bz2.sha256 | 1 -
packages/SOURCES/vala-0.26.1.tar.xz.sha256 | 1 -
packages/SOURCES/videoproto-2.3.2.tar.bz2.sha256 | 1 -
packages/SOURCES/xcb-proto-1.11.tar.bz2.sha256 | 1 -
packages/SOURCES/xcmiscproto-1.2.2.tar.bz2.sha256 | 1 -
packages/SOURCES/xextproto-7.3.0.tar.bz2.sha256 | 1 -
.../SOURCES/xf86bigfontproto-1.2.0.tar.bz2.sha256 | 1 -
packages/SOURCES/xf86dgaproto-2.1.tar.bz2.sha256 | 1 -
packages/SOURCES/xf86driproto-2.1.1.tar.bz2.sha256 | 1 -
.../SOURCES/xf86miscproto-0.9.3.tar.bz2.sha256 | 1 -
.../SOURCES/xf86vidmodeproto-2.3.1.tar.bz2.sha256 | 1 -
.../SOURCES/xineramaproto-1.2.1.tar.bz2.sha256 | 1 -
packages/SOURCES/xproto-7.0.26.tar.bz2.sha256 | 1 -
.../xproxymanagementprotocol-1.0.3.tar.bz2.sha256 | 1 -
.../SOURCES/xtrans-1.0.3-avoid-gethostname.patch | 11 -
packages/SOURCES/xtrans-1.3.5.tar.bz2.sha256 | 1 -
packages/SOURCES/yelp-tools-3.14.1.tar.xz.sha256 | 1 -
packages/SOURCES/yelp-xsl-3.14.0.tar.xz.sha256 | 1 -
packages/SPECS/SDL2.spec | 107 ------
packages/SPECS/SDL2_image.spec | 69 ----
packages/SPECS/SDL2_mixer.spec | 64 ----
packages/SPECS/SDL2_net.spec | 53 ---
packages/SPECS/SDL2_ttf.spec | 57 ---
packages/SPECS/aspell.spec | 109 ------
packages/SPECS/cairo.spec | 178 ----------
packages/SPECS/dbus.spec | 159 ---------
packages/SPECS/dejavu-fonts.spec | 52 ---
packages/SPECS/desktop-file-utils.spec | 44 ---
packages/SPECS/fontconfig.spec | 132 -------
packages/SPECS/freedesktop-debug.spec | 78 ----
packages/SPECS/freedesktop-platform-base.spec | 35 --
packages/SPECS/freedesktop-platform.spec | 126 -------
packages/SPECS/freedesktop-sdk-base.spec | 37 --
packages/SPECS/freedesktop-sdk.spec | 98 -----
packages/SPECS/freetype.spec | 101 ------
packages/SPECS/gnu-free-fonts.spec | 74 ----
packages/SPECS/google-crosextra-caladea-fonts.spec | 60 ----
packages/SPECS/google-crosextra-carlito-fonts.spec | 60 ----
packages/SPECS/graphite2.spec | 78 ----
packages/SPECS/gstreamer1-plugins-base.spec | 336 ------------------
packages/SPECS/gstreamer1.spec | 164 ---------
packages/SPECS/gtk-doc-stub.spec | 44 ---
packages/SPECS/harfbuzz.spec | 82 -----
packages/SPECS/hicolor-icon-theme.spec | 50 ---
packages/SPECS/hunspell-en.spec | 120 -------
packages/SPECS/hunspell.spec | 80 -----
packages/SPECS/libICE.spec | 66 ----
packages/SPECS/libSM.spec | 66 ----
packages/SPECS/libX11.spec | 104 ------
packages/SPECS/libXScrnSaver.spec | 61 ----
packages/SPECS/libXau.spec | 66 ----
packages/SPECS/libXcomposite.spec | 58 ---
packages/SPECS/libXcursor.spec | 87 -----
packages/SPECS/libXdamage.spec | 58 ---
packages/SPECS/libXdmcp.spec | 61 ----
packages/SPECS/libXext.spec | 81 -----
packages/SPECS/libXfixes.spec | 61 ----
packages/SPECS/libXft.spec | 72 ----
packages/SPECS/libXi.spec | 77 ----
packages/SPECS/libXinerama.spec | 64 ----
packages/SPECS/libXpm.spec | 64 ----
packages/SPECS/libXrandr.spec | 63 ----
packages/SPECS/libXrender.spec | 62 ----
packages/SPECS/libXt.spec | 104 ------
packages/SPECS/libXtst.spec | 68 ----
packages/SPECS/libXv.spec | 64 ----
packages/SPECS/libXvMC.spec | 74 ----
packages/SPECS/libXxf86vm.spec | 61 ----
packages/SPECS/libdrm.spec | 108 ------
packages/SPECS/libepoxy.spec | 55 ---
packages/SPECS/liberation-fonts.spec | 76 ----
packages/SPECS/libpciaccess.spec | 60 ----
packages/SPECS/libproxy.spec | 294 ---------------
packages/SPECS/libxcb.spec | 106 ------
packages/SPECS/libxkbcommon.spec | 93 -----
packages/SPECS/libxkbfile.spec | 64 ----
packages/SPECS/libxshmfence.spec | 52 ---
packages/SPECS/llvm.spec | 312 ----------------
packages/SPECS/mesa.spec | 335 ------------------
packages/SPECS/orc.spec | 103 ------
packages/SPECS/pixman.spec | 64 ----
packages/SPECS/pulseaudio.spec | 286 ---------------
packages/SPECS/shared-mime-info.spec | 72 ----
packages/SPECS/wayland.spec | 142 --------
packages/SPECS/xcb-proto.spec | 45 ---
packages/SPECS/xkeyboard-config.spec | 75 ----
packages/SPECS/xorg-x11-proto-devel.spec | 287 ---------------
packages/SPECS/xorg-x11-util-macros.spec | 39 --
packages/SPECS/xorg-x11-xtrans-devel.spec | 57 ---
packages/bin/ccache/c++ | 1 -
packages/bin/ccache/cc | 1 -
packages/bin/ccache/g++ | 1 -
packages/bin/ccache/gcc | 1 -
post.sh | 4 -
setup.sh | 9 -
setup_root.sh | 27 --
simple-commit.sh | 30 --
.../SPECS => specs}/abattis-cantarell-fonts.spec | 0
{packages/SPECS => specs}/adwaita-icon-theme.spec | 0
{packages/SPECS => specs}/at-spi2-atk.spec | 0
{packages/SPECS => specs}/at-spi2-core.spec | 0
{packages/SPECS => specs}/atk.spec | 0
{packages/SPECS => specs}/clutter-gtk.spec | 0
{packages/SPECS => specs}/clutter.spec | 0
{packages/SPECS => specs}/cogl.spec | 0
{packages/SPECS => specs}/dbus-glib.spec | 0
{packages/SPECS => specs}/dconf.spec | 0
{packages/SPECS => specs}/enchant.spec | 0
{packages/SPECS => specs}/gdk-pixbuf2.spec | 0
{packages/SOURCES => specs}/gio-netlink.patch | 0
{packages/SPECS => specs}/gjs.spec | 0
{packages/SPECS => specs}/glib-networking.spec | 0
{packages/SPECS => specs}/glib2.spec | 0
{packages/SPECS => specs}/gnome-common.spec | 0
{packages/SPECS => specs}/gnome-debug.spec | 2 +-
{packages/SPECS => specs}/gnome-platform.spec | 2 +-
{packages/SPECS => specs}/gnome-sdk.spec | 2 +-
.../SPECS => specs}/gnome-themes-standard.spec | 0
.../SPECS => specs}/gobject-introspection.spec | 0
.../SPECS => specs}/gsettings-desktop-schemas.spec | 0
.../gtk2-pixdata-deprecation.patch | 0
{packages/SPECS => specs}/gtk2.spec | 0
{packages/SPECS => specs}/gtk3.spec | 0
{packages/SOURCES => specs}/gtkrc | 0
.../gvfs-remote-monitor-remove-warning.patch | 0
{packages/SPECS => specs}/gvfs.spec | 0
{packages/SOURCES => specs}/im-cedilla.conf | 0
{packages/SPECS => specs}/itstool.spec | 0
{packages/SPECS => specs}/json-glib.spec | 0
{packages/SPECS => specs}/libappstream-glib.spec | 0
{packages/SPECS => specs}/libcroco.spec | 0
{packages/SPECS => specs}/libdatrie.spec | 0
{packages/SPECS => specs}/libnotify.spec | 0
{packages/SPECS => specs}/librsvg2.spec | 0
{packages/SPECS => specs}/libsecret.spec | 1 +
{packages/SPECS => specs}/libsoup.spec | 0
{packages/SPECS => specs}/libthai.spec | 0
.../SOURCES => specs}/mozjs-build-fixes.patch | 0
{packages/SPECS => specs}/mozjs24.spec | 0
{packages/SPECS => specs}/pango.spec | 0
{packages/SPECS => specs}/pygobject3.spec | 0
{packages/SPECS => specs}/python3-cairo.spec | 0
{packages/SOURCES => specs}/rpm-macros | 0
{packages/SPECS => specs}/vala.spec | 0
...e-Only-show-the-cursor-on-motion-if-moved.patch | 0
{packages/SPECS => specs}/vte.spec | 0
.../webkit-glib-gmutexlocker.patch | 0
{packages/SPECS => specs}/webkitgtk4.spec | 0
{packages/SPECS => specs}/yelp-tools.spec | 0
{packages/SPECS => specs}/yelp-xsl.spec | 0
{packages/SPECS => specs}/zenity.spec | 0
untag.sh | 22 --
276 files changed, 20 insertions(+), 9726 deletions(-)
---
diff --git a/Makefile b/Makefile
index 0232f2f..4f1d3fb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,280 +1,26 @@
-srcdir = $(CURDIR)
-builddir = $(CURDIR)
-
-FREEDESKTOP_VERSION=1.0
-GNOME_VERSION=3.16
+NAME=gnome
+ID=org.gnome
+VERSION=3.18
ARCH=x86_64
-IMAGEDIR=freedesktop-sdk-base/images/$(ARCH)
-SPECS=packages/SPECS
-NOARCH=packages/RPMS/noarch
-BASE_HASH=7c8b7a164472f67b5ed69802e3119bc1804127aa
+IMAGEDIR=freedesktop-sdk-images/freedesktop-sdk-base/images/$(ARCH)
+BASE_HASH=cda42b256f1691e750bce3a421a4fe6536115ac3
EXTRA_NAME=
DELTAS=
GPG_KEY=
GPG_HOME=
-all: gnome-platform.tar.gz gnome-sdk.tar.gz
-
-SDK_BASE_IMAGE=$(IMAGEDIR)/freedesktop-contents-sdk-$(ARCH)-$(BASE_HASH).tar.gz
-PLATFORM_BASE_IMAGE=$(IMAGEDIR)/freedesktop-contents-platform-$(ARCH)-$(BASE_HASH).tar.gz
-
-$(SDK_BASE_IMAGE) $(PLATFORM_BASE_IMAGE) images:
- if test ! -d freedesktop-sdk-base; then \
- git clone git://anongit.freedesktop.org/xdg-app/freedesktop-sdk-base;\
- fi
- (cd freedesktop-sdk-base && \
- git fetch origin && \
- git checkout $(BASE_HASH) && \
- make)
-
-NULL=
-
-PACKAGES = \
- freedesktop-platform-base \
- freedesktop-sdk-base \
- freedesktop-platform \
- freedesktop-sdk \
- freedesktop-debug \
- gnome-platform \
- gnome-sdk \
- gnome-debug \
- \
- SDL2 \
- SDL2_image \
- SDL2_mixer \
- SDL2_net \
- SDL2_ttf \
- abattis-cantarell-fonts \
- adwaita-icon-theme \
- aspell \
- at-spi2-atk \
- at-spi2-core \
- atk \
- cairo \
- clutter \
- clutter-gtk \
- cogl \
- dbus \
- dbus-glib \
- dconf \
- dejavu-fonts \
- desktop-file-utils \
- enchant \
- fontconfig \
- freetype \
- gdk-pixbuf2 \
- gjs \
- glib-networking \
- glib2 \
- gnome-common \
- gnome-themes-standard \
- gnu-free-fonts \
- gobject-introspection \
- google-crosextra-caladea-fonts \
- google-crosextra-carlito-fonts \
- graphite2 \
- gsettings-desktop-schemas \
- gstreamer1 \
- gstreamer1-plugins-base \
- gtk-doc-stub \
- gtk2 \
- gtk3 \
- gvfs \
- harfbuzz \
- hicolor-icon-theme \
- hunspell-en hunspell \
- itstool \
- json-glib \
- libICE \
- libSM \
- libX11 \
- libXScrnSaver \
- libXau \
- libXcomposite \
- libXcursor \
- libXdamage \
- libXdmcp \
- libXext \
- libXfixes \
- libXft \
- libXi \
- libXinerama \
- libXpm \
- libXrandr \
- libXrender \
- libXt \
- libXtst \
- libXv \
- libXvMC \
- libXxf86vm \
- libappstream-glib \
- libcroco \
- libdatrie \
- libdrm \
- libepoxy \
- liberation-fonts \
- libnotify \
- libpciaccess \
- libproxy \
- librsvg2 \
- libsecret \
- libsoup \
- libthai \
- libxcb \
- libxkbcommon \
- libxkbfile \
- libxshmfence \
- llvm \
- mesa \
- mozjs24 \
- orc \
- pango \
- pixman \
- pulseaudio \
- pygobject3 \
- python3-cairo \
- shared-mime-info \
- vala \
- vte \
- wayland \
- webkitgtk4 \
- xcb-proto \
- xkeyboard-config \
- xorg-x11-proto-devel \
- xorg-x11-util-macros \
- xorg-x11-xtrans-devel \
- yelp-tools \
- yelp-xsl \
- zenity \
- $(NULL)
-
-ALL_SPECS =$(PACKAGES:%=$(SPECS)/%.spec)
-
-deps: rpm-dependencies.P
-
-rpm-dependencies.P: $(ALL_SPECS) makedeps.sh $(SDK_BASE_IMAGE)
- ./setup.sh $(SDK_BASE_IMAGE)
- ./build.sh ./makedeps.sh $(ALL_SPECS) > rpm-dependencies.P
- ./clear_root.sh
-
-gnome-sdk.tar.gz gnome-sdk-rpmdb.tar.gz: $(NOARCH)/gnome-sdk-0.1-1.sdk.noarch.rpm
- ./setup.sh $(SDK_BASE_IMAGE)
- ./build.sh smart install -y $(NOARCH)/gnome-sdk-0.1-1.sdk.noarch.rpm
- ./build.sh ./post.sh
- rm -rf gnome-sdk.tar.gz gnome-sdk-rpmdb.tar.gz
- tar --transform 's,^build/root/usr,files,S' -czf gnome-sdk.tar.gz build/root/usr --owner=root
- tar --transform 's,^build/var,files,S' -czf gnome-sdk-rpmdb.tar.gz build/var/lib/rpm --owner=root
- ./clear_root.sh
-
-gnome-debug.tar.gz gnome-debug-src.tar.gz: $(NOARCH)/gnome-debug-0.1-1.sdk.noarch.rpm
- ./setup.sh $(SDK_BASE_IMAGE)
- ./build.sh smart install -y $(NOARCH)/gnome-debug-0.1-1.sdk.noarch.rpm
- rm -rf gnome-debug.tar.gz gnome-debug-src.tar.gz
- tar --transform 's,^build/root/usr/lib/debug,files,S' -czf gnome-debug.tar.gz
build/root/usr/lib/debug --owner=root
- tar --transform 's,^build/root/usr/src/debug,files,S' -czf gnome-debug-src.tar.gz
build/root/usr/src/debug --owner=root
- ./clear_root.sh
-
-freedesktop-sdk.tar.gz freedesktop-sdk-rpmdb.tar.gz: $(NOARCH)/freedesktop-sdk-0.1-1.sdk.noarch.rpm
- ./setup.sh $(SDK_BASE_IMAGE)
- ./build.sh smart install -y $(NOARCH)/freedesktop-sdk-0.1-1.sdk.noarch.rpm
- ./build.sh ./post.sh
- rm -rf freedesktop-sdk.tar.gz freedesktop-sdk-rpmdb.tar.gz
- tar --transform 's,^build/root/usr,files,S' -czf freedesktop-sdk.tar.gz build/root/usr --owner=root
- tar --transform 's,^build/var,files,S' -czf freedesktop-sdk-rpmdb.tar.gz build/var/lib/rpm
--owner=root
- ./clear_root.sh
-
-freedesktop-debug.tar.gz freedesktop-debug-src.tar.gz: $(NOARCH)/freedesktop-debug-0.1-1.sdk.noarch.rpm
- ./setup.sh $(SDK_BASE_IMAGE)
- ./build.sh smart install -y $(NOARCH)/freedesktop-debug-0.1-1.sdk.noarch.rpm
- rm -rf freedesktop-debug.tar.gz freedesktop-debug-src.tar.gz
- tar --transform 's,^build/root/usr/lib/debug,files,S' -czf freedesktop-debug.tar.gz
build/root/usr/lib/debug --owner=root
- tar --transform 's,^build/root/usr/src/debug,files,S' -czf freedesktop-debug-src.tar.gz
build/root/usr/src/debug --owner=root
- ./clear_root.sh
-
-freedesktop-platform-base: $(NOARCH)/freedesktop-platform-base-0.1-1.sdk.noarch.rpm
-
-$(NOARCH)/freedesktop-platform-base-0.1-1.sdk.noarch.rpm: $(SPECS)/freedesktop-platform-base.spec setup.sh
build.sh $(PLATFORM_BASE_IMAGE) $(SDK_BASE_IMAGE)
- -echo building freedesktop-platform-base.spec
- rm -rf packages/freedesktop-platform
- mkdir -p packages/freedesktop-platform
- tar -C packages/freedesktop-platform -xzf $(PLATFORM_BASE_IMAGE)
- ./setup.sh $(SDK_BASE_IMAGE)
- ./build.sh rpmbuild -ba $(SPECS)/freedesktop-platform-base.spec
- ./clear_root.sh
-
-freedesktop-sdk-base: $(NOARCH)/freedesktop-sdk-base-0.1-1.sdk.noarch.rpm
-
-freedesktop-platform-packages: $(NOARCH)/freedesktop-platform-0.1-1.sdk.noarch.rpm
$(NOARCH)/freedesktop-platform-base-0.1-1.sdk.noarch.rpm setup.sh build.sh
- ./setup.sh $(SDK_BASE_IMAGE)
- rm -f freedesktop-platform-packages
- ./build.sh ./list_packages.sh freedesktop-platform > freedesktop-platform-packages
- ./clear_root.sh
-
-freedesktop-platform.tar.gz freedesktop-platform-rpmdb.tar.gz: freedesktop-platform-packages
$(NOARCH)/freedesktop-platform-0.1-1.sdk.noarch.rpm setup.sh build.sh $(PLATFORM_BASE_IMAGE)
- -echo building freedesktop-platform
- ./setup_root.sh $(PLATFORM_BASE_IMAGE)
- ./build.sh rpm -Uvh `cat freedesktop-platform-packages`
- ./build.sh ./post.sh
- tar --transform 's,^build/root/usr,files,S' -czf freedesktop-platform.tar.gz build/root/usr
--owner=root
- tar --transform 's,^build/var,files,S' -czf freedesktop-platform-rpmdb.tar.gz build/var/lib/rpm
--owner=root
- ./clear_root.sh
-
-gnome-platform-packages: $(NOARCH)/gnome-platform-0.1-1.sdk.noarch.rpm
$(NOARCH)/freedesktop-platform-base-0.1-1.sdk.noarch.rpm setup.sh build.sh
- ./setup.sh $(SDK_BASE_IMAGE)
- rm -f gnome-platform-packages
- ./build.sh ./list_packages.sh gnome-platform > gnome-platform-packages
- ./clear_root.sh
-
-gnome-platform.tar.gz gnome-platform-rpmdb.tar.gz: gnome-platform-packages
$(NOARCH)/gnome-platform-0.1-1.sdk.noarch.rpm setup.sh build.sh $(PLATFORM_BASE_IMAGE)
- -echo building gnome-platform
- ./setup_root.sh $(PLATFORM_BASE_IMAGE)
- ./build.sh rpm -Uvh `cat gnome-platform-packages`
- ./build.sh ./post.sh
- tar --transform 's,^build/root/usr,files,S' -czf gnome-platform.tar.gz build/root/usr --owner=root
- tar --transform 's,^build/var,files,S' -czf gnome-platform-rpmdb.tar.gz build/var/lib/rpm --owner=root
- ./clear_root.sh
-
-repo:
- ostree init --mode=archive-z2 --repo=repo
-
-commit-freedesktop-platform: repo freedesktop-platform.tar.gz freedesktop-platform-rpmdb.tar.gz
- ./commit.sh repo freedesktop-platform.tar.gz freedesktop-platform-rpmdb.tar.gz
metadata.freedesktop-platform org.freedesktop.Platform$(EXTRA_NAME) $(ARCH) $(FREEDESKTOP_VERSION)
-
-commit-freedesktop-sdk: repo freedesktop-sdk.tar.gz freedesktop-sdk-rpmdb.tar.gz
- ./commit.sh repo freedesktop-sdk.tar.gz freedesktop-sdk-rpmdb.tar.gz metadata.freedesktop-sdk
org.freedesktop.Sdk$(EXTRA_NAME) $(ARCH) $(FREEDESKTOP_VERSION)
-
-commit-freedesktop-debug: repo freedesktop-debug.tar.gz freedesktop-debug-src.tar.gz
- ./simple-commit.sh repo freedesktop-debug.tar.gz org.freedesktop.Debug$(EXTRA_NAME) $(ARCH)
$(FREEDESKTOP_VERSION)
- ./simple-commit.sh repo freedesktop-debug-src.tar.gz org.freedesktop.DebugSrc$(EXTRA_NAME) $(ARCH)
$(FREEDESKTOP_VERSION)
-
-commit-platform: repo gnome-platform.tar.gz gnome-platform-rpmdb.tar.gz
- ./commit.sh repo gnome-platform.tar.gz gnome-platform-rpmdb.tar.gz metadata.platform
org.gnome.Platform$(EXTRA_NAME) $(ARCH) $(GNOME_VERSION)
-
-commit-sdk: repo gnome-sdk.tar.gz gnome-sdk-rpmdb.tar.gz
- ./commit.sh repo gnome-sdk.tar.gz gnome-sdk-rpmdb.tar.gz metadata.sdk org.gnome.Sdk$(EXTRA_NAME)
$(ARCH) $(GNOME_VERSION)
-
-commit-debug: repo gnome-debug.tar.gz gnome-debug-src.tar.gz
- ./simple-commit.sh repo gnome-debug.tar.gz org.gnome.Debug$(EXTRA_NAME) $(ARCH) $(GNOME_VERSION)
- ./simple-commit.sh repo gnome-debug-src.tar.gz org.gnome.DebugSrc$(EXTRA_NAME) $(ARCH)
$(GNOME_VERSION)
-
-commit-gnome: commit-sdk commit-platform commit-debug
- echo done
+BASE_SPECS=$(wildcard freedesktop-sdk-images/specs/*.spec)
+BASE_SPECS_BASENAME=$(notdir $(BASE_SPECS))
+GNOME_SPECS=$(wildcard specs/*.spec)
+GNOME_SPECS_BASENAME=$(notdir $(GNOME_SPECS))
-commit-freedesktop: commit-freedesktop-sdk commit-freedesktop-platform commit-freedesktop-debug
- echo done
+# ALL_SPECS is all of GNOME_SPECS and the ones from BASE_SPECS that are not overridden by GNOME_SPECS
+ALL_SPECS = $(addprefix freedesktop-sdk-images/specs/,$(filter-out
$(GNOME_SPECS_BASENAME),$(BASE_SPECS_BASENAME))) $(GNOME_SPECS)
-commit: commit-gnome commit-freedesktop
- echo done
+all: $(NAME)-$(VERSION)-platform.tar.gz $(NAME)-$(VERSION)-sdk.tar.gz
-untag:
- ./untag.sh repo org.freedesktop.Platform $(ARCH) $(FREEDESKTOP_VERSION) $(EXTRA_NAME)
- ./untag.sh repo org.freedesktop.Sdk $(ARCH) $(FREEDESKTOP_VERSION) $(EXTRA_NAME)
- ./untag.sh repo org.freedesktop.Debug $(ARCH) $(FREEDESKTOP_VERSION) $(EXTRA_NAME)
- ./untag.sh repo org.freedesktop.DebugSrc $(ARCH) $(FREEDESKTOP_VERSION) $(EXTRA_NAME)
- ./untag.sh repo org.gnome.Platform $(ARCH) $(GNOME_VERSION) $(EXTRA_NAME)
- ./untag.sh repo org.gnome.Sdk $(ARCH) $(GNOME_VERSION) $(EXTRA_NAME)
- ./untag.sh repo org.gnome.Debug $(ARCH) $(GNOME_VERSION) $(EXTRA_NAME)
- ./untag.sh repo org.gnome.DebugSrc $(ARCH) $(GNOME_VERSION) $(EXTRA_NAME)
+debug: $(NAME)-$(VERSION)-debug.tar.gz
+include freedesktop-sdk-images/Makefile.inc
-include rpm-dependencies.P
diff --git a/bin b/bin
new file mode 120000
index 0000000..e8eb7ec
--- /dev/null
+++ b/bin
@@ -0,0 +1 @@
+freedesktop-sdk-images/bin
\ No newline at end of file
diff --git a/buildhome b/buildhome
new file mode 120000
index 0000000..16b15cf
--- /dev/null
+++ b/buildhome
@@ -0,0 +1 @@
+freedesktop-sdk-images/buildhome/
\ No newline at end of file
diff --git a/packages/SPECS/abattis-cantarell-fonts.spec b/specs/abattis-cantarell-fonts.spec
similarity index 100%
rename from packages/SPECS/abattis-cantarell-fonts.spec
rename to specs/abattis-cantarell-fonts.spec
diff --git a/packages/SPECS/adwaita-icon-theme.spec b/specs/adwaita-icon-theme.spec
similarity index 100%
rename from packages/SPECS/adwaita-icon-theme.spec
rename to specs/adwaita-icon-theme.spec
diff --git a/packages/SPECS/at-spi2-atk.spec b/specs/at-spi2-atk.spec
similarity index 100%
rename from packages/SPECS/at-spi2-atk.spec
rename to specs/at-spi2-atk.spec
diff --git a/packages/SPECS/at-spi2-core.spec b/specs/at-spi2-core.spec
similarity index 100%
rename from packages/SPECS/at-spi2-core.spec
rename to specs/at-spi2-core.spec
diff --git a/packages/SPECS/atk.spec b/specs/atk.spec
similarity index 100%
rename from packages/SPECS/atk.spec
rename to specs/atk.spec
diff --git a/packages/SPECS/clutter-gtk.spec b/specs/clutter-gtk.spec
similarity index 100%
rename from packages/SPECS/clutter-gtk.spec
rename to specs/clutter-gtk.spec
diff --git a/packages/SPECS/clutter.spec b/specs/clutter.spec
similarity index 100%
rename from packages/SPECS/clutter.spec
rename to specs/clutter.spec
diff --git a/packages/SPECS/cogl.spec b/specs/cogl.spec
similarity index 100%
rename from packages/SPECS/cogl.spec
rename to specs/cogl.spec
diff --git a/packages/SPECS/dbus-glib.spec b/specs/dbus-glib.spec
similarity index 100%
rename from packages/SPECS/dbus-glib.spec
rename to specs/dbus-glib.spec
diff --git a/packages/SPECS/dconf.spec b/specs/dconf.spec
similarity index 100%
rename from packages/SPECS/dconf.spec
rename to specs/dconf.spec
diff --git a/packages/SPECS/enchant.spec b/specs/enchant.spec
similarity index 100%
rename from packages/SPECS/enchant.spec
rename to specs/enchant.spec
diff --git a/packages/SPECS/gdk-pixbuf2.spec b/specs/gdk-pixbuf2.spec
similarity index 100%
rename from packages/SPECS/gdk-pixbuf2.spec
rename to specs/gdk-pixbuf2.spec
diff --git a/packages/SOURCES/gio-netlink.patch b/specs/gio-netlink.patch
similarity index 100%
rename from packages/SOURCES/gio-netlink.patch
rename to specs/gio-netlink.patch
diff --git a/packages/SPECS/gjs.spec b/specs/gjs.spec
similarity index 100%
rename from packages/SPECS/gjs.spec
rename to specs/gjs.spec
diff --git a/packages/SPECS/glib-networking.spec b/specs/glib-networking.spec
similarity index 100%
rename from packages/SPECS/glib-networking.spec
rename to specs/glib-networking.spec
diff --git a/packages/SPECS/glib2.spec b/specs/glib2.spec
similarity index 100%
rename from packages/SPECS/glib2.spec
rename to specs/glib2.spec
diff --git a/packages/SPECS/gnome-common.spec b/specs/gnome-common.spec
similarity index 100%
rename from packages/SPECS/gnome-common.spec
rename to specs/gnome-common.spec
diff --git a/packages/SPECS/gnome-debug.spec b/specs/gnome-debug.spec
similarity index 96%
rename from packages/SPECS/gnome-debug.spec
rename to specs/gnome-debug.spec
index 6f88830..618f16e 100644
--- a/packages/SPECS/gnome-debug.spec
+++ b/specs/gnome-debug.spec
@@ -1,5 +1,5 @@
Name: gnome-debug
-Version: 0.1
+Version: 3.18
Release: 1%{?dist}
Summary: Gnome sdk debug info
diff --git a/packages/SPECS/gnome-platform.spec b/specs/gnome-platform.spec
similarity index 98%
rename from packages/SPECS/gnome-platform.spec
rename to specs/gnome-platform.spec
index 73307a8..fae7cc5 100644
--- a/packages/SPECS/gnome-platform.spec
+++ b/specs/gnome-platform.spec
@@ -1,5 +1,5 @@
Name: gnome-platform
-Version: 0.1
+Version: 3.18
Release: 1%{?dist}
Summary: Gnome platform
diff --git a/packages/SPECS/gnome-sdk.spec b/specs/gnome-sdk.spec
similarity index 98%
rename from packages/SPECS/gnome-sdk.spec
rename to specs/gnome-sdk.spec
index 909daf4..a62ff7e 100644
--- a/packages/SPECS/gnome-sdk.spec
+++ b/specs/gnome-sdk.spec
@@ -1,5 +1,5 @@
Name: gnome-sdk
-Version: 0.1
+Version: 3.18
Release: 1%{?dist}
Summary: Gnome sdk
Source1: rpm-macros
diff --git a/packages/SPECS/gnome-themes-standard.spec b/specs/gnome-themes-standard.spec
similarity index 100%
rename from packages/SPECS/gnome-themes-standard.spec
rename to specs/gnome-themes-standard.spec
diff --git a/packages/SPECS/gobject-introspection.spec b/specs/gobject-introspection.spec
similarity index 100%
rename from packages/SPECS/gobject-introspection.spec
rename to specs/gobject-introspection.spec
diff --git a/packages/SPECS/gsettings-desktop-schemas.spec b/specs/gsettings-desktop-schemas.spec
similarity index 100%
rename from packages/SPECS/gsettings-desktop-schemas.spec
rename to specs/gsettings-desktop-schemas.spec
diff --git a/packages/SOURCES/gtk2-pixdata-deprecation.patch b/specs/gtk2-pixdata-deprecation.patch
similarity index 100%
rename from packages/SOURCES/gtk2-pixdata-deprecation.patch
rename to specs/gtk2-pixdata-deprecation.patch
diff --git a/packages/SPECS/gtk2.spec b/specs/gtk2.spec
similarity index 100%
rename from packages/SPECS/gtk2.spec
rename to specs/gtk2.spec
diff --git a/packages/SPECS/gtk3.spec b/specs/gtk3.spec
similarity index 100%
rename from packages/SPECS/gtk3.spec
rename to specs/gtk3.spec
diff --git a/packages/SOURCES/gtkrc b/specs/gtkrc
similarity index 100%
rename from packages/SOURCES/gtkrc
rename to specs/gtkrc
diff --git a/packages/SOURCES/gvfs-remote-monitor-remove-warning.patch
b/specs/gvfs-remote-monitor-remove-warning.patch
similarity index 100%
rename from packages/SOURCES/gvfs-remote-monitor-remove-warning.patch
rename to specs/gvfs-remote-monitor-remove-warning.patch
diff --git a/packages/SPECS/gvfs.spec b/specs/gvfs.spec
similarity index 100%
rename from packages/SPECS/gvfs.spec
rename to specs/gvfs.spec
diff --git a/packages/SOURCES/im-cedilla.conf b/specs/im-cedilla.conf
similarity index 100%
rename from packages/SOURCES/im-cedilla.conf
rename to specs/im-cedilla.conf
diff --git a/packages/SPECS/itstool.spec b/specs/itstool.spec
similarity index 100%
rename from packages/SPECS/itstool.spec
rename to specs/itstool.spec
diff --git a/packages/SPECS/json-glib.spec b/specs/json-glib.spec
similarity index 100%
rename from packages/SPECS/json-glib.spec
rename to specs/json-glib.spec
diff --git a/packages/SPECS/libappstream-glib.spec b/specs/libappstream-glib.spec
similarity index 100%
rename from packages/SPECS/libappstream-glib.spec
rename to specs/libappstream-glib.spec
diff --git a/packages/SPECS/libcroco.spec b/specs/libcroco.spec
similarity index 100%
rename from packages/SPECS/libcroco.spec
rename to specs/libcroco.spec
diff --git a/packages/SPECS/libdatrie.spec b/specs/libdatrie.spec
similarity index 100%
rename from packages/SPECS/libdatrie.spec
rename to specs/libdatrie.spec
diff --git a/packages/SPECS/libnotify.spec b/specs/libnotify.spec
similarity index 100%
rename from packages/SPECS/libnotify.spec
rename to specs/libnotify.spec
diff --git a/packages/SPECS/librsvg2.spec b/specs/librsvg2.spec
similarity index 100%
rename from packages/SPECS/librsvg2.spec
rename to specs/librsvg2.spec
diff --git a/packages/SPECS/libsecret.spec b/specs/libsecret.spec
similarity index 99%
rename from packages/SPECS/libsecret.spec
rename to specs/libsecret.spec
index e77da66..3cf947d 100644
--- a/packages/SPECS/libsecret.spec
+++ b/specs/libsecret.spec
@@ -35,6 +35,7 @@ developing applications that use %{name}.
%build
aclocal --force
+libtoolize
autoconf
%configure --disable-static --disable-gtk-doc --disable-manpages
make %{?_smp_mflags}
diff --git a/packages/SPECS/libsoup.spec b/specs/libsoup.spec
similarity index 100%
rename from packages/SPECS/libsoup.spec
rename to specs/libsoup.spec
diff --git a/packages/SPECS/libthai.spec b/specs/libthai.spec
similarity index 100%
rename from packages/SPECS/libthai.spec
rename to specs/libthai.spec
diff --git a/packages/SOURCES/mozjs-build-fixes.patch b/specs/mozjs-build-fixes.patch
similarity index 100%
rename from packages/SOURCES/mozjs-build-fixes.patch
rename to specs/mozjs-build-fixes.patch
diff --git a/packages/SPECS/mozjs24.spec b/specs/mozjs24.spec
similarity index 100%
rename from packages/SPECS/mozjs24.spec
rename to specs/mozjs24.spec
diff --git a/packages/SPECS/pango.spec b/specs/pango.spec
similarity index 100%
rename from packages/SPECS/pango.spec
rename to specs/pango.spec
diff --git a/packages/SPECS/pygobject3.spec b/specs/pygobject3.spec
similarity index 100%
rename from packages/SPECS/pygobject3.spec
rename to specs/pygobject3.spec
diff --git a/packages/SPECS/python3-cairo.spec b/specs/python3-cairo.spec
similarity index 100%
rename from packages/SPECS/python3-cairo.spec
rename to specs/python3-cairo.spec
diff --git a/packages/SOURCES/rpm-macros b/specs/rpm-macros
similarity index 100%
rename from packages/SOURCES/rpm-macros
rename to specs/rpm-macros
diff --git a/packages/SPECS/vala.spec b/specs/vala.spec
similarity index 100%
rename from packages/SPECS/vala.spec
rename to specs/vala.spec
diff --git a/packages/SOURCES/vte-Only-show-the-cursor-on-motion-if-moved.patch
b/specs/vte-Only-show-the-cursor-on-motion-if-moved.patch
similarity index 100%
rename from packages/SOURCES/vte-Only-show-the-cursor-on-motion-if-moved.patch
rename to specs/vte-Only-show-the-cursor-on-motion-if-moved.patch
diff --git a/packages/SPECS/vte.spec b/specs/vte.spec
similarity index 100%
rename from packages/SPECS/vte.spec
rename to specs/vte.spec
diff --git a/packages/SOURCES/webkit-glib-gmutexlocker.patch b/specs/webkit-glib-gmutexlocker.patch
similarity index 100%
rename from packages/SOURCES/webkit-glib-gmutexlocker.patch
rename to specs/webkit-glib-gmutexlocker.patch
diff --git a/packages/SPECS/webkitgtk4.spec b/specs/webkitgtk4.spec
similarity index 100%
rename from packages/SPECS/webkitgtk4.spec
rename to specs/webkitgtk4.spec
diff --git a/packages/SPECS/yelp-tools.spec b/specs/yelp-tools.spec
similarity index 100%
rename from packages/SPECS/yelp-tools.spec
rename to specs/yelp-tools.spec
diff --git a/packages/SPECS/yelp-xsl.spec b/specs/yelp-xsl.spec
similarity index 100%
rename from packages/SPECS/yelp-xsl.spec
rename to specs/yelp-xsl.spec
diff --git a/packages/SPECS/zenity.spec b/specs/zenity.spec
similarity index 100%
rename from packages/SPECS/zenity.spec
rename to specs/zenity.spec
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]