always use "git archive" tarballs

This commit is contained in:
Kay Sievers 2015-07-05 16:45:42 +02:00
parent ee6fc81588
commit e074d0f41a
2 changed files with 4 additions and 15 deletions

View File

@ -2,17 +2,14 @@
set -e
NAME=systemd
UPSTREAM=git://anongit.freedesktop.org/systemd/systemd
REFDIR="$HOME/git/systemd" # for faster cloning, if available
UPSTREAM=git@github.com:systemd/systemd.git
[ -n "$1" ] && HEAD="$1" || HEAD="HEAD"
WORKDIR="$(mktemp -d --tmpdir "$NAME.XXXXXXXXXX")"
trap 'rm -rf $WORKDIR' exit
[ -d "$REFDIR" ] && REFERENCE="--reference $REFDIR"
git clone $REFERENCE "$UPSTREAM" "$WORKDIR"
git clone "$UPSTREAM" "$WORKDIR"
pushd "$WORKDIR" > /dev/null
git branch to-archive $HEAD

View File

@ -25,7 +25,7 @@ Summary: A System and Service Manager
# Snapshot tarball can be created using: ./make-git-shapshot.sh [gitcommit]
Source0: %{name}-git%{gitcommit}.tar.xz
%else
Source0: http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.xz
Source0: %{name}-%{version}.tar.xz
%endif
# Prevent accidental removal of the systemd package
@ -87,11 +87,9 @@ BuildRequires: gnu-efi gnu-efi-devel
# https://bugzilla.redhat.com/show_bug.cgi?id=1071284
BuildRequires: libseccomp-devel
%endif
%if %{defined gitcommit}%{num_patches}
BuildRequires: automake
BuildRequires: autoconf
BuildRequires: libtool
%endif
%if %{num_patches}
BuildRequires: git
%endif
@ -256,13 +254,7 @@ sed -r -i 's/\blibsystemd-(login|journal|id128|daemon).c \\/\\/' Makefile.am
%endif
%build
%if %{defined gitcommit}
./autogen.sh
%else
%if %{num_patches}
autoreconf -i
%endif
%endif
./autogen.sh
%{?fedora: %global ntpvendor fedora}
%{?rhel: %global ntpvendor rhel}