July 2017 - openSUSE Commits - openSUSE Mailing Lists

commit rawstudio for openSUSE:Factory
by root＠hilbert.suse.de 30 Jul '17

30 Jul '17

Hello community, here is the log from the commit of package rawstudio for openSUSE:Factory checked in at 2017-07-30 11:26:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rawstudio (Old) and /work/SRC/openSUSE:Factory/.rawstudio.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rawstudio" Sun Jul 30 11:26:58 2017 rev:3 rq:512974 version:2.0+git20170413.003dd4f3 Changes: -------- --- /work/SRC/openSUSE:Factory/rawstudio/rawstudio.changes 2016-07-05 09:52:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rawstudio.new/rawstudio.changes 2017-07-30 11:27:08.947349686 +0200 @@ -1,0 +2,16 @@ +Thu Jul 27 16:55:36 UTC 2017 - tchvatal(a)suse.com + +- Update the service to generate sensible name for the tarball +- Switch to lcms2 from lcms +- Drop upstream merged patch: + * rawstudio-2.1_unraw.patch +- Update to version 2.0+git20170413.003dd4f3: + * Do more relaxed matching when displying camera profile choices. + * Do not link to defunct website. This fixes #22. + * Removed rawstudio.org from readme. + * Fix a crash when we don't have select lens. + * Update rawspeed to last version (Feb 8, 2016). + * Remove plugin load-dcraw + * + Panasonic GH4 + GH5 + +------------------------------------------------------------------- Old: ---- rawstudio-1456433636.6643b14.tar.xz rawstudio-2.1_unraw.patch New: ---- rawstudio-2.0+git20170413.003dd4f3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rawstudio.spec ++++++ --- /var/tmp/diff_new_pack.zWFKlO/_old 2017-07-30 11:27:10.607115483 +0200 +++ /var/tmp/diff_new_pack.zWFKlO/_new 2017-07-30 11:27:10.611114918 +0200 @@ -1,7 +1,7 @@ # # spec file for package rawstudio # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -18,19 +18,18 @@ %define sover 2_1 Name: rawstudio -Version: 1456433636.6643b14 +Version: 2.0+git20170413.003dd4f3 Release: 0 Summary: Raw-image converter License: GPL-2.0 Group: Productivity/Graphics/Other Url: http://rawstudio.org/ Source0: %{name}-%{version}.tar.xz -# PATCH-FIX-OPENSUSE unraw.patch [bnc#985103] avvissu(a)yandex.by -- Remove dcraw loader plugin -Patch0: rawstudio-2.1_unraw.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ BuildRequires: git +BuildRequires: intltool BuildRequires: libjpeg-devel BuildRequires: libtiff-devel BuildRequires: libtool @@ -42,14 +41,15 @@ BuildRequires: pkgconfig(flickcurl) BuildRequires: pkgconfig(gconf-2.0) BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(lcms) +BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(lensfun) BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libgphoto2) BuildRequires: pkgconfig(libssl) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(sqlite3) -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires(post): update-desktop-files +Requires(postun): update-desktop-files %description RawStudio is a digital camera RAW files processing software. @@ -75,10 +75,9 @@ %prep %setup -q -%patch0 -p1 %build -./autogen.sh +./autogen.sh --no-configure %configure --disable-static make %{?_smp_mflags} @@ -96,11 +95,9 @@ %desktop_database_postun %post -n lib%{name}-%{sover} -p /sbin/ldconfig - %postun -n lib%{name}-%{sover} -p /sbin/ldconfig %files -%defattr(-,root,root) %doc AUTHORS COPYING NEWS README.md %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop @@ -113,16 +110,13 @@ %{_datadir}/rawspeed/ %files -n lib%{name}-%{sover} -%defattr(-,root,root) %{_libdir}/lib%{name}-*.so %files -n lib%{name}-devel -%defattr(-,root,root) %{_includedir}/%{name}*/ %{_libdir}/pkgconfig/%{name}*.pc %{_libdir}/lib%{name}.so %files lang -f %{name}.lang -%defattr(-,root,root) %changelog ++++++ _service ++++++ --- /var/tmp/diff_new_pack.zWFKlO/_old 2017-07-30 11:27:10.647109838 +0200 +++ /var/tmp/diff_new_pack.zWFKlO/_new 2017-07-30 11:27:10.651109275 +0200 @@ -2,6 +2,9 @@ <service name="tar_scm" mode="disabled"> <param name="url">https://github.com/rawstudio/rawstudio.git</param> <param name="scm">git</param> + <param name="changesgenerate">enable</param> + <param name="filename">rawstudio</param> + <param name="versionformat">2.0+git%cd.%h</param> </service> <service mode="disabled" name="recompress"> <param name="file">*.tar</param>

1 0

commit subnetcalc for openSUSE:Factory
by root＠hilbert.suse.de 30 Jul '17

30 Jul '17

