From 1235df5076bda0d8037ad15c58ff5cd0c96bfc5c Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 16 Sep 2015 16:31:02 +0200 Subject: [PATCH] Drop git snapshot handling We've been building it from tarballs for several years now. --- make-git-snapshot.sh | 22 ---------------------- weston.spec | 15 +-------------- 2 files changed, 1 insertion(+), 36 deletions(-) delete mode 100755 make-git-snapshot.sh diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh deleted file mode 100755 index 7c6f10b..0000000 --- a/make-git-snapshot.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -# Usage: ./make-git-snapshot.sh [COMMIT] -# -# to make a snapshot of the given tag/branch. Defaults to HEAD. -# Point env var REF to a local mesa repo to reduce clone time. - -DIRNAME=weston-$( date +%Y%m%d ) - -echo REF ${REF:+--reference $REF} -echo DIRNAME $DIRNAME -echo HEAD ${1:-HEAD} - -rm -rf $DIRNAME - -git clone ${REF:+--reference $REF} \ - git://anongit.freedesktop.org/wayland/weston $DIRNAME - -GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \ - | bzip2 > $DIRNAME.tar.bz2 - -# rm -rf $DIRNAME diff --git a/weston.spec b/weston.spec index 7d2fabe..5ef86cd 100644 --- a/weston.spec +++ b/weston.spec @@ -1,32 +1,22 @@ -#define gitdate 20130515 - %if 0%{?fedora} >= 21 %define with_rdp 1 %endif Name: weston Version: 1.8.92 -#Release: 4%{?alphatag}%{?dist} Release: 1%{?dist} Summary: Reference compositor for Wayland Group: User Interface/X License: BSD and CC-BY-SA URL: http://wayland.freedesktop.org/ -%if 0%{?gitdate} -Source0: %{name}-%{gitdate}.tar.bz2 -%else Source0: http://wayland.freedesktop.org/releases/%{name}-%{version}.tar.xz -%endif -Source1: make-git-snapshot.sh -BuildRequires: autoconf BuildRequires: cairo-devel >= 1.10.0 BuildRequires: glib2-devel BuildRequires: libdrm-devel BuildRequires: libjpeg-turbo-devel BuildRequires: libpng-devel BuildRequires: librsvg2 -BuildRequires: libtool BuildRequires: libinput-devel >= 0.8 %if 0%{?fedora} < 18 BuildRequires: libudev-devel @@ -73,12 +63,9 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Common headers for weston %prep -%setup -q -n %{name}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} +%setup -q %build -%if 0%{?gitdate} -autoreconf -ivf -%endif %configure --disable-static --disable-setuid-install --enable-xwayland \ %{?with_rdp:--enable-rdp-compositor} make %{?_smp_mflags}