From e074d0f41ac4f84c006baddef1196ce6e5cc08bd Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Jul 05 2015 14:47:32 +0000 Subject: always use "git archive" tarballs --- diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh index 38bfbf3..0372688 100755 --- a/make-git-snapshot.sh +++ b/make-git-snapshot.sh @@ -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 diff --git a/systemd.spec b/systemd.spec index 93b8c47..b0c6e88 100644 --- a/systemd.spec +++ b/systemd.spec @@ -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}