February 2015 - openSUSE Commits - openSUSE Mailing Lists

commit mdadm for openSUSE:Factory
by root＠hilbert.suse.de 06 Feb '15

06 Feb '15

Hello community, here is the log from the commit of package mdadm for openSUSE:Factory checked in at 2015-02-06 10:21:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mdadm (Old) and /work/SRC/openSUSE:Factory/.mdadm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mdadm" Changes: -------- --- /work/SRC/openSUSE:Factory/mdadm/mdadm.changes 2014-11-11 09:59:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mdadm.new/mdadm.changes 2015-02-06 10:21:19.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Feb 3 23:40:32 UTC 2015 - nfbrown(a)suse.com + +- mdcheck-careful.patch + Be careful about reading all output of "mdadm --detail --export" + as shell commands - it isn't quoted. + (bnc#910500) + +------------------------------------------------------------------- New: ---- mdcheck-careful.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mdadm.spec ++++++ --- /var/tmp/diff_new_pack.2SjoiJ/_old 2015-02-06 10:21:20.000000000 +0100 +++ /var/tmp/diff_new_pack.2SjoiJ/_new 2015-02-06 10:21:20.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package mdadm # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -44,6 +44,8 @@ Patch2: 0001-Grow-fix-removal-of-line-in-wrong-case.patch # PATCH-FIX-UPSTREAM mdcheck-no-devices.fix bnc#903051 nfbrown(a)suse.de Patch3: mdcheck-no-devices.fix +# PATCH-FIX-UPSTREAM mdcheck-careful.patch bnc#910500 nfbrown(a)suse.de +Patch4: mdcheck-careful.patch %define _udevdir %(pkg-config --variable=udevdir udev) %define _systemdshutdowndir %{_unitdir}/../system-shutdown @@ -58,6 +60,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build make %{?_smp_mflags} CC="%__cc" CXFLAGS="$RPM_OPT_FLAGS -Wno-error" SUSE=yes ++++++ mdcheck-careful.patch ++++++ >From 979b1feb093b1c2e0f8b58716329f2da092741d4 Mon Sep 17 00:00:00 2001 From: NeilBrown <neilb(a)suse.de> Date: Wed, 4 Feb 2015 09:06:47 +1100 Subject: [PATCH] mdcheck: be careful when sourcing the output of "mdadm --detail --export" The output of "mdadm --detail --export" isn't quoted properly so fields that contain spaces can be a problem. We only want the MD_UUID field, and it has a very well defined format with no spaces. So use 'grep' to limit the output to just that. Signed-off-by: NeilBrown <neilb(a)suse.de> diff --git a/misc/mdcheck b/misc/mdcheck index ca5fe84a1284..2c8f54d6e4cf 100644 --- a/misc/mdcheck +++ b/misc/mdcheck @@ -88,7 +88,7 @@ do continue fi - mdadm --detail --export "$dev" > $tmp || continue + mdadm --detail --export "$dev" | grep '^MD_UUID=' > $tmp || continue source $tmp fl="/var/lib/mdcheck/MD_UUID_$MD_UUID" if [ -z "$cont" ] -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yasm for openSUSE:Factory
by root＠hilbert.suse.de 06 Feb '15

06 Feb '15

Hello community, here is the log from the commit of package yasm for openSUSE:Factory checked in at 2015-02-06 10:20:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yasm (Old) and /work/SRC/openSUSE:Factory/.yasm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yasm" Changes: -------- --- /work/SRC/openSUSE:Factory/yasm/yasm.changes 2014-10-19 19:27:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yasm.new/yasm.changes 2015-02-06 10:20:54.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Feb 3 11:45:57 UTC 2015 - crrodriguez(a)opensuse.org + +- yasm-re2c-nogendate.patch: Do not add date and time + to files generated with builtin old/different implementation + of re2c. [BNC#915937] + +------------------------------------------------------------------- New: ---- yasm-re2c-nogendate.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yasm.spec ++++++ --- /var/tmp/diff_new_pack.MCAase/_old 2015-02-06 10:20:55.000000000 +0100 +++ /var/tmp/diff_new_pack.MCAase/_new 2015-02-06 10:20:55.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package yasm # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -26,6 +26,7 @@ Source: http://www.tortall.net/projects/yasm/releases/yasm-%{version}.tar.gz Patch0: %{name}-no-build-date.patch Patch1: %{name}-no-rpm-opt-flags.patch +Patch2: yasm-re2c-nogendate.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-base BuildRequires: xmlto @@ -50,7 +51,7 @@ %setup -q -n %{name}-%{version} %patch0 -p1 %patch1 - +%patch2 -p1 %build export CFLAGS="%{optflags}" %configure \ ++++++ yasm-re2c-nogendate.patch ++++++ --- yasm-1.3.0.orig/tools/re2c/parser.c +++ yasm-1.3.0/tools/re2c/parser.c @@ -232,9 +232,9 @@ void parse(FILE *i, FILE *o){ peektok = NONE; - fputs("/* Generated by re2c 0.9.1-C on ", o); - fprintf(o, "%-24s", ctime(&now)); - fputs(" */\n", o); oline+=2; + //fputs("/* Generated by re2c 0.9.1-C on ", o); + //fprintf(o, "%-24s", ctime(&now)); + //fputs(" */\n", o); oline+=2; in = Scanner_new(i); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit autofs for openSUSE:Factory
by root＠hilbert.suse.de 06 Feb '15

06 Feb '15

