Hello community,

here is the log from the commit of package util-macros for openSUSE:Factory 
checked in at 2018-03-08 10:53:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/util-macros (Old)
 and      /work/SRC/openSUSE:Factory/.util-macros.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "util-macros"

Thu Mar  8 10:53:45 2018 rev:4 rq:582994 version:1.19.2

Changes:
--------
--- /work/SRC/openSUSE:Factory/util-macros/util-macros.changes  2017-02-07 
11:56:12.371348289 +0100
+++ /work/SRC/openSUSE:Factory/.util-macros.new/util-macros.changes     
2018-03-08 10:53:46.761372307 +0100
@@ -1,0 +2,8 @@
+Mon Mar  5 14:30:29 UTC 2018 - sndir...@suse.com
+
+- update to release 1.19.2
+  * Update check for manpage section numbers to not rely on Solaris version
+  * Rework CHANGELOG_CMD to touch/echo >&2 only as needed
+  * Rework INSTALL_CMD to touch/echo >&2 only as needed
+
+-------------------------------------------------------------------

Old:
----
  util-macros-1.19.1.tar.bz2

New:
----
  util-macros-1.19.2.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ util-macros.spec ++++++
--- /var/tmp/diff_new_pack.RPeYMN/_old  2018-03-08 10:53:47.473346677 +0100
+++ /var/tmp/diff_new_pack.RPeYMN/_new  2018-03-08 10:53:47.477346532 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package util-macros
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           util-macros
-Version:        1.19.1
+Version:        1.19.2
 Release:        0
 BuildRequires:  pkg-config
 
@@ -28,9 +28,9 @@
 Url:            http://xorg.freedesktop.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        The X Protocol
+#Source URL:    http://xorg.freedesktop.org/releases/individual/util/
 License:        HPND
 Group:          Development/Libraries/X11 
-#Source URL:    http://xorg.freedesktop.org/releases/individual/util/
 Source:         %{name}-%{version}.tar.bz2
 
 %description