Hello community, here is the log from the commit of package subnetcalc for openSUSE:Factory checked in at 2017-07-30 11:26:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/subnetcalc (Old) and /work/SRC/openSUSE:Factory/.subnetcalc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "subnetcalc" Sun Jul 30 11:26:51 2017 rev:2 rq:512963 version:2.4.3 Changes: -------- --- /work/SRC/openSUSE:Factory/subnetcalc/subnetcalc.changes 2017-07-21 22:45:09.588609947 +0200 +++ /work/SRC/openSUSE:Factory/.subnetcalc.new/subnetcalc.changes 2017-07-30 11:26:55.089305151 +0200 @@ -1,0 +2,5 @@ +Wed Jun 28 08:09:04 UTC 2017 - jengelh(a)inai.de + +- Whitespace/grammar fixes + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ subnetcalc.spec ++++++ --- /var/tmp/diff_new_pack.Q6OF7M/_old 2017-07-30 11:26:56.949042728 +0200 +++ /var/tmp/diff_new_pack.Q6OF7M/_new 2017-07-30 11:26:56.953042164 +0200 @@ -29,11 +29,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -SubNetCalc is an IPv4/IPv6 subnet address calculator. For given IPv4 or IPv6 +SubNetCalc is an IPv4/IPv6 subnet address calculator. For a given IPv4 or IPv6 address and netmask or prefix length, it calculates network address, broadcast -address, maximum number of hosts and host address range. Also, it prints the +address, maximum number of hosts and host address range. It also prints the addresses in binary format for better understandability. Furthermore, it -prints useful information on specific address types (e.g. type, scope, +prints information on specific address types (e.g. type, scope, interface ID, etc.). %prep

1 0

commit spyder for openSUSE:Factory
by root＠hilbert.suse.de 30 Jul '17

30 Jul '17

Hello community, here is the log from the commit of package spyder for openSUSE:Factory checked in at 2017-07-30 11:26:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/spyder (Old) and /work/SRC/openSUSE:Factory/.spyder.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "spyder" Sun Jul 30 11:26:47 2017 rev:26 rq:512960 version:2.3.8 Changes: -------- --- /work/SRC/openSUSE:Factory/spyder/spyder.changes 2016-03-16 10:34:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.spyder.new/spyder.changes 2017-07-30 11:26:51.001881913 +0200 @@ -1,0 +2,5 @@ +Fri Jul 21 11:31:45 UTC 2017 - sebix+novell.com(a)sebix.at + +- specfile fixes, fixes builds + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spyder.spec ++++++ --- /var/tmp/diff_new_pack.yns9yU/_old 2017-07-30 11:26:51.853761708 +0200 +++ /var/tmp/diff_new_pack.yns9yU/_new 2017-07-30 11:26:51.857761143 +0200 @@ -1,7 +1,7 @@ # # spec file for package spyder # -# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -84,15 +84,18 @@ Documentation and help files for both %{name} and python-spyderlib %lang_package + %prep %setup -q # Fix wrong-file-end-of-line-encoding RPMLint warning sed -i 's/\r$//' doc/*.rst sed -i 's/\r$//' spyderlib/userconfig.py sed -i 's/\r$//' LICENSE +# Remove shebangs +sed -i '1s/^#!.*//' spyderlib/utils/external/pickleshare.py spyderlib/userconfig.py %build -python setup.py build && rm build/lib/spyderlib/doc/.buildinfo +python setup.py build %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} @@ -112,7 +115,11 @@ %fdupes %{buildroot}%{python_sitelib} # Documentation belongs into _docdir: rm -r %{buildroot}%{python_sitelib}/spyderlib/doc -rm -f build/lib/spyderlib/doc/.buildinfo +# Build documentation +sphinx-build -b html -d doc/build/doctrees doc doc/build/html +rm doc/build/html/.buildinfo +# Fix shebang +sed -i '1s/^#!\/usr\/bin\/python/#!\/usr\/bin\/python2/' %{buildroot}%{_bindir}/%{name} %files %defattr(-,root,root,-) @@ -134,7 +141,7 @@ %files doc %defattr(-,root,root,-) -%doc build/lib/spyderlib/doc/ +%doc doc/build/html %files lang -f %{name}.lang %defattr(-,root,root)

1 0

commit SuSEfirewall2 for openSUSE:Factory
by root＠hilbert.suse.de 30 Jul '17

30 Jul '17

Hello community, here is the log from the commit of package SuSEfirewall2 for openSUSE:Factory checked in at 2017-07-30 11:26:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/SuSEfirewall2 (Old) and /work/SRC/openSUSE:Factory/.SuSEfirewall2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "SuSEfirewall2" Sun Jul 30 11:26:25 2017 rev:85 rq:512885 version:3.6.365 Changes: -------- --- /work/SRC/openSUSE:Factory/SuSEfirewall2/SuSEfirewall2.changes 2017-07-02 13:37:21.174044525 +0200 +++ /work/SRC/openSUSE:Factory/.SuSEfirewall2.new/SuSEfirewall2.changes 2017-07-30 11:26:37.675762321 +0200 @@ -1,0 +2,25 @@ +Fri Jul 28 08:40:55 UTC 2017 - matthias.gerstner(a)suse.com + +- Removed bogus nfs alias units, added correct nfs-client target in + SuSEfirewall2.service (bnc#946325). + + The nfs alias units are false friends, because they don't fix the startup + ordering between nfs and SuSEfirewall2. + + The missing nfs-client target could cause nfs mounts for nfs versions < 4.1 + to be unable to receive callbacks from the server, when the nfs client was + started before the SuSEfirewall2 was started on boot. + +------------------------------------------------------------------- +Wed Jul 12 13:40:57 UTC 2017 - matthias.gerstner(a)suse.com + +- sysctl settings: make list of sysctl.d directories configurable via + FW_SYSCTL_PATHS (bnc#1044523) + +------------------------------------------------------------------- +Thu Jul 6 10:05:41 UTC 2017 - matthias.gerstner(a)suse.com + +- clarified warning message about FW_ROUTE being enabled but ip_forwarding not configured +- sysctl.d: avoid error messages if no /etc/sysctl.d/*.conf files are existing (bnc#1044523) + +------------------------------------------------------------------- Old: ---- SuSEfirewall2-3.6.360.tar.bz2 New: ---- SuSEfirewall2-3.6.365.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ SuSEfirewall2.spec ++++++ --- /var/tmp/diff_new_pack.sRUgFr/_old 2017-07-30 11:26:38.419657352 +0200 +++ /var/tmp/diff_new_pack.sRUgFr/_new 2017-07-30 11:26:38.419657352 +0200 @@ -19,7 +19,7 @@ %define newname SUSEfirewall2 Name: SuSEfirewall2 -Version: 3.6.360 +Version: 3.6.365 Release: 0 Url: http://en.opensuse.org/SuSEfirewall2 PreReq: /bin/sed textutils fileutils grep filesystem ++++++ SuSEfirewall2-3.6.360.tar.bz2 -> SuSEfirewall2-3.6.365.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SuSEfirewall2-3.6.360/SuSEfirewall2 new/SuSEfirewall2-3.6.365/SuSEfirewall2 --- old/SuSEfirewall2-3.6.360/SuSEfirewall2 2017-06-28 11:18:23.000000000 +0200 +++ new/SuSEfirewall2-3.6.365/SuSEfirewall2 2017-07-28 10:40:25.000000000 +0200 @@ -135,7 +135,7 @@ { [ "$MODE" != "debug" ] && return - message $* + message ${FUNCNAME[1]} $* } deprecated() @@ -628,23 +628,53 @@ # checks multiple sysctl.d config locations for configure values function get_any_sysctl_cfg() { - local path="$1" + local value="$1" + + if [ -z "$FW_SYSCTL_PATHS" ]; then + # don't check all available sysctl.d directories for the + # reason discussed in bnc#1044523 + FW_SYSCTL_PATHS="/etc/sysctl.conf /etc/sysctl.d /usr/local/lib/sysctl.d" + fi + + local path + for path in $FW_SYSCTL_PATHS; do + dbgmessage "Checking for sysctl value $value in path $path" + if [ -d "$path" ]; then + # expand to any config files found in the sysctl.d + # style directory + paths=$path/*.conf + dbgmessage "Expanded $path to $paths" + else + paths=$path + fi - for file in /etc/sysctl.conf /etc/sysctl.d/*.conf; do - get_sysctl_cfg "$path" "$file" && return 0 + for file in $paths; do + # check for existence, because the wildcard match + # above might yield no matches, which would result in + # error messages otherwise + if [ -r "$file" ]; then + dbgmessage "Checking in file $file" + get_sysctl_cfg "$value" "$file" && sysctl_file="$file" && return 0 + dbgmessage "no match" + fi + done done + sysctl_file="" return 1 } -# outputs the configured value of the sysctl setting passed as $1 in the +# returns the configured value of the sysctl setting passed as $1 in the # configuration file $2. -# return code of 0 if a value was found and output, 1 if none was found +# return code of 0 if a value was found and returned, 1 if none was found +# +# the sysctl setting's value is returned in the sysctl_value variable function get_sysctl_cfg() { local path="$1" local sysctl="$2" local line + sysctl_value="" # translate the proc path to a sysctl path syspath=`echo "$path" | /usr/bin/cut -d '/' -f 4- | /usr/bin/tr '/' '.'` @@ -656,7 +686,7 @@ line=`/usr/bin/grep "^[^#]*$syspath" $sysctl` if [ $? -eq 0 ]; then - /usr/bin/cut -d '=' -f 2 <<<"$line" | /usr/bin/tr -d ' \t' + sysctl_value=`/usr/bin/cut -d '=' -f 2 <<<"$line" | /usr/bin/tr -d ' \t'` return 0 fi @@ -690,10 +720,13 @@ [ -z "$path" -o ! -w "$path" ] && return - cfg_value=`get_any_sysctl_cfg $path` && have_cfg=true || have_cfg=false + local sysctl_value="" + local sysctl_file="" + local have_cfg=false + get_any_sysctl_cfg "$path" && have_cfg=true if $have_cfg; then - [ "$cfg_value" = "$value" ] && same_value=true || same_value=false + [ "$sysctl_value" = "$value" ] && same_value=true || same_value=false # this mode stuff is mostly to allow for backward compatibility # regarding ip forwarding. If forwarding is not explicitly enabled @@ -701,16 +734,16 @@ # what force and reset mode are for. if [ "$mode" = "reset" ]; then if ! $same_value; then - dbgmessage "value for $path in sysctl is different, not resetting it" + dbgmessage "value for $path in $sysctl_file is different, not resetting it" # configure value is different, so do nothing return 1 fi elif [ "$mode" = "force" ]; then if ! $same_value; then - warning "value for $path in sysctl.conf is different, but required by firewall, overriding" + warning "value for $path in $sysctl_file is different, but required by firewall, overriding" fi else - dbgmessage "$path override in sysctl.conf, not setting it" + message "$path override in $sysctl_file, not setting it" return 1 fi fi @@ -1445,7 +1478,7 @@ [ "$enabled" -eq 1 ] && return setproc 1 $PROC_PATH "force" - warning "$PROC_PATH is not enabled, you should configure this in /etc/sysctl.conf" + warning "$PROC_PATH is not enabled, but required for FW_ROUTE, you should configure this in /etc/sysctl.conf. This option has been implicitly enabled now." } disable_ip_forwarding() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SuSEfirewall2-3.6.360/SuSEfirewall2.service new/SuSEfirewall2-3.6.365/SuSEfirewall2.service --- old/SuSEfirewall2-3.6.360/SuSEfirewall2.service 2017-06-28 11:18:23.000000000 +0200 +++ new/SuSEfirewall2-3.6.365/SuSEfirewall2.service 2017-07-28 10:40:25.000000000 +0200 @@ -1,6 +1,6 @@ [Unit] Description=SuSEfirewall2 phase 2 -After=network.target ypbind.service nfs.service nfsserver.service nfs-server.service rpcbind.service SuSEfirewall2_init.service +After=network.target nfs-client.target ypbind.service nfs-server.service rpcbind.service SuSEfirewall2_init.service Wants=SuSEfirewall2_init.service Conflicts=firewalld.service diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SuSEfirewall2-3.6.360/SuSEfirewall2.sysconfig new/SuSEfirewall2-3.6.365/SuSEfirewall2.sysconfig --- old/SuSEfirewall2-3.6.360/SuSEfirewall2.sysconfig 2017-06-28 11:18:23.000000000 +0200 +++ new/SuSEfirewall2-3.6.365/SuSEfirewall2.sysconfig 2017-07-28 10:40:25.000000000 +0200 @@ -718,7 +718,7 @@ # # If you have configured one of these settings in /etc/sysctl.conf then # SuSEfirewall2 won't apply any different value to allow you to override some -# of these settings to your liking. +# of these settings to your liking. Also see FW_SYSCTL_DIRS. # # Tip: Set this to "no" until you have verified that you have got a # configuration which works for you. Then set this to "yes" and keep it @@ -728,6 +728,18 @@ # FW_KERNEL_SECURITY="" +## Type: string +# +# Consider the following sysctl.d style directories and sysctl.conf style +# files before modifying any sysctl values during runtime. If a value is +# already configured in one of these dirs/files then it won't be changed by +# SuSEFirewall any more. +# +# This affects FW_KERNEL_SECURITY settings and forwarding settings for +# FW_ROUTE. If empty this defaults to /etc/sysctl.conf, /etc/sysctl.d, +# /usr/local/lib/sysctl.d.conf. +FW_SYSCTL_PATHS="" + ## Type: yesno # # Whether ip routing should be disabled when the firewall is shut diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SuSEfirewall2-3.6.360/obs/mkpackage new/SuSEfirewall2-3.6.365/obs/mkpackage --- old/SuSEfirewall2-3.6.360/obs/mkpackage 2017-06-28 11:18:23.000000000 +0200 +++ new/SuSEfirewall2-3.6.365/obs/mkpackage 2017-07-28 10:40:25.000000000 +0200 @@ -18,11 +18,16 @@ echo "ln -s home\:*\:branches\:*/$name $dstdir" exit 1 fi +if [ ! -f "$dstdir/$name.spec" ]; then + echo "*** Error: Couldn't find $dstdir/$name.spec" + exit 1 +fi if [ "`git --no-pager diff --name-only|wc -l`" != '0' -o "`git --no-pager diff --name-only --cached|wc -l`" != 0 ]; then echo "*** Error: uncomitted changes" echo "run 'git add file' to add files, 'git commit -a' to commit changes" exit 1 fi + cd "$dstdir" echo "osc up" osc up

1 0

commit docker for openSUSE:Factory
by root＠hilbert.suse.de 30 Jul '17

30 Jul '17

Hello community, here is the log from the commit of package docker for openSUSE:Factory checked in at 2017-07-30 11:26:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/docker (Old) and /work/SRC/openSUSE:Factory/.docker.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "docker" Sun Jul 30 11:26:14 2017 rev:57 rq:512811 version:17.04.0_ce Changes: -------- --- /work/SRC/openSUSE:Factory/docker/docker.changes 2017-06-21 13:52:10.841780602 +0200 +++ /work/SRC/openSUSE:Factory/.docker.new/docker.changes 2017-07-30 11:26:35.980001604 +0200 @@ -1,0 +2,29 @@ +Wed Jul 19 18:12:26 UTC 2017 - jmassaguerpla(a)suse.com + +- enable deferred removal for sle12sp2 and newer (and openSUSE + equivalent. fix bsc#1021227 + +------------------------------------------------------------------- +Wed Jul 19 17:17:04 UTC 2017 - jmassaguerpla(a)suse.com + +- enable libseccomp on sle12sp2 and newer, 42.2 and newer + fix bsc#1028638 - docker: conditional filtering not supported on + libseccomp for sle12 + +------------------------------------------------------------------- +Tue Jul 11 10:50:12 UTC 2017 - jmassaguerpla(a)suse.com + +- add SuSEfirewall2.service to the After clause in docker.service + in order to fix bsc#1046024 + +------------------------------------------------------------------- +Fri Jul 7 14:53:59 UTC 2017 - thipp(a)suse.de + +- fix path to docker-runc in systemd service file + +------------------------------------------------------------------- +Thu Jul 6 14:18:29 UTC 2017 - thipp(a)suse.de + +- change dependency to docker-runc + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ docker.spec ++++++ --- /var/tmp/diff_new_pack.cfiPLB/_old 2017-07-30 11:26:37.059849231 +0200 +++ /var/tmp/diff_new_pack.cfiPLB/_new 2017-07-30 11:26:37.067848102 +0200 @@ -65,9 +65,16 @@ BuildRequires: glibc-devel-static BuildRequires: libapparmor-devel BuildRequires: libbtrfs-devel >= 3.8 -# If not leap 42.1 (120100), not sle12sp1 (120100) and not sle12 (1315) -# enable libseccomp -%if 0%{?sle_version} != 120100 && 0%{?suse_version} != 1315 +# enable libseccomp for sle >= sle12sp2 +%if 0%{?sle_version} >= 120200 +%define with_libseccomp 1 +%endif +# enable libseccomp for leap >= 42.2 +%if 0%{?leap_version} >= 420200 +%define with_libseccomp 1 +%endif +# enable libseccomp for Factory +%if 0%{?suse_version} > 1320 %define with_libseccomp 1 %endif %if 0%{?with_libseccomp} @@ -87,7 +94,7 @@ # Dockerfile to ensure that we don't use a slightly incompatible version of # runC or containerd (which would be bad). Requires: containerd = 0.2.5+gitr639_422e31c -Requires: runc = 0.1.1+gitr2947_9c2d8d1 +Requires: docker-runc = 0.1.1+gitr2947_9c2d8d1 # Provides mkfs.ext4 - used by Docker when devicemapper storage driver is used Requires: e2fsprogs Requires: git-core >= 1.7 @@ -180,11 +187,9 @@ %if 0%{?with_libseccomp} BUILDTAGS="seccomp $BUILDTAGS" %endif -# Note that these commands do not allow %%elseif. -# For versions equal to or below SLE12 && openSUSE_13.2 libdevmapper.h is not -# recent enough to define dm_task_deferred_remove(). (This is not true of -# SLE12_SP1 but we cannot distinguish it with this macro.) -%if 0%{?suse_version} <= 1320 +# For SLE12 libdevmapper.h is not recent enough to define +# dm_task_deferred_remove(). +%if 0%{?sle_version} == 120000 BUILDTAGS="libdm_no_deferred_remove $BUILDTAGS" %endif ++++++ docker.service ++++++ --- /var/tmp/diff_new_pack.cfiPLB/_old 2017-07-30 11:26:37.223826092 +0200 +++ /var/tmp/diff_new_pack.cfiPLB/_new 2017-07-30 11:26:37.223826092 +0200 @@ -1,7 +1,7 @@ [Unit] Description=Docker Application Container Engine Documentation=http://docs.docker.com -After=network.target containerd.socket containerd.service lvm2-monitor.service +After=network.target containerd.socket containerd.service lvm2-monitor.service SuSEfirewall2.service Requires=containerd.socket containerd.service [Service] @@ -11,7 +11,7 @@ # enabled by default because enabling socket activation means that on boot your # containers won't start until someone tries to administer the Docker daemon. Type=simple -ExecStart=/usr/bin/dockerd --containerd /run/containerd/containerd.sock --add-runtime oci=/usr/bin/docker-runc $DOCKER_NETWORK_OPTIONS $DOCKER_OPTS +ExecStart=/usr/bin/dockerd --containerd /run/containerd/containerd.sock --add-runtime oci=/usr/sbin/docker-runc $DOCKER_NETWORK_OPTIONS $DOCKER_OPTS ExecStartPost=/usr/lib/docker/docker_service_helper.sh wait ExecReload=/bin/kill -s HUP $MAINPID

1 0

commit rpmlint for openSUSE:Factory
by root＠hilbert.suse.de 30 Jul '17

30 Jul '17

Hello community, here is the log from the commit of package rpmlint for openSUSE:Factory checked in at 2017-07-30 11:26:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpmlint (Old) and /work/SRC/openSUSE:Factory/.rpmlint.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rpmlint" Sun Jul 30 11:26:06 2017 rev:275 rq:512616 version:1.8 Changes: -------- --- /work/SRC/openSUSE:Factory/rpmlint/rpmlint.changes 2017-07-17 09:00:52.662806074 +0200 +++ /work/SRC/openSUSE:Factory/.rpmlint.new/rpmlint.changes 2017-07-30 11:26:33.368370124 +0200 @@ -1,0 +2,10 @@ +Tue Jul 25 13:56:28 UTC 2017 - matthias.gerstner(a)suse.com + +- Added tpm2-abrmd (bnc#1049694) + +------------------------------------------------------------------- +Sat Jul 15 18:24:28 UTC 2017 - ilya(a)ilya.pp.ua + +- Add user mednafen for mednafen network play server + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ rpmlint.spec: same change ++++++ config ++++++ --- /var/tmp/diff_new_pack.VQZaJM/_old 2017-07-30 11:26:35.236106573 +0200 +++ /var/tmp/diff_new_pack.VQZaJM/_new 2017-07-30 11:26:35.240106009 +0200 @@ -329,6 +329,7 @@ 'man', 'mdnsd', 'mdom', + 'mednafen', 'memcached', 'messagebus', 'mumble-server', @@ -763,7 +764,10 @@ # pam_dbus (bsc#1039709). Take care to # never enable/integrate this by default (see bsc comments) "pam_dbus.conf", - "pam_dbus.service" + "pam_dbus.service", + # tpm2-abrmd (bnc#1049694) + "tpm2-abrmd.conf", + "tpm2-abrmd.service" )) setOption("PAMModules.WhiteList", (

1 0

commit go for openSUSE:Factory
by root＠hilbert.suse.de 30 Jul '17

30 Jul '17

Hello community, here is the log from the commit of package go for openSUSE:Factory checked in at 2017-07-30 11:25:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/go (Old) and /work/SRC/openSUSE:Factory/.go.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "go" Sun Jul 30 11:25:53 2017 rev:77 rq:512221 version:1.8.3 Changes: -------- --- /work/SRC/openSUSE:Factory/go/go.changes 2017-06-30 18:38:32.418384479 +0200 +++ /work/SRC/openSUSE:Factory/.go.new/go.changes 2017-07-30 11:26:31.652612229 +0200 @@ -1,0 +2,20 @@ +Fri Jul 21 18:51:29 UTC 2017 - jmassaguerpla(a)suse.com + +- Remove ruby requirement. golang-macros are not ruby anymore, plus + this requirement should have been in the golang-packaging package + +------------------------------------------------------------------- +Fri Jul 7 10:44:28 UTC 2017 - jmassaguerpla(a)suse.com + +- Simplify all the "ifdef suse_version" by removing versions which + have reach eol (13.* 42.1 sle11*) + +------------------------------------------------------------------- +Thu Jul 6 15:18:14 UTC 2017 - jmassaguerpla(a)suse.com + +- Add gcc6-go.patch for sle12 and leap42.x and use binutils-gold + except for s390x/s390 + Remove gcc5-go.patch cause we use gcc6 for sle12 and leap42.x and + gcc7 for newer versions (factory) + +------------------------------------------------------------------- @@ -25,0 +46,5 @@ +------------------------------------------------------------------- +Thu May 11 13:09:03 UTC 2017 - agraf(a)suse.com + + +- Enable gccgo with gcc-6 for SLE12 Old: ---- gcc5-go.patch New: ---- gcc6-go.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ go.spec ++++++ --- /var/tmp/diff_new_pack.ir1SSJ/_old 2017-07-30 11:26:32.588480172 +0200 +++ /var/tmp/diff_new_pack.ir1SSJ/_new 2017-07-30 11:26:32.596479043 +0200 @@ -96,43 +96,37 @@ # PATCH-FIX-SUSE fix_certificates_lookup.patch fcastelli(a)suse.com -- this patch forces Go to look for certificates only in the openSUSE/SLE locations. It also fixes certificate loading on SLE11, see https://github.com/golang/go/issues/6391 Patch7: fix_certificates_lookup.patch # PATCH-FIX-UPSTREAM marguerite(a)opensuse.org - find /usr/bin/go-5 when bootstrapping with gcc5-go -Patch8: gcc5-go.patch +Patch8: gcc6-go.patch Patch9: gcc7-go.patch # PATCH-FIX-OPENSUSE: Bump _MaxGomaxprocs to a larger number for NUMA machines. Patch10: runtime-bump-MaxGomaxprocs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # boostrap %if %{with_gccgo} -%ifarch aarch64 +%ifnarch s390 s390x BuildRequires: binutils-gold %endif -%if 0%{?suse_version} > 1320 -BuildRequires: gcc7-go +%if 0%{?suse_version} == 1315 +# SLE12 or Leap 42.x +BuildRequires: gcc6-go %else -BuildRequires: gcc5-go +BuildRequires: gcc7-go %endif %else +# no gcc-go BuildRequires: go1.4 %endif -%if 0%{?suse_version} >= 1210 -BuildRequires: systemd -%endif -%if 0%{?suse_version} >= 1100 BuildRequires: fdupes +BuildRequires: systemd Recommends: go-doc = %{version} #BNC#818502 debug edit tool of rpm fails on i586 builds -%if 0%{?suse_version} > 1230 -BuildRequires: rpm >= 4.11.1 -%endif -%endif BuildRequires: bc +BuildRequires: rpm >= 4.11.1 # for go.gdbinit, directory ownership BuildRequires: gdb Requires(post): update-alternatives Requires(postun): update-alternatives Requires: gcc -# for golang-macros.rb -Requires: ruby Provides: go = %{version} Provides: go-devel = go%{version} Provides: go-devel-static = go%{version} @@ -171,10 +165,11 @@ %endif %patch7 -p1 %if %{with_gccgo} -%if 0%{?suse_version} > 1320 -%patch9 -p1 -%else +%if 0%{?suse_version} == 1315 +# SLE12 or Leap 42.x %patch8 -p1 +%else +%patch9 -p1 %endif %endif %patch10 -p1 @@ -288,9 +283,7 @@ cp -r AUTHORS CONTRIBUTORS CONTRIBUTING.md LICENSE PATENTS README.md README.SUSE %{buildroot}%{_docdir}/go/%{go_api} cp -r doc/* %{buildroot}%{_docdir}/go/%{go_api} -%if 0%{?suse_version} >= 1100 %fdupes -s %{buildroot}%{_prefix} -%endif %post ++++++ gcc5-go.patch -> gcc6-go.patch ++++++ --- /work/SRC/openSUSE:Factory/go/gcc5-go.patch 2017-06-09 15:55:35.539040336 +0200 +++ /work/SRC/openSUSE:Factory/.go.new/gcc6-go.patch 2017-07-30 11:26:31.500633674 +0200 @@ -1,5 +1,5 @@ diff --git a/src/cmd/dist/buildtool.go b/src/cmd/dist/buildtool.go -index b0b9b2579d..1647935a2b 100644 +index b0b9b25..4a0b3fb 100644 --- a/src/cmd/dist/buildtool.go +++ b/src/cmd/dist/buildtool.go @@ -143,7 +143,7 @@ func bootstrapBuildTools() { @@ -7,12 +7,12 @@ // Use the math_big_pure_go build tag to disable the assembly in math/big // which may contain unsupported instructions. - run(workspace, ShowOutput|CheckExit, pathf("%s/bin/go", goroot_bootstrap), "install", "-gcflags=-l", "-tags=math_big_pure_go", "-v", "bootstrap/cmd/...") -+ run(workspace, ShowOutput|CheckExit, pathf("%s/bin/go-5", goroot_bootstrap), "install", "-gcflags=-l", "-tags=math_big_pure_go", "-v", "bootstrap/cmd/...") ++ run(workspace, ShowOutput|CheckExit, pathf("%s/bin/go-6", goroot_bootstrap), "install", "-gcflags=-l", "-tags=math_big_pure_go", "-v", "bootstrap/cmd/...") // Copy binaries into tool binary directory. for _, name := range bootstrapDirs { diff --git a/src/make.bash b/src/make.bash -index 84aaab56db..f794d4131c 100755 +index 84aaab5..628b93e 100755 --- a/src/make.bash +++ b/src/make.bash @@ -41,7 +41,7 @@ @@ -30,8 +30,8 @@ GOROOT_BOOTSTRAP=${GOROOT_BOOTSTRAP:-$HOME/go1.4} -if [ ! -x "$GOROOT_BOOTSTRAP/bin/go" ]; then - echo "ERROR: Cannot find $GOROOT_BOOTSTRAP/bin/go." >&2 -+if [ ! -x "$GOROOT_BOOTSTRAP/bin/go-5" ]; then -+ echo "ERROR: Cannot find $GOROOT_BOOTSTRAP/bin/go-5." >&2 ++if [ ! -x "$GOROOT_BOOTSTRAP/bin/go-6" ]; then ++ echo "ERROR: Cannot find $GOROOT_BOOTSTRAP/bin/go-6." >&2 echo "Set \$GOROOT_BOOTSTRAP to a working Go tree >= Go 1.4." >&2 exit 1 fi @@ -40,12 +40,12 @@ fi rm -f cmd/dist/dist -GOROOT="$GOROOT_BOOTSTRAP" GOOS="" GOARCH="" "$GOROOT_BOOTSTRAP/bin/go" build -o cmd/dist/dist ./cmd/dist -+GOROOT="$GOROOT_BOOTSTRAP" GOOS="" GOARCH="" "$GOROOT_BOOTSTRAP/bin/go-5" build -o cmd/dist/dist ./cmd/dist ++GOROOT="$GOROOT_BOOTSTRAP" GOOS="" GOARCH="" "$GOROOT_BOOTSTRAP/bin/go-6" build -o cmd/dist/dist ./cmd/dist # -e doesn't propagate out of eval, so check success by hand. eval $(./cmd/dist/dist env -p || echo FAIL=true) diff --git a/src/make.rc b/src/make.rc -index ba3554cd76..05c33a6f6d 100755 +index ba3554c..6d40673 100755 --- a/src/make.rc +++ b/src/make.rc @@ -46,13 +46,13 @@ echo cmd/dist @@ -54,14 +54,14 @@ GOROOT_BOOTSTRAP = $home/go1.4 -if(! test -x $GOROOT_BOOTSTRAP/bin/go){ - echo 'ERROR: Cannot find '$GOROOT_BOOTSTRAP'/bin/go.' >[1=2] -+if(! test -x $GOROOT_BOOTSTRAP/bin/go-5){ -+ echo 'ERROR: Cannot find '$GOROOT_BOOTSTRAP'/bin/go-5.' >[1=2] ++if(! test -x $GOROOT_BOOTSTRAP/bin/go-6){ ++ echo 'ERROR: Cannot find '$GOROOT_BOOTSTRAP'/bin/go-6.' >[1=2] echo 'Set $GOROOT_BOOTSTRAP to a working Go tree >= Go 1.4.' >[1=2] exit bootstrap } rm -f cmd/dist/dist -GOROOT=$GOROOT_BOOTSTRAP GOOS='' GOARCH='' $GOROOT_BOOTSTRAP/bin/go build -o cmd/dist/dist ./cmd/dist -+GOROOT=$GOROOT_BOOTSTRAP GOOS='' GOARCH='' $GOROOT_BOOTSTRAP/bin/go-5 build -o cmd/dist/dist ./cmd/dist ++GOROOT=$GOROOT_BOOTSTRAP GOOS='' GOARCH='' $GOROOT_BOOTSTRAP/bin/go-6 build -o cmd/dist/dist ./cmd/dist eval `{./cmd/dist/dist env -9} echo

1 0

commit go1.7 for openSUSE:Factory
by root＠hilbert.suse.de 30 Jul '17

30 Jul '17

Hello community, here is the log from the commit of package go1.7 for openSUSE:Factory checked in at 2017-07-30 11:25:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/go1.7 (Old) and /work/SRC/openSUSE:Factory/.go1.7.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "go1.7" Sun Jul 30 11:25:47 2017 rev:3 rq:512219 version:1.7.5 Changes: -------- --- /work/SRC/openSUSE:Factory/go1.7/go1.7.changes 2017-07-11 08:33:29.290760860 +0200 +++ /work/SRC/openSUSE:Factory/.go1.7.new/go1.7.changes 2017-07-30 11:26:30.208815959 +0200 @@ -1,0 +2,11 @@ +Fri Jul 21 18:52:20 UTC 2017 - jmassaguerpla(a)suse.com + +- Remove ruby requirement. golang-macros are not ruby anymore, plus + +------------------------------------------------------------------- +Mon Jul 17 10:39:45 UTC 2017 - thipp(a)suse.de + +- Remove gcc5-go dependency and only use gcc6-go if needed +- Remove gcc5-go.patch + +------------------------------------------------------------------- Old: ---- gcc5-go.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ go1.7.spec ++++++ --- /var/tmp/diff_new_pack.IgC9zt/_old 2017-07-30 11:26:31.176679386 +0200 +++ /var/tmp/diff_new_pack.IgC9zt/_new 2017-07-30 11:26:31.184678258 +0200 @@ -1,5 +1,5 @@ # -# spec file for package go +# spec file for package go1.7 # # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # @@ -96,7 +96,6 @@ # PATCH-FIX-SUSE fix_certificates_lookup.patch fcastelli(a)suse.com -- this patch forces Go to look for certificates only in the openSUSE/SLE locations. It also fixes certificate loading on SLE11, see https://github.com/golang/go/issues/6391 Patch7: fix_certificates_lookup.patch # PATCH-FIX-UPSTREAM marguerite(a)opensuse.org - find /usr/bin/go-5 when bootstrapping with gcc5-go -Patch8: gcc5-go.patch Patch9: gcc6-go.patch # PATCH-FIX-OPENSUSE: Bump _MaxGomaxprocs to a larger number for NUMA machines. Patch10: runtime-bump-MaxGomaxprocs.patch @@ -105,12 +104,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build # boostrap %if %{with_gccgo} -%if 0%{?suse_version} > 1320 BuildRequires: gcc6-go %else -BuildRequires: gcc5-go -%endif -%else BuildRequires: go1.4 %endif %if 0%{?suse_version} >= 1210 @@ -133,8 +128,6 @@ Requires(post): update-alternatives Requires(postun): update-alternatives Requires: gcc -# for golang-macros.rb -Requires: ruby Provides: go = %{version} Provides: go-devel = go%{version} Provides: go-devel-static = go%{version} @@ -173,11 +166,7 @@ %endif %patch7 -p1 %if %{with_gccgo} -%if 0%{?suse_version} > 1320 %patch9 -p1 -%else -%patch8 -p1 -%endif %endif %patch10 -p1 %patch11 -p1

1 0

commit rdma-core for openSUSE:Factory
by root＠hilbert.suse.de 30 Jul '17

30 Jul '17

Hello community, here is the log from the commit of package rdma-core for openSUSE:Factory checked in at 2017-07-30 11:25:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rdma-core (Old) and /work/SRC/openSUSE:Factory/.rdma-core.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rdma-core" Sun Jul 30 11:25:41 2017 rev:5 rq:511833 version:14 Changes: -------- --- /work/SRC/openSUSE:Factory/rdma-core/rdma-core.changes 2017-07-12 19:34:23.262064570 +0200 +++ /work/SRC/openSUSE:Factory/.rdma-core.new/rdma-core.changes 2017-07-30 11:26:25.969414168 +0200 @@ -1,0 +2,10 @@ +Thu Jul 20 13:44:16 UTC 2017 - nmoreychaisemartin(a)suse.com + +- ibacm now obsoletes libibacmp1 (bsc#1049854) + +------------------------------------------------------------------- +Thu Jul 13 13:42:09 UTC 2017 - schwab(a)suse.de + +- No mlx5 on %arm + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rdma-core.spec ++++++ --- /var/tmp/diff_new_pack.cQ9rGG/_old 2017-07-30 11:26:26.765301863 +0200 +++ /var/tmp/diff_new_pack.cQ9rGG/_new 2017-07-30 11:26:26.769301298 +0200 @@ -105,7 +105,7 @@ Requires: %{rdmacm_lname} = %{version}-%{release} Requires: %{umad_lname} = %{version}-%{release} Requires: %{verbs_lname} = %{version}-%{release} -%ifnarch s390 armv7hl +%ifnarch s390 %arm Requires: %{mlx5_lname} = %{version}-%{release} %endif Requires: rsocket = %{version}-%{release} @@ -154,7 +154,7 @@ Obsoletes: libocrdma-rdmav2 < %{version}-%{release} Provides: librxe-rdmav2 = %{version}-%{release} Obsoletes: librxe-rdmav2 < %{version}-%{release} -%ifnarch s390 armv7hl +%ifnarch s390 %arm Requires: %{mlx5_lname} = %{version}-%{release} %endif @@ -187,7 +187,7 @@ %description -n %verbs_lname This package contains the ibverbs runtime library. -%ifnarch s390 armv7hl +%ifnarch s390 %arm %package -n %mlx5_lname Summary: MLX5 runtime library Group: System/Libraries @@ -209,6 +209,7 @@ Summary: InfiniBand Communication Manager Assistant Group: Productivity/Networking/Other Requires: %{name} = %{version} +Obsoletes: libibacmp1 < %{version} %description -n ibacm The ibacm daemon helps reduce the load of managing path record lookups on @@ -385,7 +386,7 @@ %post -n %verbs_lname -p /sbin/ldconfig %postun -n %verbs_lname -p /sbin/ldconfig -%ifnarch s390 armv7hl +%ifnarch s390 %arm %post -n %mlx5_lname -p /sbin/ldconfig %postun -n %mlx5_lname -p /sbin/ldconfig %endif @@ -503,7 +504,7 @@ %{_mandir}/man3/umad* %{_mandir}/man3/*_to_ibv_rate.* %{_mandir}/man7/rdma_cm.* -%ifnarch s390 armv7hl +%ifnarch s390 %arm %{_mandir}/man3/mlx5* %{_mandir}/man7/mlx5* %endif @@ -524,7 +525,7 @@ %defattr(-,root,root) %{_libdir}/libibverbs*.so.* -%ifnarch s390 armv7hl +%ifnarch s390 %arm %files -n %mlx5_lname %defattr(-,root,root) %{_libdir}/libmlx5*.so.*

1 0

commit libpng16 for openSUSE:Factory
by root＠hilbert.suse.de 30 Jul '17

30 Jul '17

Hello community, here is the log from the commit of package libpng16 for openSUSE:Factory checked in at 2017-07-30 11:25:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libpng16 (Old) and /work/SRC/openSUSE:Factory/.libpng16.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libpng16" Sun Jul 30 11:25:32 2017 rev:35 rq:511589 version:1.6.30 Changes: -------- --- /work/SRC/openSUSE:Factory/libpng16/libpng16.changes 2017-07-04 11:55:27.962094546 +0200 +++ /work/SRC/openSUSE:Factory/.libpng16.new/libpng16.changes 2017-07-30 11:26:24.945558641 +0200 @@ -1,0 +2,18 @@ +Wed Jul 19 15:51:28 UTC 2017 - stefan.bruens(a)rwth-aachen.de + +- Drop png-version-info-only.patch, it has no effect after applying + 0001-libpng16-Revised-pngpriv.h-to-use-PNG_VERSION_INFO_O.patch + Both patches achieve the same, prefer the upstream version + +------------------------------------------------------------------- +Fri Jul 14 15:57:51 UTC 2017 - stefan.bruens(a)rwth-aachen.de + +- Add 0001-libpng16-Revised-pngpriv.h-to-use-PNG_VERSION_INFO_O.patch + Fix build on ARM + +------------------------------------------------------------------- +Mon Jul 10 15:11:14 UTC 2017 - schwab(a)suse.de + +- png-version-info-only.patch: fix missing PNG_VERSION_INFO_ONLY check + +------------------------------------------------------------------- New: ---- 0001-libpng16-Revised-pngpriv.h-to-use-PNG_VERSION_INFO_O.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libpng16.spec ++++++ --- /var/tmp/diff_new_pack.aKn9ag/_old 2017-07-30 11:26:25.713450286 +0200 +++ /var/tmp/diff_new_pack.aKn9ag/_new 2017-07-30 11:26:25.717449722 +0200 @@ -35,6 +35,8 @@ Source2: libpng16.keyring Source3: rpm-macros.libpng-tools Source4: baselibs.conf +# PATCH-FIX-UPSTREAM 0001-libpng16-Revised-pngpriv.h-to-use-PNG_VERSION_INFO_O.patch stefan.bruens(a)rwth-aachen.de -- Cherry-pick upstream fix for ARM build, fixed in 1.6.31 +Patch0: 0001-libpng16-Revised-pngpriv.h-to-use-PNG_VERSION_INFO_O.patch #BuildRequires: gpg-offline BuildRequires: libtool BuildRequires: pkg-config @@ -109,6 +111,7 @@ %prep %setup -n libpng-%{version} +%patch0 -p1 %build # PNG_SAFE_LIMITS_SUPPORTED: http://www.openwall.com/lists/oss-security/2015/01/10/1 ++++++ 0001-libpng16-Revised-pngpriv.h-to-use-PNG_VERSION_INFO_O.patch ++++++ >From 3f67eb68e05ae87ec985f413b97b4cdd2922533d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=83=C2=BCns?= <stefan.bruens(a)rwth-aachen.de> Date: Fri, 14 Jul 2017 17:53:43 +0200 Subject: [PATCH] [libpng16] Revised pngpriv.h to use PNG_VERSION_INFO_ONLY instead of PNG_ARM_NEON_IMPLEMENTATION == 2 to exclude some definitions that assembler cannot recognize. [SBruens] Cherry-picked from 54126d5c59653e744ee8af81ba61fd910ce4d295, removed merge conflicts. --- pngpriv.h | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/pngpriv.h b/pngpriv.h index a062a8da1..f50de2b86 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -452,6 +452,21 @@ # define png_fixed_error(s1,s2) png_err(s1) #endif +/* Some fixed point APIs are still required even if not exported because + * they get used by the corresponding floating point APIs. This magic + * deals with this: + */ +#ifdef PNG_FIXED_POINT_SUPPORTED +# define PNGFAPI PNGAPI +#else +# define PNGFAPI /* PRIVATE */ +#endif + +#ifndef PNG_VERSION_INFO_ONLY +/* Other defines specific to compilers can go here. Try to keep + * them inside an appropriate ifdef/endif pair for portability. + */ + /* C allows up-casts from (void*) to any pointer and (const void*) to any * pointer to a const object. C++ regards this as a type error and requires an * explicit, static, cast and provides the static_cast<> rune to ensure that @@ -480,20 +495,6 @@ # define png_aligncastconst(type, value) ((const void*)(value)) #endif /* __cplusplus */ -/* Some fixed point APIs are still required even if not exported because - * they get used by the corresponding floating point APIs. This magic - * deals with this: - */ -#ifdef PNG_FIXED_POINT_SUPPORTED -# define PNGFAPI PNGAPI -#else -# define PNGFAPI /* PRIVATE */ -#endif - -#ifndef PNG_VERSION_INFO_ONLY -/* Other defines specific to compilers can go here. Try to keep - * them inside an appropriate ifdef/endif pair for portability. - */ #if defined(PNG_FLOATING_POINT_SUPPORTED) ||\ defined(PNG_FLOATING_ARITHMETIC_SUPPORTED) /* png.c requires the following ANSI-C constants if the conversion of -- 2.13.2

1 0