From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Wed, 1 Mar 2023 17:26:48 +0000 (+0100)
Subject: - updated to 1.0.8
X-Git-Tag: auto/th/xorg-cf-files-1.0.8-1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=566f080d23f1282a2f5b7e31d2309b2a99b45066;p=packages%2Fxorg-cf-files.git

- updated to 1.0.8
---

diff --git a/xorg-cf-files-libdir.patch b/xorg-cf-files-libdir.patch
index 982539c..058e196 100644
--- a/xorg-cf-files-libdir.patch
+++ b/xorg-cf-files-libdir.patch
@@ -4,20 +4,20 @@
  #  undef __amd64__
  #  undef __x86_64__
  #  define AMD64Architecture
-+#  if defined(_ILP32) | defined(__ILP32__)
++#  if defined(_ILP32) || defined(__ILP32__)
 +#    define AMD64ArchX32ABI
 +#  endif
  # endif
  # if defined(amd64__) || defined (x86_64__)
  #  undef amd64__
---- xorg-cf-files-1.0.6/linux.cf.orig	2016-04-13 18:03:18.456082965 +0200
-+++ xorg-cf-files-1.0.6/linux.cf	2016-04-13 18:13:41.561260974 +0200
-@@ -579,13 +579,21 @@ InstallNamedTargetNoClobber(install,file
+--- xorg-cf-files-1.0.8/linux.cf.orig	2023-03-01 18:20:50.043361935 +0100
++++ xorg-cf-files-1.0.8/linux.cf	2023-03-01 18:21:50.653033584 +0100
+@@ -589,13 +589,21 @@ InstallNamedTargetNoClobber(install,file
  #define MkdirHierCmd		mkdir -p
  
  #ifndef HaveLib64
--# if defined (AMD64Architecture) || defined (s390xArchitecture) || defined (Ppc64Architecture) || defined (AArch64Architecture)
-+# if (defined (AMD64Architecture) || defined (s390xArchitecture) || defined (Ppc64Architecture) || defined (AArch64Architecture)) && !defined (AMD64ArchX32ABI)
+-# if defined (AMD64Architecture) || defined (s390xArchitecture) || defined (Ppc64Architecture) || defined (AArch64Architecture) || defined (RV64Architecture)
++# if defined ((AMD64Architecture) || defined (s390xArchitecture) || defined (Ppc64Architecture) || defined (AArch64Architecture) || defined (RV64Architecture)) && !defined(AMD64ArchX32ABI)
  #  define HaveLib64	YES
  # else
  #  define HaveLib64	NO
@@ -35,7 +35,7 @@
  #if UseElfFormat
  # ifndef DoLoadableServer
  #  if defined(MipsArchitecture) || defined(SuperHArchitecture)
-@@ -645,16 +653,20 @@ InstallNamedTargetNoClobber(install,file
+@@ -655,16 +663,20 @@ InstallNamedTargetNoClobber(install,file
  #  ifndef TermcapLibrary
  #   if UseStaticTermcapLib
  #    if LinuxUsesNcurses
@@ -62,7 +62,7 @@
  #     endif
  #    endif
  #   else
-@@ -1081,6 +1093,16 @@ InstallNamedTargetNoClobber(install,file
+@@ -1127,6 +1139,16 @@ InstallNamedTargetNoClobber(install,file
  # ifndef TkLibDir
  #  define TkLibDir		/usr/lib64
  # endif
diff --git a/xorg-cf-files.spec b/xorg-cf-files.spec
index 0488ded..94160d9 100644
--- a/xorg-cf-files.spec
+++ b/xorg-cf-files.spec
@@ -1,19 +1,21 @@
 Summary:	X.org cf files
 Summary(pl.UTF-8):	Pliki cf z X.org
 Name:		xorg-cf-files
-Version:	1.0.7
-Release:	2
+Version:	1.0.8
+Release:	1
 License:	MIT
 Group:		X11/Development/Tools
-Source0:	https://xorg.freedesktop.org/releases/individual/util/%{name}-%{version}.tar.bz2
-# Source0-md5:	56548c4798e385aea26347ebc90fe410
+Source0:	https://xorg.freedesktop.org/releases/individual/util/%{name}-%{version}.tar.xz
+# Source0-md5:	daed7279016bb921f0a0e969c9508535
 Patch0:		%{name}-mandir.patch
 Patch1:		%{name}-libdir.patch
 URL:		https://xorg.freedesktop.org/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
+BuildRequires:	tar >= 1:1.22
 BuildRequires:	xorg-font-font-util >= 1.1
 BuildRequires:	xorg-util-util-macros >= 1.4
+BuildRequires:	xz
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # no binaries in package