Date: Monday, April 16, 2018 @ 17:12:41
  Author: heftig
Revision: 321917

archrelease: copy trunk to extra-x86_64

Added:
  ostree/repos/extra-x86_64/PKGBUILD
    (from rev 321916, ostree/trunk/PKGBUILD)
Deleted:
  ostree/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |  147 +++++++++++++++++++++++++++++++------------------------------
 1 file changed, 75 insertions(+), 72 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD    2018-04-16 17:11:48 UTC (rev 321916)
+++ PKGBUILD    2018-04-16 17:12:41 UTC (rev 321917)
@@ -1,72 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com>
-# Contributor: Mirco Tischler <mt-ml at gmx dot de>
-
-pkgname=ostree
-pkgver=2018.4
-pkgrel=1
-pkgdesc="Operating system and container binary deployment and upgrades"
-url="https://ostree.readthedocs.org/en/latest/";
-arch=(x86_64)
-license=(GPL)
-depends=(glib2 xz zlib libsoup gpgme libarchive fuse2 util-linux mkinitcpio
-         openssl avahi)
-makedepends=(e2fsprogs gobject-introspection gtk-doc libxslt systemd git
-             python2)
-checkdepends=(parallel syslinux gjs cpio elfutils)
-_commit=155c936cd57892adab7b0b4ed4473da7fc45caa3  # tags/v2018.4^0
-source=("git+https://github.com/ostreedev/ostree#commit=$_commit";
-        "git+https://github.com/mendsley/bsdiff";
-        "git+https://git.gnome.org/browse/libglnx";)
-sha256sums=('SKIP'
-            'SKIP'
-            'SKIP')
-
-prepare() {
-  cd $pkgname
-
-  git submodule init
-  git config --local submodule.bsdiff.url "$srcdir/bsdiff"
-  git config --local submodule.libglnx.url "$srcdir/libglnx"
-  git submodule update
-
-  find . -name '*.py' -exec sed -i '1s/python$/&2/' {} +
-
-  NOCONFIGURE=1 ./autogen.sh
-}
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/^v//;s/-/+/g'
-}
-
-build() {
-  cd $pkgname
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --sbindir=/usr/bin \
-    --libexecdir=/usr/lib \
-    --with-mkinitcpio \
-    --with-openssl \
-    --with-builtin-grub2-mkconfig \
-    --enable-experimental-api \
-    --disable-static \
-    --enable-gtk-doc
-
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-  make
-}
-
-check() {
-  cd $pkgname
-  make check || :
-}
-
-package() {
-  cd $pkgname
-  make DESTDIR="$pkgdir" install
-}

Copied: ostree/repos/extra-x86_64/PKGBUILD (from rev 321916, 
ostree/trunk/PKGBUILD)
===================================================================
--- PKGBUILD                            (rev 0)
+++ PKGBUILD    2018-04-16 17:12:41 UTC (rev 321917)
@@ -0,0 +1,75 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com>
+# Contributor: Mirco Tischler <mt-ml at gmx dot de>
+
+pkgname=ostree
+pkgver=2018.4
+pkgrel=2
+pkgdesc="Operating system and container binary deployment and upgrades"
+url="https://ostree.readthedocs.org/en/latest/";
+arch=(x86_64)
+license=(GPL)
+depends=(glib2 xz zlib libsoup gpgme libarchive fuse2 util-linux mkinitcpio
+         openssl avahi)
+makedepends=(e2fsprogs gobject-introspection gtk-doc libxslt systemd git
+             python2)
+checkdepends=(parallel syslinux gjs cpio elfutils)
+_commit=155c936cd57892adab7b0b4ed4473da7fc45caa3  # tags/v2018.4^0
+source=("git+https://github.com/ostreedev/ostree#commit=$_commit";
+        "git+https://github.com/mendsley/bsdiff";
+        "git+https://git.gnome.org/browse/libglnx";)
+sha256sums=('SKIP'
+            'SKIP'
+            'SKIP')
+
+prepare() {
+  cd $pkgname
+
+  # https://bugs.archlinux.org/task/58229
+  git cherry-pick -n 28c7bc6d0e153a0b07bdb82d25473a490765067f
+
+  git submodule init
+  git config --local submodule.bsdiff.url "$srcdir/bsdiff"
+  git config --local submodule.libglnx.url "$srcdir/libglnx"
+  git submodule update
+
+  find . -name '*.py' -exec sed -i '1s/python$/&2/' {} +
+
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/^v//;s/-/+/g'
+}
+
+build() {
+  cd $pkgname
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --sbindir=/usr/bin \
+    --libexecdir=/usr/lib \
+    --with-mkinitcpio \
+    --with-openssl \
+    --with-builtin-grub2-mkconfig \
+    --enable-experimental-api \
+    --disable-static \
+    --enable-gtk-doc
+
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+  make
+}
+
+check() {
+  cd $pkgname
+  make check || :
+}
+
+package() {
+  cd $pkgname
+  make DESTDIR="$pkgdir" install
+}

Reply via email to