From ea6f4c8a703c8303d92eaeb0a4d9ab0b75210b77 Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet <kwizart@gmail.com>
Date: Apr 01 2021 14:41:00 +0000
Subject: [PATCH 1/2] Clean-up for snapshot


Signed-off-by: Nicolas Chauvet <kwizart@gmail.com>

---

diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh
deleted file mode 100755
index 0d9b2ad..0000000
--- a/make-git-snapshot.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-DIRNAME=xorg-server-$( date +%Y%m%d )
-
-rm -rf $DIRNAME
-git clone git://git.freedesktop.org/git/xorg/xserver $DIRNAME
-cd $DIRNAME
-if [ -z "$1" ]; then
-    git log | head -1
-else
-    git checkout $1
-fi
-git log | head -1 | awk '{ print $2 }' > ../commitid
-git repack -a -d
-cd ..
-tar cf - $DIRNAME | xz -c9 > $DIRNAME.tar.xz
-rm -rf $DIRNAME
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 8a3da67..25ff36c 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -12,7 +12,9 @@
 %undefine _hardened_build
 %undefine _strict_symbol_defs_build
 
-#global gitdate 20161026
+#global gitdate 20210128
+%global commit0 5429791b1cf7f6cabf6c64aad0a4b1b5418253c9
+%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 %global stable_abi 1
 
 %if !0%{?gitdate} || %{stable_abi}
@@ -46,22 +48,16 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.20.10
-Release:   5%{?gitdate:.%{gitdate}}%{?dist}
+Release:   5%{?gitdate:.%{gitdate}git%{shortcommit0}}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 
-#VCS:      git:git://git.freedesktop.org/git/xorg/xserver
 %if 0%{?gitdate}
-# git snapshot.  to recreate, run:
-# ./make-git-snapshot.sh `cat commitid`
-Source0:   xorg-server-%{gitdate}.tar.xz
-#Source0:   http://www.x.org/pub/individual/xserver/%{pkgname}-%{version}.tar.bz2
-Source1:   make-git-snapshot.sh
-Source2:   commitid
+Source0:   https://gitlab.freedesktop.org/xorg/xserver/-/archive/%{commit0}/xserver-%{shortcommit0}.tar.gz
 %else
 Source0:   https://www.x.org/pub/individual/xserver/%{pkgname}-%{version}.tar.bz2
-Source1:   gitignore
 %endif
+Source1:   gitignore
 
 Source4:   10-quirks.conf
 
@@ -280,7 +276,7 @@ Xserver source code needed to build VNC server (Xvnc)
 
 
 %prep
-%autosetup -N -n %{pkgname}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
+%autosetup -N -n %{?gitdate:xserver-%{commit0}}%{!?gitdate:%{pkgname}-%{version}}
 rm -rf .git
 cp %{SOURCE1} .gitignore
 # ick

From 17c6814f1317d383aca2c85a5e761c2d95f04db6 Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet <kwizart@gmail.com>
Date: Apr 01 2021 14:41:01 +0000
Subject: [PATCH 2/2] Update gitignore


Signed-off-by: Nicolas Chauvet <kwizart@gmail.com>

---

diff --git a/.gitignore b/.gitignore
index ae892e8..b5215aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,36 +1,5 @@
-xorg-server-1.9.1.tar.bz2
-/xorg-server-20101125.tar.xz
-/xorg-server-20101201.tar.xz
-/xorg-server-1.10.0.tar.bz2
-/xorg-server-20110418.tar.xz
-/xorg-server-20110510.tar.xz
-/xorg-server-20110818.tar.xz
-/xorg-server-1.11.0.tar.bz2
-/xorg-server-1.11.1.tar.bz2
-/xorg-server-20111109.tar.xz
-/xorg-server-20120103.tar.xz
-/xorg-server-20120124.tar.xz
-/xorg-server-20120215.tar.xz
-/xorg-server-1.12.0.tar.bz2
-/xorg-server-1.12.1.tar.bz2
-/xorg-server-1.12.2.tar.bz2
-/xorg-server-1.12.3.tar.bz2
-/xorg-server-20120717.tar.xz
-/xorg-server-20120726.tar.xz
-/xorg-server-20120808.tar.xz
-/xorg-server-20120822.tar.xz
-/xorg-server-1.13.0.tar.bz2
-/xorg-server-1.13.1.tar.bz2
-/xorg-server-20130109.tar.xz
-/xorg-server-20130215.tar.xz
-/xorg-server-1.14.0.tar.bz2
-/xorg-server-1.14.1.tar.bz2
-/xorg-server-1.14.1.901.tar.bz2
-/xorg-server-1.14.2.tar.bz2
-/xorg-server-1.14.3.tar.bz2
-/xorg-server-1.14.99.3.tar.bz2
-/xorg-server-1.14.99.901.tar.bz2
-/xorg-server-1.14.99.902.tar.bz2
+xorg-server-*.tar.*
+xserver-*.tar.*
 *.bz2
+*.gz
 *.xz
-/xorg-x11-server-1.15.0-1.fc21.src.rpm