Accepting request 187063 from home:Zaitor:branches:X11:XOrg

Update to ver 1.0.5

OBS-URL: https://build.opensuse.org/request/show/187063
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-cf-files?expand=0&rev=10

aarch64-support.diff

@@ -1,62 +0,0 @@
-Index: Imake.cf
-===================================================================
---- Imake.cf.orig
-+++ Imake.cf
-@@ -1022,6 +1022,10 @@ XCOMM Keep cpp from replacing path eleme
- #   define AMD64Architecture
- #  endif
- # endif
-+# if defined(__aarch64__)
-+#   define AArch64Architecture
-+#   undef __aarch64__
-+# endif
- #endif /* linux || __GLIBC__ */
- 
- #if (defined(__Lynx__) || defined(Lynx)) && (defined(i386) || defined(__i386__) || defined(__x86__) || defined(__powerpc__) || defined(__sparc__) || defined(sparc))
-Index: linux.cf
-===================================================================
---- linux.cf.orig
-+++ linux.cf
-@@ -578,7 +578,7 @@ InstallNamedTargetNoClobber(install,file
- #define MkdirHierCmd		mkdir -p
- 
- #ifndef HaveLib64
--# if defined (AMD64Architecture) || defined (s390xArchitecture) || defined (Ppc64Architecture)
-+# if defined (AMD64Architecture) || defined (s390xArchitecture) || defined (Ppc64Architecture) || defined (AArch64Architecture)
- #  define HaveLib64	YES
- # else
- #  define HaveLib64	NO
-@@ -976,6 +976,16 @@ InstallNamedTargetNoClobber(install,file
- # define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
- #endif /* AMD64Architecture */
- 
-+#ifdef AArch64Architecture
-+# ifndef OptimizedCDebugFlags
-+#  define OptimizedCDebugFlags	DefaultGcc2AArch64Opt
-+# endif
-+# define LinuxMachineDefines   -D__aarch64__
-+# define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
-+# define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
-+#endif /* AArch64Architecture */
-+
-+
- #ifndef StandardDefines
- # ifdef __linux__
- #  define StandardDefines	-Dlinux LinuxMachineDefines LinuxSourceDefines
-Index: xfree86.cf
-===================================================================
---- xfree86.cf.orig
-+++ xfree86.cf
-@@ -2022,6 +2022,12 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japane
- # endif
- #endif
- 
-+#if HasGcc2 && defined(AArch64Architecture)
-+# ifndef DefaultGcc2AArch64Opt
-+#  define DefaultGcc2AArch64Opt -O2 -fno-strength-reduce GccAliasingArgs
-+# endif
-+#endif
-+
- #if HasGcc2 && defined(AlphaArchitecture)
- # ifndef DefaultGcc2AxpOpt
- #  define DefaultGcc2AxpOpt -O2 GccAliasingArgs

xorg-cf-files-1.0.4.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:36e9ce83e4978f59909c6f44c43002d9b240ae66e23984ea1086f0b18c810669
-size 367380

xorg-cf-files-1.0.5.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ed23b85043edecc38fad4229e0ebdb7ff80b570e746bc03a7c8678d601be7ed4
+size 377835

xorg-cf-files.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Wed Aug 14 11:11:40 UTC 2013 - zaitor@opensuse.org
+
+- Update to version 1.0.5:
+  + sun.cf: stop linking libraries merged into libc in later
+    Solaris releases.
+  + Remove xprint_host.def.
+  + Trim trailing whitespace.
+  + Add Aarch64 support.
+  + Update xorgversion.def from 7.6 to 7.7.
+  + On Solaris 11 & later, use /usr/gnu/bin/install for InstallCmd.
+- Drop aarch64-support.diff, fixed upstream.
+
 -------------------------------------------------------------------
 Sun Mar  3 09:32:26 UTC 2013 - schwab@suse.de
 

xorg-cf-files.spec

@@ -17,14 +17,13 @@
 
 
 Name:           xorg-cf-files
-Version:        1.0.4
+Version:        1.0.5
 Release:        0
 Summary:        Data files for the imake utility
 License:        MIT
 Group:          Development/Tools/Building
 Url:            http://xorg.freedesktop.org/
 Source0:        http://xorg.freedesktop.org/releases/individual/util/%{name}-%{version}.tar.bz2
-Patch0:         aarch64-support.diff
 BuildRequires:  font-util >= 1.1
 BuildRequires:  pkgconfig(xorg-macros) >= 1.4
 Requires:       gccmakedep
@@ -52,7 +51,7 @@ converted.
 
 %prep
 %setup -q
-%patch0
+
 cat > host.def << EOF
 #define ConfigDir %_configdir
 #define XAppLoadDir /usr/share/X11/app-defaults