Hello community, here is the log from the commit of package autofs for openSUSE:Factory checked in at 2015-02-06 10:20:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/autofs (Old) and /work/SRC/openSUSE:Factory/.autofs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "autofs" Changes: -------- --- /work/SRC/openSUSE:Factory/autofs/autofs.changes 2015-01-21 21:55:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.autofs.new/autofs.changes 2015-02-06 10:20:32.000000000 +0100 @@ -1,0 +2,17 @@ +Tue Feb 3 19:51:56 UTC 2015 - lchiquitto(a)suse.com + +- Fix autofs.service so that multiple options passed through + sysconfig AUTOFS_OPTIONS work correctly (bsc#909472) + +------------------------------------------------------------------- +Tue Feb 3 18:40:56 UTC 2015 - lchiquitto(a)suse.com + +- Fix configuration handling now that we have /etc/autofs.conf + and /etc/sysconfig/autofs. Runtime options are now configured in + the former, while settings that affect the daemon start up are + still handled in the latter. +- Clean-up sysconfig.autofs, leave only init script options: + $OPTIONS and $USE_MISC_DEVICE. +- Run %fillup also when systemd is enabled. (bsc#906606) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autofs.spec ++++++ --- /var/tmp/diff_new_pack.8m3UqM/_old 2015-02-06 10:20:34.000000000 +0100 +++ /var/tmp/diff_new_pack.8m3UqM/_new 2015-02-06 10:20:34.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package autofs # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -159,14 +159,15 @@ if /sbin/chkconfig -c autofs 3; then %{insserv_force_if_yast autofs} fi -%{fillup_only -n autofs} %endif +%{fillup_only} + %preun %{stop_on_removal autofs} %if %{with_systemd} %service_del_preun %{name}.service -%fillup_only %endif +%{fillup_only} %postun %if %{with_systemd} @@ -175,6 +176,7 @@ %{restart_on_update autofs} %{insserv_cleanup} %endif + %files %defattr (-, root, root) %{_localstatedir}/adm/fillup-templates/sysconfig.autofs ++++++ autofs.service ++++++ --- /var/tmp/diff_new_pack.8m3UqM/_old 2015-02-06 10:20:34.000000000 +0100 +++ /var/tmp/diff_new_pack.8m3UqM/_new 2015-02-06 10:20:34.000000000 +0100 @@ -8,7 +8,7 @@ Type=forking PIDFile=/var/run/automount.pid EnvironmentFile=-/etc/sysconfig/autofs -ExecStart=/usr/sbin/automount ${AUTOFS_OPTIONS} -p /var/run/automount.pid +ExecStart=/usr/sbin/automount $AUTOFS_OPTIONS -p /var/run/automount.pid ExecReload=/usr/bin/kill -HUP $MAINPID TimeoutSec=180 ++++++ sysconfig.autofs ++++++ --- /var/tmp/diff_new_pack.8m3UqM/_old 2015-02-06 10:20:34.000000000 +0100 +++ /var/tmp/diff_new_pack.8m3UqM/_new 2015-02-06 10:20:34.000000000 +0100 @@ -1,28 +1,11 @@ ## Path: System/File systems/Autofs -## Description: General global options. +## Description: Options that will be used when the daemon is started. ## Type: string ## Default: "" ## ServiceReload: autofs # AUTOFS_OPTIONS="" -## Description: Default mount options. -## Type: string -## Default: "" -# -# Default mount options which are appended or replaced to -# each map entry (see also APPEND_OPTIONS). -LOCAL_OPTIONS="" - -## Description: Append or replace options. -## Type: string -## Default: "yes" -# -# Determine whether LOCAL_OPTIONS are appended to map entry options -# or if the map entry options replace the global options -# (program default "yes", append options). -APPEND_OPTIONS="yes" - ## Description: Use AutoFS miscellaneous device (/dev/autofs). ## Type: string ## Default: "yes" @@ -30,138 +13,3 @@ # Determine whether the AutoFS misc device (/dev/autofs) will be used # for routing ioctl commands. Requires kernel support (2.6.28 and newer). USE_MISC_DEVICE="yes" - -## Description: Default map name for the master map. -## Type: string -## Default: "auto.master" -# -DEFAULT_MASTER_MAP_NAME="auto.master" - -## Description: Set the default mount timeout. -## Type: integer(0:) -## Default: 600 -# -DEFAULT_TIMEOUT=600 - -## Description: Set the default negative timeout for failed mount attempts. -## Type: integer(0:) -## Default: 60 -# -#DEFAULT_NEGATIVE_TIMEOUT=60 - -## Description: Time to wait for a response from mount(8). -## Type: integer(-1:) -## Default: -1 -# -# Setting this timeout can cause problems when mount would otherwise -# wait for a server that is temporarily unavailable, such as when -# it's restarting. The default of waiting for mount(8) usually -# results in a wait of around 3 minutes. -#DEFAULT_MOUNT_WAIT=-1 - -## Description: Time to wait for a response from umount(8). -## Type: integer(0:) -## Default: 12 -# -#DEFAULT_UMOUNT_WAIT=12 - -## Description: The default protocol used by mount.nfs(8). -## Type: string -## Default: 3 -# -# Since we can't identify the default automatically we need to -# set it in our configuration. This will only make a difference -# for replicated map entries as availability probing isn't -# used for single host map entries. -#MOUNT_NFS_DEFAULT_PROTOCOL=3 - -## Description: maps are browsable by default. -## Type: string -## Default: "yes" -# -DEFAULT_BROWSE_MODE="yes" - -## Description: Set default log level. -## Type: string -## Default: "none" -# -# "none", "verbose" or "debug" -# -DEFAULT_LOGGING="none" - -## Description: Define the default LDAP schema to use for lookups. -## Type: string -## Default: "auto.master" -# -# System default -# -DEFAULT_MAP_OBJECT_CLASS="nisMap" -DEFAULT_ENTRY_OBJECT_CLASS="nisObject" -DEFAULT_MAP_ATTRIBUTE="nisMapName" -DEFAULT_ENTRY_ATTRIBUTE="cn" -DEFAULT_VALUE_ATTRIBUTE="nisMapEntry" -# -# Other common LDAP nameing -# -#DEFAULT_MAP_OBJECT_CLASS="automountMap" -#DEFAULT_ENTRY_OBJECT_CLASS="automount" -#DEFAULT_MAP_ATTRIBUTE="ou" -#DEFAULT_ENTRY_ATTRIBUTE="cn" -#DEFAULT_VALUE_ATTRIBUTE="automountInformation" -# -#DEFAULT_MAP_OBJECT_CLASS="automountMap" -#DEFAULT_ENTRY_OBJECT_CLASS="automount" -#DEFAULT_MAP_ATTRIBUTE="automountMapName" -#DEFAULT_ENTRY_ATTRIBUTE="automountKey" -#DEFAULT_VALUE_ATTRIBUTE="automountInformation" - -## Description: Set the default location for the SASL authentication configuration file. -## Type: string -## Default: "/etc/autofs_ldap_auth.conf" -# -DEFAULT_AUTH_CONF_FILE="etc/autofs_ldap_auth.conf" - -## Description: List of LDAP server URIs. -## Type: string -## Default: "" -# -# Space seperated list of server URIs of the form <proto>://<server>[/] -# where <proto> can be ldap or ldaps. The option can be given multiple -# times. Map entries that include a server name override this option. -# -# This configuration option can also be used to request AutoFS lookup -# SRV RRs for a domain of the form <proto>:///[<domain dn>]. Note that a -# trailing "/" is not allowed when using this form. If the domain dn -# is not specified the DNS domain name (if any) is used to construct -# the domain dn for the SRV RR lookup. The server list returned from -# an SRV RR lookup is refreshed according to the minimum ttl found in -# the SRV RR records or after one hour, whichever is less. -#LDAP_URI="" - -## Description: Timeout value for the synchronous LDAP API calls. -## Type: integer -## Default: LDAP library default -# -#LDAP_TIMEOUT=-1 - -## Description: Set the network LDAP response timeout (default 8). -## Type: integer -## Default: 8 -# -#LDAP_NETWORK_TIMEOUT=8 - -## Description: Define the LDAP base dn for map dn lookup. -## Type: string -## Default: "" -# -# Multiple entries can be given and they are checked in the order -# they appear here. -#SEARCH_BASE="" - -## Description: Set the map cache hash table size. -## Type: integer -## Default: 1024 -# -# Should be a power of 2 with a ratio roughly between 1:10 and 1:20 -# for each map. -MAP_HASH_TABLE_SIZE=1024 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libgadu for openSUSE:Factory
by root＠hilbert.suse.de 06 Feb '15

06 Feb '15

Hello community, here is the log from the commit of package libgadu for openSUSE:Factory checked in at 2015-02-06 10:20:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libgadu (Old) and /work/SRC/openSUSE:Factory/.libgadu.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libgadu" Changes: -------- --- /work/SRC/openSUSE:Factory/libgadu/libgadu.changes 2014-06-26 08:00:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libgadu.new/libgadu.changes 2015-02-06 10:20:01.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Feb 3 18:09:54 UTC 2015 - fisiu(a)opensuse.org + +- Update to version 1.12.1, bugfix release: + + improved compatibility with GG11 protocol + + fix segfaults when got incorrect reply from public catalog + + fixes related to proxy servers + +------------------------------------------------------------------- Old: ---- libgadu-1.12.0.tar.gz New: ---- libgadu-1.12.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgadu.spec ++++++ --- /var/tmp/diff_new_pack.Kcs4UG/_old 2015-02-06 10:20:02.000000000 +0100 +++ /var/tmp/diff_new_pack.Kcs4UG/_new 2015-02-06 10:20:02.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libgadu # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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,9 +17,8 @@ %define soname 3 - Name: libgadu -Version: 1.12.0 +Version: 1.12.1 Release: 0 Summary: Library for Handling of Gadu-Gadu Instant Messaging License: LGPL-2.1+ @@ -40,7 +39,6 @@ instant messenger Gadu-Gadu. %package -n %{name}%{soname} - Summary: Library for Handling of Gadu-Gadu Instant Messaging Group: System/Libraries Provides: %{name} = %{version} @@ -73,10 +71,7 @@ # remove installdox from html dir rm -f docs/html/installdox # -rm -f %{buildroot}%{_libdir}/*.la - -%clean -%{?buildroot:rm -rf %{buildroot}} +find %{buildroot} -type f -name "*.la" -delete -print %post -n %{name}%{soname} -p /sbin/ldconfig ++++++ libgadu-1.12.0.tar.gz -> libgadu-1.12.1.tar.gz ++++++ ++++ 35960 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libqt5-qtbase for openSUSE:Factory
by root＠hilbert.suse.de 06 Feb '15

06 Feb '15

Hello community, here is the log from the commit of package libqt5-qtbase for openSUSE:Factory checked in at 2015-02-06 10:19:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtbase (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtbase.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libqt5-qtbase" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtbase/libqt5-qtbase.changes 2015-01-15 16:00:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libqt5-qtbase.new/libqt5-qtbase.changes 2015-02-06 10:19:35.000000000 +0100 @@ -1,0 +2,16 @@ +Tue Feb 3 13:48:49 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Fixed qt_instdate generation, so the Qt5Core library doesn't have + DATE embedded +- Drop fdupes usage as it provides unpredictable results, and fools + build-compare +- Add libqt5-qtbase-rpmlintrc due to duplicates waste warnings: we + rather have a few bytes more than to republish same binaries due + to fdupes +- Added make-qdbusxml2cpp-output-reproducible.patch: don't include + date/time in the generated include guards; prevents unnecessary + rebuilds +- Added fix-drag-and-drop-regression.patch from upstream, + fixes QTBUG-43436 + +------------------------------------------------------------------- New: ---- fix-drag-and-drop-regression.patch libqt5-qtbase-rpmlintrc make-qdbusxml2cpp-output-reproducible.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtbase.spec ++++++ --- /var/tmp/diff_new_pack.6gCtCy/_old 2015-02-06 10:19:37.000000000 +0100 +++ /var/tmp/diff_new_pack.6gCtCy/_new 2015-02-06 10:19:37.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libqt5-qtbase # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -41,6 +41,7 @@ Source1: libqt5-qtbase.changes Source2: macros.qt5 Source3: baselibs.conf +Source99: libqt5-qtbase-rpmlintrc # patches 0-1000 are openSUSE and/or non-upstream(able) patches # # PATCH-FIX-UPSTREAM libqt5-libtool-nodate.diff -- for ommiting date/time on build Patch0: libqt5-libtool-nodate.diff @@ -56,6 +57,8 @@ Patch5: libqt5-do-not-use-shm-if-display-name-doesnt-look-local.patch # PATCH-FIX-OPENSUSE QTBUG41590.patch -- https://bugreports.qt-project.org/browse/QTBUG-40971 https://bugreports.qt-project.org/browse/QTBUG-41590 Patch6: QTBUG41590.patch +# PATCH-FIX-OPENSUSE make-qdbusxml2cpp-output-reproducible.patch -- https://codereview.qt-project.org/#/c/105210/1 +Patch7: make-qdbusxml2cpp-output-reproducible.patch # patches 1000-2000 and above from upstream 5.3 branch # # patches 2000-3000 and above from upstream 5.4 branch # # PATCH-FIX-UPSTREAM Handle-SelectionClientClose-in-QXcbClipboard.patch -- kde#329174 @@ -64,9 +67,9 @@ Patch2001: qimage_conversions.cpp-Fix-build-on-big-endian-syste.patch # PATCH-FIX-UPSTREAM Fix-use-after-free-bug.patch Patch2002: Fix-use-after-free-bug.patch +Patch2003: fix-drag-and-drop-regression.patch BuildRequires: alsa-devel BuildRequires: cups-devel -BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libjpeg-devel BuildRequires: libmng-devel @@ -150,9 +153,11 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p0 %patch2000 -p1 %patch2001 -p1 %patch2002 -p1 +%patch2003 -p1 # be sure not to use them rm -r src/3rdparty/{libjpeg,freetype,libpng,zlib} @@ -677,8 +682,8 @@ mkdir .git %endif # Record mtime of changes file instead of build time -CHANGES=`stat --format="%y" %{SOURCE1}|cut --characters=1-10` -sed -i -e "s/qt_instdate=\$TODAY/qt_instdate=$CHANGES/" configure +export CHANGES=`stat --format="%y" %{SOURCE1}|cut --characters=1-10` +sed -i 's|qt_instdate=`date +%Y-%m-%d`|qt_instdate=$CHANGES|g' configure # so non-qt5 apps/libs don't get stripped sed -i -e 's|^$QMAKE_STRIP.*=$.*$|\1|g' mkspecs/common/linux.conf @@ -819,15 +824,6 @@ chmod -R 644 *.png popd -# Only symlink mkspecs, as headers and cmake files are across different packages. If needed, call fdupes on every dir, as per package split -%fdupes -s %{buildroot}%{libqt5_archdatadir}/mkspecs/ - -%fdupes -s %{buildroot}%{libqt5_examplesdir}/ - -for headers in QtCore QtConcurrent QtTest QtNetwork QtXml QtSql QtGui QtWidgets QtDBus QtPrintSupport QtOpenGL; do - %fdupes -s %{buildroot}%{libqt5_includedir}/$headers -done - %post -n libQt5Core5 -p /sbin/ldconfig %post -n libQt5Concurrent5 -p /sbin/ldconfig ++++++ fix-drag-and-drop-regression.patch ++++++ From: Gatis Paeglis <gatis.paeglis(a)theqtcompany.com> Date: Wed, 07 Jan 2015 12:51:38 +0000 Subject: Fix drag and drop regression X-Git-Url: http://quickgit.kde.org/?p=qt%2Fqtbase.git&a=commitdiff&h=3c21c4581dbd957d9… --- Fix drag and drop regression Fix regression introduced by e4becdc3d310a0dd1a6d34d0796a52b21dedeb2d Add QPlatformDrag::ownsDragObject() function, QDragManager can use the return value of this function to decide if it should take care of deleting QDrag object or platform plugin will take care of deleting QDrag. XCB platform plugins uses async dnd data delivery mechanism. It allows user to drop something and then continue working with the assurance that the target will get the data regardless of how slow the network connections are, which means that a source window should preserve QDrag data until dnd has finished. Change-Id: I1fbad7380cddec98b756698993dd397409833150 Task-number: QTBUG-43436 Reviewed-by: Friedemann Kleint <Friedemann.Kleint(a)theqtcompany.com> --- --- a/src/gui/kernel/qdnd.cpp +++ b/src/gui/kernel/qdnd.cpp @@ -134,7 +134,8 @@ QGuiApplicationPrivate::instance()->notifyDragStarted(o); const Qt::DropAction result = m_platformDrag->drag(m_object); m_object = 0; - o->deleteLater(); + if (!m_platformDrag->ownsDragObject()) + o->deleteLater(); return result; } --- a/src/gui/kernel/qplatformdrag.cpp +++ b/src/gui/kernel/qplatformdrag.cpp @@ -241,6 +241,18 @@ return *qt_drag_default_pixmap(); } +/*! + \since 5.4 + \brief Returns bool indicating whether QPlatformDrag takes ownership + and therefore responsibility of deleting the QDrag object passed in + from QPlatformDrag::drag. This can be useful on platforms where QDrag + object has to be kept around. + */ +bool QPlatformDrag::ownsDragObject() const +{ + return false; +} + #endif // QT_NO_DRAGANDDROP QT_END_NAMESPACE --- a/src/gui/kernel/qplatformdrag.h +++ b/src/gui/kernel/qplatformdrag.h @@ -98,6 +98,8 @@ static QPixmap defaultPixmap(); + virtual bool ownsDragObject() const; + private: QPlatformDragPrivate *d_ptr; --- a/src/plugins/platforms/xcb/qxcbdrag.cpp +++ b/src/plugins/platforms/xcb/qxcbdrag.cpp @@ -999,6 +999,8 @@ if (at != -1) { Transaction t = transactions.takeAt(at); + if (t.drag) + t.drag->deleteLater(); // QDragManager *manager = QDragManager::self(); // Window target = current_target; @@ -1186,6 +1188,11 @@ } } +bool QXcbDrag::ownsDragObject() const +{ + return true; +} + QXcbDropData::QXcbDropData(QXcbDrag *d) : QXcbMime(), drag(d) --- a/src/plugins/platforms/xcb/qxcbdrag.h +++ b/src/plugins/platforms/xcb/qxcbdrag.h @@ -70,12 +70,11 @@ virtual QMimeData *platformDropData(); - - void startDrag(); - void cancel(); - void move(const QMouseEvent *me); - void drop(const QMouseEvent *me); - void endDrag(); + void startDrag() Q_DECL_OVERRIDE; + void cancel() Q_DECL_OVERRIDE; + void move(const QMouseEvent *me) Q_DECL_OVERRIDE; + void drop(const QMouseEvent *me) Q_DECL_OVERRIDE; + void endDrag() Q_DECL_OVERRIDE; void handleEnter(QWindow *window, const xcb_client_message_event_t *event); void handlePosition(QWindow *w, const xcb_client_message_event_t *event); @@ -87,6 +86,7 @@ void handleFinished(const xcb_client_message_event_t *event); bool dndEnable(QXcbWindow *win, bool on); + bool ownsDragObject() const Q_DECL_OVERRIDE; void updatePixmap(); xcb_timestamp_t targetTime() { return target_time; } ++++++ libqt5-qtbase-rpmlintrc ++++++ addFilter("files-duplicated-waste .*") addFilter("files-duplicate .*")++++++ make-qdbusxml2cpp-output-reproducible.patch ++++++ --- src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp.old 2014-12-05 17:24:31.000000000 +0100 +++ src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp 2015-02-03 16:11:26.574739176 +0100 @@ -32,7 +32,6 @@ ****************************************************************************/ #include <qbytearray.h> -#include <qdatetime.h> #include <qdebug.h> #include <qfile.h> #include <qfileinfo.h> @@ -58,7 +57,6 @@ static QString parentClassName; static QString proxyFile; static QString adaptorFile; static QString inputFile; -static QDateTime classCreationTime; static bool skipNamespaces; static bool verbose; static bool includeMocs; @@ -212,10 +210,8 @@ static QDBusIntrospection::Interfaces re QFile input(inputFile); if (inputFile.isEmpty() || inputFile == QLatin1String("-")) { input.open(stdin, QIODevice::ReadOnly); - classCreationTime = QDateTime::currentDateTime(); } else { input.open(QIODevice::ReadOnly); - classCreationTime = QFileInfo(input).lastModified(); } QByteArray data = input.readAll(); @@ -551,9 +547,8 @@ static void writeProxy(const QString &fi } else { includeGuard = QLatin1String("QDBUSXML2CPP_PROXY"); } - includeGuard = QString(QLatin1String("%1_%2")) - .arg(includeGuard) - .arg(classCreationTime.toTime_t()); + includeGuard = QString(QLatin1String("%1")) + .arg(includeGuard); hs << "#ifndef " << includeGuard << endl << "#define " << includeGuard << endl << endl; @@ -859,9 +854,8 @@ static void writeAdaptor(const QString & } else { includeGuard = QLatin1String("QDBUSXML2CPP_ADAPTOR"); } - includeGuard = QString(QLatin1String("%1_%2")) - .arg(includeGuard) - .arg(QDateTime::currentDateTime().toTime_t()); + includeGuard = QString(QLatin1String("%1")) + .arg(includeGuard); hs << "#ifndef " << includeGuard << endl << "#define " << includeGuard << endl << endl; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mkfontscale for openSUSE:Factory
by root＠hilbert.suse.de 06 Feb '15

06 Feb '15

Hello community, here is the log from the commit of package mkfontscale for openSUSE:Factory checked in at 2015-02-06 10:19:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mkfontscale (Old) and /work/SRC/openSUSE:Factory/.mkfontscale.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mkfontscale" Changes: -------- --- /work/SRC/openSUSE:Factory/mkfontscale/mkfontscale.changes 2013-08-19 13:30:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mkfontscale.new/mkfontscale.changes 2015-02-06 10:19:11.000000000 +0100 @@ -1,0 +2,16 @@ +Mon Feb 2 23:53:41 UTC 2015 - zaitor(a)opensuse.org + +- Update to version 1.1.2: + + Remove extraneous duplicate checks for -r & -n options. + + autogen.sh: Honor NOCONFIGURE=1. + + configure: Drop AM_MAINTAINER_MODE. + + Only include config.h if it exists. + + Fix possible malloc allocation error found by clang static + analysis. + + Plug a memory leak found by clang static analysis. + + Print which option was in error along with usage message. + + Make usage() always exit(1). + + Add -v flag to print program version. + + Add missing newline to usage output. + +------------------------------------------------------------------- Old: ---- mkfontscale-1.1.1.tar.bz2 New: ---- mkfontscale-1.1.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkfontscale.spec ++++++ --- /var/tmp/diff_new_pack.lNqHof/_old 2015-02-06 10:19:11.000000000 +0100 +++ /var/tmp/diff_new_pack.lNqHof/_new 2015-02-06 10:19:11.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package mkfontscale # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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: mkfontscale -Version: 1.1.1 +Version: 1.1.2 Release: 0 Summary: Utility to create index of scalable font files for X License: MIT @@ -29,7 +29,7 @@ BuildRequires: pkgconfig(fontenc) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(xorg-macros) >= 1.8 -BuildRequires: pkgconfig(xproto) +BuildRequires: pkgconfig(xproto) >= 7.0.25 # This was part of the xorg-x11 package up to version 7.6 Conflicts: xorg-x11 <= 7.6 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -40,7 +40,6 @@ %prep %setup -q -##%%patch0 -p1 %build %configure ++++++ mkfontscale-1.1.1.tar.bz2 -> mkfontscale-1.1.2.tar.bz2 ++++++ ++++ 4204 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/mkfontscale-1.1.1/ChangeLog new/mkfontscale-1.1.2/ChangeLog --- old/mkfontscale-1.1.1/ChangeLog 2013-07-17 07:53:19.000000000 +0200 +++ new/mkfontscale-1.1.2/ChangeLog 2015-01-17 08:41:09.000000000 +0100 @@ -1,3 +1,118 @@ +commit 87d628f8eec170ec13bb9feefb1ce05aed07d1d6 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Fri Jan 16 23:40:40 2015 -0800 + + mkfontscale 1.1.2 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 47908fd7a0d061fdcd21e3498da4e223ca9136d9 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Fri Jun 20 23:23:54 2014 -0700 + + Remove extraneous duplicate checks for -r & -n options + + Flagged by cppcheck 1.65: + [mkfontscale.c:247]: (style) Expression is always false because + 'else if' condition matches previous condition at line 224. + [mkfontscale.c:245]: (style) Expression is always false because + 'else if' condition matches previous condition at line 227. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + Reviewed-by: Hans de Goede <hdegoede(a)redhat.com> + +commit 48e541dc2f2fc3f4e99d3e168c28241ff5adff4d +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Mon Jun 2 19:39:49 2014 -0700 + + autogen.sh: Honor NOCONFIGURE=1 + + See http://people.gnome.org/~walters/docs/build-api.txt + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit f14019d598c215e09cff88c739bbf7f4d6c6b89f +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Mon Jun 2 19:39:49 2014 -0700 + + configure: Drop AM_MAINTAINER_MODE + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 399db42a151687f1181ae23d28a76d31125a2853 +Author: Thomas Klausner <wiz(a)NetBSD.org> +Date: Tue Mar 18 23:14:47 2014 +0100 + + Only include config.h if it exists. + + Reviewed-by: Gaetan Nadon <memsize(a)videotron.ca> + Signed-off-by: Thomas Klausner <wiz(a)NetBSD.org> + +commit eac564e0fc9052a39981ea47b271f7f3d2821944 +Author: Jeremy Huddleston Sequoia <jeremyhu(a)apple.com> +Date: Thu Jan 2 00:43:14 2014 -0800 + + Fix possible malloc allocation error found by clang static analysis + + list.c:238:23: warning: Call to 'malloc' has an allocation size of 0 bytes + ListPtr *sorted = malloc(l * sizeof(ListPtr)); + ^~~~~~~~~~~~~~~~~~~~~~~~~~~ + + Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu(a)apple.com> + +commit 423ffbe9c5552dfeffa81bb6e2f2b62ab6b17580 +Author: Jeremy Huddleston Sequoia <jeremyhu(a)apple.com> +Date: Thu Jan 2 00:39:25 2014 -0800 + + Plug a memory leak found by clang static analysis + + mkfontscale.c:635:25: warning: Potential leak of memory pointed to by 'notice' + foundry = notice_foundry(notice); + ~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~ + mkfontscale.c:640:8: warning: Potential leak of memory pointed to by 'notice' + if(strcmp(slant, "i") == 0) { + ^~~~~~ + + Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu(a)apple.com> + +commit 880a0c4733e62e54e6a0f1238c7430727d23657b +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Fri Nov 8 23:48:28 2013 -0800 + + Print which option was in error along with usage message + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + Reviewed-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 26c89de6cdf0a5b7122a630a5df37fd67a4163e2 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Fri Nov 8 23:28:16 2013 -0800 + + Make usage() always exit(1) + + Avoid duplicating exit(1) calls after every single call to usage() + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + Reviewed-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 43ab9b11699acadbf09b8ed050a7a2f7e630dce4 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Fri Nov 8 23:21:32 2013 -0800 + + Add -v flag to print program version + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + Reviewed-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit e5788db7f179bf89d2e5e3c97c69058027cb93bd +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Fri Nov 8 22:56:02 2013 -0800 + + Add missing newline to usage output + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + Reviewed-by: Gaetan Nadon <memsize(a)videotron.ca> + commit f48de13423c7300f4da9f61993b624426b38ddc0 Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> Date: Tue Jul 16 22:50:54 2013 -0700 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/mkfontscale-1.1.1/INSTALL new/mkfontscale-1.1.2/INSTALL --- old/mkfontscale-1.1.1/INSTALL 2013-07-17 07:53:19.000000000 +0200 +++ new/mkfontscale-1.1.2/INSTALL 2015-01-17 08:41:09.000000000 +0100 @@ -1,11 +1,13 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, +Inc. - This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. + Copying and distribution of this file, with or without modification, +are permitted in any medium without royalty provided the copyright +notice and this notice are preserved. This file is offered as-is, +without warranty of any kind. Basic Installation ================== @@ -13,7 +15,11 @@ Briefly, the shell commands `./configure; make; make install' should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for -instructions specific to this package. +instructions specific to this package. Some packages provide this +`INSTALL' file but do not implement all of the features documented +below. The lack of an optional feature in a given package is not +necessarily a bug. More recommendations for GNU packages can be found +in *note Makefile Conventions: (standards)Makefile Conventions. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -42,7 +48,7 @@ you want to change it or regenerate `configure' using a newer version of `autoconf'. -The simplest way to compile this package is: + The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type `./configure' to configure the package for your system. @@ -53,12 +59,22 @@ 2. Type `make' to compile the package. 3. Optionally, type `make check' to run any self-tests that come with - the package. + the package, generally using the just-built uninstalled binaries. 4. Type `make install' to install the programs and any data files and - documentation. + documentation. When installing into a prefix owned by root, it is + recommended that the package be configured and built as a regular + user, and only the `make install' phase executed with root + privileges. + + 5. Optionally, type `make installcheck' to repeat any self-tests, but + this time using the binaries in their final installed location. + This target does not install anything. Running this target as a + regular user, particularly if the prior `make install' required + root privileges, verifies that the installation completed + correctly. - 5. You can remove the program binaries and object files from the + 6. You can remove the program binaries and object files from the source code directory by typing `make clean'. To also remove the files that `configure' created (so you can compile the package for a different kind of computer), type `make distclean'. There is @@ -67,8 +83,15 @@ all sorts of other programs in order to regenerate files that came with the distribution. - 6. Often, you can also type `make uninstall' to remove the installed - files again. + 7. Often, you can also type `make uninstall' to remove the installed + files again. In practice, not all packages have tested that + uninstallation works correctly, even though it is required by the + GNU Coding Standards. + + 8. Some packages, particularly those that use Automake, provide `make + distcheck', which can by used by developers to test that all other + targets like `make install' and `make uninstall' work correctly. + This target is generally not run by end users. Compilers and Options ===================== @@ -93,7 +116,8 @@ own directory. To do this, you can use GNU `make'. `cd' to the directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. +source code in the directory that `configure' is in and in `..'. This +is known as a "VPATH" build. With a non-GNU `make', it is safer to compile the package for one architecture at a time in the source code directory. After you have @@ -120,7 +144,8 @@ By default, `make install' installs the package's commands under `/usr/local/bin', include files under `/usr/local/include', etc. You can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX'. +`configure' the option `--prefix=PREFIX', where PREFIX must be an +absolute file name. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you @@ -131,15 +156,46 @@ In addition, if you use an unusual directory layout you can give options like `--bindir=DIR' to specify different values for particular kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. +you can set and what kinds of files go in them. In general, the +default for these options is expressed in terms of `${prefix}', so that +specifying just `--prefix' will affect all of the other directory +specifications that were not explicitly provided. + + The most portable way to affect installation locations is to pass the +correct locations to `configure'; however, many packages provide one or +both of the following shortcuts of passing variable assignments to the +`make install' command line to change installation locations without +having to reconfigure or recompile. + + The first method involves providing an override variable for each +affected directory. For example, `make install +prefix=/alternate/directory' will choose an alternate location for all +directory configuration variables that were expressed in terms of +`${prefix}'. Any directories that were specified during `configure', +but not in terms of `${prefix}', must each be overridden at install +time for the entire installation to be relocated. The approach of +makefile variable overrides for each directory variable is required by +the GNU Coding Standards, and ideally causes no recompilation. +However, some platforms have known limitations with the semantics of +shared libraries that end up requiring recompilation when using this +method, particularly noticeable in packages that use GNU Libtool. + + The second method involves providing the `DESTDIR' variable. For +example, `make install DESTDIR=/alternate/directory' will prepend +`/alternate/directory' before all installation names. The approach of +`DESTDIR' overrides is not required by the GNU Coding Standards, and +does not work on platforms that have drive letters. On the other hand, +it does better at avoiding recompilation issues, and works well even +when some directory options were not specified in terms of `${prefix}' +at `configure' time. + +Optional Features +================= If the package supports it, you can cause programs to be installed with an extra prefix or suffix on their names by giving `configure' the option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. -Optional Features -================= - Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE @@ -152,6 +208,13 @@ you can use the `configure' options `--x-includes=DIR' and `--x-libraries=DIR' to specify their locations. + Some packages offer the ability to configure how verbose the +execution of `make' will be. For these packages, running `./configure +--enable-silent-rules' sets the default to minimal output, which can be +overridden with `make V=1'; while running `./configure +--disable-silent-rules' sets the default to verbose, which can be +overridden with `make V=0'. + Particular systems ================== @@ -159,10 +222,15 @@ CC is not installed, it is recommended to use the following options in order to use an ANSI C compiler: - ./configure CC="cc -Ae" + ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" and if that doesn't work, install pre-built binaries of GCC for HP-UX. + HP-UX `make' updates targets which have the same time stamps as +their prerequisites, which makes it generally unusable when shipped +generated files such as `configure' are involved. Use GNU `make' +instead. + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot parse its `<wchar.h>' header file. The option `-nodtk' can be used as a workaround. If GNU CC is not installed, it is therefore recommended @@ -174,6 +242,16 @@ ./configure CC="cc -nodtk" + On Solaris, don't put `/usr/ucb' early in your `PATH'. This +directory contains several dysfunctional programs; working variants of +these programs are available in `/usr/bin'. So, if you need `/usr/ucb' +in your `PATH', put it _after_ `/usr/bin'. + + On Haiku, software installed for all users goes in `/boot/common', +not `/usr/local'. It is recommended to use the following options: + + ./configure --prefix=/boot/common + Specifying the System Type ========================== @@ -189,7 +267,8 @@ where SYSTEM can have one of these forms: - OS KERNEL-OS + OS + KERNEL-OS See the file `config.sub' for the possible values of each field. If `config.sub' isn't included in this package, then this package doesn't @@ -277,7 +356,7 @@ `configure' can determine that directory automatically. `--prefix=DIR' - Use DIR as the installation prefix. *Note Installation Names:: + Use DIR as the installation prefix. *note Installation Names:: for more details, including other options available for fine-tuning the installation locations. 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/mkfontscale-1.1.1/compile new/mkfontscale-1.1.2/compile --- old/mkfontscale-1.1.1/compile 2013-07-17 07:51:10.000000000 +0200 +++ new/mkfontscale-1.1.2/compile 2015-01-17 08:40:50.000000000 +0100 @@ -3,7 +3,7 @@ scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # Written by Tom Tromey <tromey(a)cygnus.com>. # # This program is free software; you can redistribute it and/or modify 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/mkfontscale-1.1.1/configure.ac new/mkfontscale-1.1.2/configure.ac --- old/mkfontscale-1.1.1/configure.ac 2013-07-17 07:51:03.000000000 +0200 +++ new/mkfontscale-1.1.2/configure.ac 2015-01-17 08:40:45.000000000 +0100 @@ -22,7 +22,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([mkfontscale], [1.1.1], +AC_INIT([mkfontscale], [1.1.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [mkfontscale]) AC_CONFIG_SRCDIR([Makefile.am]) @@ -31,7 +31,6 @@ # Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) -AM_MAINTAINER_MODE # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS m4_ifndef([XORG_MACROS_VERSION], @@ -54,7 +53,7 @@ # Checks for pkg-config packages PKG_CHECK_MODULES(MKFONTSCALE, fontenc freetype2) -PKG_CHECK_MODULES(X11, xproto) +PKG_CHECK_MODULES(X11, [xproto >= 7.0.25]) dnl Allow checking code with lint, sparse, etc. XORG_WITH_LINT 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/mkfontscale-1.1.1/hash.c new/mkfontscale-1.1.2/hash.c --- old/mkfontscale-1.1.1/hash.c 2013-07-17 07:51:03.000000000 +0200 +++ new/mkfontscale-1.1.2/hash.c 2015-01-17 08:40:45.000000000 +0100 @@ -20,7 +20,9 @@ THE SOFTWARE. */ +#ifdef HAVE_CONFIG_H #include "config.h" +#endif #include <stdlib.h> #include <stdio.h> 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/mkfontscale-1.1.1/list.c new/mkfontscale-1.1.2/list.c --- old/mkfontscale-1.1.1/list.c 2013-07-17 07:51:03.000000000 +0200 +++ new/mkfontscale-1.1.2/list.c 2015-01-17 08:40:45.000000000 +0100 @@ -235,7 +235,12 @@ int i; int l = listLength(old); ListPtr n; - ListPtr *sorted = malloc(l * sizeof(ListPtr)); + ListPtr *sorted; + + if (l <= 0) + return old; + + sorted = malloc(l * sizeof(ListPtr)); if (sorted == NULL) return old; 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/mkfontscale-1.1.1/man/mkfontscale.man new/mkfontscale-1.1.2/man/mkfontscale.man --- old/mkfontscale-1.1.1/man/mkfontscale.man 2013-07-17 07:51:03.000000000 +0200 +++ new/mkfontscale-1.1.2/man/mkfontscale.man 2015-01-17 08:40:45.000000000 +0100 @@ -38,6 +38,8 @@ ] [ .B \-u | \-U ] [ +.B \-v +] [ .B \-\- ] [ .I directory @@ -132,6 +134,9 @@ disable (\fI-u\fP) or enable (\fI-U\fP) indexing of ISO 10646:1 font encodings (default: enabled). .TP +.B \-v +print program version and exit. +.TP .B \-\- end of options. .SH SEE ALSO 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/mkfontscale-1.1.1/missing new/mkfontscale-1.1.2/missing --- old/mkfontscale-1.1.1/missing 2013-07-17 07:51:11.000000000 +0200 +++ new/mkfontscale-1.1.2/missing 2015-01-17 08:40:50.000000000 +0100 @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-06-26.16; # UTC +scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -160,7 +160,7 @@ ;; autom4te*) echo "You might have modified some maintainer files that require" - echo "the 'automa4te' program to be rebuilt." + echo "the 'autom4te' program to be rebuilt." program_details 'autom4te' ;; bison*|yacc*) 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/mkfontscale-1.1.1/mkfontscale.c new/mkfontscale-1.1.2/mkfontscale.c --- old/mkfontscale-1.1.1/mkfontscale.c 2013-07-17 07:51:03.000000000 +0200 +++ new/mkfontscale-1.1.2/mkfontscale.c 2015-01-17 08:40:45.000000000 +0100 @@ -20,7 +20,9 @@ THE SOFTWARE. */ +#ifdef HAVE_CONFIG_H #include "config.h" +#endif #include <stdio.h> #include <stdlib.h> @@ -34,6 +36,7 @@ #include <ctype.h> #include <X11/Xos.h> +#include <X11/Xfuncproto.h> #include <X11/fonts/fontenc.h> #include <ft2build.h> #include FT_FREETYPE_H @@ -112,15 +115,24 @@ static int reencodeLegacy; static char *encodingPrefix; static char *exclusionSuffix; +static char *ProgramName; -static void +static void _X_NORETURN _X_COLD usage(void) { - fprintf(stderr, + fprintf(stderr, "Usage:\n" "mkfontscale [ -b ] [ -s ] [ -o filename ] [-x suffix ]\n" - " [ -a encoding ] [ -f fuzz ] [ -l ] " + " [ -a encoding ] [ -f fuzz ] [ -l ]\n" " [ -e directory ] [ -p prefix ] [ -n ] [ -r ] \n" - " [-u] [-U] [ directory ]...\n"); + " [-u] [-U] [-v] [ directory ]...\n"); + exit(1); +} + +static void _X_NORETURN _X_COLD +missing_arg (const char *option) +{ + fprintf(stderr, "%s: %s requires an argument\n", ProgramName, option); + usage(); } int @@ -131,6 +143,7 @@ int rc, ll = 0; char prefix[NPREFIX]; + ProgramName = argv[0]; encodingPrefix = NULL; exclusionSuffix = NULL; @@ -166,34 +179,31 @@ break; } else if (strcmp(argv[argn], "-x") == 0) { if(argn >= argc - 1) { - usage(); - exit(1); + missing_arg("-x"); } exclusionSuffix = argv[argn + 1]; argn += 2; } else if(strcmp(argv[argn], "-a") == 0) { if(argn >= argc - 1) { - usage(); - exit(1); + missing_arg("-a"); } makeList(&argv[argn + 1], 1, encodings, 0); argn += 2; } else if(strcmp(argv[argn], "-p") == 0) { if(argn >= argc - 1) { - usage(); - exit(1); + missing_arg("-p"); } if(strlen(argv[argn + 1]) > NPREFIX - 1) { + fprintf(stderr, "%s: argument to -p cannot be longer than " + "%d characters\n", ProgramName, NPREFIX - 1); usage(); - exit(1); } free(encodingPrefix); encodingPrefix = dsprintf("%s", argv[argn + 1]); argn += 2; } else if(strcmp(argv[argn], "-e") == 0) { if(argn >= argc - 1) { - usage(); - exit(1); + missing_arg("-e"); } rc = readEncodings(encodingsToDo, argv[argn + 1]); if(rc < 0) @@ -222,25 +232,21 @@ argn++; } else if(strcmp(argv[argn], "-o") == 0) { if(argn >= argc - 1) { - usage(); - exit(1); + missing_arg("-o"); } outfilename = argv[argn + 1]; argn += 2; } else if(strcmp(argv[argn], "-f") == 0) { if(argn >= argc - 1) { - usage(); - exit(1); + missing_arg("-f"); } bigEncodingFuzz = atof(argv[argn + 1]) / 100.0; argn += 2; - } else if (strcmp(argv[argn], "-r") == 0) { /* ignore for now */ - argn++; - } else if (strcmp(argv[argn], "-n") == 0) { - argn++; + } else if (strcmp(argv[argn], "-v") == 0) { + printf("%s\n", PACKAGE_STRING); + exit(0); } else { usage(); - exit(1); } } @@ -482,7 +488,7 @@ i++; } - if(safe_flag) return s; + if(safe_flag) return strdup(s); len = i; t = malloc(len + 1); @@ -506,7 +512,7 @@ { ListPtr xlfd = NULL; const char *foundry, *family, *weight, *slant, *sWidth, *adstyle, - *spacing, *full_name; + *spacing, *full_name, *tmp; TT_Header *head; TT_HoriHeader *hhea; TT_OS2 *os2; @@ -574,11 +580,11 @@ if(t1info) { if(!family) - family = t1info->family_name; + family = strdup(t1info->family_name); if(!family) - family = t1info->full_name; + family = strdup(t1info->full_name); if(!full_name) - full_name = t1info->full_name; + full_name = strdup(t1info->full_name); if(!foundry) foundry = notice_foundry(t1info->notice); if(!weight) @@ -595,7 +601,7 @@ if(!full_name) { fprintf(stderr, "Couldn't determine full name for %s\n", filename); - full_name = filename; + full_name = strdup(filename); } if(head) { @@ -620,11 +626,13 @@ notice = getName(face, TT_NAME_ID_TRADEMARK); if(notice) { foundry = notice_foundry(notice); + free(notice); } if(!foundry) { notice = getName(face, TT_NAME_ID_MANUFACTURER); if(notice) { foundry = notice_foundry(notice); + free(notice); } } } @@ -642,7 +650,7 @@ if(!foundry) foundry = "misc"; if(!family) { fprintf(stderr, "Couldn't get family name for %s\n", filename); - family = filename; + family = strdup(filename); } if(!weight) weight = "medium"; @@ -651,9 +659,11 @@ if(!adstyle) adstyle = ""; if(!spacing) spacing = "p"; - /* Yes, it's a memory leak. */ foundry = safe(foundry); + + tmp = family; family = safe(family); + free((void *)tmp); if(!isBitmap) { xlfd = listConsF(xlfd, @@ -676,6 +686,10 @@ spacing, 60); } } + + free((void *)family); + free((void *)foundry); + free((void *)full_name); return xlfd; } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit apache2 for openSUSE:Factory
by root＠hilbert.suse.de 06 Feb '15

06 Feb '15

Hello community, here is the log from the commit of package apache2 for openSUSE:Factory checked in at 2015-02-06 10:18:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apache2 (Old) and /work/SRC/openSUSE:Factory/.apache2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "apache2" Changes: -------- --- /work/SRC/openSUSE:Factory/apache2/apache2.changes 2015-01-22 21:48:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.apache2.new/apache2.changes 2015-02-06 10:18:46.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 3 15:12:04 UTC 2015 - pgajdos(a)suse.com + +- httpd2.pid in rc.apache2 was wrong [bnc#898193] + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rc.apache2 ++++++ --- /var/tmp/diff_new_pack.FWK2Qj/_old 2015-02-06 10:18:49.000000000 +0100 +++ /var/tmp/diff_new_pack.FWK2Qj/_new 2015-02-06 10:18:49.000000000 +0100 @@ -29,7 +29,7 @@ : ${sysconfdir:=/etc/$pname} : ${apache_link:=/usr/sbin/httpd2} : ${sysconfig_apache:=/etc/sysconfig/$pname} -: ${pidfile:=/var/run/httpd2.pid} +: ${pidfile:=/var/run/httpd.pid} : ${logdir:=/var/log/$pname} : ${homedir:=/var/lib/$pname} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Alien-Tidyp for openSUSE:Factory
by root＠hilbert.suse.de 06 Feb '15

06 Feb '15

Hello community, here is the log from the commit of package perl-Alien-Tidyp for openSUSE:Factory checked in at 2015-02-06 10:18:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Alien-Tidyp (Old) and /work/SRC/openSUSE:Factory/.perl-Alien-Tidyp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Alien-Tidyp" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Alien-Tidyp/perl-Alien-Tidyp.changes 2012-12-05 14:02:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Alien-Tidyp.new/perl-Alien-Tidyp.changes 2015-02-06 10:18:21.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 3 15:11:56 UTC 2015 - coolo(a)suse.com + +- require fix in latest module::build (boo#915943) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Alien-Tidyp.spec ++++++ --- /var/tmp/diff_new_pack.uQZXF2/_old 2015-02-06 10:18:22.000000000 +0100 +++ /var/tmp/diff_new_pack.uQZXF2/_new 2015-02-06 10:18:22.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package perl-Alien-Tidyp # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -27,33 +27,25 @@ Source: http://www.cpan.org/authors/id/K/KM/KMX/%{cpan_name}-v%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build -# MANUAL -BuildRequires: libtidyp-devel BuildRequires: perl BuildRequires: perl-macros BuildRequires: perl(Archive::Extract) BuildRequires: perl(Digest::SHA) BuildRequires: perl(ExtUtils::CBuilder) -BuildRequires: perl(ExtUtils::Command) -BuildRequires: perl(ExtUtils::Liblist) -BuildRequires: perl(File::Copy) BuildRequires: perl(File::Fetch) -BuildRequires: perl(File::Path) BuildRequires: perl(File::ShareDir) >= 1.00 -BuildRequires: perl(File::Spec) -BuildRequires: perl(File::Temp) -BuildRequires: perl(Module::Build) -BuildRequires: perl(Module::Build) -BuildRequires: perl(Test::More) +BuildRequires: perl(Module::Build) >= 0.4211 Requires: perl(File::ShareDir) >= 1.00 -Requires: perl(File::Spec) %{perl_requires} +# MANUAL +BuildRequires: libtidyp-devel %description Building, finding and using tidyp library - L<http://www.tidyp.com> %prep %setup -q -n %{cpan_name}-v%{version} +find . -type f -print0 | xargs -0 chmod 644 %build %{__perl} Build.PL installdirs=vendor @@ -66,9 +58,6 @@ ./Build install destdir=%{buildroot} create_packlist=0 %perl_gen_filelist -%clean -%{__rm} -rf %{buildroot} - %files -f %{name}.files %defattr(-,root,root,755) %doc Changes patches README sharedir TODO -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Module-Build for openSUSE:Factory
by root＠hilbert.suse.de 06 Feb '15

06 Feb '15

Hello community, here is the log from the commit of package perl-Module-Build for openSUSE:Factory checked in at 2015-02-06 10:17:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Module-Build (Old) and /work/SRC/openSUSE:Factory/.perl-Module-Build.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Module-Build" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Module-Build/perl-Module-Build.changes 2014-12-29 00:33:15.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Module-Build.new/perl-Module-Build.changes 2015-02-06 10:17:57.000000000 +0100 @@ -1,0 +2,18 @@ +Tue Feb 3 16:07:00 UTC 2015 - coolo(a)suse.com + +- add make-builds-reproducible.patch to sort the config data + +------------------------------------------------------------------- +Tue Feb 3 15:55:41 UTC 2015 - coolo(a)suse.com + +- updated to 0.4211 + [BUG FIXES] + - Fix t/actions/installdeps.t to work on "perl in space" [Ed J] + - Stop using version->normal(); prefer stringify() [John Peacock] + + [DEPRECATIONS] + - inc::latest has been split out to a separate distribution on CPAN. + It is an optional prerequisite, only needed for the experimental + bundling feature. + +------------------------------------------------------------------- Old: ---- Module-Build-0.4210.tar.gz New: ---- Module-Build-0.4211.tar.gz make-builds-reproducible.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Module-Build.spec ++++++ --- /var/tmp/diff_new_pack.EpwgZI/_old 2015-02-06 10:17:58.000000000 +0100 +++ /var/tmp/diff_new_pack.EpwgZI/_new 2015-02-06 10:17:58.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package perl-Module-Build # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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: perl-Module-Build -Version: 0.4210 +Version: 0.4211 Release: 0 %define cpan_name Module-Build Summary: Build and install Perl modules @@ -25,11 +25,12 @@ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/Module-Build/ Source: http://www.cpan.org/authors/id/L/LE/LEONT/%{cpan_name}-%{version}.tar.gz +Patch0: make-builds-reproducible.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros -BuildRequires: perl(CPAN::Meta) >= 2.141170 +BuildRequires: perl(CPAN::Meta) >= 2.142060 BuildRequires: perl(CPAN::Meta::YAML) >= 0.003 BuildRequires: perl(ExtUtils::CBuilder) >= 0.27 BuildRequires: perl(ExtUtils::ParseXS) >= 2.21 @@ -39,7 +40,7 @@ BuildRequires: perl(Pod::Man) >= 2.17 BuildRequires: perl(Test::Harness) >= 3.16 BuildRequires: perl(version) >= 0.87 -Requires: perl(CPAN::Meta) >= 2.141170 +Requires: perl(CPAN::Meta) >= 2.142060 Requires: perl(ExtUtils::CBuilder) >= 0.27 Requires: perl(ExtUtils::ParseXS) >= 2.21 Requires: perl(Module::Metadata) >= 1.000002 @@ -60,10 +61,45 @@ See the "MOTIVATIONS" manpage for more comparisons between 'ExtUtils::MakeMaker' and 'Module::Build'. +To install 'Module::Build', and any other module that uses 'Module::Build' +for its installation process, do the following: + + perl Build.PL # 'Build.PL' script creates the 'Build' script + ./Build # Need ./ to ensure we're using this "Build" script + ./Build test # and not another one that happens to be in the PATH + ./Build install + +This illustrates initial configuration and the running of three 'actions'. +In this case the actions run are 'build' (the default action), 'test', and +'install'. Other actions defined so far include: + + build manifest + clean manifest_skip + code manpages + config_data pardist + diff ppd + dist ppmdist + distcheck prereq_data + distclean prereq_report + distdir pure_install + distinstall realclean + distmeta retest + distsign skipcheck + disttest test + docs testall + fakeinstall testcover + help testdb + html testpod + install testpodcoverage + installdeps versioninstall + +You can run the 'help' action for a complete list of actions. + %prep %setup -q -n %{cpan_name}-%{version} +# MANUAL +%patch0 -p1 find . -type f -print0 | xargs -0 chmod 644 -sed -i "s|^use warnings;.*|use warnings;\nuse lib '%{perl_vendorlib}';\n|g" lib/Module/Build/Base.pm %build %{__perl} Build.PL installdirs=vendor ++++++ Module-Build-0.4210.tar.gz -> Module-Build-0.4211.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Module-Build-0.4210/Build.PL new/Module-Build-0.4211/Build.PL --- old/Module-Build-0.4210/Build.PL 2014-09-01 16:15:58.000000000 +0200 +++ new/Module-Build-0.4211/Build.PL 2015-01-20 01:37:51.000000000 +0100 @@ -60,7 +60,7 @@ 'Getopt::Long' => 0, 'Test::Harness' => 0, 'CPAN::Meta' => '2.142060', - 'Perl::OSType' => 1, # needs 1.0 API + 'Perl::OSType' => ( $^O eq 'bitrig' ? 1.004 : 1 ), # needs 1.0 API 'version' => 0.87, # No longer requires M::B 'Module::Metadata' => 1.000002, # uses version.pm 'Pod::Man' => 2.17, # utf8 support @@ -107,6 +107,7 @@ inc_bundling_support => { description => "Bundle Module::Build in inc/", requires => { + 'inc::latest' => 0.500, # split out from Module::Build 'ExtUtils::Install' => 1.54, # also gets us ExtUtils::Installed 1.999_001 'ExtUtils::Installed' => 1.999, # technically 1.999_001 is what's available }, @@ -126,7 +127,8 @@ meta_merge => { resources => { MailingList => 'mailto:module-build@perl.org', - repository => 'https://github.com/Perl-Toolchain-Gang/Module-Build' + repository => 'https://github.com/Perl-Toolchain-Gang/Module-Build', + IRC => 'irc://irc.perl.org/#toolchain', } }, ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Module-Build-0.4210/Changes new/Module-Build-0.4211/Changes --- old/Module-Build-0.4210/Changes 2014-09-01 16:15:57.000000000 +0200 +++ new/Module-Build-0.4211/Changes 2015-01-20 01:37:51.000000000 +0100 @@ -1,5 +1,19 @@ Revision history for Perl extension Module::Build. +0.4211 - Tue Jan 20 01:33:42 CET 2015 + + [BUG FIXES] + + - Fix t/actions/installdeps.t to work on "perl in space" [Ed J] + + - Stop using version->normal(); prefer stringify() [John Peacock] + + [DEPRECATIONS] + + - inc::latest has been split out to a separate distribution on CPAN. + It is an optional prerequisite, only needed for the experimental + bundling feature. + 0.4210 - Mon Sep 1 13:30:29 CEST 2014 [BUG FIXES] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Module-Build-0.4210/MANIFEST new/Module-Build-0.4211/MANIFEST --- old/Module-Build-0.4210/MANIFEST 2014-09-01 16:15:57.000000000 +0200 +++ new/Module-Build-0.4211/MANIFEST 2015-01-20 01:37:50.000000000 +0100 @@ -7,8 +7,6 @@ inc/Module/Metadata.pm inc/Perl/OSType.pm INSTALL -lib/inc/latest.pm -lib/inc/latest/private.pm lib/Module/Build.pm lib/Module/Build/API.pod lib/Module/Build/Authoring.pod diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Module-Build-0.4210/META.json new/Module-Build-0.4211/META.json --- old/Module-Build-0.4210/META.json 2014-09-01 16:15:57.000000000 +0200 +++ new/Module-Build-0.4211/META.json 2015-01-20 01:37:51.000000000 +0100 @@ -5,7 +5,7 @@ "Module-Build mailing list at <module-build(a)perl.org>." ], "dynamic_config" : 1, - "generated_by" : "Module::Build version 0.421", + "generated_by" : "Module::Build version 0.4211", "license" : [ "perl_5" ], @@ -67,87 +67,79 @@ "provides" : { "Module::Build" : { "file" : "lib/Module/Build.pm", - "version" : "0.4210" + "version" : "0.4211" }, "Module::Build::Base" : { "file" : "lib/Module/Build/Base.pm", - "version" : "0.4210" + "version" : "0.4211" }, "Module::Build::Compat" : { "file" : "lib/Module/Build/Compat.pm", - "version" : "0.4210" + "version" : "0.4211" }, "Module::Build::Config" : { "file" : "lib/Module/Build/Config.pm", - "version" : "0.4210" + "version" : "0.4211" }, "Module::Build::Cookbook" : { "file" : "lib/Module/Build/Cookbook.pm", - "version" : "0.4210" + "version" : "0.4211" }, "Module::Build::Dumper" : { "file" : "lib/Module/Build/Dumper.pm", - "version" : "0.4210" + "version" : "0.4211" }, "Module::Build::Notes" : { "file" : "lib/Module/Build/Notes.pm", - "version" : "0.4210" + "version" : "0.4211" }, "Module::Build::PPMMaker" : { "file" : "lib/Module/Build/PPMMaker.pm", - "version" : "0.4210" + "version" : "0.4211" }, "Module::Build::Platform::Default" : { "file" : "lib/Module/Build/Platform/Default.pm", - "version" : "0.4210" + "version" : "0.4211" }, "Module::Build::Platform::MacOS" : { "file" : "lib/Module/Build/Platform/MacOS.pm", - "version" : "0.4210" + "version" : "0.4211" }, "Module::Build::Platform::Unix" : { "file" : "lib/Module/Build/Platform/Unix.pm", - "version" : "0.4210" + "version" : "0.4211" }, "Module::Build::Platform::VMS" : { "file" : "lib/Module/Build/Platform/VMS.pm", - "version" : "0.4210" + "version" : "0.4211" }, "Module::Build::Platform::VOS" : { "file" : "lib/Module/Build/Platform/VOS.pm", - "version" : "0.4210" + "version" : "0.4211" }, "Module::Build::Platform::Windows" : { "file" : "lib/Module/Build/Platform/Windows.pm", - "version" : "0.4210" + "version" : "0.4211" }, "Module::Build::Platform::aix" : { "file" : "lib/Module/Build/Platform/aix.pm", - "version" : "0.4210" + "version" : "0.4211" }, "Module::Build::Platform::cygwin" : { "file" : "lib/Module/Build/Platform/cygwin.pm", - "version" : "0.4210" + "version" : "0.4211" }, "Module::Build::Platform::darwin" : { "file" : "lib/Module/Build/Platform/darwin.pm", - "version" : "0.4210" + "version" : "0.4211" }, "Module::Build::Platform::os2" : { "file" : "lib/Module/Build/Platform/os2.pm", - "version" : "0.4210" + "version" : "0.4211" }, "Module::Build::PodParser" : { "file" : "lib/Module/Build/PodParser.pm", - "version" : "0.4210" - }, - "inc::latest" : { - "file" : "lib/inc/latest.pm", - "version" : "0.4210" - }, - "inc::latest::private" : { - "file" : "lib/inc/latest/private.pm", - "version" : "0.4210" + "version" : "0.4211" } }, "release_status" : "stable", @@ -158,7 +150,8 @@ "repository" : { "url" : "https://github.com/Perl-Toolchain-Gang/Module-Build" }, + "x_IRC" : "irc://irc.perl.org/#toolchain", "x_MailingList" : "mailto:module-build@perl.org" }, - "version" : "0.4210" + "version" : "0.4211" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Module-Build-0.4210/META.yml new/Module-Build-0.4211/META.yml --- old/Module-Build-0.4210/META.yml 2014-09-01 16:15:57.000000000 +0200 +++ new/Module-Build-0.4211/META.yml 2015-01-20 01:37:51.000000000 +0100 @@ -15,7 +15,7 @@ Perl::OSType: '1' version: '0.87' dynamic_config: 1 -generated_by: 'Module::Build version 0.421, CPAN::Meta::Converter version 2.142060' +generated_by: 'Module::Build version 0.4211, CPAN::Meta::Converter version 2.142060' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -24,67 +24,61 @@ provides: Module::Build: file: lib/Module/Build.pm - version: '0.4210' + version: '0.4211' Module::Build::Base: file: lib/Module/Build/Base.pm - version: '0.4210' + version: '0.4211' Module::Build::Compat: file: lib/Module/Build/Compat.pm - version: '0.4210' + version: '0.4211' Module::Build::Config: file: lib/Module/Build/Config.pm - version: '0.4210' + version: '0.4211' Module::Build::Cookbook: file: lib/Module/Build/Cookbook.pm - version: '0.4210' + version: '0.4211' Module::Build::Dumper: file: lib/Module/Build/Dumper.pm - version: '0.4210' + version: '0.4211' Module::Build::Notes: file: lib/Module/Build/Notes.pm - version: '0.4210' + version: '0.4211' Module::Build::PPMMaker: file: lib/Module/Build/PPMMaker.pm - version: '0.4210' + version: '0.4211' Module::Build::Platform::Default: file: lib/Module/Build/Platform/Default.pm - version: '0.4210' + version: '0.4211' Module::Build::Platform::MacOS: file: lib/Module/Build/Platform/MacOS.pm - version: '0.4210' + version: '0.4211' Module::Build::Platform::Unix: file: lib/Module/Build/Platform/Unix.pm - version: '0.4210' + version: '0.4211' Module::Build::Platform::VMS: file: lib/Module/Build/Platform/VMS.pm - version: '0.4210' + version: '0.4211' Module::Build::Platform::VOS: file: lib/Module/Build/Platform/VOS.pm - version: '0.4210' + version: '0.4211' Module::Build::Platform::Windows: file: lib/Module/Build/Platform/Windows.pm - version: '0.4210' + version: '0.4211' Module::Build::Platform::aix: file: lib/Module/Build/Platform/aix.pm - version: '0.4210' + version: '0.4211' Module::Build::Platform::cygwin: file: lib/Module/Build/Platform/cygwin.pm - version: '0.4210' + version: '0.4211' Module::Build::Platform::darwin: file: lib/Module/Build/Platform/darwin.pm - version: '0.4210' + version: '0.4211' Module::Build::Platform::os2: file: lib/Module/Build/Platform/os2.pm - version: '0.4210' + version: '0.4211' Module::Build::PodParser: file: lib/Module/Build/PodParser.pm - version: '0.4210' - inc::latest: - file: lib/inc/latest.pm - version: '0.4210' - inc::latest::private: - file: lib/inc/latest/private.pm - version: '0.4210' + version: '0.4211' recommends: ExtUtils::Install: '0.3' ExtUtils::Manifest: '1.54' @@ -113,7 +107,8 @@ perl: '5.008000' version: '0.87' resources: + IRC: irc://irc.perl.org/#toolchain MailingList: mailto:module-build@perl.org license: http://dev.perl.org/licenses/ repository: https://github.com/Perl-Toolchain-Gang/Module-Build -version: '0.4210' +version: '0.4211' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Module-Build-0.4210/lib/Module/Build/Base.pm new/Module-Build-0.4211/lib/Module/Build/Base.pm --- old/Module-Build-0.4210/lib/Module/Build/Base.pm 2014-09-01 16:15:57.000000000 +0200 +++ new/Module-Build-0.4211/lib/Module/Build/Base.pm 2015-01-20 01:37:50.000000000 +0100 @@ -6,7 +6,7 @@ use strict; use warnings; -our $VERSION = '0.4210'; +our $VERSION = '0.4211'; $VERSION = eval $VERSION; use Carp; @@ -4582,7 +4582,7 @@ # take as is without modification } elsif ( ref $version eq 'version') { # version objects - $version = $version->is_qv ? $version->normal : $version->stringify; + $version = $version->stringify; } elsif ( $version =~ /^[^v][^.]*\.[^.]+\./ ) { # no leading v, multiple dots # normalize string tuples without "v": "1.2.3" -> "v1.2.3" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Module-Build-0.4210/lib/Module/Build/Bundling.pod new/Module-Build-0.4211/lib/Module/Build/Bundling.pod --- old/Module-Build-0.4210/lib/Module/Build/Bundling.pod 2014-09-01 16:15:57.000000000 +0200 +++ new/Module-Build-0.4211/lib/Module/Build/Bundling.pod 2015-01-20 01:37:50.000000000 +0100 @@ -34,7 +34,7 @@ highest version Module::Build is used, whether this is in C<inc/> or already installed on the user's system. This ensures that all necessary features are available as well as any new bug fixes. This is done using -the new L<inc::latest> module. +the experimental L<inc::latest> module, available on CPAN. A "normal" Build.PL looks like this (with only the minimum required fields): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Module-Build-0.4210/lib/Module/Build/Compat.pm new/Module-Build-0.4211/lib/Module/Build/Compat.pm --- old/Module-Build-0.4210/lib/Module/Build/Compat.pm 2014-09-01 16:15:57.000000000 +0200 +++ new/Module-Build-0.4211/lib/Module/Build/Compat.pm 2015-01-20 01:37:51.000000000 +0100 @@ -2,7 +2,7 @@ use strict; use warnings; -our $VERSION = '0.4210'; +our $VERSION = '0.4211'; use File::Basename (); use File::Spec; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Module-Build-0.4210/lib/Module/Build/Config.pm new/Module-Build-0.4211/lib/Module/Build/Config.pm --- old/Module-Build-0.4210/lib/Module/Build/Config.pm 2014-09-01 16:15:57.000000000 +0200 +++ new/Module-Build-0.4211/lib/Module/Build/Config.pm 2015-01-20 01:37:50.000000000 +0100 @@ -2,7 +2,7 @@ use strict; use warnings; -our $VERSION = '0.4210'; +our $VERSION = '0.4211'; $VERSION = eval $VERSION; use Config; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Module-Build-0.4210/lib/Module/Build/Cookbook.pm new/Module-Build-0.4211/lib/Module/Build/Cookbook.pm --- old/Module-Build-0.4210/lib/Module/Build/Cookbook.pm 2014-09-01 16:15:58.000000000 +0200 +++ new/Module-Build-0.4211/lib/Module/Build/Cookbook.pm 2015-01-20 01:37:50.000000000 +0100 @@ -1,7 +1,7 @@ package Module::Build::Cookbook; use strict; use warnings; -our $VERSION = '0.4210'; +our $VERSION = '0.4211'; =head1 NAME diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Module-Build-0.4210/lib/Module/Build/Dumper.pm new/Module-Build-0.4211/lib/Module/Build/Dumper.pm --- old/Module-Build-0.4210/lib/Module/Build/Dumper.pm 2014-09-01 16:15:58.000000000 +0200 +++ new/Module-Build-0.4211/lib/Module/Build/Dumper.pm 2015-01-20 01:37:50.000000000 +0100 @@ -1,7 +1,7 @@ package Module::Build::Dumper; use strict; use warnings; -our $VERSION = '0.4210'; +our $VERSION = '0.4211'; # This is just a split-out of a wrapper function to do Data::Dumper # stuff "the right way". See: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Module-Build-0.4210/lib/Module/Build/Notes.pm new/Module-Build-0.4211/lib/Module/Build/Notes.pm --- old/Module-Build-0.4210/lib/Module/Build/Notes.pm 2014-09-01 16:15:56.000000000 +0200 +++ new/Module-Build-0.4211/lib/Module/Build/Notes.pm 2015-01-20 01:37:50.000000000 +0100 @@ -4,7 +4,7 @@ use strict; use warnings; -our $VERSION = '0.4210'; +our $VERSION = '0.4211'; $VERSION = eval $VERSION; use Data::Dumper; use Module::Build::Dumper; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Module-Build-0.4210/lib/Module/Build/PPMMaker.pm new/Module-Build-0.4211/lib/Module/Build/PPMMaker.pm --- old/Module-Build-0.4210/lib/Module/Build/PPMMaker.pm 2014-09-01 16:15:57.000000000 +0200 +++ new/Module-Build-0.4211/lib/Module/Build/PPMMaker.pm 2015-01-20 01:37:51.000000000 +0100 @@ -4,7 +4,7 @@ use warnings; use Config; -our $VERSION = '0.4210'; +our $VERSION = '0.4211'; $VERSION = eval $VERSION; # This code is mostly borrowed from ExtUtils::MM_Unix 6.10_03, with a diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Module-Build-0.4210/lib/Module/Build/Platform/Default.pm new/Module-Build-0.4211/lib/Module/Build/Platform/Default.pm --- old/Module-Build-0.4210/lib/Module/Build/Platform/Default.pm 2014-09-01 16:15:57.000000000 +0200 +++ new/Module-Build-0.4211/lib/Module/Build/Platform/Default.pm 2015-01-20 01:37:50.000000000 +0100 @@ -2,7 +2,7 @@ use strict; use warnings; -our $VERSION = '0.4210'; +our $VERSION = '0.4211'; $VERSION = eval $VERSION; use Module::Build::Base; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Module-Build-0.4210/lib/Module/Build/Platform/MacOS.pm new/Module-Build-0.4211/lib/Module/Build/Platform/MacOS.pm --- old/Module-Build-0.4210/lib/Module/Build/Platform/MacOS.pm 2014-09-01 16:15:58.000000000 +0200 +++ new/Module-Build-0.4211/lib/Module/Build/Platform/MacOS.pm 2015-01-20 01:37:51.000000000 +0100 @@ -2,7 +2,7 @@ use strict; use warnings; -our $VERSION = '0.4210'; +our $VERSION = '0.4211'; $VERSION = eval $VERSION; use Module::Build::Base; our @ISA = qw(Module::Build::Base); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Module-Build-0.4210/lib/Module/Build/Platform/Unix.pm new/Module-Build-0.4211/lib/Module/Build/Platform/Unix.pm --- old/Module-Build-0.4210/lib/Module/Build/Platform/Unix.pm 2014-09-01 16:15:58.000000000 +0200 +++ new/Module-Build-0.4211/lib/Module/Build/Platform/Unix.pm 2015-01-20 01:37:51.000000000 +0100 @@ -2,7 +2,7 @@ use strict; use warnings; -our $VERSION = '0.4210'; +our $VERSION = '0.4211'; $VERSION = eval $VERSION; use Module::Build::Base; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Module-Build-0.4210/lib/Module/Build/Platform/VMS.pm new/Module-Build-0.4211/lib/Module/Build/Platform/VMS.pm --- old/Module-Build-0.4210/lib/Module/Build/Platform/VMS.pm 2014-09-01 16:15:57.000000000 +0200 +++ new/Module-Build-0.4211/lib/Module/Build/Platform/VMS.pm 2015-01-20 01:37:50.000000000 +0100 @@ -2,7 +2,7 @@ use strict; use warnings; -our $VERSION = '0.4210'; +our $VERSION = '0.4211'; $VERSION = eval $VERSION; use Module::Build::Base; use Config; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Module-Build-0.4210/lib/Module/Build/Platform/VOS.pm new/Module-Build-0.4211/lib/Module/Build/Platform/VOS.pm --- old/Module-Build-0.4210/lib/Module/Build/Platform/VOS.pm 2014-09-01 16:15:58.000000000 +0200 +++ new/Module-Build-0.4211/lib/Module/Build/Platform/VOS.pm 2015-01-20 01:37:51.000000000 +0100 @@ -2,7 +2,7 @@ use strict; use warnings; -our $VERSION = '0.4210'; +our $VERSION = '0.4211'; $VERSION = eval $VERSION; use Module::Build::Base; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Module-Build-0.4210/lib/Module/Build/Platform/Windows.pm new/Module-Build-0.4211/lib/Module/Build/Platform/Windows.pm --- old/Module-Build-0.4210/lib/Module/Build/Platform/Windows.pm 2014-09-01 16:15:57.000000000 +0200 +++ new/Module-Build-0.4211/lib/Module/Build/Platform/Windows.pm 2015-01-20 01:37:51.000000000 +0100 @@ -2,7 +2,7 @@ use strict; use warnings; -our $VERSION = '0.4210'; +our $VERSION = '0.4211'; $VERSION = eval $VERSION; use Config; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Module-Build-0.4210/lib/Module/Build/Platform/aix.pm new/Module-Build-0.4211/lib/Module/Build/Platform/aix.pm --- old/Module-Build-0.4210/lib/Module/Build/Platform/aix.pm 2014-09-01 16:15:58.000000000 +0200 +++ new/Module-Build-0.4211/lib/Module/Build/Platform/aix.pm 2015-01-20 01:37:50.000000000 +0100 @@ -2,7 +2,7 @@ use strict; use warnings; -our $VERSION = '0.4210'; +our $VERSION = '0.4211'; $VERSION = eval $VERSION; use Module::Build::Platform::Unix; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Module-Build-0.4210/lib/Module/Build/Platform/cygwin.pm new/Module-Build-0.4211/lib/Module/Build/Platform/cygwin.pm --- old/Module-Build-0.4210/lib/Module/Build/Platform/cygwin.pm 2014-09-01 16:15:57.000000000 +0200 +++ new/Module-Build-0.4211/lib/Module/Build/Platform/cygwin.pm 2015-01-20 01:37:51.000000000 +0100 @@ -2,7 +2,7 @@ use strict; use warnings; -our $VERSION = '0.4210'; +our $VERSION = '0.4211'; $VERSION = eval $VERSION; use Module::Build::Platform::Unix; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Module-Build-0.4210/lib/Module/Build/Platform/darwin.pm new/Module-Build-0.4211/lib/Module/Build/Platform/darwin.pm --- old/Module-Build-0.4210/lib/Module/Build/Platform/darwin.pm 2014-09-01 16:15:57.000000000 +0200 +++ new/Module-Build-0.4211/lib/Module/Build/Platform/darwin.pm 2015-01-20 01:37:50.000000000 +0100 @@ -2,7 +2,7 @@ use strict; use warnings; -our $VERSION = '0.4210'; +our $VERSION = '0.4211'; $VERSION = eval $VERSION; use Module::Build::Platform::Unix; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Module-Build-0.4210/lib/Module/Build/Platform/os2.pm new/Module-Build-0.4211/lib/Module/Build/Platform/os2.pm --- old/Module-Build-0.4210/lib/Module/Build/Platform/os2.pm 2014-09-01 16:15:58.000000000 +0200 +++ new/Module-Build-0.4211/lib/Module/Build/Platform/os2.pm 2015-01-20 01:37:50.000000000 +0100 @@ -2,7 +2,7 @@ use strict; use warnings; -our $VERSION = '0.4210'; +our $VERSION = '0.4211'; $VERSION = eval $VERSION; use Module::Build::Platform::Unix; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Module-Build-0.4210/lib/Module/Build/PodParser.pm new/Module-Build-0.4211/lib/Module/Build/PodParser.pm --- old/Module-Build-0.4210/lib/Module/Build/PodParser.pm 2014-09-01 16:15:58.000000000 +0200 +++ new/Module-Build-0.4211/lib/Module/Build/PodParser.pm 2015-01-20 01:37:51.000000000 +0100 @@ -2,7 +2,7 @@ use strict; use warnings; -our $VERSION = '0.4210'; +our $VERSION = '0.4211'; $VERSION = eval $VERSION; sub new { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Module-Build-0.4210/lib/Module/Build.pm new/Module-Build-0.4211/lib/Module/Build.pm --- old/Module-Build-0.4210/lib/Module/Build.pm 2014-09-01 16:15:58.000000000 +0200 +++ new/Module-Build-0.4211/lib/Module/Build.pm 2015-01-20 01:37:51.000000000 +0100 @@ -19,7 +19,7 @@ use Module::Build::Base; our @ISA = qw(Module::Build::Base); -our $VERSION = '0.4210'; +our $VERSION = '0.4211'; $VERSION = eval $VERSION; # Inserts the given module into the @ISA hierarchy between diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Module-Build-0.4210/lib/inc/latest/private.pm new/Module-Build-0.4211/lib/inc/latest/private.pm --- old/Module-Build-0.4210/lib/inc/latest/private.pm 2014-09-01 16:15:57.000000000 +0200 +++ new/Module-Build-0.4211/lib/inc/latest/private.pm 1970-01-01 01:00:00.000000000 +0100 @@ -1,103 +0,0 @@ -package inc::latest::private; - -use if $] >= 5.019, 'deprecate'; - -use 5.006; -use strict; -use warnings; -our $VERSION = '0.4210'; -$VERSION = eval $VERSION; - -use File::Spec; - -# must ultimately "goto" the import routine of the module to be loaded -# so that the calling package is correct when $mod->import() runs. -sub import { - my ($package, $mod, @args) = @_; - my $file = $package->_mod2path($mod); - - if ($INC{$file}) { - # Already loaded, but let _load_module handle import args - goto \&_load_module; - } - - # A bundled copy must be present - my ($bundled, $bundled_dir) = $package->_search_bundled($file) - or die "No bundled copy of $mod found"; - - my $from_inc = $package->_search_INC($file); - unless ($from_inc) { - # Only bundled is available - unshift(@INC, $bundled_dir); - goto \&_load_module; - } - - if (_version($from_inc) >= _version($bundled)) { - # Ignore the bundled copy - goto \&_load_module; - } - - # Load the bundled copy - unshift(@INC, $bundled_dir); - goto \&_load_module; -} - -sub _version { - require ExtUtils::MakeMaker; - return ExtUtils::MM->parse_version(shift); -} - -# use "goto" for import to preserve caller -sub _load_module { - my $package = shift; # remaining @_ is ready for goto - my ($mod, @args) = @_; - eval "require $mod; 1" or die $@; - if ( my $import = $mod->can('import') ) { - goto $import; - } - return 1; -} - -sub _search_bundled { - my ($self, $file) = @_; - - my $mypath = 'inc'; - - opendir my $DH, $mypath or die "Can't open directory $mypath: $!"; - - while (defined(my $e = readdir $DH)) { - next unless $e =~ /^inc_/; - my $try = File::Spec->catfile($mypath, $e, $file); - - return($try, File::Spec->catdir($mypath, $e)) if -e $try; - } - return; -} - -# Look for the given path in @INC. -sub _search_INC { - # TODO: doesn't handle coderefs or arrayrefs or objects in @INC, but - # it probably should - my ($self, $file) = @_; - - foreach my $dir (@INC) { - next if ref $dir; - my $try = File::Spec->catfile($dir, $file); - return $try if -e $try; - } - - return; -} - -# Translate a module name into a directory/file.pm to search for in @INC -sub _mod2path { - my ($self, $mod) = @_; - my @parts = split /::/, $mod; - $parts[-1] .= '.pm'; - return $parts[0] if @parts == 1; - return File::Spec->catfile(@parts); -} - -1; - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Module-Build-0.4210/lib/inc/latest.pm new/Module-Build-0.4211/lib/inc/latest.pm --- old/Module-Build-0.4210/lib/inc/latest.pm 2014-09-01 16:15:57.000000000 +0200 +++ new/Module-Build-0.4211/lib/inc/latest.pm 1970-01-01 01:00:00.000000000 +0100 @@ -1,248 +0,0 @@ -package inc::latest; - -use if $] >= 5.019, 'deprecate'; - -use 5.006; -use strict; -use warnings; -our $VERSION = '0.4210'; -$VERSION = eval $VERSION; - -use Carp; -use File::Basename (); -use File::Spec (); -use File::Path (); -use File::Copy (); - -# track and return modules loaded by inc::latest -my @loaded_modules; -sub loaded_modules {@loaded_modules} - -# must ultimately "goto" the import routine of the module to be loaded -# so that the calling package is correct when $mod->import() runs. -sub import { - my ($package, $mod, @args) = @_; - return unless(defined $mod); - - my $private_path = 'inc/latest/private.pm'; - if(-e $private_path) { - # user mode - delegate work to bundled private module - require $private_path; - splice( @_, 0, 1, 'inc::latest::private'); - goto \&inc::latest::private::import; - } - - # author mode - just record and load the modules - push(@loaded_modules, $mod); - require inc::latest::private; - goto \&inc::latest::private::_load_module; -} - -sub write { - my $package = shift; - my ($where, @preload) = @_; - - warn "should really be writing in inc/" unless $where =~ /inc$/; - - # write inc/latest.pm - File::Path::mkpath( $where ); - open my $fh, '>', File::Spec->catfile($where,'latest.pm'); - print {$fh} "# This stub created by inc::latest $VERSION\n"; - print {$fh} <<'HERE'; -package inc::latest; -use strict; -require inc::latest::private; -our @ISA = qw/inc::latest::private/; -HERE - if (@preload) { - print {$fh} "\npackage inc::latest::preload;\n"; - for my $mod (@preload) { - print {$fh} "inc::latest->import('$mod');\n"; - } - } - print {$fh} "\n1;\n"; - close $fh; - - # write inc/latest/private; - require inc::latest::private; - File::Path::mkpath( File::Spec->catdir( $where, 'latest' ) ); - my $from = $INC{'inc/latest/private.pm'}; - my $to = File::Spec->catfile($where,'latest','private.pm'); - File::Copy::copy( $from, $to ) or die "Couldn't copy '$from' to '$to': $!"; - - return 1; -} - -sub bundle_module { - my ($package, $module, $where) = @_; - - # create inc/inc_$foo - (my $dist = $module) =~ s{::}{-}g; - my $inc_lib = File::Spec->catdir($where,"inc_$dist"); - File::Path::mkpath $inc_lib; - - # get list of files to copy - require ExtUtils::Installed; - # workaround buggy EU::Installed check of @INC - my $inst = ExtUtils::Installed->new(extra_libs => [@INC]); - my $packlist = $inst->packlist( $module ) or die "Couldn't find packlist"; - my @files = grep { /\.pm$/ } keys %$packlist; - - - # figure out prefix - my $mod_path = quotemeta $package->_mod2path( $module ); - my ($prefix) = grep { /$mod_path$/ } @files; - $prefix =~ s{$mod_path$}{}; - - # copy files - for my $from ( @files ) { - next unless $from =~ /\.pm$/; - (my $mod_path = $from) =~ s{^\Q$prefix\E}{}; - my $to = File::Spec->catfile( $inc_lib, $mod_path ); - File::Path::mkpath(File::Basename::dirname($to)); - File::Copy::copy( $from, $to ) or die "Couldn't copy '$from' to '$to': $!"; - } - return 1; -} - -# Translate a module name into a directory/file.pm to search for in @INC -sub _mod2path { - my ($self, $mod) = @_; - my @parts = split /::/, $mod; - $parts[-1] .= '.pm'; - return $parts[0] if @parts == 1; - return File::Spec->catfile(@parts); -} - -1; - - -=head1 NAME - -inc::latest - use modules bundled in inc/ if they are newer than installed ones - -=head1 SYNOPSIS - - # in Build.PL - use inc::latest 'Module::Build'; - -=head1 DESCRIPTION - -The C<inc::latest> module helps bootstrap configure-time dependencies for CPAN -distributions. These dependencies get bundled into the C<inc> directory within -a distribution and are used by Build.PL (or Makefile.PL). - -Arguments to C<inc::latest> are module names that are checked against both the -current C<@INC> array and against specially-named directories in C<inc>. If -the bundled version is newer than the installed one (or the module isn't -installed, then, the bundled directory is added to the start of <@INC> and the -module is loaded from there. - -There are actually two variations of C<inc::latest> -- one for authors and one -for the C<inc> directory. For distribution authors, the C<inc::latest> -installed in the system will record modules loaded via C<inc::latest> and can -be used to create the bundled files in C<inc>, including writing the second -variation as C<inc/latest.pm>. - -This second C<inc::latest> is the one that is loaded in a distribution being -installed (e.g. from Build.PL). This bundled C<inc::latest> is the one -that determines which module to load. - -=head2 Special notes on bundling - -The C<inc::latest> module creates bundled directories based on the packlist -file of an installed distribution. Even though C<inc::latest> takes module -name arguments, it is better to think of it as bundling and making available -entire I<distributions>. When a module is loaded through C<inc::latest>, -it looks in all bundled distributions in C<inc/> for a newer module than -can be found in the existing C<@INC> array. - -Thus, the module-name provided should usually be the "top-level" module name of -a distribution, though this is not strictly required. For example, -L<Module::Build> has a number of heuristics to map module names to packlists, -allowing users to do things like this: - - use inc::latest 'Devel::AssertOS::Unix'; - -even though Devel::AssertOS::Unix is contained within the Devel-CheckOS -distribution. - -At the current time, packlists are required. Thus, bundling dual-core modules -may require a 'forced install' over versions in the latest version of perl -in order to create the necessary packlist for bundling. - -=head1 USAGE - -When calling C<use>, the bundled C<inc::latest> takes a single module name and -optional arguments to pass to that module's own import method. - - use 'inc::latest' 'Foo::Bar' qw/foo bar baz/; - -=head2 Author-mode - -You are in author-mode inc::latest if any of the Author-mode methods are -available. For example: - - if ( inc::latest->can('write') ) { - inc::latest->write('inc'); - } - -=over 4 - -=item loaded_modules() - - my @list = inc::latest->loaded_modules; - -This takes no arguments and always returns a list of module names requested for -loading via "use inc::latest 'MODULE'", regardless of whether the load was -successful or not. - -=item write() - - inc::latest->write( 'inc' ); - -This writes the bundled version of inc::latest to the directory name given as an -argument. It almost all cases, it should be 'C<inc>'. - -=item bundle_module() - - for my $mod ( inc::latest->loaded_modules ) { - inc::latest->bundle_module($mod, $dir); - } - -If $mod corresponds to a packlist, then this function creates a specially-named -directory in $dir and copies all .pm files from the modlist to the new -directory (which almost always should just be 'inc'). For example, if Foo::Bar -is the name of the module, and $dir is 'inc', then the directory would be -'inc/inc_Foo-Bar' and contain files like this: - - inc/inc_Foo-Bar/Foo/Bar.pm - -Currently, $mod B<must> have a packlist. If this is not the case (e.g. for a -dual-core module), then the bundling will fail. You may be able to create a -packlist by forced installing the module on top of the version that came with -core Perl. - -=back - -=head2 As bundled in inc/ - -All methods are private. Only the C<import> method is public. - -=head1 AUTHOR - -Eric Wilhelm <ewilhelm(a)cpan.org>, David Golden <dagolden(a)cpan.org> - -=head1 COPYRIGHT - -Copyright (c) 2009 by Eric Wilhelm and David Golden - -This library is free software; you can redistribute it and/or -modify it under the same terms as Perl itself. - -=head1 SEE ALSO - -L<Module::Build> - -=cut - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Module-Build-0.4210/t/actions/installdeps.t new/Module-Build-0.4211/t/actions/installdeps.t --- old/Module-Build-0.4210/t/actions/installdeps.t 2014-09-01 16:15:57.000000000 +0200 +++ new/Module-Build-0.4211/t/actions/installdeps.t 2015-01-20 01:37:51.000000000 +0100 @@ -20,14 +20,14 @@ build_requires => { 'Getopt::Long' => 9998, }, - cpan_client => $^X . ' -le print($_)for($^X,@ARGV)', + cpan_client => qq{"$^X"} . ' -le print($_)for($^X,@ARGV)', )->regen; # get a Module::Build object and test with it my $mb; stdout_stderr_of( sub { $mb = $dist->new_from_context('verbose' => 1) } ); isa_ok( $mb, "Module::Build" ); -like( $mb->cpan_client, qr/^\Q$^X\E/, "cpan_client is mocked with perl" ); +like( $mb->cpan_client, qr/^"\Q$^X\E"/, "cpan_client is mocked with perl" ); my $retval; my $out = stdout_of( sub { ++++++ make-builds-reproducible.patch ++++++ Index: Module-Build-0.4211/lib/Module/Build/Dumper.pm =================================================================== --- Module-Build-0.4211.orig/lib/Module/Build/Dumper.pm +++ Module-Build-0.4211/lib/Module/Build/Dumper.pm @@ -11,8 +11,11 @@ use Data::Dumper; sub _data_dump { my ($self, $data) = @_; + + my $dumper = Data::Dumper->new([$data],['x'])->Purity(1)->Terse(0); + $dumper->Sortkeys(1); return ("do{ my " - . Data::Dumper->new([$data],['x'])->Purity(1)->Terse(0)->Dump() + . $dumper->Dump() . '$x; }') } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Encode-HanExtra for openSUSE:Factory
by root＠hilbert.suse.de 06 Feb '15

06 Feb '15

Hello community, here is the log from the commit of package perl-Encode-HanExtra for openSUSE:Factory checked in at 2015-02-06 10:17:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Encode-HanExtra (Old) and /work/SRC/openSUSE:Factory/.perl-Encode-HanExtra.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Encode-HanExtra" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Encode-HanExtra/perl-Encode-HanExtra.changes 2014-11-13 09:19:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Encode-HanExtra.new/perl-Encode-HanExtra.changes 2015-02-06 10:17:32.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Feb 3 15:32:50 CET 2015 - tiwai(a)suse.de + +- sort the entries in HanExtra.c for consistent packaging + (boo#915951): + HanExtra-include-sort.patch + +------------------------------------------------------------------- New: ---- HanExtra-include-sort.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Encode-HanExtra.spec ++++++ --- /var/tmp/diff_new_pack.rFlDqg/_old 2015-02-06 10:17:33.000000000 +0100 +++ /var/tmp/diff_new_pack.rFlDqg/_new 2015-02-06 10:17:33.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package perl-Encode-HanExtra # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -22,6 +22,7 @@ Release: 0 Url: http://search.cpan.org/~autrijus/Encode-HanExtra-0.23/ Source0: http://search.cpan.org/CPAN/authors/id/A/AU/AUDREYT/Encode-HanExtra-0.23.ta… +Patch1: HanExtra-include-sort.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Extra sets of Chinese encodings License: MIT @@ -48,6 +49,7 @@ %prep %setup -q -n Encode-HanExtra-%{version} +%patch1 -p1 %build CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL ++++++ HanExtra-include-sort.patch ++++++ --- Makefile.PL | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/Makefile.PL +++ b/Makefile.PL @@ -112,7 +112,7 @@ sub post_initialize { #define U8 U8 #include "encode.h" END - foreach my $table (keys %tables) { + foreach my $table (sort keys %tables) { print XS qq[#include "${table}.h"\n]; } print XS <<"END"; @@ -141,7 +141,7 @@ PROTOTYPES: DISABLE BOOT: { END - foreach my $table (keys %tables) { + foreach my $table (sort keys %tables) { print XS qq[#include "${table}.exh"\n]; } print XS "}\n"; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0