Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package di for openSUSE:Factory checked in
at 2025-02-20 16:32:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/di (Old)
and /work/SRC/openSUSE:Factory/.di.new.1873 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "di"
Thu Feb 20 16:32:26 2025 rev:3 rq:1247134 version:5.0.11
Changes:
--------
--- /work/SRC/openSUSE:Factory/di/di.changes 2025-02-11 21:25:00.775214823
+0100
+++ /work/SRC/openSUSE:Factory/.di.new.1873/di.changes 2025-02-20
16:33:42.929313412 +0100
@@ -1,0 +2,12 @@
+Wed Feb 19 05:51:44 UTC 2025 - Andreas Stieger <andreas.stie...@gmx.de>
+
+- Update to 5.0.11:
+ * build fixes to mo files, package them
+
+-------------------------------------------------------------------
+Tue Feb 18 17:34:29 UTC 2025 - Andreas Stieger <andreas.stie...@gmx.de>
+
+- Update to 5.0.10:
+ * more build system tweaks and fixes for other platforms
+
+-------------------------------------------------------------------
Old:
----
di-5.0.6.tar.gz
New:
----
di-5.0.11.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ di.spec ++++++
--- /var/tmp/diff_new_pack.iXQwQE/_old 2025-02-20 16:33:44.533380543 +0100
+++ /var/tmp/diff_new_pack.iXQwQE/_new 2025-02-20 16:33:44.545381046 +0100
@@ -19,7 +19,7 @@
%define sover 5
Name: di
-Version: 5.0.6
+Version: 5.0.11
Release: 0
Summary: Disk Information Utility
License: Zlib
@@ -66,13 +66,14 @@
%install
%cmake_install
+%find_lang %{name}
%check
%ctest
%ldconfig_scriptlets -n libdi%{sover}
-%files
+%files -f %{name}.lang
%license LICENSE.txt
%doc README.txt
%{_bindir}/di
++++++ di-5.0.6.tar.gz -> di-5.0.11.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/di-5.0.6/CMakeLists.txt new/di-5.0.11/CMakeLists.txt
--- old/di-5.0.6/CMakeLists.txt 2025-02-10 14:40:37.000000000 +0100
+++ new/di-5.0.11/CMakeLists.txt 2025-02-18 16:36:25.000000000 +0100
@@ -75,17 +75,22 @@
include (CheckVariableExists)
include (CheckPrototypeDefinition)
-# MacOS cmake uses a path for the compiler that doesn't
-# have the proper include paths built in.
-# /Library/Developer/CommandLineTools/usr/bin/cc
-# I consider this a bug.
-# I don't know what the path for the xcode compiler is, but it
-# probably starts with /Library/Developer
-# this is only used for getting the xdc member types, so
-# it doesn't matter much which compiler, just need one that works.
-set (MYCC ${CMAKE_C_COMPILER})
-if (APPLE AND ${CMAKE_C_COMPILER} MATCHES "^/Library/Developer/")
- set (MYCC /usr/bin/clang)
+if (APPLE)
+ # MacOS cmake uses a path for the compiler that doesn't
+ # have the proper include paths built in. /usr/bin/clang
+ # works with command line tools, but apparently not for xcode.
+ # if the SDKROOT environment variable is not set, set it.
+ if (NOT DEFINED ENV{SDKROOT})
+ execute_process (
+ OUTPUT_VARIABLE sdktemp
+ ERROR_QUIET
+ COMMAND xcrun --sdk macosx --show-sdk-path
+ COMMAND tr -d "\n"
+ )
+ if (DEFINED sdktemp AND NOT sdktemp STREQUAL "")
+ set (ENV{SDKROOT} ${sdktemp})
+ endif()
+ endif()
endif()
#### compile options
@@ -272,6 +277,7 @@
SYSTEM
# for macos
/opt/local/include
+ /opt/homebrew/include
# for freebsd
/usr/local/include
"${CMAKE_BINARY_DIR}"
@@ -281,6 +287,7 @@
set (required_includes
# for macos
/opt/local/include
+ /opt/homebrew/include
# for freebsd
/usr/local/include
)
@@ -488,7 +495,9 @@
macro (memberxdr structnm membernm)
message ("-- Determining ${structnm} ${membernm} xdr type")
- file (WRITE ${membernm}.c "
+ set (txdrdir "${CMAKE_BINARY_DIR}/tmpxdr")
+ file (MAKE_DIRECTORY "${txdrdir}")
+ file (WRITE "${txdrdir}/${membernm}.c" "
#include <rpcsvc/rquota.h>
int
@@ -502,12 +511,13 @@
set (tinc ${TIRPC_INCLUDE_DIRS})
endif()
execute_process (
- OUTPUT_FILE ${membernm}.out
+ OUTPUT_FILE "${txdrdir}/${membernm}.out"
ERROR_QUIET
- COMMAND ${MYCC} -I ${tinc} -E ${membernm}.c
+ COMMAND ${CMAKE_C_COMPILER} -I ${tinc} -E
+ "${txdrdir}/${membernm}.c"
)
unset (tinc)
- if (EXISTS ${membernm}.out)
+ if (EXISTS "${txdrdir}/${membernm}.out")
execute_process (
OUTPUT_VARIABLE xdr_out
# unfortunately, the sed command will find other matches
@@ -515,18 +525,18 @@
# possibly will switch to awk in the future.
# Some headers have tabs, use the [^a-z0-9_] to avoid putting
# them in here.
- COMMAND sed -n -e "/struct *${structnm}/,/^ *};/ p" ${membernm}.out
+ COMMAND sed -n -e "/struct *${structnm}/,/^ *};/ p"
+ "${txdrdir}/${membernm}.out"
COMMAND grep "^[^a-z0-9_]*[a-z0-9_][a-z0-9_]*[^a-z0-9_]*${membernm};"
COMMAND sed -e "s,^[^a-z0-9_]*,," -e "s,[^a-z0-9_].*,,"
COMMAND tr -d "\n"
)
set (xdr_${membernm} xdr_${xdr_out})
endif()
- file (REMOVE ${membernm}.c)
- if (EXISTS ${membernm}.out)
- file (REMOVE ${membernm}.out)
+ file (REMOVE "${txdrdir}/${membernm}.c")
+ if (EXISTS "${txdrdir}/${membernm}.out")
+ file (REMOVE "${txdrdir}/${membernm}.out")
endif()
- set (CMAKE_REQUIRED_INCLUDES ${required_includes})
endmacro()
macro (checkIncludeConflict hdrvara hdra hdrvarb hdrb varnm)
@@ -1237,8 +1247,6 @@
configure_file (${CMAKE_SOURCE_DIR}/di.pc.in di.pc @ONLY)
-# need to build the .mo files
-
#### install
install (TARGETS ${DI_LIBNAME}
@@ -1271,6 +1279,9 @@
install (CODE
"execute_process (
- COMMAND utils/instpo.sh \"${CMAKE_INSTALL_FULL_LOCALEDIR}\"
+ COMMAND \"${PROJECT_SOURCE_DIR}/utils/instpo.sh\"
+ \"${PROJECT_SOURCE_DIR}/po\"
+ \"${CMAKE_INSTALL_FULL_LOCALEDIR}\"
+ \"${CMAKE_BINARY_DIR}/tmppo\"
)"
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/di-5.0.6/Makefile new/di-5.0.11/Makefile
--- old/di-5.0.6/Makefile 2025-02-09 19:01:50.000000000 +0100
+++ new/di-5.0.11/Makefile 2025-02-17 21:03:52.000000000 +0100
@@ -116,7 +116,7 @@
*.o *.obj \
$(MKC_FILES)/mkc_compile.log \
tests.d/chksh* \
- tests.d/test_order.tmp >/dev/null 2>&1; exit 0
+ >/dev/null 2>&1; exit 0
@-test -d $(BUILDDIR) && cmake --build $(BUILDDIR) --target clean
.PHONY: realclean
@@ -307,8 +307,7 @@
.PHONY: mkc-install-po
mkc-install-po:
- test -d $(INST_LOCALEDIR) || mkdir -p $(INST_LOCALEDIR)
- -./utils/instpo.sh $(INST_LOCALEDIR)
+ -./utils/instpo.sh "`pwd`/po" $(INST_LOCALEDIR) "`pwd`/tmp"
.PHONY: mkc-install-pc
mkc-install-pc: $(MKC_REQLIB)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/di-5.0.6/VERSION.txt new/di-5.0.11/VERSION.txt
--- old/di-5.0.6/VERSION.txt 2025-02-09 16:16:37.000000000 +0100
+++ new/di-5.0.11/VERSION.txt 2025-02-18 01:42:04.000000000 +0100
@@ -1,5 +1,5 @@
-DI_VERSION=5.0.6
-DI_LIBVERSION=5.0.6
+DI_VERSION=5.0.11
+DI_LIBVERSION=5.0.11
DI_SOVERSION=5
DI_RELEASE_STATUS=production
export DI_VERSION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/di-5.0.6/mkc_config/di-env.mkc
new/di-5.0.11/mkc_config/di-env.mkc
--- old/di-5.0.6/mkc_config/di-env.mkc 2025-02-09 16:23:03.000000000 +0100
+++ new/di-5.0.11/mkc_config/di-env.mkc 2025-02-18 16:35:34.000000000 +0100
@@ -78,19 +78,31 @@
pkg cflags libtirpc
pkg libs libtirpc
-pkg cflags gmp /opt/local/lib/pkgconfig
-pkg libs gmp /opt/local/lib/pkgconfig
-if nogmp ! _pkg_libs_gmp
- pkg cflags gmp /usr/pkg/lib/pkgconfig
- pkg libs gmp /usr/pkg/lib/pkgconfig
+env DI_USE_MATH
+
+if nousemath ! _env_DI_USE_MATH || == _env_DI_USE_MATH DI_GMP
+ pkg cflags gmp /opt/local/lib/pkgconfig
+ pkg libs gmp /opt/local/lib/pkgconfig
+ if nomath_g ! _pkg_libs_gmp
+ pkg cflags gmp /opt/homebrew/lib/pkgconfig
+ pkg libs gmp /opt/homebrew/lib/pkgconfig
+ endif
+ if nomath_g ! _pkg_libs_gmp
+ pkg cflags gmp /usr/pkg/lib/pkgconfig
+ pkg libs gmp /usr/pkg/lib/pkgconfig
+ endif
endif
-if nogmp ! _pkg_libs_gmp
+if nomath_g ! _pkg_libs_gmp || == _env_DI_USE_MATH DI_TOMMATH
pkg cflags libtommath /opt/local/lib/pkgconfig
pkg libs libtommath /opt/local/lib/pkgconfig
-endif
-if nogmpnotommath ! _pkg_libs_gmp && ! _pkg_libs_libtommath
- pkg cflags libtommath /usr/pkg/lib/pkgconfig
- pkg libs libtommath /usr/pkg/lib/pkgconfig
+ if nomath_gt ! _pkg_libs_gmp && ! _pkg_libs_libtommath
+ pkg cflags libtommath /opt/homebrew/lib/pkgconfig
+ pkg libs libtommath /opt/homebrew/lib/pkgconfig
+ endif
+ if nomath_gt ! _pkg_libs_gmp && ! _pkg_libs_libtommath
+ pkg cflags libtommath /usr/pkg/lib/pkgconfig
+ pkg libs libtommath /usr/pkg/lib/pkgconfig
+ endif
endif
libs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/di-5.0.6/mkc_config/di.mkc
new/di-5.0.11/mkc_config/di.mkc
--- old/di-5.0.6/mkc_config/di.mkc 2025-02-09 19:43:57.000000000 +0100
+++ new/di-5.0.11/mkc_config/di.mkc 2025-02-18 16:40:11.000000000 +0100
@@ -275,7 +275,7 @@
env DI_USE_MATH DI_GMP
endif
# at the moment, libtommath in macports has a broken pkg-config
- if havetommath _pkg_libs_libtommath && ! == _MKCONFIG_SYSTYPE Darwin
+ if havetommath _pkg_libs_libtommath && ! _pkg_libs_gmp && ! ==
_MKCONFIG_SYSTYPE Darwin
env DI_USE_MATH DI_TOMMATH
endif
if nousemath ! _env_DI_USE_MATH
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/di-5.0.6/mkconfig/ChangeLog
new/di-5.0.11/mkconfig/ChangeLog
--- old/di-5.0.6/mkconfig/ChangeLog 2025-02-08 15:34:57.000000000 +0100
+++ new/di-5.0.11/mkconfig/ChangeLog 2025-02-18 17:31:25.000000000 +0100
@@ -1,5 +1,9 @@
CHANGES
+ 2.6.6 2025-2-18
+ Env: Add some additional paths to check for pkg-config files.
+ Env: Update paths for MacOS, NetBSD.
+
2.6.5 2025-2-8
Env: Fixed cflags processing.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/di-5.0.6/mkconfig/VERSION
new/di-5.0.11/mkconfig/VERSION
--- old/di-5.0.6/mkconfig/VERSION 2025-02-08 15:16:55.000000000 +0100
+++ new/di-5.0.11/mkconfig/VERSION 2025-02-18 17:16:17.000000000 +0100
@@ -1 +1 @@
-2.6.5
+2.6.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/di-5.0.6/mkconfig/units/env-cc.sh
new/di-5.0.11/mkconfig/units/env-cc.sh
--- old/di-5.0.6/mkconfig/units/env-cc.sh 2025-02-08 15:35:34.000000000
+0100
+++ new/di-5.0.11/mkconfig/units/env-cc.sh 2025-02-18 17:30:26.000000000
+0100
@@ -226,10 +226,21 @@
esac
fi
;;
+ Darwin)
+ if [ -d /opt/local/include ]; then
+ doappend cflags_include " -I/opt/local/include"
+ fi
+ if [ -d /opt/homebrew/include ]; then
+ doappend cflags_include " -I/opt/homebrew/include"
+ fi
+ ;;
DragonFly|FreeBSD|OpenBSD)
# *BSD has many packages that get installed in /usr/local
doappend cflags_include " -I/usr/local/include"
;;
+ NetBSD)
+ doappend cflags_include " -I/usr/pkg/include"
+ ;;
HP-UX)
if [ "z${lfccflags}" = z -a "${_MKCONFIG_32BIT_FLAGS}" = F ]; then
doappend cflags_system " -D_LARGEFILE64_SOURCE
-D_FILE_OFFSET_BITS=64"
@@ -490,10 +501,22 @@
doappend ldflags_system " $lfldflags"
case ${_MKCONFIG_SYSTYPE} in
- FreeBSD)
- # FreeBSD has many packages that get installed in /usr/local
+ Darwin)
+ if [ -d /opt/local/include ]; then
+ doappend ldflags_system " -L/opt/local/lib"
+ fi
+ if [ -d /opt/homebrew/include ]; then
+ doappend ldflags_system " -L/opt/homebrew/lib"
+ fi
+ doappend ldflags_system " -L/usr/local/lib"
+ ;;
+ DragonFly|FreeBSD|OpenBSD)
+ # *BSD has many packages that get installed in /usr/local
doappend ldflags_system " -L/usr/local/lib"
;;
+ NetBSD)
+ doappend ldflags_system " -L/usr/pkg/lib"
+ ;;
HP-UX)
# check for libintl in other places...
if [ -d /usr/local/include -a \
@@ -900,7 +923,7 @@
sp=
incchk=
pp=`puts $PATH | sed 's/:/ /g'`
- for p in $pp $HOME/local/lib /usr/local/lib /opt/local/lib; do
+ for p in $pp $HOME/local/lib /usr/local/lib /opt/local/lib /opt/homebrew/lib
/usr/pkg/lib; do
td=$p
case $p in
*/bin)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/di-5.0.6/utils/chkcmake.sh
new/di-5.0.11/utils/chkcmake.sh
--- old/di-5.0.6/utils/chkcmake.sh 2025-02-08 00:37:59.000000000 +0100
+++ new/di-5.0.11/utils/chkcmake.sh 2025-02-18 16:36:47.000000000 +0100
@@ -22,7 +22,7 @@
exit 0
fi
-PATH=/opt/local/bin:/usr/local/bin:$PATH
+PATH=/opt/local/bin:/opt/homebrew/bin:/usr/local/bin:/usr/pkg/bin:$PATH
# need a more modern version of awk...
awkcmd=`which gawk 2>/dev/null`
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/di-5.0.6/utils/instpo.sh
new/di-5.0.11/utils/instpo.sh
--- old/di-5.0.6/utils/instpo.sh 2025-02-08 17:35:43.000000000 +0100
+++ new/di-5.0.11/utils/instpo.sh 2025-02-17 22:16:43.000000000 +0100
@@ -3,48 +3,53 @@
# Copyright 2025 Brad Lanam Pleasant Hill CA
#
-INST_LOCALEDIR=$1
+PODIR=$1
+INST_LOCALEDIR=$2
+TMPPODIR=$3
-if [ "x${INST_LOCALEDIR}" = x ]; then
- echo "instpo.sh: No locale dir specified"
+if [ "x${PODIR}" = x ]; then
+ echo "instpo.sh: No po/ dir specified"
exit 1
fi
-if [ ! "x${DESTDIR}" = x ]; then
- INST_LOCALEDIR="${DESTDIR}/${INST_LOCALEDIR}"
+if [ ! -d "${PODIR}" ]; then
+ echo "instpo.sh: po/ dir does not exist"
+ exit 1
fi
-while test ! -f CMakeLists.txt -a ! -d man -a ! -d utils -a ! -d po; do
- cd ..
-done
+if [ "x${INST_LOCALEDIR}" = x ]; then
+ echo "instpo.sh: No locale dir specified"
+ exit 1
+fi
-cd po
-rc=$?
-if [ $rc -ne 0 ]; then
- echo "No po/ directory."
- exit 0
+if [ "x${TMPPODIR}" = x ]; then
+ echo "instpo.sh: No temporary dir specified"
+ exit 1
fi
-test -d "${INST_LOCALEDIR}" || mkdir -p "${INST_LOCALEDIR}"
+if [ ! "x${DESTDIR}" = x ]; then
+ INST_LOCALEDIR="${DESTDIR}/${INST_LOCALEDIR}"
+fi
-# try for xmsgfmt first, for older systems
-msgfmtcmd=`which xmsgfmt 2>/dev/null`
+msgfmtcmd=`which gmsgfmt 2>/dev/null`
rc=$?
if [ $rc -ne 0 -o "x$msgfmtcmd" = x ]; then
- msgfmtcmd=`which gmsgfmt 2>/dev/null`
+ msgfmtcmd=`which msgfmt 2>/dev/null`
rc=$?
if [ $rc -ne 0 -o "x$msgfmtcmd" = x ]; then
- msgfmtcmd=`which msgfmt 2>/dev/null`
- rc=$?
- if [ $rc -ne 0 -o "x$msgfmtcmd" = x ]; then
- # maybe the which command is not there...
- # try some common spots
- if [ -f /usr/bin/xmsgfmt ]; then
- msgfmtcmd=xmsgfmt
- fi
- if [ "x$msgfmtcmd" = x -a -f /usr/bin/msgfmt ]; then
- msgfmtcmd=msgfmt
- fi
+ # maybe the which command is not there...
+ # try some common spots
+ if [ "x$msgfmtcmd" = x -a -f /usr/bin/msgfmt ]; then
+ msgfmtcmd=/usr/bin/msgfmt
+ fi
+ if [ "x$msgfmtcmd" = x -a -f /opt/local/bin/msgfmt ]; then
+ msgfmtcmd=/opt/local/bin/msgfmt
+ fi
+ if [ "x$msgfmtcmd" = x -a -f /opt/homebrew/bin/msgfmt ]; then
+ msgfmtcmd=/opt/homebrew/bin/msgfmt
+ fi
+ if [ "x$msgfmtcmd" = x -a -f /usr/local/bin/msgfmt ]; then
+ msgfmtcmd=/usr/local/bin/msgfmt
fi
fi
fi
@@ -54,21 +59,31 @@
exit 1
fi
+cd "${PODIR}"
+rc=$?
+if [ $rc -ne 0 ]; then
+ echo "No po/ directory."
+ exit 0
+fi
+
+test -d "${INST_LOCALEDIR}" || mkdir -p "${INST_LOCALEDIR}"
+test -d "${TMPPODIR}" || mkdir -p "${TMPPODIR}"
+
for i in *.po; do
j=`echo $i | sed 's,\\.po$,,'`
- ${msgfmtcmd} -o $j.mo $i 2> /dev/null
+ ${msgfmtcmd} -o "${TMPPODIR}/$j.mo" $i 2> /dev/null
rc=$?
if [ $rc -ne 0 ]; then
echo "instpo.sh: msgfmt failed for $i"
continue
fi
- if [ ! -f $j.mo ]; then
+ if [ ! -f "${TMPPODIR}/$j.mo" ]; then
continue
fi
test -d ${INST_LOCALEDIR}/$j/LC_MESSAGES ||
mkdir -p ${INST_LOCALEDIR}/$j/LC_MESSAGES
- cp -pf $j.mo ${INST_LOCALEDIR}/$j/LC_MESSAGES/di.mo
- rm -f $j.mo
+ cp -pf "${TMPPODIR}/$j.mo" ${INST_LOCALEDIR}/$j/LC_MESSAGES/di.mo
+ rm -f "${TMPPODIR}/$j.mo"
done
exit 0