++++++ util-macros-1.19.1.tar.bz2 -> util-macros-1.19.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/util-macros-1.19.1/ChangeLog 
new/util-macros-1.19.2/ChangeLog
--- old/util-macros-1.19.1/ChangeLog    2017-01-29 20:24:51.000000000 +0100
+++ new/util-macros-1.19.2/ChangeLog    2018-03-05 02:41:59.000000000 +0100
@@ -1,3 +1,83 @@
+commit 771b773b50717884b37f6b2473166b4be4670076
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date:   Sun Mar 4 17:40:10 2018 -0800
+
+    Version bump: 1.19.2
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 6694c973c8c2b5fae5934a49578f69d2817ab49c
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date:   Sat Nov 4 17:29:24 2017 -0700
+
+    Update check for manpage section numbers to not rely on Solaris version
+    
+    Check for a specific file instead of a specific set of versions from
+    uname, to cope with manpage section alignment coming to 11.4 instead
+    of 12.0.
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+    Reviewed-by: Matthieu Herrb <matth...@herrb.eu>
+
+commit 39f07f7db58ebbf3dcb64a2bf9098ed5cf3d1223
+Author: Emil Velikov <emil.vel...@collabora.com>
+Date:   Tue Feb 14 11:38:21 2017 +0000
+
+    Rework INSTALL_CMD to touch/echo >&2 only as needed
+    
+    Analogous to previous commit.
+    
+    With this commit we no longer get the following erroneous messages
+    during `make distcheck'.
+    
+    "
+    failed to copy INSTALL from util-macros: installing possibly empty INSTALL.
+    ...
+    failed to copy INSTALL from util-macros: installing possibly empty INSTALL.
+    "
+    
+    Cc: Gaetan Nadon <mems...@videotron.ca>
+    Cc: Peter Hutterer <peter.hutte...@who-t.net>
+    Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
+    Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 4fc573e2f3cbbed7baa5e05fb798c2e4f4236f7d
+Author: Emil Velikov <emil.veli...@collabora.com>
+Date:   Tue Feb 14 11:38:20 2017 +0000
+
+    Rework CHANGELOG_CMD to touch/echo >&2 only as needed
+    
+    Currently CHANGELOG_CMD issues a
+    
+      touch ChangeLog; echo "Scary message" >&2
+    
+    even if the file is already present. For example, when running `make
+    distcheck' the following is observed:
+    
+    "
+    /bin/sh: ../../.changelog.tmp: Permission denied
+    git directory not found: installing possibly empty changelog.
+    ...
+    /bin/sh: ../../.changelog.tmp: Permission denied
+    git directory not found: installing possibly empty changelog.
+    "
+    
+    That in itself happens since srcdir is RO, thus shell redirection [to
+    srcddir/.changelog.tmp] fails. At the same time the latter message is
+    wrong and misleading since the file is already there, with the correct
+    contents.
+    
+    Silence the permissing warning (/dev/null is our friend), and add
+    a simple `test -e .../ChangeLog || (...' prior to the touch/echo combo.
+    
+    As we're here also update the message to be more generic, since there
+    are multiple other reasons why things can fail.
+    
+    Cc: Gaetan Nadon <mems...@videotron.ca>
+    Cc: Peter Hutterer <peter.hutte...@who-t.net>
+    Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
+    Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
 commit 4b6b1dfea16214b5104b5373341dc8bc7016d0b5
 Author: Matt Turner <matts...@gmail.com>
 Date:   Sun Jan 29 11:23:47 2017 -0800
@@ -558,7 +638,7 @@
     more copies.
     
     Callers should be able to just add
-       TESTS_ENVIRONMENT = $(XORG_MALLOC_DEBUG_ENV)
+            TESTS_ENVIRONMENT = $(XORG_MALLOC_DEBUG_ENV)
     
     If built with an older xorg-macros, then the tests will simply be
     less stringent, matching what happens on platforms without any
@@ -829,8 +909,8 @@
      Interface to module:
      HAVE_GLIB: used in makefiles to conditionally build targets
      with_glib: used in configure.ac to know if GLib has been found
-     --with-glib:      'yes' user instructs the module to use glib
-               'no' user instructs the module not to use glib
+     --with-glib:   'yes' user instructs the module to use glib
+                    'no' user instructs the module not to use glib
     
     Reviewed-by: Dan Nicholson <dbn.li...@gmail.com>
     Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/util-macros-1.19.1/configure 
new/util-macros-1.19.2/configure
--- old/util-macros-1.19.1/configure    2017-01-29 20:24:49.000000000 +0100
+++ new/util-macros-1.19.2/configure    2018-03-05 02:41:57.000000000 +0100
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for util-macros 1.19.1.
+# Generated by GNU Autoconf 2.69 for util-macros 1.19.2.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
@@ -580,8 +580,8 @@
 # Identity of this package.
 PACKAGE_NAME='util-macros'
 PACKAGE_TARNAME='util-macros'
-PACKAGE_VERSION='1.19.1'
-PACKAGE_STRING='util-macros 1.19.1'
+PACKAGE_VERSION='1.19.2'
+PACKAGE_STRING='util-macros 1.19.2'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 PACKAGE_URL=''
 
@@ -1202,7 +1202,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures util-macros 1.19.1 to adapt to many kinds of systems.
+\`configure' configures util-macros 1.19.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1268,7 +1268,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of util-macros 1.19.1:";;
+     short | recursive ) echo "Configuration of util-macros 1.19.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1342,7 +1342,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-util-macros configure 1.19.1
+util-macros configure 1.19.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1359,7 +1359,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by util-macros $as_me 1.19.1, which was
+It was created by util-macros $as_me 1.19.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2223,7 +2223,7 @@
 
 # Define the identity of the package.
  PACKAGE='util-macros'
- VERSION='1.19.1'
+ VERSION='1.19.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2366,10 +2366,11 @@
 
 
 
-CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > 
\$(top_srcdir)/.changelog.tmp && \
+CHANGELOG_CMD="((GIT_DIR=\$(top_srcdir)/.git git log > 
\$(top_srcdir)/.changelog.tmp) 2>/dev/null && \
 mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \
-|| (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \
-echo 'git directory not found: installing possibly empty changelog.' >&2)"
+|| (rm -f \$(top_srcdir)/.changelog.tmp; test -e \$(top_srcdir)/ChangeLog || ( 
\
+touch \$(top_srcdir)/ChangeLog; \
+echo 'git failed to create ChangeLog: installing empty ChangeLog.' >&2))"
 
 
 
@@ -2926,7 +2927,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by util-macros $as_me 1.19.1, which was
+This file was extended by util-macros $as_me 1.19.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -2979,7 +2980,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; 
s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-util-macros config.status 1.19.1
+util-macros config.status 1.19.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/util-macros-1.19.1/configure.ac 
new/util-macros-1.19.2/configure.ac
--- old/util-macros-1.19.1/configure.ac 2017-01-29 20:23:44.000000000 +0100
+++ new/util-macros-1.19.2/configure.ac 2018-03-05 02:41:55.000000000 +0100
@@ -23,7 +23,7 @@
 
 AC_PREREQ([2.62])
 AC_INIT([util-macros],
-        [1.19.1],
+        [1.19.2],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         [util-macros])
 AC_CONFIG_SRCDIR([Makefile.am])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/util-macros-1.19.1/xorg-macros.m4.in 
new/util-macros-1.19.2/xorg-macros.m4.in
--- old/util-macros-1.19.1/xorg-macros.m4.in    2017-01-29 20:22:45.000000000 
+0100
+++ new/util-macros-1.19.2/xorg-macros.m4.in    2018-03-05 02:41:55.000000000 
+0100
@@ -114,6 +114,17 @@
 AC_REQUIRE([AC_CANONICAL_HOST])
 AC_REQUIRE([AC_PROG_SED])
 
+case $host_os in
+    solaris*)
+        # Solaris 2.0 - 11.3 use SysV man page section numbers, so we
+        # check for a man page file found in later versions that use
+        # traditional section numbers instead
+        AC_CHECK_FILE([/usr/share/man/man7/attributes.7],
+                [SYSV_MAN_SECTIONS=false], [SYSV_MAN_SECTIONS=true])
+        ;;
+    *) SYSV_MAN_SECTIONS=false ;;
+esac
+
 if test x$APP_MAN_SUFFIX = x    ; then
     APP_MAN_SUFFIX=1
 fi
@@ -129,9 +140,8 @@
 fi
 
 if test x$FILE_MAN_SUFFIX = x    ; then
-    case $host_os in
-       # Solaris 2.0 - 11 use SysV man page sections
-       solaris2.?|solaris2.1[[01]])    FILE_MAN_SUFFIX=4  ;;
+    case $SYSV_MAN_SECTIONS in
+       true)                           FILE_MAN_SUFFIX=4  ;;
        *)                              FILE_MAN_SUFFIX=5  ;;
     esac
 fi
@@ -140,9 +150,8 @@
 fi
 
 if test x$MISC_MAN_SUFFIX = x    ; then
-    case $host_os in
-       # Solaris 2.0 - 11 use SysV man page sections
-       solaris2.?|solaris2.1[[01]])    MISC_MAN_SUFFIX=5  ;;
+    case $SYSV_MAN_SECTIONS in
+       true)                           MISC_MAN_SUFFIX=5  ;;
        *)                              MISC_MAN_SUFFIX=7  ;;
     esac
 fi
@@ -151,9 +160,8 @@
 fi
 
 if test x$DRIVER_MAN_SUFFIX = x    ; then
-    case $host_os in
-       # Solaris 2.0 - 11 use SysV man page sections
-       solaris2.?|solaris2.1[[01]])    DRIVER_MAN_SUFFIX=7  ;;
+    case $SYSV_MAN_SECTIONS in
+       true)                           DRIVER_MAN_SUFFIX=7  ;;
        *)                              DRIVER_MAN_SUFFIX=4  ;;
     esac
 fi
@@ -162,9 +170,8 @@
 fi
 
 if test x$ADMIN_MAN_SUFFIX = x    ; then
-    case $host_os in
-       # Solaris 2.0 - 11 use SysV man page sections
-       solaris2.?|solaris2.1[[01]])    ADMIN_MAN_SUFFIX=1m ;;
+    case $SYSV_MAN_SECTIONS in
+       true)                           ADMIN_MAN_SUFFIX=1m ;;
        *)                              ADMIN_MAN_SUFFIX=8  ;;
     esac
 fi
@@ -1839,7 +1846,8 @@
 macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdatadir xorg-macros`
 INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && \
 mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \
-|| (rm -f \$(top_srcdir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \
-echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing 
possibly empty INSTALL.' >&2)"
+|| (rm -f \$(top_srcdir)/.INSTALL.tmp; test -e \$(top_srcdir)/INSTALL || ( \
+touch \$(top_srcdir)/INSTALL; \
+echo 'failed to copy INSTALL from util-macros: installing empty INSTALL.' 
>&2))"
 AC_SUBST([INSTALL_CMD])
 ]) # XORG_INSTALL
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/util-macros-1.19.1/xorgversion.m4 
new/util-macros-1.19.2/xorgversion.m4
--- old/util-macros-1.19.1/xorgversion.m4       2017-01-29 20:22:45.000000000 
+0100
+++ new/util-macros-1.19.2/xorgversion.m4       2018-03-05 02:41:55.000000000 
+0100
@@ -56,9 +56,10 @@
 #
 #
 AC_DEFUN([XORG_CHANGELOG], [
-CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > 
\$(top_srcdir)/.changelog.tmp && \
+CHANGELOG_CMD="((GIT_DIR=\$(top_srcdir)/.git git log > 
\$(top_srcdir)/.changelog.tmp) 2>/dev/null && \
 mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \
-|| (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \
-echo 'git directory not found: installing possibly empty changelog.' >&2)"
+|| (rm -f \$(top_srcdir)/.changelog.tmp; test -e \$(top_srcdir)/ChangeLog || ( 
\
+touch \$(top_srcdir)/ChangeLog; \
+echo 'git failed to create ChangeLog: installing empty ChangeLog.' >&2))"
 AC_SUBST([CHANGELOG_CMD])
 ]) # XORG_CHANGELOG


Reply via email to