Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xorg-cf-files for openSUSE:Factory checked in at 2021-08-04 22:28:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xorg-cf-files (Old) and /work/SRC/openSUSE:Factory/.xorg-cf-files.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xorg-cf-files" Wed Aug 4 22:28:36 2021 rev:15 rq:909747 version:1.0.7 Changes: -------- --- /work/SRC/openSUSE:Factory/xorg-cf-files/xorg-cf-files.changes 2021-03-12 13:30:14.754067154 +0100 +++ /work/SRC/openSUSE:Factory/.xorg-cf-files.new.1899/xorg-cf-files.changes 2021-08-04 22:29:14.985775281 +0200 @@ -1,0 +2,9 @@ +Mon Aug 2 10:36:53 UTC 2021 - Stefan Dirsch <sndir...@suse.com> + +- Update to version 1.0.7 + * This is a minor update to resolve a compatibility issue with + GNU binutils 2.36. +- supersedes u_ar-clq-Imake.tmpl-binutils_2.36.patch +- refreshed u_riscv.patch, u_xorg-cf-files-D_DEFAULT_SOURCE.patch + +------------------------------------------------------------------- Old: ---- u_ar-clq-Imake.tmpl-binutils_2.36.patch xorg-cf-files-1.0.6.tar.bz2 New: ---- xorg-cf-files-1.0.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-cf-files.spec ++++++ --- /var/tmp/diff_new_pack.bmCMZ2/_old 2021-08-04 22:29:15.405774768 +0200 +++ /var/tmp/diff_new_pack.bmCMZ2/_new 2021-08-04 22:29:15.409774764 +0200 @@ -17,7 +17,7 @@ Name: xorg-cf-files -Version: 1.0.6 +Version: 1.0.7 Release: 0 Summary: Data files for the imake utility License: MIT @@ -26,8 +26,6 @@ Source0: http://xorg.freedesktop.org/releases/individual/util/%{name}-%{version}.tar.bz2 Patch0: u_riscv.patch Patch1: u_xorg-cf-files-D_DEFAULT_SOURCE.patch -#PATCH-FIX-UPSTREAM "ar l" in binutils 2.36 now has actual meaning -Patch2: u_ar-clq-Imake.tmpl-binutils_2.36.patch BuildRequires: font-util >= 1.1 BuildRequires: pkgconfig(xorg-macros) >= 1.4 Requires: gccmakedep @@ -57,7 +55,6 @@ %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 cat > host.def << EOF #define ConfigDir %_configdir ++++++ u_riscv.patch ++++++ --- /var/tmp/diff_new_pack.bmCMZ2/_old 2021-08-04 22:29:15.425774744 +0200 +++ /var/tmp/diff_new_pack.bmCMZ2/_new 2021-08-04 22:29:15.425774744 +0200 @@ -2,10 +2,10 @@ Subject: Add support for riscv64 Patch-Mainline: To be upstreamed -Index: xorg-cf-files-1.0.6/Imake.cf +Index: xorg-cf-files-1.0.7/Imake.cf =================================================================== ---- xorg-cf-files-1.0.6.orig/Imake.cf -+++ xorg-cf-files-1.0.6/Imake.cf +--- xorg-cf-files-1.0.7.orig/Imake.cf ++++ xorg-cf-files-1.0.7/Imake.cf @@ -1037,6 +1037,11 @@ XCOMM Keep cpp from replacing path eleme # define AArch64Architecture # undef __aarch64__ @@ -18,11 +18,11 @@ #endif /* linux || __GLIBC__ */ #if (defined(__Lynx__) || defined(Lynx)) && (defined(i386) || defined(__i386__) || defined(__x86__) || defined(__powerpc__) || defined(__sparc__) || defined(sparc)) -Index: xorg-cf-files-1.0.6/linux.cf +Index: xorg-cf-files-1.0.7/linux.cf =================================================================== ---- xorg-cf-files-1.0.6.orig/linux.cf -+++ xorg-cf-files-1.0.6/linux.cf -@@ -578,7 +578,7 @@ InstallNamedTargetNoClobber(install,file +--- xorg-cf-files-1.0.7.orig/linux.cf ++++ xorg-cf-files-1.0.7/linux.cf +@@ -584,7 +584,7 @@ InstallNamedTargetNoClobber(install,file #define MkdirHierCmd mkdir -p #ifndef HaveLib64 @@ -31,7 +31,7 @@ # define HaveLib64 YES # else # define HaveLib64 NO -@@ -994,6 +994,15 @@ InstallNamedTargetNoClobber(install,file +@@ -1000,6 +1000,15 @@ InstallNamedTargetNoClobber(install,file # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 #endif /* AArch64Architecture */ @@ -47,10 +47,10 @@ #ifndef StandardDefines # ifdef __linux__ # define StandardDefines -Dlinux LinuxMachineDefines LinuxSourceDefines -Index: xorg-cf-files-1.0.6/xfree86.cf +Index: xorg-cf-files-1.0.7/xfree86.cf =================================================================== ---- xorg-cf-files-1.0.6.orig/xfree86.cf -+++ xorg-cf-files-1.0.6/xfree86.cf +--- xorg-cf-files-1.0.7.orig/xfree86.cf ++++ xorg-cf-files-1.0.7/xfree86.cf @@ -2052,6 +2052,12 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japane # endif #endif @@ -64,10 +64,10 @@ #ifndef DefaultGcc2DebugOpt # define DefaultGcc2DebugOpt -g #endif -Index: xorg-cf-files-1.0.6/xorg.cf +Index: xorg-cf-files-1.0.7/xorg.cf =================================================================== ---- xorg-cf-files-1.0.6.orig/xorg.cf -+++ xorg-cf-files-1.0.6/xorg.cf +--- xorg-cf-files-1.0.7.orig/xorg.cf ++++ xorg-cf-files-1.0.7/xorg.cf @@ -1603,6 +1603,12 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japane # endif #endif ++++++ u_xorg-cf-files-D_DEFAULT_SOURCE.patch ++++++ --- /var/tmp/diff_new_pack.bmCMZ2/_old 2021-08-04 22:29:15.433774734 +0200 +++ /var/tmp/diff_new_pack.bmCMZ2/_new 2021-08-04 22:29:15.433774734 +0200 @@ -1,6 +1,7 @@ -diff -u -p xorg-cf-files-1.0.6.orig/gnu.cf xorg-cf-files-1.0.6/gnu.cf ---- xorg-cf-files-1.0.6.orig/gnu.cf 2021-01-04 12:47:28.399794000 +0100 -+++ xorg-cf-files-1.0.6/gnu.cf 2021-01-04 12:49:14.978974000 +0100 +Index: xorg-cf-files-1.0.7/gnu.cf +=================================================================== +--- xorg-cf-files-1.0.7.orig/gnu.cf ++++ xorg-cf-files-1.0.7/gnu.cf @@ -21,7 +21,7 @@ XCOMM operating system: OSName (OSMajor #define GNUSourceDefines -D_POSIX_C_SOURCE=199309L \ @@ -10,10 +11,11 @@ XCOMM XXXMB: What about _GNU_SOURCE, see Linux/UseInstalled? -diff -u -p xorg-cf-files-1.0.6.orig/linux.cf xorg-cf-files-1.0.6/linux.cf ---- xorg-cf-files-1.0.6.orig/linux.cf 2021-01-04 12:47:28.194801000 +0100 -+++ xorg-cf-files-1.0.6/linux.cf 2021-01-04 12:49:59.493049000 +0100 -@@ -232,7 +232,7 @@ InstallNamedTargetNoClobber(install,file +Index: xorg-cf-files-1.0.7/linux.cf +=================================================================== +--- xorg-cf-files-1.0.7.orig/linux.cf ++++ xorg-cf-files-1.0.7/linux.cf +@@ -238,7 +238,7 @@ InstallNamedTargetNoClobber(install,file #if LinuxCLibMajorVersion >= 6 # define LinuxSourceDefines -D_POSIX_C_SOURCE=199309L \ -D_POSIX_SOURCE -D_XOPEN_SOURCE \ @@ -22,7 +24,7 @@ -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \ LinuxAdditionalIncludes LinuxGnuSourceDefines \ LinuxLocaleDefines -@@ -251,7 +251,7 @@ InstallNamedTargetNoClobber(install,file +@@ -257,7 +257,7 @@ InstallNamedTargetNoClobber(install,file # endif #else # define LinuxSourceDefines -D_POSIX_SOURCE -D_POSIX_C_SOURCE=2 \ ++++++ xorg-cf-files-1.0.6.tar.bz2 -> xorg-cf-files-1.0.7.tar.bz2 ++++++ ++++ 18797 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xorg-cf-files-1.0.6/ChangeLog new/xorg-cf-files-1.0.7/ChangeLog --- old/xorg-cf-files-1.0.6/ChangeLog 2015-12-22 02:28:23.000000000 +0100 +++ new/xorg-cf-files-1.0.7/ChangeLog 2021-08-02 03:00:47.000000000 +0200 @@ -1,3 +1,69 @@ +commit 8142029c10379002a3f00094060b78e9d55e8322 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Sun Aug 1 17:59:14 2021 -0700 + + xorg-cf-files 1.0.7 + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit a6d4d6223ef75119d5373fa4cc04161bcdb4e769 +Author: Petr P??sa?? < <ppi...@redhat.com> +Date: Mon Mar 29 10:45:10 2021 +0200 + + Imake.tmpl: Invoke "ar cq" with binutils + + GNU binutils 2.36 repurposed "l" modifier. It used to be ignored, now + it specifies the dependencies of a static library to be recorded in an + archive. + + That broke nas which uses imake as a build configiration tool: + + $ ar clq libdia.a dispatch.o dixutils.o events.o globals.o main.o resource.o swapreq.o tables.o swaprep.o audispatch.o auswap.o autables.o auevents.o auutil.o auconfig.o auprocess.o nasconf.o lex.o gram.o + ar: libdeps specified more than once + + This patch changes AR command from "ar clq" to "ar cq" if binutils are + used. + + <https://bugzilla.redhat.com/show_bug.cgi?id=1943274> + +commit ab38ff414778dd115414da00b065c73608dfd0d9 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Fri Dec 7 20:17:33 2018 -0800 + + Update configure.ac bug URL for gitlab migration + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit d9ac2abeabc4b39bd2c1f1d903d34b0d055a4b30 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Mon Nov 19 23:33:43 2018 -0800 + + Update README for gitlab migration + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit d47131ed97ee491bb883c29ec0b106e8d5acfcd3 +Author: Than Ngo <t...@redhat.com> +Date: Thu Jul 5 10:42:09 2018 -0400 + + linux: Update LinuxDistribution == LinuxRedHat section + + The imake config files in Fedora Core 5+ and Red Hat Enterprise Linux 5+ + have been shipping with this patch, which has then shamefully languished + in the srpm and never been merged. Correct this oversight. + + [Than wrote the patch, I just wrote the commit message - ajax] + + Signed-off-by: Adam Jackson <a...@redhat.com> + +commit fbeeff56339e4d15a4a42b5e19edc12befde8f6e +Author: Mihail Konev <k....@ya.ru> +Date: Thu Jan 26 14:00:22 2017 +1000 + + autogen: add default patch prefix + + Signed-off-by: Mihail Konev <k....@ya.ru> + commit 689d873a035c05a9d6a39feb13a028762bf781e0 Author: Alan Coopersmith <alan.coopersm...@oracle.com> Date: Mon Dec 21 17:25:23 2015 -0800 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xorg-cf-files-1.0.6/Imake.tmpl new/xorg-cf-files-1.0.7/Imake.tmpl --- old/xorg-cf-files-1.0.6/Imake.tmpl 2015-12-22 02:28:02.000000000 +0100 +++ new/xorg-cf-files-1.0.7/Imake.tmpl 2021-08-02 03:00:38.000000000 +0200 @@ -1078,7 +1078,7 @@ #define ArCmdBase ar #endif #ifndef ArCmd -#if HasLargeTmp || SystemV4 +#if HasLargeTmp || SystemV4 || LinuxBinUtilsMajorVersion #define ArCmd ArCmdBase cq #else #define ArCmd ArCmdBase clq diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xorg-cf-files-1.0.6/README new/xorg-cf-files-1.0.7/README --- old/xorg-cf-files-1.0.6/README 2015-12-22 02:28:02.000000000 +0100 +++ new/xorg-cf-files-1.0.7/README 2021-08-02 03:00:38.000000000 +0200 @@ -18,25 +18,17 @@ All questions regarding this software should be directed at the Xorg mailing list: - http://lists.freedesktop.org/mailman/listinfo/xorg - -Please submit bug reports to the Xorg bugzilla: - - https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + https://lists.x.org/mailman/listinfo/xorg The master development code repository can be found at: - git://anongit.freedesktop.org/git/xorg/util/cf + https://gitlab.freedesktop.org/xorg/util/cf - http://cgit.freedesktop.org/xorg/util/cf +Please submit bug reports and requests to merge patches there. For patch submission instructions, see: - http://www.x.org/wiki/Development/Documentation/SubmittingPatches - -For more information on the git code manager, see: - - http://wiki.x.org/wiki/GitPage + https://www.x.org/wiki/Development/Documentation/SubmittingPatches ------------------------------------------------------------------------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xorg-cf-files-1.0.6/compile new/xorg-cf-files-1.0.7/compile --- old/xorg-cf-files-1.0.6/compile 2015-12-22 02:28:10.000000000 +0100 +++ new/xorg-cf-files-1.0.7/compile 2021-08-02 03:00:43.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-10-14.11; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # Written by Tom Tromey <tro...@cygnus.com>. # # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -53,7 +53,7 @@ MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN* | MSYS*) file_conv=cygwin ;; *) @@ -67,7 +67,7 @@ mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/*) + cygwin/* | msys/*) file=`cygpath -m "$file" || echo "$file"` ;; wine/*) @@ -255,7 +255,8 @@ echo "compile $scriptversion" exit $? ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) func_cl_wrapper "$@" # Doesn't return... ;; esac @@ -339,9 +340,9 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xorg-cf-files-1.0.6/configure.ac new/xorg-cf-files-1.0.7/configure.ac --- old/xorg-cf-files-1.0.6/configure.ac 2015-12-22 02:28:02.000000000 +0100 +++ new/xorg-cf-files-1.0.7/configure.ac 2021-08-02 03:00:38.000000000 +0200 @@ -3,8 +3,8 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([xorg-cf-files], [1.0.6], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], +AC_INIT([xorg-cf-files], [1.0.7], + [https://gitlab.freedesktop.org/xorg/util/cf/issues], [xorg-cf-files]) AC_CONFIG_SRCDIR([Makefile.am]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xorg-cf-files-1.0.6/linux.cf new/xorg-cf-files-1.0.7/linux.cf --- old/xorg-cf-files-1.0.6/linux.cf 2015-12-22 02:28:02.000000000 +0100 +++ new/xorg-cf-files-1.0.7/linux.cf 2021-08-02 03:00:38.000000000 +0200 @@ -190,7 +190,13 @@ #endif /* LinuxDebian */ #if LinuxDistribution == LinuxRedHat -#define FSUseSyslog YES +# define FSUseSyslog YES +# define BuildRman NO +# define BuildHtmlManPages NO +# define ProjectRoot /usr +# define ManPath /usr/share/man +# define XAppLoadDir /usr/share/X11/app-defaults +# define ConfigDir /usr/share/X11/config #endif #ifndef HasDevRandom diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xorg-cf-files-1.0.6/missing new/xorg-cf-files-1.0.7/missing --- old/xorg-cf-files-1.0.6/missing 2015-12-22 02:28:10.000000000 +0100 +++ new/xorg-cf-files-1.0.7/missing 2021-08-02 03:00:43.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2013-10-28.13; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -101,9 +101,9 @@ exit $st fi -perl_URL=http://www.perl.org/ -flex_URL=http://flex.sourceforge.net/ -gnu_software_URL=http://www.gnu.org/software +perl_URL=https://www.perl.org/ +flex_URL=https://github.com/westes/flex +gnu_software_URL=https://www.gnu.org/software program_details () { @@ -207,9 +207,9 @@ exit $st # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xorg-cf-files-1.0.6/site.def new/xorg-cf-files-1.0.7/site.def --- old/xorg-cf-files-1.0.6/site.def 2015-12-22 02:28:14.000000000 +0100 +++ new/xorg-cf-files-1.0.7/site.def 2021-08-02 03:00:47.000000000 +0200 @@ -72,7 +72,7 @@ #ifdef AfterVendorCF #ifndef ProjectRoot -#define ProjectRoot /usr/X11R7 +#define ProjectRoot /usr/local #endif #ifndef FontDir
