openSUSE Commits
Threads by month
- ----- 2024 -----
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
August 2018
- 1 participants
- 1600 discussions
Hello community,
here is the log from the commit of package weston for openSUSE:Factory checked in at 2018-08-31 10:44:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/weston (Old)
and /work/SRC/openSUSE:Factory/.weston.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "weston"
Fri Aug 31 10:44:02 2018 rev:18 rq:631747 version:5.0.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/weston/weston.changes 2018-07-06 10:44:27.587078759 +0200
+++ /work/SRC/openSUSE:Factory/.weston.new/weston.changes 2018-08-31 10:44:32.919210018 +0200
@@ -1,0 +2,8 @@
+Sat Aug 25 17:30:52 UTC 2018 - jengelh(a)inai.de
+
+- Update to new upstream release 5
+ * The use of hardware planes in atomic mode setting.
+ * Clone mode
+ * A new touchscreen calibrator
+
+-------------------------------------------------------------------
Old:
----
weston-4.0.0.tar.xz
weston-4.0.0.tar.xz.sig
New:
----
weston-5.0.0.tar.xz
weston-5.0.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ weston.spec ++++++
--- /var/tmp/diff_new_pack.Dbe0My/_old 2018-08-31 10:44:33.487210699 +0200
+++ /var/tmp/diff_new_pack.Dbe0My/_new 2018-08-31 10:44:33.487210699 +0200
@@ -18,7 +18,7 @@
Name: weston
%define lname libweston0
-Version: 4.0.0
+Version: 5.0.0
Release: 0
Summary: Wayland Reference Compositor
License: MIT AND CC-BY-SA-3.0
@@ -49,7 +49,7 @@
BuildRequires: pkgconfig(gbm)
BuildRequires: pkgconfig(glesv2)
BuildRequires: pkgconfig(lcms2)
-BuildRequires: pkgconfig(libdrm) >= 2.4.30
+BuildRequires: pkgconfig(libdrm) >= 2.4.68
BuildRequires: pkgconfig(libinput) >= 0.8.0
BuildRequires: pkgconfig(libsystemd) >= 209
BuildRequires: pkgconfig(libudev) >= 136
@@ -60,7 +60,7 @@
BuildRequires: pkgconfig(wayland-protocols) >= 1.13
BuildRequires: pkgconfig(wayland-scanner)
BuildRequires: pkgconfig(wayland-server) >= 1.12.0
-BuildRequires: pkgconfig(xcb)
+BuildRequires: pkgconfig(xcb) >= 1.8
BuildRequires: pkgconfig(xcb-composite)
BuildRequires: pkgconfig(xcb-shm)
BuildRequires: pkgconfig(xcb-xfixes)
@@ -82,30 +82,30 @@
Xorg server and can pull X clients into the Wayland desktop and act
as a X window manager.
-%package -n libweston-4
+%package -n libweston-5
Summary: Weston rendering backend collection
Group: System/Libraries
-%description -n libweston-4
+%description -n libweston-5
This subpackage contains backend renderer plugins, used by
-libweston-4-0.
+libweston-5-0.
-%package -n libweston-4-0
+%package -n libweston-5-0
Summary: The Weston compositor as a shared library
Group: System/Libraries
-Requires: libweston-4 >= %version
+Requires: libweston-5 >= %version
-%description -n libweston-4-0
+%description -n libweston-5-0
The libweston library is intended for use by other compositor efforts
(projects) that want to more easily utilize Weston's internal
functionalities. Weston's own reference compositor also makes use of
this.
-%package -n libweston-desktop-4-0
+%package -n libweston-desktop-5-0
Summary: The Weston compositor as a shared library
Group: System/Libraries
-%description -n libweston-desktop-4-0
+%description -n libweston-desktop-5-0
libweston-desktop provides an additional level of functionality of
relevance to compositors implementing a desktop metaphor style of
graphical interface. This library API is designed around xdg_shell
@@ -154,14 +154,14 @@
fi
%endif
-%post -n libweston-4-0 -p /sbin/ldconfig
-%postun -n libweston-4-0 -p /sbin/ldconfig
-%post -n libweston-desktop-4-0 -p /sbin/ldconfig
-%postun -n libweston-desktop-4-0 -p /sbin/ldconfig
+%post -n libweston-5-0 -p /sbin/ldconfig
+%postun -n libweston-5-0 -p /sbin/ldconfig
+%post -n libweston-desktop-5-0 -p /sbin/ldconfig
+%postun -n libweston-desktop-5-0 -p /sbin/ldconfig
%files
%defattr(-,root,root)
-%doc COPYING README
+%license COPYING
%_bindir/w*
%_libexecdir/%name-*
%_libdir/%name/
@@ -169,17 +169,17 @@
%_datadir/wayland-sessions/
%_mandir/man?/*.*
-%files -n libweston-4-0
+%files -n libweston-5-0
%defattr(-,root,root)
-%_libdir/libweston-4.so.0*
+%_libdir/libweston-5.so.0*
-%files -n libweston-4
+%files -n libweston-5
%defattr(-,root,root)
-%_libdir/libweston-4/
+%_libdir/libweston-5/
-%files -n libweston-desktop-4-0
+%files -n libweston-desktop-5-0
%defattr(-,root,root)
-%_libdir/libweston-desktop-4.so.0*
+%_libdir/libweston-desktop-5.so.0*
%files devel
%defattr(-,root,root)
++++++ weston-4.0.0.tar.xz -> weston-5.0.0.tar.xz ++++++
++++ 23970 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package rmt-server for openSUSE:Factory checked in at 2018-08-31 10:44:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rmt-server (Old)
and /work/SRC/openSUSE:Factory/.rmt-server.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rmt-server"
Fri Aug 31 10:44:00 2018 rev:13 rq:631740 version:1.0.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/rmt-server/rmt-server.changes 2018-07-27 10:58:14.753876642 +0200
+++ /work/SRC/openSUSE:Factory/.rmt-server.new/rmt-server.changes 2018-08-31 10:44:31.807208686 +0200
@@ -1,0 +2,8 @@
+Thu Aug 2 16:19:35 UTC 2018 - fschnizlein(a)suse.com
+
+- Version 1.0.6
+- Change file paths to new locations to make RMT work with
+ read-only rootfs (bsc#1102198)
+- Change file permissions for rmt.conf (bsc#1104232)
+
+-------------------------------------------------------------------
@@ -4,0 +13 @@
+- sort all list outputs alphabetically (bsc#1088680)
Old:
----
rmt-server-1.0.5.tar.bz2
New:
----
rmt-server-1.0.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rmt-server.spec ++++++
--- /var/tmp/diff_new_pack.UA0Uqg/_old 2018-08-31 10:44:32.547209572 +0200
+++ /var/tmp/diff_new_pack.UA0Uqg/_new 2018-08-31 10:44:32.551209577 +0200
@@ -19,18 +19,19 @@
%define app_dir %{_datadir}/rmt/
%define lib_dir %{_libdir}/rmt/
%define data_dir %{_localstatedir}/lib/rmt/
+%define conf_dir %{_sysconfdir}/rmt
%define rmt_user _rmt
%define rmt_group nginx
%if 0%{?suse_version} == 1315
%define is_sle_12_family 1
%endif
Name: rmt-server
-Version: 1.0.5
+Version: 1.0.6
Release: 0
Summary: Repository mirroring tool and registration proxy for SCC
License: GPL-2.0-or-later
Group: Productivity/Networking/Web/Proxy
-URL: https://software.opensuse.org/package/rmt-server
+Url: https://software.opensuse.org/package/rmt-server
Source0: %{name}-%{version}.tar.bz2
Source1: rmt-server-rpmlintrc
Source2: rmt.conf
@@ -67,7 +68,8 @@
Requires(post): shadow
Requires(post): timezone
Requires(post): util-linux
-Recommends: yast2-rmt
+Conflicts: yast2-rmt < 1.0.3
+Recommends: yast2-rmt >= 1.0.3
# Does not build for i586 and s390 and is not supported on those architectures
ExcludeArch: %{ix86} s390
@@ -100,12 +102,14 @@
mkdir -p %{buildroot}%{data_dir}
mkdir -p %{buildroot}%{lib_dir}
mkdir -p %{buildroot}%{app_dir}
+mkdir -p %{buildroot}%{conf_dir}
+mkdir -p %{buildroot}/var/lib/rmt
mv tmp %{buildroot}%{data_dir}
mkdir %{buildroot}%{data_dir}/public
mv public/repo %{buildroot}%{data_dir}/public/
mv vendor %{buildroot}%{lib_dir}
-mv ssl %{buildroot}%{app_dir}
+mv ssl %{buildroot}%{conf_dir}
cp -ar . %{buildroot}%{app_dir}
ln -s %{data_dir}/tmp %{buildroot}%{app_dir}/tmp
@@ -183,11 +187,14 @@
%files
%attr(-,%{rmt_user},%{rmt_group}) %{app_dir}
%attr(-,%{rmt_user},%{rmt_group}) %{data_dir}
+%attr(-,%{rmt_user},%{rmt_group}) %{conf_dir}
+%attr(-,%{rmt_user},%{rmt_group}) /var/lib/rmt
%dir %{_libexecdir}/supportconfig
%dir %{_libexecdir}/supportconfig/plugins
%dir %{_sysconfdir}/nginx
%dir %{_sysconfdir}/nginx/vhosts.d
-%config(noreplace) %{_sysconfdir}/rmt.conf
+%dir /var/lib/rmt
+%config(noreplace) %attr(0640, %{rmt_user},root) %{_sysconfdir}/rmt.conf
%config(noreplace) %{_sysconfdir}/nginx/vhosts.d/rmt-server-http.conf
%config(noreplace) %{_sysconfdir}/nginx/vhosts.d/rmt-server-https.conf
%{_mandir}/man8/rmt-cli.8%{?ext_man}
@@ -219,10 +226,23 @@
%service_add_post rmt-server.target rmt-server.service rmt-server-migration.service rmt-server-mirror.service rmt-server-sync.service
cd %{_datadir}/rmt && runuser -u %{rmt_user} -g %{rmt_group} -- bin/rails secrets:setup >/dev/null
cd %{_datadir}/rmt && runuser -u %{rmt_user} -g %{rmt_group} -- bin/rails runner -e production "Rails::Secrets.write({'production' => {'secret_key_base' => SecureRandom.hex(64)}}.to_yaml)" >/dev/null
-if [ $1 -eq 1 ] ; then
+
+# Run only on install
+if [ $1 -eq 1 ]; then
echo "Please run the YaST RMT module (or 'yast2 rmt' from the command line) to complete the configuration of your RMT" >> /dev/stdout
fi
+# Run only on upgrade
+if [ $1 -eq 2 ]; then
+ if [ -d %{app_dir}/ssl ]; then
+ mv %{app_dir}/ssl/* %{conf_dir}/ssl
+ echo "RMT ssl configuration has been moved to a new place. New place is: %{conf_dir}/ssl"
+ fi
+ if [ -f %{app_dir}/config/system_uuid ]; then
+ mv %{app_dir}/config/system_uuid /var/lib/rmt/system_uuid
+ fi
+fi
+
%preun
%service_del_preun rmt-server.target rmt-server.service rmt-server-migration.service rmt-server-mirror.service rmt-server-sync.service
++++++ nginx-https.conf ++++++
--- /var/tmp/diff_new_pack.UA0Uqg/_old 2018-08-31 10:44:32.587209621 +0200
+++ /var/tmp/diff_new_pack.UA0Uqg/_new 2018-08-31 10:44:32.587209621 +0200
@@ -10,8 +10,8 @@
error_log /var/log/nginx/rmt_https_error.log;
root /usr/share/rmt/public;
- ssl_certificate /usr/share/rmt/ssl/rmt-server.crt;
- ssl_certificate_key /usr/share/rmt/ssl/rmt-server.key;
+ ssl_certificate /etc/rmt/ssl/rmt-server.crt;
+ ssl_certificate_key /etc/rmt/ssl/rmt-server.key;
ssl_protocols TLSv1.2 TLSv1.3;
location / {
@@ -37,6 +37,6 @@
# An alias to RMT CA certificate, so that it can be downloaded to client machines.
location /rmt.crt {
- alias /usr/share/rmt/ssl/rmt-ca.crt;
+ alias /etc/rmt/ssl/rmt-ca.crt;
}
}
++++++ rmt-cli.8.gz ++++++
--- /var/tmp/diff_new_pack.UA0Uqg/_old 2018-08-31 10:44:32.603209640 +0200
+++ /var/tmp/diff_new_pack.UA0Uqg/_new 2018-08-31 10:44:32.607209644 +0200
@@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
-.TH "RMT\-CLI" "8" "May 2018" "" "RMT"
+.TH "RMT\-CLI" "8" "August 2018" "" "RMT"
.
.SH "NAME"
\fBrmt\-cli\fR \- control and configure your RMT server
@@ -159,10 +159,10 @@
By default access to API endpoints consumed by \fBSUSEConnect\fR is limited to HTTPS only\. nginx is configured to use SSL certificate and private key from the following locations:
.
.IP "\(bu" 4
-Certificate: \fB/usr/share/rmt/ssl/rmt\-server\.crt\fR
+Certificate: \fB/etc/rmt/ssl/rmt\-server\.crt\fR
.
.IP "\(bu" 4
-Private key: \fB/usr/share/rmt/ssl/rmt\-server\.key\fR
+Private key: \fB/etc/rmt/ssl/rmt\-server\.key\fR
.
.IP "" 0
.
++++++ rmt-server-1.0.5.tar.bz2 -> rmt-server-1.0.6.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/rmt-server/rmt-server-1.0.5.tar.bz2 /work/SRC/openSUSE:Factory/.rmt-server.new/rmt-server-1.0.6.tar.bz2 differ: char 11, line 1
1
0
Hello community,
here is the log from the commit of package dateutils for openSUSE:Factory checked in at 2018-08-31 10:43:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dateutils (Old)
and /work/SRC/openSUSE:Factory/.dateutils.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dateutils"
Fri Aug 31 10:43:47 2018 rev:21 rq:631611 version:0.4.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/dateutils/dateutils.changes 2018-03-07 10:37:31.180327625 +0100
+++ /work/SRC/openSUSE:Factory/.dateutils.new/dateutils.changes 2018-08-31 10:44:20.959195705 +0200
@@ -1,0 +2,26 @@
+Sat Aug 25 18:31:39 UTC 2018 - jengelh(a)inai.de
+
+- Ensure neutrality of descriptions.
+- Trim idempotent %if..%endif guards.
+
+-------------------------------------------------------------------
+Tue Aug 14 10:42:17 UTC 2018 - mvetter(a)suse.com
+
+- Update to 0.4.4:
+ Incompatible changes:
+ * suffix `m` is no longer accepted as a synonym for `mo`
+ with date-only input, issue #76
+ Bugfixes:
+ * expose BSD routines (fgetln()) to yuck
+ * for dates passed to dateround(1) that coincidentally
+ match the roundspecs do read them as dates
+ * wrong timestamps read via -i %s signal error
+ * facilitate bmake build
+ * time rounding on date-only input keeps the date unchanged
+ * dateseq's short-cut iterator (2 date arguments) does not
+ interfere with the 3-argument version
+ * adding 0 date or time units does not change the summand
+ * datezone on times (without date) will return times
+ * zones are singletons now, opened and closed only once
+
+-------------------------------------------------------------------
Old:
----
dateutils-0.4.3.tar.asc
dateutils-0.4.3.tar.xz
New:
----
dateutils-0.4.4.tar.asc
dateutils-0.4.4.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dateutils.spec ++++++
--- /var/tmp/diff_new_pack.8xa5dd/_old 2018-08-31 10:44:21.551196413 +0200
+++ /var/tmp/diff_new_pack.8xa5dd/_new 2018-08-31 10:44:21.555196417 +0200
@@ -1,7 +1,7 @@
#
# spec file for package dateutils
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -34,9 +34,9 @@
%define have_octave 1
%endif
Name: dateutils
-Version: 0.4.3
+Version: 0.4.4
Release: 0
-Summary: Nifty command line date and time utilities
+Summary: Command line date and time utilities
License: BSD-3-Clause
Group: Productivity/Text/Utilities
Url: https://github.com/hroptatyr/dateutils/
@@ -61,7 +61,6 @@
conversions, and as such they are highly pipe-able and modeled after
their well-known cousins (e.g. dtest vs. test, or dgrep vs. grep).
-%if %{have_octave}
%package octave
Summary: Dateutils functions for matlab and octave
Group: Development/Libraries/Other
@@ -70,7 +69,6 @@
%description octave
Dateutils can be used from within matlab or ocatave.
-%endif
%prep
%setup -q
++++++ dateutils-0.4.3.tar.xz -> dateutils-0.4.4.tar.xz ++++++
++++ 4617 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package slrn for openSUSE:Factory checked in at 2018-08-31 10:43:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/slrn (Old)
and /work/SRC/openSUSE:Factory/.slrn.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "slrn"
Fri Aug 31 10:43:51 2018 rev:27 rq:631613 version:1.0.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/slrn/slrn.changes 2017-10-18 10:55:00.968110421 +0200
+++ /work/SRC/openSUSE:Factory/.slrn.new/slrn.changes 2018-08-31 10:44:22.135197111 +0200
@@ -1,0 +2,5 @@
+Sun Aug 19 17:00:52 UTC 2018 - mcepl(a)suse.com
+
+- Clean up SPEC
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ slrn.spec ++++++
--- /var/tmp/diff_new_pack.wdwEkV/_old 2018-08-31 10:44:22.923198053 +0200
+++ /var/tmp/diff_new_pack.wdwEkV/_new 2018-08-31 10:44:22.923198053 +0200
@@ -1,7 +1,7 @@
#
# spec file for package slrn
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,9 +20,9 @@
Version: 1.0.3
Release: 0
Summary: Threaded Newsreader
-License: GPL-2.0+
+License: GPL-2.0-or-later
Group: Productivity/Networking/News/Clients
-Url: http://www.slrn.org
+URL: http://www.slrn.org
Source: %{name}-%{version}-gpl.tar.bz2
Source1: clean-tar.sh
# PATCH-FIX-OPENSUSE slrn-do-not-strip-binaries.diff gber(a)opensuse.org -- Prevents binaris from being stripped
@@ -81,7 +81,8 @@
find contrib/ doc -type f -exec chmod 644 {} +
%files
-%doc changes.txt COPYING COPYRIGHT README
+%license COPYING
+%doc changes.txt COPYRIGHT README
%doc doc/{FAQ,FIRST_STEPS,help.txt,manual.txt,pc-keys.txt,README.GroupLens}
%doc doc/{README.macros,README.multiuser,README.SSL,score.txt,slrn-doc.html}
%doc doc/{slrnfuns.txt,slrn.rc,THANKS,*.sl}
@@ -90,8 +91,8 @@
%config(noreplace) %{_sysconfdir}/slrn/slrn.rc
%{_bindir}/slrn
%{_bindir}/slrnpull
-%{_mandir}/man1/slrn.1*
-%{_mandir}/man1/slrnpull.1*
+%{_mandir}/man1/slrn.1%{?ext_man}
+%{_mandir}/man1/slrnpull.1%{?ext_man}
%{_datadir}/slrn
%files lang -f %{name}.lang
1
0
Hello community,
here is the log from the commit of package python-detox for openSUSE:Factory checked in at 2018-08-31 10:43:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-detox (Old)
and /work/SRC/openSUSE:Factory/.python-detox.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-detox"
Fri Aug 31 10:43:43 2018 rev:6 rq:631544 version:0.13
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-detox/python-detox.changes 2015-05-11 19:48:41.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.python-detox.new/python-detox.changes 2018-08-31 10:44:18.227192439 +0200
@@ -1,0 +2,15 @@
+Sat Aug 25 18:18:33 UTC 2018 - jengelh(a)inai.de
+
+- Use noun phrase in summary.
+
+-------------------------------------------------------------------
+Thu Aug 23 10:03:05 UTC 2018 - tchvatal(a)suse.com
+
+- Switch to singlespec
+- Run tests
+- Update to 0.13:
+ * get compatible again to tox-2.0
+ * Add support for running detox as python -m detox
+ * use pytest for testing
+
+-------------------------------------------------------------------
Old:
----
detox-0.9.4.tar.gz
New:
----
detox-0.13.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-detox.spec ++++++
--- /var/tmp/diff_new_pack.4NZjVr/_old 2018-08-31 10:44:18.859193194 +0200
+++ /var/tmp/diff_new_pack.4NZjVr/_new 2018-08-31 10:44:18.863193199 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-detox
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,31 +16,27 @@
#
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-detox
-Version: 0.9.4
+Version: 0.13
Release: 0
-Summary: Distributing activities of the tox tool
+Summary: Distributed variant of the tox tool
License: MIT
Group: Development/Languages/Python
-Url: http://bitbucket.org/hpk42/detox
-Source: https://pypi.python.org/packages/source/d/detox/detox-%{version}.tar.gz
-BuildRequires: python-devel
-BuildRequires: python-setuptools
-# Test requirements:
-BuildRequires: python-eventlet >= 0.15.0
-BuildRequires: python-nose
-BuildRequires: python-py >= 1.4.13
-BuildRequires: python-pytest
-BuildRequires: python-tox >= 1.9.0
+URL: http://bitbucket.org/hpk42/detox
+Source: https://files.pythonhosted.org/packages/source/d/detox/detox-%{version}.tar…
+BuildRequires: %{python_module eventlet >= 0.15.0}
+BuildRequires: %{python_module py >= 1.4.27}
+BuildRequires: %{python_module pytest}
+BuildRequires: %{python_module setuptools}
+BuildRequires: %{python_module tox >= 2}
+BuildRequires: fdupes
+BuildRequires: python-rpm-macros
Requires: python-eventlet >= 0.15.0
-Requires: python-py >= 1.4.13
-Requires: python-tox >= 1.9.0
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%if 0%{?suse_version} && 0%{?suse_version} <= 1110
-%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%else
+Requires: python-py >= 1.4.2713
+Requires: python-tox >= 2
BuildArch: noarch
-%endif
+%python_subpackages
%description
detox is the distributed version of "tox". It makes efficient use of multiple
@@ -56,18 +52,21 @@
%setup -q -n detox-%{version}
%build
-python setup.py build
+%python_build
%install
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+%python_install
+%python_expand %fdupes %{buildroot}%{$python_sitelib}
-#%%check
-#nosetests
-
-%files
-%defattr(-,root,root,-)
-%doc LICENSE CHANGELOG
-%{_bindir}/detox
+%check
+export PATH="$PATH:%{buildroot}%{_bindir}"
+# All 3 skipped tests just timeout in OBS
+%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} py.test-%{$python_version} -k 'not (test_getvenv or test_test or test_runtests)'
+
+%files %{python_files}
+%license LICENSE
+%doc CHANGELOG
+%python3_only %{_bindir}/detox
%{python_sitelib}/*
%changelog
++++++ detox-0.9.4.tar.gz -> detox-0.13.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/detox-0.9.4/CHANGELOG new/detox-0.13/CHANGELOG
--- old/detox-0.9.4/CHANGELOG 2015-02-24 15:51:26.000000000 +0100
+++ new/detox-0.13/CHANGELOG 2018-08-20 17:51:42.000000000 +0200
@@ -1,3 +1,38 @@
+0.13.0
+-----------------------
+- (fix `#283 <https://github.com/tox-dev/tox/issues/283>`_) detox creates virtualenvs
+ repeatedly and unnecessarily - by Thomas Steinke
+
+0.12.0
+-----------------------
+
+- (fix `#792 <https://github.com/tox-dev/tox/issues/792>`_) bump tox version constraint
+ to <4.0 - by Pi Delport
+- support and test with Python 2.7, 3.4+ - by Miro Hrončok
+- fix project url to point ot github - by Neil Halelamien
+- remove some unused imports - by Nir Soffer
+
+
+0.11.0
+-----------------------
+
+- #406: Add support for running detox as python -m detox
+ Thanks André Caron (@AndreLouisCaron).
+
+- (infrastructure) add Travis CI setup.
+ Thanks Timothée Mazzucotelli (@Pawamoy).
+
+- add "-n NUMPROC" option to set number of processes. The default
+ is the number of CPUs as determined by multiprocessing.cpu_count()
+ or "2" if the call does not work (e.g. on py27/windows).
+ Thanks Timothée Mazzucotelli (@Pawamoy).
+
+
+0.10.0
+-----------------------
+
+- get compatible again to tox-2.0
+
0.9.4
-----------------------
@@ -30,7 +65,7 @@
0.9.1
-----------------------
-- fix issue5 - small adjustments to work with latest tox-1.4.3 version
+- fix issue5 - small adjustments to work with latest tox-1.4.3 version
0.9
-----------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/detox-0.9.4/MANIFEST.in new/detox-0.13/MANIFEST.in
--- old/detox-0.9.4/MANIFEST.in 2015-02-24 15:51:26.000000000 +0100
+++ new/detox-0.13/MANIFEST.in 2018-04-20 13:34:23.000000000 +0200
@@ -3,3 +3,6 @@
include tox.ini
include LICENSE
graft tests
+
+global-exclude __pycache__
+global-exclude *.py[cod]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/detox-0.9.4/PKG-INFO new/detox-0.13/PKG-INFO
--- old/detox-0.9.4/PKG-INFO 2015-02-24 15:51:27.000000000 +0100
+++ new/detox-0.13/PKG-INFO 2018-08-20 18:49:39.000000000 +0200
@@ -1,10 +1,10 @@
Metadata-Version: 1.1
Name: detox
-Version: 0.9.4
-Summary: distributing activities of the tox tool (py2 only)
-Home-page: http://bitbucket.org/hpk42/detox
+Version: 0.13
+Summary: distributing activities of the tox tool
+Home-page: https://github.com/tox-dev/detox
Author: holger krekel
-Author-email: holger at merlinux.eu
+Author-email: holger(a)merlinux.eu
License: MIT
Description:
What is detox?
@@ -19,16 +19,16 @@
in the same way and with the same options with which you would run
``tox``, see the `tox home page`_ for more info.
- Please file issues as "tox" issues using the "detox" component:
+ Please file issues as "tox" issues using the "detox" label:
- https://bitbucket.org/hpk42/tox/issues
+ https://github.com/tox-dev/tox/issues
.. note::
- detox runs only on python2.6 and python2.7 (but supports creation of
- python3 and all environments supported of the underlying "tox" command)
+ detox runs on python2.7 and python3.4+ (but supports creation of
+ all environments supported of the underlying "tox" command)
- .. _`tox home page`: http://tox.testrun.org/
+ .. _`tox home page`: http://tox.readthedocs.org
Platform: unix
Platform: linux
@@ -36,11 +36,17 @@
Platform: cygwin
Platform: win32
Classifier: Development Status :: 4 - Beta
+Classifier: Framework :: tox
Classifier: Intended Audience :: Developers
Classifier: License :: OSI Approved :: MIT License
Classifier: Operating System :: POSIX
Classifier: Operating System :: Microsoft :: Windows
Classifier: Operating System :: MacOS :: MacOS X
+Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
Classifier: Topic :: Software Development :: Testing
Classifier: Topic :: Software Development :: Libraries
Classifier: Topic :: Utilities
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/detox-0.9.4/README.md new/detox-0.13/README.md
--- old/detox-0.9.4/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/detox-0.13/README.md 2018-04-14 14:47:13.000000000 +0200
@@ -0,0 +1,17 @@
+[![Build Status](https://travis-ci.org/tox-dev/detox.svg?branch=master)](https://tra…
+
+# What is detox?
+
+detox is the distributed version of [tox](https://pypi.org/project/tox/). It makes efficient use of multiple CPUs by running all possible activities in parallel. It has the same options and configuration that tox has so after installation can just run:
+
+ detox
+
+in the same way and with the same options with which you would run `tox`, see the [tox home page](http://tox.readthedocs.io) for more info.
+
+Additionally, detox offers a `-n` or `--num` option to set the number of concurrent processes to use.
+
+Please file issues as ["tox" issues](https://github.com/tox-dev/tox/issues) using a "detox: " prefix in the issue title.
+
+## Note
+
+detox runs on python2.7 and python3.4+ (but supports creation of all environments supported of the underlying "tox" command)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/detox-0.9.4/detox/__init__.py new/detox-0.13/detox/__init__.py
--- old/detox-0.9.4/detox/__init__.py 2015-02-24 15:51:26.000000000 +0100
+++ new/detox-0.13/detox/__init__.py 2018-04-20 12:17:11.000000000 +0200
@@ -1 +1 @@
-__version__ = '0.9.4'
+__version__ = '0.12'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/detox-0.9.4/detox/__main__.py new/detox-0.13/detox/__main__.py
--- old/detox-0.9.4/detox/__main__.py 1970-01-01 01:00:00.000000000 +0100
+++ new/detox-0.13/detox/__main__.py 2018-04-11 13:12:37.000000000 +0200
@@ -0,0 +1,5 @@
+from detox.main import main
+
+# Enable ``python -m detox ...``.
+if __name__ == '__main__':
+ main()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/detox-0.9.4/detox/main.py new/detox-0.13/detox/main.py
--- old/detox-0.9.4/detox/main.py 2015-02-24 15:51:26.000000000 +0100
+++ new/detox-0.13/detox/main.py 2018-08-20 17:51:42.000000000 +0200
@@ -1,12 +1,11 @@
import sys
-import argparse
import py
import detox
from detox.proc import Detox
def parse(args):
- import tox._config
- return tox._config.parseconfig(args, "detox")
+ from tox.session import prepare
+ return prepare(args)
def main(args=None):
if args is None:
@@ -21,4 +20,4 @@
#detox.toxsession.report.line(
# "detox speed-up: %.2f (elapsed %.2f, cumulated %.2f)" % (
# cumulated / elapsed, elapsed, cumulated), bold=True)
- return retcode
+ raise SystemExit(retcode)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/detox-0.9.4/detox/proc.py new/detox-0.13/detox/proc.py
--- old/detox-0.9.4/detox/proc.py 2015-02-24 15:51:26.000000000 +0100
+++ new/detox-0.13/detox/proc.py 2018-08-20 17:51:42.000000000 +0200
@@ -1,14 +1,10 @@
from __future__ import with_statement
import eventlet
-import sys
-import py
from eventlet.timeout import Timeout
from eventlet.green.subprocess import Popen, PIPE, STDOUT
from eventlet import GreenPool
-import eventlet
-import tox._config
-import tox._cmdline
+import tox.session
def timelimited(secs, func):
if secs is not None:
@@ -17,7 +13,7 @@
return func()
class FileSpinner:
- chars = "- \ | / - \ | /".split()
+ chars = r"- \ | / - \ | /".split()
def __init__(self):
self.path2last = {}
@@ -33,7 +29,7 @@
return self.chars[charindex % len(self.chars)]
-class ToxReporter(tox._cmdline.Reporter):
+class ToxReporter(tox.session.Reporter):
sortorder = ("runtests command installdeps installpkg inst inst-nodeps "
"sdist-make create recreate".split())
@@ -112,12 +108,12 @@
try:
return self._toxsession
except AttributeError:
- self._toxsession = tox._cmdline.Session(
+ self._toxsession = tox.session.Session(
self._toxconfig, Report=ToxReporter, popen=Popen)
return self._toxsession
def provide_sdist(self):
- sdistpath = self.toxsession.sdist()
+ sdistpath = self.toxsession.get_installpkg_path()
if not sdistpath:
raise SystemExit(1)
return sdistpath
@@ -138,6 +134,7 @@
if self.toxsession.config.skipsdist:
venv, = self.getresources("venv:%s" % venvname)
if venv:
+ venv.finish()
self.toxsession.runtestenv(venv, redirect=True)
else:
venv, sdist = self.getresources("venv:%s" % venvname, "sdist")
@@ -147,7 +144,7 @@
self.toxsession.runtestenv(venv, redirect=True)
def runtestsmulti(self, envlist):
- pool = GreenPool()
+ pool = GreenPool(size=self._toxconfig.option.numproc)
for env in envlist:
pool.spawn_n(self.runtests, env)
pool.waitall()
@@ -162,7 +159,7 @@
def __init__(self, providerbase):
self._providerbase = providerbase
self._spec2thread = {}
- self._pool = GreenPool(1000)
+ self._pool = GreenPool()
self._resources = {}
def _dispatchprovider(self, spec):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/detox-0.9.4/detox/tox_proclimit.py new/detox-0.13/detox/tox_proclimit.py
--- old/detox-0.9.4/detox/tox_proclimit.py 1970-01-01 01:00:00.000000000 +0100
+++ new/detox-0.13/detox/tox_proclimit.py 2018-04-16 13:10:08.000000000 +0200
@@ -0,0 +1,27 @@
+import argparse
+import multiprocessing
+
+from tox import hookimpl
+
+
+@hookimpl
+def tox_addoption(parser):
+ def positive_integer(value):
+ ivalue = int(value)
+ if ivalue <= 0:
+ raise argparse.ArgumentTypeError(
+ "%s is an invalid positive int value" % value)
+ return ivalue
+
+ try:
+ num_proc = multiprocessing.cpu_count()
+ except Exception:
+ num_proc = 2
+ parser.add_argument(
+ "-n", "--num",
+ type=positive_integer,
+ action="store",
+ default=num_proc,
+ dest="numproc",
+ help="set the number of concurrent processes "
+ "(default %s)." % num_proc)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/detox-0.9.4/detox.egg-info/PKG-INFO new/detox-0.13/detox.egg-info/PKG-INFO
--- old/detox-0.9.4/detox.egg-info/PKG-INFO 2015-02-24 15:51:27.000000000 +0100
+++ new/detox-0.13/detox.egg-info/PKG-INFO 2018-08-20 18:49:39.000000000 +0200
@@ -1,10 +1,10 @@
Metadata-Version: 1.1
Name: detox
-Version: 0.9.4
-Summary: distributing activities of the tox tool (py2 only)
-Home-page: http://bitbucket.org/hpk42/detox
+Version: 0.13
+Summary: distributing activities of the tox tool
+Home-page: https://github.com/tox-dev/detox
Author: holger krekel
-Author-email: holger at merlinux.eu
+Author-email: holger(a)merlinux.eu
License: MIT
Description:
What is detox?
@@ -19,16 +19,16 @@
in the same way and with the same options with which you would run
``tox``, see the `tox home page`_ for more info.
- Please file issues as "tox" issues using the "detox" component:
+ Please file issues as "tox" issues using the "detox" label:
- https://bitbucket.org/hpk42/tox/issues
+ https://github.com/tox-dev/tox/issues
.. note::
- detox runs only on python2.6 and python2.7 (but supports creation of
- python3 and all environments supported of the underlying "tox" command)
+ detox runs on python2.7 and python3.4+ (but supports creation of
+ all environments supported of the underlying "tox" command)
- .. _`tox home page`: http://tox.testrun.org/
+ .. _`tox home page`: http://tox.readthedocs.org
Platform: unix
Platform: linux
@@ -36,11 +36,17 @@
Platform: cygwin
Platform: win32
Classifier: Development Status :: 4 - Beta
+Classifier: Framework :: tox
Classifier: Intended Audience :: Developers
Classifier: License :: OSI Approved :: MIT License
Classifier: Operating System :: POSIX
Classifier: Operating System :: Microsoft :: Windows
Classifier: Operating System :: MacOS :: MacOS X
+Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
Classifier: Topic :: Software Development :: Testing
Classifier: Topic :: Software Development :: Libraries
Classifier: Topic :: Utilities
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/detox-0.9.4/detox.egg-info/SOURCES.txt new/detox-0.13/detox.egg-info/SOURCES.txt
--- old/detox-0.9.4/detox.egg-info/SOURCES.txt 2015-02-24 15:51:27.000000000 +0100
+++ new/detox-0.13/detox.egg-info/SOURCES.txt 2018-08-20 18:49:39.000000000 +0200
@@ -1,11 +1,15 @@
CHANGELOG
LICENSE
MANIFEST.in
+README.md
+setup.cfg
setup.py
tox.ini
detox/__init__.py
+detox/__main__.py
detox/main.py
detox/proc.py
+detox/tox_proclimit.py
detox.egg-info/PKG-INFO
detox.egg-info/SOURCES.txt
detox.egg-info/dependency_links.txt
@@ -13,4 +17,5 @@
detox.egg-info/requires.txt
detox.egg-info/top_level.txt
tests/conftest.py
-tests/test_detox.py
\ No newline at end of file
+tests/test_detox.py
+tests/test_main.py
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/detox-0.9.4/detox.egg-info/entry_points.txt new/detox-0.13/detox.egg-info/entry_points.txt
--- old/detox-0.9.4/detox.egg-info/entry_points.txt 2015-02-24 15:51:27.000000000 +0100
+++ new/detox-0.13/detox.egg-info/entry_points.txt 2018-08-20 18:49:39.000000000 +0200
@@ -1,3 +1,6 @@
[console_scripts]
detox=detox.main:main
+[tox]
+proclimit = detox.tox_proclimit
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/detox-0.9.4/detox.egg-info/requires.txt new/detox-0.13/detox.egg-info/requires.txt
--- old/detox-0.9.4/detox.egg-info/requires.txt 2015-02-24 15:51:27.000000000 +0100
+++ new/detox-0.13/detox.egg-info/requires.txt 2018-08-20 18:49:39.000000000 +0200
@@ -1,3 +1,3 @@
-tox>=1.9.0
-py>=1.4.13
+tox<4,>=2
+py>=1.4.27
eventlet>=0.15.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/detox-0.9.4/setup.cfg new/detox-0.13/setup.cfg
--- old/detox-0.9.4/setup.cfg 2015-02-24 15:51:27.000000000 +0100
+++ new/detox-0.13/setup.cfg 2018-08-20 18:49:39.000000000 +0200
@@ -1,5 +1,10 @@
+[bdist_wheel]
+universal = 1
+
+[devpi:upload]
+formats = sdist.tgz,bdist_wheel
+
[egg_info]
tag_build =
tag_date = 0
-tag_svn_revision = 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/detox-0.9.4/setup.py new/detox-0.13/setup.py
--- old/detox-0.9.4/setup.py 2015-02-24 15:51:26.000000000 +0100
+++ new/detox-0.13/setup.py 2018-08-20 18:47:59.000000000 +0200
@@ -1,8 +1,6 @@
-import os, sys
-
from setuptools import setup
-long_description="""
+long_description = """
What is detox?
==========================
@@ -15,45 +13,53 @@
in the same way and with the same options with which you would run
``tox``, see the `tox home page`_ for more info.
-Please file issues as "tox" issues using the "detox" component:
+Please file issues as "tox" issues using the "detox" label:
- https://bitbucket.org/hpk42/tox/issues
+ https://github.com/tox-dev/tox/issues
.. note::
- detox runs only on python2.6 and python2.7 (but supports creation of
- python3 and all environments supported of the underlying "tox" command)
+ detox runs on python2.7 and python3.4+ (but supports creation of
+ all environments supported of the underlying "tox" command)
-.. _`tox home page`: http://tox.testrun.org/
+.. _`tox home page`: http://tox.readthedocs.org
"""
+
def main():
setup(
name='detox',
- description='distributing activities of the tox tool (py2 only)',
- long_description = long_description,
- version='0.9.4',
- url='http://bitbucket.org/hpk42/detox',
+ description='distributing activities of the tox tool',
+ long_description=long_description,
+ version='0.13',
+ url='https://github.com/tox-dev/detox',
license='MIT',
platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
author='holger krekel',
- author_email='holger at merlinux.eu',
+ author_email='holger(a)merlinux.eu',
classifiers=['Development Status :: 4 - Beta',
+ 'Framework :: tox',
'Intended Audience :: Developers',
'License :: OSI Approved :: MIT License',
'Operating System :: POSIX',
'Operating System :: Microsoft :: Windows',
'Operating System :: MacOS :: MacOS X',
+ 'Programming Language :: Python :: 2.7',
+ 'Programming Language :: Python :: 3.4',
+ 'Programming Language :: Python :: 3.5',
+ 'Programming Language :: Python :: 3.6',
+ 'Programming Language :: Python :: 3.7',
'Topic :: Software Development :: Testing',
'Topic :: Software Development :: Libraries',
'Topic :: Utilities',
'Programming Language :: Python',
],
packages=['detox', ],
- install_requires=['tox>=1.9.0',
- 'py>=1.4.13', 'eventlet>=0.15.0',],
- entry_points={'console_scripts': 'detox=detox.main:main'},
+ install_requires=['tox>=2,<4', 'py>=1.4.27', 'eventlet>=0.15.0'],
+ entry_points={'console_scripts': 'detox=detox.main:main',
+ 'tox': ['proclimit = detox.tox_proclimit']},
)
+
if __name__ == '__main__':
main()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/detox-0.9.4/tests/conftest.py new/detox-0.13/tests/conftest.py
--- old/detox-0.9.4/tests/conftest.py 2015-02-24 15:51:26.000000000 +0100
+++ new/detox-0.13/tests/conftest.py 2018-08-20 18:32:26.000000000 +0200
@@ -44,6 +44,20 @@
tmpdir.join("example2", "__init__.py").ensure()
+def create_example3(tmpdir):
+ tmpdir.join("tox.ini").write(d("""
+ [tox]
+ skipsdist = True
+
+ [testenv]
+ commands = python -c 'import time; time.sleep(1)'
+
+ [testenv:py1]
+ [testenv:py2]
+ """))
+ tmpdir.join("example3", "__init__.py").ensure()
+
+
def pytest_configure(config):
config.addinivalue_line("markers", "example1: use example1 for setup")
config.addinivalue_line("markers", "example2: use example2 for setup")
@@ -151,4 +165,3 @@
result = testdir.runpytest()
assert "failed to timeout" not in result.stdout.str()
result.stdout.fnmatch_lines(["*Timeout: 0.01*"])
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/detox-0.9.4/tests/test_detox.py new/detox-0.13/tests/test_detox.py
--- old/detox-0.9.4/tests/test_detox.py 2015-02-24 15:51:26.000000000 +0100
+++ new/detox-0.13/tests/test_detox.py 2018-04-11 13:12:37.000000000 +0200
@@ -1,3 +1,5 @@
+from datetime import datetime, timedelta
+
import pytest
import eventlet
import detox
@@ -86,3 +88,47 @@
"py*getenv*",
"py*create:*",
])
+
+
+class TestProcLimitOption:
+ pytestmark = [pytest.mark.example3]
+
+ def test_runtestmulti(self):
+ class MyConfig:
+ class MyOption:
+ numproc = 7
+ option = MyOption()
+
+ l = []
+
+ def MyGreenPool(**kw):
+ l.append(kw)
+ # Building a Detox object will already call GreenPool(),
+ # so we have to let MyGreenPool being called twice before raise
+ if len(l) == 2:
+ raise ValueError
+
+ from detox import proc
+ setattr(proc, 'GreenPool', MyGreenPool)
+ with pytest.raises(ValueError):
+ d = proc.Detox(MyConfig())
+ d.runtestsmulti(['env1', 'env2', 'env3']) # Fake env list
+
+ assert l[0] == {} # When building Detox object
+ assert l[1] == {'size': 7} # When calling runtestsmulti
+
+ @pytest.mark.timeout(60)
+ def test_runtests(self, cmd):
+ now1 = datetime.now()
+ cmd.rundetox("-n", "1", "-epy1,py2")
+ then1 = datetime.now()
+ delta1 = then1 - now1
+ assert delta1 >= timedelta(seconds=2)
+
+ now2 = datetime.now()
+ cmd.rundetox("--num", "2", "-epy1,py2")
+ then2 = datetime.now()
+ delta2 = then2 - now2
+ assert delta2 >= timedelta(seconds=1)
+
+ assert delta1 >= delta2, 'pool size=2 took much time than pool size=1'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/detox-0.9.4/tests/test_main.py new/detox-0.13/tests/test_main.py
--- old/detox-0.9.4/tests/test_main.py 1970-01-01 01:00:00.000000000 +0100
+++ new/detox-0.13/tests/test_main.py 2018-04-11 13:12:37.000000000 +0200
@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+
+
+import subprocess
+import sys
+
+
+def invoke(command, success_codes=(0,)):
+ try:
+ output = subprocess.check_output(command, stderr=subprocess.STDOUT)
+ status = 0
+ except subprocess.CalledProcessError as error:
+ output = error.output
+ status = error.returncode
+ output = output.decode('utf-8')
+ if status not in success_codes:
+ raise Exception(
+ 'Command %r return exit code %d and output: """%s""".' % (
+ command,
+ status,
+ output,
+ )
+ )
+ return status, output
+
+
+def test_run_as_module():
+ """Can be run as `python -m detox ...`."""
+ status, output = invoke([
+ sys.executable, '-m', 'detox', '--help',
+ ])
+ assert status == 0
+ assert output.startswith('usage:')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/detox-0.9.4/tox.ini new/detox-0.13/tox.ini
--- old/detox-0.9.4/tox.ini 2015-02-24 15:51:26.000000000 +0100
+++ new/detox-0.13/tox.ini 2018-04-20 15:51:25.000000000 +0200
@@ -1,8 +1,8 @@
[tox]
-envlist=py26,py27
+envlist = py27,py34,py35,py36,py37
[testenv]
-commands=py.test --junitxml={envlogdir}/junit-{envname}.xml {posargs}
-deps=
+deps =
pytest
tox
+commands = pytest --junitxml={envlogdir}/junit-{envname}.xml {posargs}
1
0
Hello community,
here is the log from the commit of package python-Parsley for openSUSE:Factory checked in at 2018-08-31 10:43:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-Parsley (Old)
and /work/SRC/openSUSE:Factory/.python-Parsley.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-Parsley"
Fri Aug 31 10:43:40 2018 rev:2 rq:631543 version:1.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-Parsley/python-Parsley.changes 2015-06-15 17:47:57.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.python-Parsley.new/python-Parsley.changes 2018-08-31 10:44:15.947189715 +0200
@@ -1,0 +2,15 @@
+Sat Aug 25 18:05:32 UTC 2018 - jengelh(a)inai.de
+
+- Use noun phrase in summary. Strip storytelling from description.
+
+-------------------------------------------------------------------
+Thu Aug 23 11:17:06 UTC 2018 - tchvatal(a)suse.com
+
+- Version update to 1.3:
+ * support py3
+ * tests redone in pytest
+- Run all tests
+- Switch to singlespec
+- Do not generate the docu and obsolete the doc subpkg
+
+-------------------------------------------------------------------
Old:
----
Parsley-1.2.tar.gz
New:
----
Parsley-1.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-Parsley.spec ++++++
--- /var/tmp/diff_new_pack.hxlM4X/_old 2018-08-31 10:44:16.371190221 +0200
+++ /var/tmp/diff_new_pack.hxlM4X/_new 2018-08-31 10:44:16.375190226 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-Parsley
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2013 LISA GmbH, Bingen, Germany.
#
# All modifications and additions to the file contributed by third parties
@@ -18,98 +18,69 @@
%define oname Parsley
-
+%define oldpython python
Name: python-Parsley
-Version: 1.2
+Version: 1.3
Release: 0
-Summary: Parsing and pattern matching made easy
+Summary: PEG algorithm based parser generator
License: MIT
Group: Development/Libraries/Python
-Url: http://github.com/washort/parsley
+URL: http://github.com/washort/parsley
Source: https://pypi.python.org/packages/source/P/%{oname}/%{oname}-%{version}.tar.…
-%if 0%{?suse_version}
+BuildRequires: %{python_module Twisted}
+BuildRequires: %{python_module pytest}
+BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
-%endif
-# Documentation requirements:
-BuildRequires: python-Sphinx
-# Testing requirements:
-BuildRequires: python-Twisted
-BuildRequires: python-setuptools
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-
-%if 0%{?suse_version} && 0%{?suse_version} <= 1110
-%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%else
+BuildRequires: python-rpm-macros
+Provides: python-parsley
+Obsoletes: %{oldpython}-Parsley-doc
+Obsoletes: python-Parsley-doc
BuildArch: noarch
-%endif
+%python_subpackages
%description
-Parsley is a parsing library for people who find parsers scary or annoying. I
-wrote it because I wanted to parse a programming language, and tools like PLY
-or ANTLR or Bison were very hard to understand and integrate into my Python
-code. Most parser generators are based on LL or LR parsing algorithms that
-compile to big state machine tables. It was like I had to wake up a different
-section of my brain to understand or work on grammar rules.
-
-Parsley, like pyparsing and ZestyParser, uses the PEG algorithm, so each
-expression in the grammar rules works like a Python expression. In particular,
-alternatives are evaluated in order, unlike table-driven parsers such as yacc,
-bison or PLY.
+Parsley is a parsing library. Most parser generators like ANTLR and
+Bison are based on LL or LR parsing algorithms that compile to big
+state machine tables, whereas Parsley, like pyparsing and
+ZestyParser, uses the PEG algorithm, so each expression in the
+grammar rules works like a Python expression. In particular,
+alternatives are evaluated in order, unlike table-driven parsers such
+as yacc, bison or PLY.
The binaries are prefixed with parsley-.
-%package doc
-Summary: Parsing and pattern matching made easy
-Group: Development/Libraries/Python
-Requires: %{name} = %{version}
-
-%description doc
-This package contains documentation files for %{name}.
-
%prep
%setup -q -n %{oname}-%{version}
+# Remove with bump, missing fixtures
+rm -f ometa/test/test_vm_builder.py
%build
-python setup.py build
-# Generate HTML documentation
-pushd doc
-make html && rm _build/html/.buildinfo
-popd
+export LANG=en_US.UTF-8
+%python_build
%install
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+export LANG=en_US.UTF-8
+%python_install
mkdir %{buildroot}/%{_bindir}
# rename binaries in order to avoid name clashes with other system packages
for f in {generate_parser,stage}; do
+ sed -i \
+ -e "s|^#!%{_bindir}/env python$|#!%{_bindir}/python3|" \
+ bin/$f
cp -v bin/$f %{buildroot}/%{_bindir}/parsley-$f
done
-%if 0%{?suse_version}
- %fdupes -s %{buildroot}%{_prefix}
-%endif
-
-# Correct what fdupes didn't find, because docs are later installed
-rm -f doc/_build/html/_downloads/tutorial3-netstrings.py
-ln -sf ../_static/listings/tutorial3-netstrings2.py doc/_build/html/_downloads/tutorial3-netstrings2.py
-rm -f doc/html/_downloads/tutorial3-netstring-reversal.py
-ln -sf ../_static/listings/tutorial3-netstring-reversal.py doc//_build/html/_downloads/tutorial3-netstring-reversal.py
+%python_expand %fdupes %{buildroot}%{$python_sitelib}
%check
-pushd ometa/test
-PYTHONPATH='../..' python -m unittest test_builder test_pymeta test_runtime
-popd
-
-%files
-%defattr(-,root,root)
-%doc LICENSE NEWS PKG-INFO README
-%{_bindir}/parsley*
-%{python_sitelib}/parsley.*
-%{python_sitelib}/ometa
-%{python_sitelib}/terml
-%{python_sitelib}/%{oname}-%{version}-py%{py_ver}.egg-info
-
-%files doc
-%defattr(-,root,root)
-%doc doc/_build/html examples
+export LANG=en_US.UTF-8
+%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} py.test-%{$python_version} ometa/test
+%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} py.test-%{$python_version} terml/test
+
+%files %{python_files}
+%license LICENSE
+%doc NEWS PKG-INFO README
+%python3_only %{_bindir}/parsley*
+%{python_sitelib}/*
%changelog
++++++ Parsley-1.2.tar.gz -> Parsley-1.3.tar.gz ++++++
++++ 9250 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package guile-json for openSUSE:Factory checked in at 2018-08-31 10:43:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/guile-json (Old)
and /work/SRC/openSUSE:Factory/.guile-json.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "guile-json"
Fri Aug 31 10:43:39 2018 rev:7 rq:631507 version:1.2.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/guile-json/guile-json.changes 2018-05-29 16:52:35.555117028 +0200
+++ /work/SRC/openSUSE:Factory/.guile-json.new/guile-json.changes 2018-08-31 10:44:15.235188864 +0200
@@ -1,0 +2,11 @@
+Fri Aug 24 12:07:57 UTC 2018 - jbrielmaier(a)suse.de
+
+- bump to 1.2.0
+ changes since 1.0.1
+ - License only GPLv3+
+ - install .go file to %(libdir)/guile
+- add guile as runtime dependency to avoid "compiling" when using
+ (json) for the first time
+- needs guile-devel to avoid build failure
+
+-------------------------------------------------------------------
Old:
----
guile-json-1.0.1.tar.gz
guile-json-1.0.1.tar.gz.sig
New:
----
guile-json-1.2.0.tar.gz
guile-json-1.2.0.tar.gz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ guile-json.spec ++++++
--- /var/tmp/diff_new_pack.yaVdDn/_old 2018-08-31 10:44:15.747189476 +0200
+++ /var/tmp/diff_new_pack.yaVdDn/_new 2018-08-31 10:44:15.747189476 +0200
@@ -17,17 +17,18 @@
Name: guile-json
-Version: 1.0.1
+Version: 1.2.0
Release: 0
Summary: JSON module for Guile
-License: LGPL-3.0-or-later AND GPL-3.0-or-later
+License: GPL-3.0-or-later
Group: Development/Libraries/Other
Url: https://savannah.nongnu.org/projects/guile-json/
Source0: http://download.savannah.gnu.org/releases/guile-json/%{name}-%{version}.tar…
Source1: http://download.savannah.gnu.org/releases/guile-json/%{name}-%{version}.tar…
Source2: https://savannah.nongnu.org/people/viewgpg.php?user_id=11331#/%{name}.keyri…
Source1000: guile-json-rpmlintrc
-BuildRequires: guile >= 2.0.0
+BuildRequires: guile-devel >= 2.0.0
+Requires: guile >= 2.0.0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -52,8 +53,9 @@
%files
%defattr(-,root,root,-)
-%license COPYING.LESSER
+%license COPYING
%doc AUTHORS NEWS README
-%{_datadir}/guile/site/json*
+%{_datadir}/guile*
+%{_libdir}/guile*
%changelog
++++++ guile-json-1.0.1.tar.gz -> guile-json-1.2.0.tar.gz ++++++
++++ 2487 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/guile-json-1.0.1/AUTHORS new/guile-json-1.2.0/AUTHORS
--- old/guile-json-1.0.1/AUTHORS 2018-05-23 19:45:25.000000000 +0200
+++ new/guile-json-1.2.0/AUTHORS 2018-08-14 08:28:16.000000000 +0200
@@ -3,6 +3,7 @@
List of contributors (in alphabetical order):
+Ludovic Courtès <ludo(a)gnu.org>
Christopher Lam <christopher.lck(a)gmail.com>
Jan Nieuwenhuizen <janneke(a)gnu.org>
Ian Price <ianprice90(a)googlemail.com>
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/guile-json-1.0.1/COPYING.LESSER new/guile-json-1.2.0/COPYING.LESSER
--- old/guile-json-1.0.1/COPYING.LESSER 2013-05-14 06:55:05.000000000 +0200
+++ new/guile-json-1.2.0/COPYING.LESSER 1970-01-01 01:00:00.000000000 +0100
@@ -1,165 +0,0 @@
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
- This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
- 0. Additional Definitions.
-
- As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
- "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
- An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
- A "Combined Work" is a work produced by combining or linking an
-Application with the Library. The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
- The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
- The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
- 1. Exception to Section 3 of the GNU GPL.
-
- You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
- 2. Conveying Modified Versions.
-
- If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
- a) under this License, provided that you make a good faith effort to
- ensure that, in the event an Application does not supply the
- function or data, the facility still operates, and performs
- whatever part of its purpose remains meaningful, or
-
- b) under the GNU GPL, with none of the additional permissions of
- this License applicable to that copy.
-
- 3. Object Code Incorporating Material from Library Header Files.
-
- The object code form of an Application may incorporate material from
-a header file that is part of the Library. You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
- a) Give prominent notice with each copy of the object code that the
- Library is used in it and that the Library and its use are
- covered by this License.
-
- b) Accompany the object code with a copy of the GNU GPL and this license
- document.
-
- 4. Combined Works.
-
- You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
- a) Give prominent notice with each copy of the Combined Work that
- the Library is used in it and that the Library and its use are
- covered by this License.
-
- b) Accompany the Combined Work with a copy of the GNU GPL and this license
- document.
-
- c) For a Combined Work that displays copyright notices during
- execution, include the copyright notice for the Library among
- these notices, as well as a reference directing the user to the
- copies of the GNU GPL and this license document.
-
- d) Do one of the following:
-
- 0) Convey the Minimal Corresponding Source under the terms of this
- License, and the Corresponding Application Code in a form
- suitable for, and under terms that permit, the user to
- recombine or relink the Application with a modified version of
- the Linked Version to produce a modified Combined Work, in the
- manner specified by section 6 of the GNU GPL for conveying
- Corresponding Source.
-
- 1) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (a) uses at run time
- a copy of the Library already present on the user's computer
- system, and (b) will operate properly with a modified version
- of the Library that is interface-compatible with the Linked
- Version.
-
- e) Provide Installation Information, but only if you would otherwise
- be required to provide such information under section 6 of the
- GNU GPL, and only to the extent that such information is
- necessary to install and execute a modified version of the
- Combined Work produced by recombining or relinking the
- Application with a modified version of the Linked Version. (If
- you use option 4d0, the Installation Information must accompany
- the Minimal Corresponding Source and Corresponding Application
- Code. If you use option 4d1, you must provide the Installation
- Information in the manner specified by section 6 of the GNU GPL
- for conveying Corresponding Source.)
-
- 5. Combined Libraries.
-
- You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
- a) Accompany the combined library with a copy of the same work based
- on the Library, uncombined with any other library facilities,
- conveyed under the terms of this License.
-
- b) Give prominent notice with the combined library that part of it
- is a work based on the Library, and explaining where to find the
- accompanying uncombined form of the same work.
-
- 6. Revised Versions of the GNU Lesser General Public License.
-
- The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
- If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
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/guile-json-1.0.1/ChangeLog new/guile-json-1.2.0/ChangeLog
--- old/guile-json-1.0.1/ChangeLog 2018-05-24 20:22:44.000000000 +0200
+++ new/guile-json-1.2.0/ChangeLog 2018-08-23 06:19:39.000000000 +0200
@@ -1,3 +1,141 @@
+commit a2b6b3ac5fe1207609ed4593a73781bd7d903ee2
+Author: Aleix Conchillo Flaqué <aconchillo(a)gmail.com>
+Date: Wed Aug 22 21:17:59 2018 -0700
+
+ bump version to 1.2.0
+
+ NEWS | 7 +++++++
+ README.org | 2 +-
+ configure.ac | 2 +-
+ 3 files changed, 9 insertions(+), 2 deletions(-)
+
+commit 2699b2f64738d11e83f6454ebd6c3a3d8f18730e
+Author: Aleix Conchillo Flaqué <aconchillo(a)gmail.com>
+Date: Wed Aug 22 21:13:55 2018 -0700
+
+ switch to GPLv3
+
+ COPYING.LESSER | 165 --------------------------
+ ChangeLog | 5 +-
+ Makefile.am | 22 ++--
+ README.org | 17 ++-
+ build-aux/guile.m4 | 341 -----------------------------------------------------
+ configure.ac | 22 ++--
+ json.scm | 22 ++--
+ json/Makefile.am | 22 ++--
+ json/builder.scm | 22 ++--
+ json/parser.scm | 22 ++--
+ pkg-list.scm.in | 26 ++--
+ 11 files changed, 82 insertions(+), 604 deletions(-)
+ delete mode 100644 COPYING.LESSER
+ delete mode 100644 build-aux/guile.m4
+
+commit 7efbc39eaa2db43a4ed344c39e53f4d4e8adb971
+Author: Aleix Conchillo Flaqué <aconchillo(a)gmail.com>
+Date: Tue Aug 14 01:18:38 2018 -0700
+
+ bump version to 1.1.1
+
+ NEWS | 4 ++++
+ README.org | 2 +-
+ configure.ac | 2 +-
+ 3 files changed, 6 insertions(+), 2 deletions(-)
+
+commit dc897555936141dbaa8b30614f02f139c1d3e019
+Author: Aleix Conchillo Flaqué <aconchillo(a)gmail.com>
+Date: Tue Aug 14 01:12:52 2018 -0700
+
+ builder: don't output extra space unless pretty printing
+
+ json/builder.scm | 15 +++++++++++----
+ 1 file changed, 11 insertions(+), 4 deletions(-)
+
+commit c543d3f63581f686f8de86848c6e4852b364aca9
+Author: Aleix Conchillo Flaqué <aleix(a)oblong.com>
+Date: Thu Jul 26 08:58:51 2018 -0700
+
+ re-add extraneous sed '' in dist-hook (os x needs it)
+
+ Makefile.am | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit 35a924df347bd719d2eb3f7842c5e8b0719d08a3
+Author: Aleix Conchillo Flaqué <aleix(a)oblong.com>
+Date: Thu Jul 26 08:54:34 2018 -0700
+
+ bump version to 1.1.0
+
+ AUTHORS | 1 +
+ NEWS | 6 ++++++
+ README.org | 2 +-
+ configure.ac | 2 +-
+ 4 files changed, 9 insertions(+), 2 deletions(-)
+
+commit e3b2367f1829068f272cc9540b18e21039054f05
+Merge: 5fea4a2 ae0a4c6
+Author: Aleix Conchillo Flaqué <aconchillo(a)gmail.com>
+Date: Thu Jul 26 08:37:05 2018 -0700
+
+ Merge pull request #17 from civodul/wip-module-installation
+
+ Install .go files to $(libdir)/guile
+
+commit ae0a4c67d02f04dbb3e3d2702e8322474d83463b
+Author: Ludovic Courtès <ludo(a)gnu.org>
+Date: Thu Jun 28 14:52:52 2018 +0200
+
+ build: Remove extraneous 'sed' argument in 'dist-hook'.
+
+ * Makefile.am (dist-hook): Remove ''.
+
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit f7c1c5ac7f244d3a2d98967e374e34806bdd5633
+Author: Ludovic Courtès <ludo(a)gnu.org>
+Date: Thu Jun 28 14:47:25 2018 +0200
+
+ build: Install .go files to $(libdir)/guile.
+
+ * Makefile.am (objdir): New variable.
+ (nobase_mod_DATA): Move $(GOBJECTS) to...
+ (nobase_nodist_obj_DATA): ... here. New variable.
+ * json/Makefile.am (objdir): New variable.
+ (nobase_mod_DATA): Move $(GOBJECTS) to...
+ (nobase_nodist_obj_DATA): ... here. New variable.
+
+ Makefile.am | 6 ++++--
+ json/Makefile.am | 5 ++++-
+ 2 files changed, 8 insertions(+), 3 deletions(-)
+
+commit d87c8eb4ca01c890dc43d6e9d7da7529ad203903
+Author: Ludovic Courtès <ludo(a)gnu.org>
+Date: Thu Jun 28 14:24:40 2018 +0200
+
+ build: Append Guile's effective version to the module directory.
+
+ * configure.ac: Use 'GUILE_PKG'.
+ * Makefile.am (moddir): Append @GUILE_EFFECTIVE_VERSION@.
+ * json/Makefile.am (moddir): Likewise.
+
+ Makefile.am | 2 +-
+ configure.ac | 7 +++++++
+ json/Makefile.am | 2 +-
+ 3 files changed, 9 insertions(+), 2 deletions(-)
+
+commit 895c94c144e28ae4037f49b2f308d9ce1385dff6
+Author: Ludovic Courtès <ludo(a)gnu.org>
+Date: Thu Jun 28 14:23:22 2018 +0200
+
+ build: Define 'moddir' in terms of $(datadir).
+
+ * Makefile.am (moddir): Define in terms of $(datadir).
+ * json/Makefile.am (moddir): Likewise.
+
+ Makefile.am | 2 +-
+ json/Makefile.am | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
commit 5fea4a2330444df81596188c0a9e5c51ca803eb1
Author: Aleix Conchillo Flaqué <aleix(a)oblong.com>
Date: Thu May 24 11:20:52 2018 -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/guile-json-1.0.1/Makefile.am new/guile-json-1.2.0/Makefile.am
--- old/guile-json-1.0.1/Makefile.am 2018-05-23 19:39:01.000000000 +0200
+++ new/guile-json-1.2.0/Makefile.am 2018-08-23 06:08:22.000000000 +0200
@@ -5,22 +5,18 @@
#
# This file is part of guile-json.
#
-# guile-json is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License and
-# the GNU Lesser General Public License as published by the Free
-# Software Foundation; either version 3 of the License, or (at your
-# option) any later version.
+# guile-json is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
#
-# guile-json is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License and the GNU Lesser General Public License
-# for more details.
+# guile-json is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# and the GNU Lesser General Public License along with guile-json;
-# if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# along with guile-json. If not, see https://www.gnu.org/licenses/.
#
SUBDIRS = json
@@ -32,15 +28,18 @@
dist-hook:
$(SHELL) $(top_srcdir)/ChangeLog > $(top_distdir)/ChangeLog
cp $(top_srcdir)/pkg-list.scm.in $(top_distdir)/pkg-list.scm
+ # '' is to make OS X happy
sed -i '' "s/%VERSION%/$(PKG_LIST_VERSION)/g" $(top_distdir)/pkg-list.scm
-moddir=$(prefix)/share/guile/site
+moddir = $(datadir)/guile/site/@GUILE_EFFECTIVE_VERSION@
+objdir = $(libdir)/guile/@GUILE_EFFECTIVE_VERSION@/site-ccache
SOURCES = json.scm
-
GOBJECTS = $(SOURCES:%.scm=%.go)
-nobase_mod_DATA = $(SOURCES) $(NOCOMP_SOURCES) $(GOBJECTS)
+nobase_mod_DATA = $(SOURCES) $(NOCOMP_SOURCES)
+nobase_nodist_obj_DATA = $(GOBJECTS)
+
EXTRA_DIST = $(SOURCES) $(NOCOMP_SOURCES)
CLEANFILES = $(GOBJECTS)
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/guile-json-1.0.1/NEWS new/guile-json-1.2.0/NEWS
--- old/guile-json-1.0.1/NEWS 2018-05-24 20:19:19.000000000 +0200
+++ new/guile-json-1.2.0/NEWS 2018-08-23 06:16:14.000000000 +0200
@@ -1,4 +1,21 @@
+
+* Version 1.2.0 (Aug 22, 2018)
+
+ - Switch to GPLv3.
+
+
+* Version 1.1.1 (Aug 14, 2018)
+
+ - Don't output extra spaces except with pretty printing.
+
+
+* Version 1.1.0 (Jul 26, 2018)
+
+ - Install .go files to $(libdir)/guile.
+ (thanks to Ludovic Courtès)
+
+
* Version 1.0.1 (May 24, 2018)
- Fixes an issue while handling alists with #nil at the beginning.
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/guile-json-1.0.1/README new/guile-json-1.2.0/README
--- old/guile-json-1.0.1/README 2018-05-24 20:19:58.000000000 +0200
+++ new/guile-json-1.2.0/README 2018-08-23 06:17:47.000000000 +0200
@@ -14,13 +14,9 @@
* Installation
-guile-json is freely available for download under the terms of the GNU General
-Public License version 3 (GPLv3) as well as the GNU Lesser General Public
-License version 3 (LGPLv3).
-
Download the latest tarball and untar it:
-- [[http://download.savannah.gnu.org/releases/guile-json/guile-json-1.0.1.tar.g…]]
+- [[http://download.savannah.gnu.org/releases/guile-json/guile-json-1.2.0.tar.g…]]
If you are cloning the repository make sure you run this first:
@@ -159,3 +155,16 @@
: scheme@(guile-user)> (define values '(234 98.56))
: scheme@(guile-user)> (scm->json `(("values" ,@values)))
: {"values" : [234, 98.56]}
+
+
+* License
+
+guile-json is freely available for download under the terms of the GNU General
+Public License version 3 (GPLv3).
+
+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 any warranty.
+
+Copyright (C) 2013-2018 Aleix Conchillo Flaque <aconchillo(a)gmail.com>
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/guile-json-1.0.1/build-aux/guile.m4 new/guile-json-1.2.0/build-aux/guile.m4
--- old/guile-json-1.0.1/build-aux/guile.m4 2014-08-18 11:40:58.000000000 +0200
+++ new/guile-json-1.2.0/build-aux/guile.m4 1970-01-01 01:00:00.000000000 +0100
@@ -1,341 +0,0 @@
-## Autoconf macros for working with Guile.
-##
-## Copyright (C) 1998,2001, 2006, 2010, 2012, 2013, 2014 Free Software Foundation, Inc.
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public License
-## as published by the Free Software Foundation; either version 3 of
-## the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-## 02110-1301 USA
-
-# serial 10
-
-## Index
-## -----
-##
-## GUILE_PKG -- find Guile development files
-## GUILE_PROGS -- set paths to Guile interpreter, config and tool programs
-## GUILE_FLAGS -- set flags for compiling and linking with Guile
-## GUILE_SITE_DIR -- find path to Guile "site" directory
-## GUILE_CHECK -- evaluate Guile Scheme code and capture the return value
-## GUILE_MODULE_CHECK -- check feature of a Guile Scheme module
-## GUILE_MODULE_AVAILABLE -- check availability of a Guile Scheme module
-## GUILE_MODULE_REQUIRED -- fail if a Guile Scheme module is unavailable
-## GUILE_MODULE_EXPORTS -- check if a module exports a variable
-## GUILE_MODULE_REQUIRED_EXPORT -- fail if a module doesn't export a variable
-
-## Code
-## ----
-
-## NOTE: Comments preceding an AC_DEFUN (starting from "Usage:") are massaged
-## into doc/ref/autoconf-macros.texi (see Makefile.am in that directory).
-
-# GUILE_PKG -- find Guile development files
-#
-# Usage: GUILE_PKG([VERSIONS])
-#
-# This macro runs the @code{pkg-config} tool to find development files
-# for an available version of Guile.
-#
-# By default, this macro will search for the latest stable version of
-# Guile (e.g. 2.0), falling back to the previous stable version
-# (e.g. 1.8) if it is available. If no guile-(a)var{VERSION}.pc file is
-# found, an error is signalled. The found version is stored in
-# @var{GUILE_EFFECTIVE_VERSION}.
-#
-# If @code{GUILE_PROGS} was already invoked, this macro ensures that the
-# development files have the same effective version as the Guile
-# program.
-#
-# @var{GUILE_EFFECTIVE_VERSION} is marked for substitution, as by
-# @code{AC_SUBST}.
-#
-AC_DEFUN([GUILE_PKG],
- [PKG_PROG_PKG_CONFIG
- _guile_versions_to_search="m4_default([$1], [2.0 1.8])"
- if test -n "$GUILE_EFFECTIVE_VERSION"; then
- _guile_tmp=""
- for v in $_guile_versions_to_search; do
- if test "$v" = "$GUILE_EFFECTIVE_VERSION"; then
- _guile_tmp=$v
- fi
- done
- if test -z "$_guile_tmp"; then
- AC_MSG_FAILURE([searching for guile development files for versions $_guile_versions_to_search, but previously found $GUILE version $GUILE_EFFECTIVE_VERSION])
- fi
- _guile_versions_to_search=$GUILE_EFFECTIVE_VERSION
- fi
- GUILE_EFFECTIVE_VERSION=""
- _guile_errors=""
- for v in $_guile_versions_to_search; do
- if test -z "$GUILE_EFFECTIVE_VERSION"; then
- AC_MSG_NOTICE([checking for guile $v])
- PKG_CHECK_EXISTS([guile-$v], [GUILE_EFFECTIVE_VERSION=$v], [])
- fi
- done
-
- if test -z "$GUILE_EFFECTIVE_VERSION"; then
- AC_MSG_ERROR([
-No Guile development packages were found.
-
-Please verify that you have Guile installed. If you installed Guile
-from a binary distribution, please verify that you have also installed
-the development packages. If you installed it yourself, you might need
-to adjust your PKG_CONFIG_PATH; see the pkg-config man page for more.
-])
- fi
- AC_MSG_NOTICE([found guile $GUILE_EFFECTIVE_VERSION])
- AC_SUBST([GUILE_EFFECTIVE_VERSION])
- ])
-
-# GUILE_FLAGS -- set flags for compiling and linking with Guile
-#
-# Usage: GUILE_FLAGS
-#
-# This macro runs the @code{pkg-config} tool to find out how to compile
-# and link programs against Guile. It sets four variables:
-# @var{GUILE_CFLAGS}, @var{GUILE_LDFLAGS}, @var{GUILE_LIBS}, and
-# @var{GUILE_LTLIBS}.
-#
-# @var{GUILE_CFLAGS}: flags to pass to a C or C++ compiler to build code that
-# uses Guile header files. This is almost always just one or more @code{-I}
-# flags.
-#
-# @var{GUILE_LDFLAGS}: flags to pass to the compiler to link a program
-# against Guile. This includes @code{-lguile-@var{VERSION}} for the
-# Guile library itself, and may also include one or more @code{-L} flag
-# to tell the compiler where to find the libraries. But it does not
-# include flags that influence the program's runtime search path for
-# libraries, and will therefore lead to a program that fails to start,
-# unless all necessary libraries are installed in a standard location
-# such as @file{/usr/lib}.
-#
-# @var{GUILE_LIBS} and @var{GUILE_LTLIBS}: flags to pass to the compiler or to
-# libtool, respectively, to link a program against Guile. It includes flags
-# that augment the program's runtime search path for libraries, so that shared
-# libraries will be found at the location where they were during linking, even
-# in non-standard locations. @var{GUILE_LIBS} is to be used when linking the
-# program directly with the compiler, whereas @var{GUILE_LTLIBS} is to be used
-# when linking the program is done through libtool.
-#
-# The variables are marked for substitution, as by @code{AC_SUBST}.
-#
-AC_DEFUN([GUILE_FLAGS],
- [AC_REQUIRE([GUILE_PKG])
- PKG_CHECK_MODULES(GUILE, [guile-$GUILE_EFFECTIVE_VERSION])
-
- dnl GUILE_CFLAGS and GUILE_LIBS are already defined and AC_SUBST'd by
- dnl PKG_CHECK_MODULES. But GUILE_LIBS to pkg-config is GUILE_LDFLAGS
- dnl to us.
-
- GUILE_LDFLAGS=$GUILE_LIBS
-
- dnl Determine the platform dependent parameters needed to use rpath.
- dnl AC_LIB_LINKFLAGS_FROM_LIBS is defined in gnulib/m4/lib-link.m4 and needs
- dnl the file gnulib/build-aux/config.rpath.
- AC_LIB_LINKFLAGS_FROM_LIBS([GUILE_LIBS], [$GUILE_LDFLAGS], [])
- GUILE_LIBS="$GUILE_LDFLAGS $GUILE_LIBS"
- AC_LIB_LINKFLAGS_FROM_LIBS([GUILE_LTLIBS], [$GUILE_LDFLAGS], [yes])
- GUILE_LTLIBS="$GUILE_LDFLAGS $GUILE_LTLIBS"
-
- AC_SUBST([GUILE_EFFECTIVE_VERSION])
- AC_SUBST([GUILE_CFLAGS])
- AC_SUBST([GUILE_LDFLAGS])
- AC_SUBST([GUILE_LIBS])
- AC_SUBST([GUILE_LTLIBS])
- ])
-
-# GUILE_SITE_DIR -- find path to Guile "site" directory
-#
-# Usage: GUILE_SITE_DIR
-#
-# This looks for Guile's "site" directory, usually something like
-# PREFIX/share/guile/site, and sets var @var{GUILE_SITE} to the path.
-# Note that the var name is different from the macro name.
-#
-# The variable is marked for substitution, as by @code{AC_SUBST}.
-#
-AC_DEFUN([GUILE_SITE_DIR],
- [AC_REQUIRE([GUILE_PKG])
- AC_MSG_CHECKING(for Guile site directory)
- GUILE_SITE=`$PKG_CONFIG --print-errors --variable=sitedir guile-$GUILE_EFFECTIVE_VERSION`
- AC_MSG_RESULT($GUILE_SITE)
- if test "$GUILE_SITE" = ""; then
- AC_MSG_FAILURE(sitedir not found)
- fi
- AC_SUBST(GUILE_SITE)
- ])
-
-# GUILE_PROGS -- set paths to Guile interpreter, config and tool programs
-#
-# Usage: GUILE_PROGS([VERSION])
-#
-# This macro looks for programs @code{guile} and @code{guild}, setting
-# variables @var{GUILE} and @var{GUILD} to their paths, respectively.
-# If @code{guile} is not found, signal an error.
-#
-# By default, this macro will search for the latest stable version of
-# Guile (e.g. 2.0). x.y or x.y.z versions can be specified. If an older
-# version is found, the macro will signal an error.
-#
-# The effective version of the found @code{guile} is set to
-# @var{GUILE_EFFECTIVE_VERSION}. This macro ensures that the effective
-# version is compatible with the result of a previous invocation of
-# @code{GUILE_FLAGS}, if any.
-#
-# As a legacy interface, it also looks for @code{guile-config} and
-# @code{guile-tools}, setting @var{GUILE_CONFIG} and @var{GUILE_TOOLS}.
-#
-# The variables are marked for substitution, as by @code{AC_SUBST}.
-#
-AC_DEFUN([GUILE_PROGS],
- [AC_PATH_PROG(GUILE,guile)
- _guile_required_version="m4_default([$1], [$GUILE_EFFECTIVE_VERSION])"
- if test -z "$_guile_required_version"; then
- _guile_required_version=2.0
- fi
- if test "$GUILE" = "" ; then
- AC_MSG_ERROR([guile required but not found])
- fi
- AC_SUBST(GUILE)
-
- _guile_effective_version=`$GUILE -c "(display (effective-version))"`
- if test -z "$GUILE_EFFECTIVE_VERSION"; then
- GUILE_EFFECTIVE_VERSION=$_guile_effective_version
- elif test "$GUILE_EFFECTIVE_VERSION" != "$_guile_effective_version"; then
- AC_MSG_ERROR([found development files for Guile $GUILE_EFFECTIVE_VERSION, but $GUILE has effective version $_guile_effective_version])
- fi
-
- _guile_major_version=`$GUILE -c "(display (major-version))"`
- _guile_minor_version=`$GUILE -c "(display (minor-version))"`
- _guile_micro_version=`$GUILE -c "(display (micro-version))"`
- _guile_prog_version="$_guile_major_version.$_guile_minor_version.$_guile_micro_version"
-
- AC_MSG_CHECKING([for Guile version >= $_guile_required_version])
- _major_version=`echo $_guile_required_version | cut -d . -f 1`
- _minor_version=`echo $_guile_required_version | cut -d . -f 2`
- _micro_version=`echo $_guile_required_version | cut -d . -f 3`
- if test "$_guile_major_version" -ge "$_major_version"; then
- if test "$_guile_minor_version" -ge "$_minor_version"; then
- if test -n "$_micro_version"; then
- if test "$_guile_micro_version" -lt "$_micro_version"; then
- AC_MSG_ERROR([Guile $_guile_required_version required, but $_guile_prog_version found])
- fi
- fi
- elif test "$GUILE_EFFECTIVE_VERSION" == "$_major_version.$_minor_version" -a -z "$_micro_version"; then
- # Allow prereleases that have the right effective version.
- true
- else
- as_fn_error $? "Guile $_guile_required_version required, but $_guile_prog_version found" "$LINENO" 5
- fi
- else
- AC_MSG_ERROR([Guile $_guile_required_version required, but $_guile_prog_version found])
- fi
- AC_MSG_RESULT([$_guile_prog_version])
-
- AC_PATH_PROG(GUILD,guild)
- AC_SUBST(GUILD)
-
- AC_PATH_PROG(GUILE_CONFIG,guile-config)
- AC_SUBST(GUILE_CONFIG)
- if test -n "$GUILD"; then
- GUILE_TOOLS=$GUILD
- else
- AC_PATH_PROG(GUILE_TOOLS,guile-tools)
- fi
- AC_SUBST(GUILE_TOOLS)
- ])
-
-# GUILE_CHECK -- evaluate Guile Scheme code and capture the return value
-#
-# Usage: GUILE_CHECK_RETVAL(var,check)
-#
-# @var{var} is a shell variable name to be set to the return value.
-# @var{check} is a Guile Scheme expression, evaluated with "$GUILE -c", and
-# returning either 0 or non-#f to indicate the check passed.
-# Non-0 number or #f indicates failure.
-# Avoid using the character "#" since that confuses autoconf.
-#
-AC_DEFUN([GUILE_CHECK],
- [AC_REQUIRE([GUILE_PROGS])
- $GUILE -c "$2" > /dev/null 2>&1
- $1=$?
- ])
-
-# GUILE_MODULE_CHECK -- check feature of a Guile Scheme module
-#
-# Usage: GUILE_MODULE_CHECK(var,module,featuretest,description)
-#
-# @var{var} is a shell variable name to be set to "yes" or "no".
-# @var{module} is a list of symbols, like: (ice-9 common-list).
-# @var{featuretest} is an expression acceptable to GUILE_CHECK, q.v.
-# @var{description} is a present-tense verb phrase (passed to AC_MSG_CHECKING).
-#
-AC_DEFUN([GUILE_MODULE_CHECK],
- [AC_MSG_CHECKING([if $2 $4])
- GUILE_CHECK($1,(use-modules $2) (exit ((lambda () $3))))
- if test "$$1" = "0" ; then $1=yes ; else $1=no ; fi
- AC_MSG_RESULT($$1)
- ])
-
-# GUILE_MODULE_AVAILABLE -- check availability of a Guile Scheme module
-#
-# Usage: GUILE_MODULE_AVAILABLE(var,module)
-#
-# @var{var} is a shell variable name to be set to "yes" or "no".
-# @var{module} is a list of symbols, like: (ice-9 common-list).
-#
-AC_DEFUN([GUILE_MODULE_AVAILABLE],
- [GUILE_MODULE_CHECK($1,$2,0,is available)
- ])
-
-# GUILE_MODULE_REQUIRED -- fail if a Guile Scheme module is unavailable
-#
-# Usage: GUILE_MODULE_REQUIRED(symlist)
-#
-# @var{symlist} is a list of symbols, WITHOUT surrounding parens,
-# like: ice-9 common-list.
-#
-AC_DEFUN([GUILE_MODULE_REQUIRED],
- [GUILE_MODULE_AVAILABLE(ac_guile_module_required, ($1))
- if test "$ac_guile_module_required" = "no" ; then
- AC_MSG_ERROR([required guile module not found: ($1)])
- fi
- ])
-
-# GUILE_MODULE_EXPORTS -- check if a module exports a variable
-#
-# Usage: GUILE_MODULE_EXPORTS(var,module,modvar)
-#
-# @var{var} is a shell variable to be set to "yes" or "no".
-# @var{module} is a list of symbols, like: (ice-9 common-list).
-# @var{modvar} is the Guile Scheme variable to check.
-#
-AC_DEFUN([GUILE_MODULE_EXPORTS],
- [GUILE_MODULE_CHECK($1,$2,$3,exports `$3')
- ])
-
-# GUILE_MODULE_REQUIRED_EXPORT -- fail if a module doesn't export a variable
-#
-# Usage: GUILE_MODULE_REQUIRED_EXPORT(module,modvar)
-#
-# @var{module} is a list of symbols, like: (ice-9 common-list).
-# @var{modvar} is the Guile Scheme variable to check.
-#
-AC_DEFUN([GUILE_MODULE_REQUIRED_EXPORT],
- [GUILE_MODULE_EXPORTS(guile_module_required_export,$1,$2)
- if test "$guile_module_required_export" = "no" ; then
- AC_MSG_ERROR([module $1 does not export $2; required])
- fi
- ])
-
-## guile.m4 ends here
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/guile-json-1.0.1/configure.ac new/guile-json-1.2.0/configure.ac
--- old/guile-json-1.0.1/configure.ac 2018-05-24 20:19:31.000000000 +0200
+++ new/guile-json-1.2.0/configure.ac 2018-08-23 06:15:33.000000000 +0200
@@ -5,30 +5,33 @@
#
# This file is part of guile-json.
#
-# guile-json is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License and
-# the GNU Lesser General Public License as published by the Free
-# Software Foundation; either version 3 of the License, or (at your
-# option) any later version.
+# guile-json is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
#
-# guile-json is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License and the GNU Lesser General Public License
-# for more details.
+# guile-json is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# and the GNU Lesser General Public License along with guile-json;
-# if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# along with guile-json. If not, see https://www.gnu.org/licenses/.
#
-AC_INIT([guile-json], [1.0.1], [aconchillo(a)gmail.com])
+AC_INIT([guile-json], [1.2.0], [aconchillo(a)gmail.com])
AC_CONFIG_SRCDIR(json.scm)
AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE([color-tests -Wall -Wno-portability])
AM_SILENT_RULES([yes])
+dnl We require pkg.m4 (from pkg-config) and guile.m4 (from Guile.)
+dnl Make sure they are available.
+m4_pattern_forbid([PKG_CHECK_MODULES])
+m4_pattern_forbid([^GUILE_PKG])
+
+dnl Check for Guile 2.x, and substitute 'GUILE_EFFECTIVE_VERSION'.
+GUILE_PKG([2.2 2.0])
GUILE_PROGS
AC_CONFIG_FILES([Makefile json/Makefile])
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/guile-json-1.0.1/json/Makefile.am new/guile-json-1.2.0/json/Makefile.am
--- old/guile-json-1.0.1/json/Makefile.am 2018-05-23 19:49:42.000000000 +0200
+++ new/guile-json-1.2.0/json/Makefile.am 2018-08-23 06:08:40.000000000 +0200
@@ -5,31 +5,30 @@
#
# This file is part of guile-json.
#
-# guile-json is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License and
-# the GNU Lesser General Public License as published by the Free
-# Software Foundation; either version 3 of the License, or (at your
-# option) any later version.
+# guile-json is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
#
-# guile-json is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License and the GNU Lesser General Public License
-# for more details.
+# guile-json is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# and the GNU Lesser General Public License along with guile-json;
-# if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# along with guile-json. If not, see https://www.gnu.org/licenses/.
#
-moddir=$(prefix)/share/guile/site/json
+moddir = $(datadir)/guile/site/@GUILE_EFFECTIVE_VERSION@/json
+objdir = $(libdir)/guile/@GUILE_EFFECTIVE_VERSION@/site-ccache/json
SOURCES = builder.scm parser.scm
GOBJECTS = $(SOURCES:%.scm=%.go)
-nobase_mod_DATA = $(SOURCES) $(NOCOMP_SOURCES) $(GOBJECTS)
+nobase_mod_DATA = $(SOURCES) $(NOCOMP_SOURCES)
+nobase_nodist_obj_DATA = $(GOBJECTS)
+
EXTRA_DIST = $(SOURCES) $(NOCOMP_SOURCES)
CLEANFILES = $(GOBJECTS)
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/guile-json-1.0.1/json/builder.scm new/guile-json-1.2.0/json/builder.scm
--- old/guile-json-1.0.1/json/builder.scm 2018-05-24 20:14:30.000000000 +0200
+++ new/guile-json-1.2.0/json/builder.scm 2018-08-23 06:09:03.000000000 +0200
@@ -5,22 +5,18 @@
;;
;; This file is part of guile-json.
;;
-;; guile-json is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU General Public License and
-;; the GNU Lesser General Public License as published by the Free
-;; Software Foundation; either version 3 of the License, or (at your
-;; option) any later version.
-;;
-;; guile-json is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License and the GNU Lesser General Public License
-;; for more details.
+;; guile-json is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3 of the License, or
+;; (at your option) any later version.
+;;
+;; guile-json is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+;; General Public License for more details.
;;
;; You should have received a copy of the GNU General Public License
-;; and the GNU Lesser General Public License along with guile-json;
-;; if not, write to the Free Software Foundation, Inc.,
-;; 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+;; along with guile-json. If not, see https://www.gnu.org/licenses/.
;;; Commentary:
@@ -92,14 +88,19 @@
(define (build-object-pair p port escape pretty level)
(display (indent-string pretty level) port)
(json-build-string (car p) port escape)
- (display " : " port)
+ (build-space port pretty)
+ (display ":" port)
+ (build-space port pretty)
(json-build (cdr p) port escape pretty level))
(define (build-newline port pretty)
(cond (pretty (newline port))))
+(define (build-space port pretty)
+ (cond (pretty (display " " port))))
+
(define (indent-string pretty level)
- (if pretty (format #f "~v_" (* 4 level)) ""))
+ (if pretty (format #f "~v_" (* 2 level)) ""))
;;
;; Main builder functions
@@ -157,13 +158,15 @@
(unless (null? scm)
(json-build (car scm) port escape pretty (+ level 1))
(for-each (lambda (v)
- (display ", " port)
+ (display "," port)
+ (build-space port pretty)
(json-build v port escape pretty (+ level 1)))
(cdr scm)))
(display "]" port))
(define (json-build-object scm port escape pretty level)
- (build-newline port pretty)
+ (cond ((> level 0)
+ (build-newline port pretty)))
(simple-format port "~A{" (indent-string pretty level))
(build-newline port pretty)
(let ((pairs scm))
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/guile-json-1.0.1/json/parser.scm new/guile-json-1.2.0/json/parser.scm
--- old/guile-json-1.0.1/json/parser.scm 2018-05-23 19:39:21.000000000 +0200
+++ new/guile-json-1.2.0/json/parser.scm 2018-08-23 06:09:27.000000000 +0200
@@ -4,22 +4,18 @@
;;
;; This file is part of guile-json.
;;
-;; guile-json is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU General Public License and
-;; the GNU Lesser General Public License as published by the Free
-;; Software Foundation; either version 3 of the License, or (at your
-;; option) any later version.
+;; guile-json is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3 of the License, or
+;; (at your option) any later version.
;;
-;; guile-json is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License and the GNU Lesser General Public License
-;; for more details.
+;; guile-json is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+;; General Public License for more details.
;;
;; You should have received a copy of the GNU General Public License
-;; and the GNU Lesser General Public License along with guile-json;
-;; if not, write to the Free Software Foundation, Inc.,
-;; 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+;; along with guile-json. If not, see https://www.gnu.org/licenses/.
;;; Commentary:
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/guile-json-1.0.1/json.scm new/guile-json-1.2.0/json.scm
--- old/guile-json-1.0.1/json.scm 2018-05-23 19:50:46.000000000 +0200
+++ new/guile-json-1.2.0/json.scm 2018-08-23 06:09:42.000000000 +0200
@@ -4,22 +4,18 @@
;;
;; This file is part of guile-json.
;;
-;; guile-json is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU General Public License and
-;; the GNU Lesser General Public License as published by the Free
-;; Software Foundation; either version 3 of the License, or (at your
-;; option) any later version.
+;; guile-json is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3 of the License, or
+;; (at your option) any later version.
;;
-;; guile-json is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License and the GNU Lesser General Public License
-;; for more details.
+;; guile-json is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+;; General Public License for more details.
;;
;; You should have received a copy of the GNU General Public License
-;; and the GNU Lesser General Public License along with guile-json;
-;; if not, write to the Free Software Foundation, Inc.,
-;; 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+;; along with guile-json. If not, see https://www.gnu.org/licenses/.
;;; Commentary:
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/guile-json-1.0.1/pkg-list.scm new/guile-json-1.2.0/pkg-list.scm
--- old/guile-json-1.0.1/pkg-list.scm 2018-05-24 20:22:44.000000000 +0200
+++ new/guile-json-1.2.0/pkg-list.scm 2018-08-23 06:19:39.000000000 +0200
@@ -3,31 +3,27 @@
;;
;; This file is part of guile-json.
;;
-;; guile-json is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU General Public License and
-;; the GNU Lesser General Public License as published by the Free
-;; Software Foundation; either version 3 of the License, or (at your
-;; option) any later version.
+;; guile-json is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3 of the License, or
+;; (at your option) any later version.
;;
-;; guile-json is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License and the GNU Lesser General Public License
-;; for more details.
+;; guile-json is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+;; General Public License for more details.
;;
;; You should have received a copy of the GNU General Public License
-;; and the GNU Lesser General Public License along with guile-json;
-;; if not, write to the Free Software Foundation, Inc.,
-;; 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+;; along with guile-json. If not, see https://www.gnu.org/licenses/.
;;
-(package (json (1 0 1))
+(package (json (1 2 0))
(depends (srfi-1))
(synopsis "JSON parser/writer for Guile")
(description
"guile-json supports the parsing and writing of JSON from Guile."
"It aims to be fully compliant with the json.org specification, and"
- "is released under the GPLv3 and the LGPLv3.")
+ "is released under the GPLv3.")
(homepage "https://github.com/aconchillo/guile-json")
(libraries "json.scm" "json")
- (documentation "README" "COPYING" "COPYING.LESSER"))
+ (documentation "README" "COPYING"))
1
0
Hello community,
here is the log from the commit of package canutils for openSUSE:Factory checked in at 2018-08-31 10:43:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/canutils (Old)
and /work/SRC/openSUSE:Factory/.canutils.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "canutils"
Fri Aug 31 10:43:37 2018 rev:8 rq:631502 version:2018.02.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/canutils/canutils.changes 2016-11-24 21:23:45.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.canutils.new/canutils.changes 2018-08-31 10:44:12.787185940 +0200
@@ -2 +2 @@
-Mon Nov 21 23:46:00 UTC 2016 - jengelh(a)inai.de
+Sat Aug 25 06:41:34 UTC 2018 - jengelh(a)inai.de
@@ -4 +4 @@
-- Description update
+- Rename canutils-linuxcan to canutils
@@ -7 +7 @@
-Mon Mar 16 15:48:41 UTC 2015 - jengelh(a)inai.de
+Wed Aug 15 09:05:03 UTC 2018 - tuukka.pasanen(a)ilmi.fi
@@ -9 +9 @@
-- Use source URLs, some more macros and some unneeded BuildRequires.
+- Update to official release 2018.02.0
@@ -12 +12 @@
-Thu Aug 8 00:31:43 UTC 2013 - jengelh(a)inai.de
+Mon Nov 21 23:43:48 UTC 2016 - jengelh(a)inai.de
@@ -14,6 +14 @@
-- Correct URL field
-
--------------------------------------------------------------------
-Sun Dec 30 08:13:40 UTC 2012 - jengelh(a)inai.de
-
-- Initial package (version 4.0.6) for build.opensuse.org
+- Initial package (version 0~g296) for build.opensuse.org
Old:
----
canutils-4.0.6.tar.bz2
New:
----
can-utils-2018.02.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ canutils.spec ++++++
--- /var/tmp/diff_new_pack.CcJjF6/_old 2018-08-31 10:44:13.235186475 +0200
+++ /var/tmp/diff_new_pack.CcJjF6/_new 2018-08-31 10:44:13.239186480 +0200
@@ -1,7 +1,7 @@
#
# spec file for package canutils
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,26 +17,22 @@
Name: canutils
-Summary: Utilities for Controller Area Networks from the Pengutronix project
-License: GPL-2.0
+Summary: Utilities for Controller Area Networks from the Linux-CAN project
+License: GPL-2.0-only AND GPL-2.0-or-later AND BSD-3-Clause
Group: Hardware/Other
-Version: 4.0.6
+Version: 2018.02.0
Release: 0
-Url: http://pengutronix.de/software/socket-can/download/
+Url: https://github.com/linux-can/can-utils
-#Git-Clone: git://git.pengutronix.de/git/tools/canutils
-Source: http://pengutronix.de/software/socket-can/download/canutils/v4.0/%name-%ver…
+Source: can-utils-%version.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: libtool
BuildRequires: pkg-config
-BuildRequires: xz
-%if 0%{?suse_version} >= 1140 || 0%{?fedora_version}
-BuildRequires: pkgconfig(libsocketcan) >= 0.0.8
-%else
-BuildRequires: libsocketcan-devel >= 0.0.8
-%endif
+Obsoletes: canutils-linuxcan
+Provides: canutils-linuxcan
%description
-SocketCAN userspace utilities and tools from Pengutronix.
+SocketCAN userspace utilities and tools.
CAN is a message-based network protocol designed for vehicles
originally initially created by Robert Bosch GmbH. SocketCAN is a set
@@ -44,25 +40,26 @@
Research to the Linux kernel.
This package contains some userspace utilities for the Linux
-SocketCAN subsystem: canconfig candump canecho cansend cansequence.
+SocketCAN subsystem: asc2log, bcmserver, canbusload,
+can-calc-bit-timing, candump, canfdtest, cangen, cangw, canlogserver,
+canplayer, cansend, cansniffer, isotpdump, isotprecv, isotpperf,
+isotpsend, isotpserver, isotpsniffer, isotptun, log2asc, log2long,
+slcan_attach, slcand and slcanpty.
%prep
-%setup -q
+%setup -q -n can-utils-%version
%build
+./autogen.sh
+# Avoid overlap with other canutils
%configure --disable-static
make %{?_smp_mflags}
%install
%make_install
-# There are no development files here..
-rm -Rf "%buildroot/%_libdir/pkgconfig"
%files
%defattr(-,root,root)
-%_bindir/can*
-%_sbindir/canconfig
-%_mandir/man8/can*.8*
-%doc COPYING
+%_bindir/*
%changelog
1
0
Hello community,
here is the log from the commit of package ucode-intel for openSUSE:Factory checked in at 2018-08-31 10:43:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ucode-intel (Old)
and /work/SRC/openSUSE:Factory/.ucode-intel.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ucode-intel"
Fri Aug 31 10:43:32 2018 rev:42 rq:631398 version:20180807a
Changes:
--------
--- /work/SRC/openSUSE:Factory/ucode-intel/ucode-intel.changes 2018-08-20 16:19:00.128787051 +0200
+++ /work/SRC/openSUSE:Factory/.ucode-intel.new/ucode-intel.changes 2018-08-31 10:44:10.223182879 +0200
@@ -1,0 +2,5 @@
+Fri Aug 24 15:03:09 UTC 2018 - meissner(a)suse.com
+
+- updated to 20180807a, no change except licensing. (bsc#1104479)
+
+-------------------------------------------------------------------
Old:
----
LICENSE
microcode-20180807.tgz
New:
----
microcode-20180807a.tgz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ucode-intel.spec ++++++
--- /var/tmp/diff_new_pack.Ou8AZP/_old 2018-08-31 10:44:10.699183447 +0200
+++ /var/tmp/diff_new_pack.Ou8AZP/_new 2018-08-31 10:44:10.707183457 +0200
@@ -17,17 +17,16 @@
Name: ucode-intel
-Version: 20180807
+Version: 20180807a
Release: 0
Summary: Microcode Updates for Intel x86/x86-64 CPUs
License: SUSE-Firmware
Group: Hardware/Other
BuildRequires: suse-module-tools
#License is: Intel Software License Agreement
-Url: https://downloadcenter.intel.com/download/28039/Linux-Processor-Microcode-D…
-Source0: https://downloadmirror.intel.com/28039/eng/microcode-%{version}.tgz
+Url: https://downloadcenter.intel.com/download/28087/Linux-Processor-Microcode-D…
+Source0: https://downloadmirror.intel.com/28087/eng/microcode-%{version}.tgz
Source1: ucode-intel-rpmlintrc
-Source2: LICENSE
Supplements: modalias(x86cpu:vendor%3A0000%3Afamily%3A*%3Amodel%3A*%3Afeature%3A*)
# new method ... note that only 1 : might be present, otherwise libzypp misinterprets it.
Supplements: modalias(cpu:type%3Ax86*ven0000*)
@@ -41,7 +40,6 @@
%prep
%setup -q -c intel-ucode
-cp %{SOURCE2} .
%build
#it is closed source.. nothing to build.
@@ -65,7 +63,7 @@
%files
%defattr(-,root,root)
-%doc LICENSE
+%license license
%doc releasenote
/lib/firmware/intel-ucode/
++++++ microcode-20180807.tgz -> microcode-20180807a.tgz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/license new/license
--- old/license 2018-08-07 16:35:44.000000000 +0200
+++ new/license 2018-08-23 21:34:09.000000000 +0200
@@ -1,332 +1,37 @@
-SOFTWARE LICENSE AGREEMENT
+Copyright (c) 2018 Intel Corporation.
+All rights reserved.
-DO NOT DOWNLOAD, INSTALL, ACCESS, COPY, OR USE ANY PORTION OF THE SOFTWARE
-UNTIL YOU HAVE READ AND ACCEPTED THE TERMS AND CONDITIONS OF THIS AGREEMENT. BY
-INSTALLING, COPYING, ACCESSING, OR USING THE SOFTWARE, YOU AGREE TO BE LEGALLY
-BOUND BY THE TERMS AND CONDITIONS OF THIS AGREEMENT. If You do not agree to be
-bound by, or the entity for whose benefit You act has not authorized You to
-accept, these terms and conditions, do not install, access, copy, or use the
-Software and destroy all copies of the Software in Your possession.
+Redistribution.
-This SOFTWARE LICENSE AGREEMENT (this "Agreement") is entered into between
-Intel Corporation, a Delaware corporation ("Intel") and You. "You" refers to
-you or your employer or other entity for whose benefit you act, as applicable.
-If you are agreeing to the terms and conditions of this Agreement on behalf of
-a company or other legal entity, you represent and warrant that you have the
-legal authority to bind that legal entity to the Agreement, in which case,
-"You" or "Your" shall be in reference to such entity. Intel and You are
-referred to herein individually as a "Party" or, together, as the "Parties".
-The Parties, in consideration of the mutual covenants contained in this
-Agreement, and for other good and valuable consideration, the receipt and
-sufficiency of which they acknowledge, and intending to be legally bound, agree
-as follows:
-
-1. PURPOSE. You seek to obtain, and Intel desires to provide You, under the
-terms of this Agreement, Software solely for Your efforts to develop and
-distribute products integrating Intel hardware and Intel software. "Software"
-refers to certain software or other collateral, including, but not limited to,
-related components, operating system, application program interfaces, device
-drivers, associated media, printed or electronic documentation and any updates,
-upgrades or releases thereto associated with Intel product(s), software or
-service(s). "Intel-based product" refers to a device that includes,
-incorporates, or implements Intel product(s), software or service(s).
-
-2. LIMITED LICENSE. Conditioned on Your compliance with the terms and
-conditions of this Agreement, Intel grants to You a limited, nonexclusive,
-nontransferable, revocable, worldwide, fully paid-up license during the term of
-this Agreement, without the right to sublicense, under Intel's copyrights
-(subject to any third party licensing requirements), to (i) reproduce the
-Software only for Your own internal evaluation, testing, validation, and
-development of Intel-based products and any associated maintenance thereof;
-(ii) reproduce, display, and publicly perform an object code representation of
-the Software, only when integrated with and executed by an Intel-based product,
-subject to any third party licensing requirements; and (iii) distribute an
-object code representation of the Software, provided by Intel, through multiple
-levels of distribution, solely as embedded in or for execution on an
-Intel-based product and subject to these license terms, and if to an end user,
-pursuant to a license agreement with terms and conditions at least as
-restrictive as those contained in the Intel End User Software License Agreement
-in Appendix A hereto.
-
-If You are not the final manufacturer or vendor of an Intel-based product
-incorporating or designed to incorporate the Software, You may transfer a copy
-of the Software to Your Original Equipment Manufacturer (OEM), Original Device
-Manufacturer (ODM), distributors, or system integration partners ("Your
-Partner") for use in accordance with the terms and conditions of this
-Agreement, provided Your Partner agrees to be fully bound by the terms hereof
-and provided that You will remain fully liable to Intel for the actions and
-inactions of Your Partner(s).
-
-3. LICENSE RESTRICTIONS. All right, title and interest in and to the Software
-and associated documentation are and will remain the exclusive property of
-Intel and its licensors or suppliers. Unless expressly permitted under the
-Agreement, You will not, and will not allow any third party to (i) use, copy,
-distribute, sell or offer to sell the Software or associated documentation;
-(ii) modify, adapt, enhance, disassemble, decompile, reverse engineer, change
-or create derivative works from the Software except and only to the extent as
-specifically required by mandatory applicable laws or any applicable third
-party license terms accompanying the Software; (iii) use or make the Software
-available for the use or benefit of third parties; or (iv) use the Software on
-Your products other than those that include the Intel hardware product(s),
-platform(s), or software identified in the Software; or (v) publish or provide
-any Software benchmark or comparison test results. You acknowledge that an
-essential basis of the bargain in this Agreement is that Intel grants You no
-licenses or other rights including, but not limited to, patent, copyright,
-trade secret, trademark, trade name, service mark or other intellectual
-property licenses or rights with respect to the Software and associated
-documentation, by implication, estoppel or otherwise, except for the licenses
-expressly granted above. You acknowledge there are significant uses of the
-Software in its original, unmodified and uncombined form. You may not remove
-any copyright notices from the Software.
-
-4. LICENSE TO FEEDBACK. This Agreement does not obligate You to provide Intel
-with materials, information, comments, suggestions, or other communication
-regarding the features, functions, performance or use of the Software
-("Feedback"). If any portion of the Software is provided or otherwise made
-available by Intel in source code form, to the extent You provide Intel with
-Feedback in a tangible form, You grant to Intel and its affiliates a
-non-exclusive, perpetual, sublicenseable, irrevocable, worldwide, royalty-free,
-fully paid-up and transferable license, to and under all of Your intellectual
-property rights, whether perfected or not, to publicly perform, publicly
-display, reproduce, use, make, have made, sell, offer for sale, distribute,
-import, create derivative works of and otherwise exploit any comments,
-suggestions, descriptions, ideas, Your Derivatives or other feedback regarding
-the Software provided by You or on Your behalf.
-
-5. OPEN SOURCE STATEMENT. The Software may include Open Source Software (OSS)
-licensed pursuant to OSS license agreement(s) identified in the OSS comments in
-the applicable source code file(s) or file header(s) provided with or otherwise
-associated with the Software. Neither You nor any OEM, ODM, customer, or
-distributor may subject any proprietary portion of the Software to any OSS
-license obligations including, without limitation, combining or distributing
-the Software with OSS in a manner that subjects Intel, the Software or any
-portion thereof to any OSS license obligation. Nothing in this Agreement limits
-any rights under, or grants rights that supersede, the terms of any applicable
-OSS license.
-
-6. THIRD PARTY SOFTWARE. Certain third party software provided with or within
-the Software may only be used (a) upon securing a license directly from the
-owner of the software or (b) in combination with hardware components purchased
-from such third party and (c) subject to further license limitations by the
-software owner. A listing of any such third party limitations is in one or more
-text files accompanying the Software. You acknowledge Intel is not providing
-You with a license to such third party software and further that it is Your
-responsibility to obtain appropriate licenses from such third parties directly.
-
-7. CONFIDENTIALITY. The terms and conditions of this Agreement, exchanged
-confidential information, as well as the Software are subject to the terms and
-conditions of the Non-Disclosure Agreement(s) or Intel Pre-Release Loan
-Agreement(s) (referred to herein collectively or individually as "NDA") entered
-into by and in force between Intel and You, and in any case no less
-confidentiality protection than You apply to Your information of similar
-sensitivity. If You would like to have a contractor perform work on Your behalf
-that requires any access to or use of Software, You must obtain a written
-confidentiality agreement from the contractor which contains terms and
-conditions with respect to access to or use of Software no less restrictive
-than those set forth in this Agreement, excluding any distribution rights and
-use for any other purpose, and You will remain fully liable to Intel for the
-actions and inactions of those contractors. You may not use Intel's name in any
-publications, advertisements, or other announcements without Intel's prior
-written consent.
-
-8. NO OBLIGATION; NO AGENCY. Intel may make changes to the Software, or items
-referenced therein, at any time without notice. Intel is not obligated to
-support, update, provide training for, or develop any further version of the
-Software or to grant any license thereto. No agency, franchise, partnership,
-joint-venture, or employee-employer relationship is intended or created by this
-Agreement.
-
-9. EXCLUSION OF WARRANTIES. THE SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY
-EXPRESS OR IMPLIED WARRANTY OF ANY KIND INCLUDING WARRANTIES OF
-MERCHANTABILITY, NONINFRINGEMENT, OR FITNESS FOR A PARTICULAR PURPOSE. Intel
-does not warrant or assume responsibility for the accuracy or completeness of
-any information, text, graphics, links or other items within the Software.
-
-10. LIMITATION OF LIABILITY. IN NO EVENT WILL INTEL OR ITS AFFILIATES,
-LICENSORS OR SUPPLIERS (INCLUDING THEIR RESPECTIVE DIRECTORS, OFFICERS,
-EMPLOYEES, AND AGENTS) BE LIABLE FOR ANY DAMAGES WHATSOEVER (INCLUDING, WITHOUT
-LIMITATION, LOST PROFITS, BUSINESS INTERRUPTION, OR LOST DATA) ARISING OUT OF
-OR IN RELATION TO THIS AGREEMENT, INCLUDING THE USE OF OR INABILITY TO USE THE
-SOFTWARE, EVEN IF INTEL HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-SOME JURISDICTIONS PROHIBIT EXCLUSION OR LIMITATION OF LIABILITY FOR IMPLIED
-WARRANTIES OR CONSEQUENTIAL OR INCIDENTAL DAMAGES, SO THE ABOVE LIMITATION MAY
-IN PART NOT APPLY TO YOU. THE SOFTWARE LICENSED HEREUNDER IS NOT DESIGNED OR
-INTENDED FOR USE IN ANY MEDICAL, LIFE SAVING OR LIFE SUSTAINING SYSTEMS,
-TRANSPORTATION SYSTEMS, NUCLEAR SYSTEMS, OR FOR ANY OTHER MISSION CRITICAL
-APPLICATION IN WHICH THE FAILURE OF THE SOFTWARE COULD LEAD TO PERSONAL INJURY
-OR DEATH. YOU MAY ALSO HAVE OTHER LEGAL RIGHTS THAT VARY FROM JURISDICTION TO
-JURISDICTION. THE LIMITED REMEDIES, WARRANTY DISCLAIMER AND LIMITED LIABILITY
-ARE FUNDAMENTAL ELEMENTS OF THE BASIS OF THE BARGAIN BETWEEN INTEL AND YOU. YOU
-ACKNOWLEDGE INTEL WOULD BE UNABLE TO PROVIDE THE SOFTWARE WITHOUT SUCH
-LIMITATIONS. YOU WILL INDEMNIFY AND HOLD INTEL AND ITS AFFILIATES, LICENSORS
-AND SUPPLIERS (INCLUDING THEIR RESPECTIVE DIRECTORS, OFFICERS, EMPLOYEES, AND
-AGENTS) HARMLESS AGAINST ALL CLAIMS, LIABILITIES, LOSSES, COSTS, DAMAGES, AND
-EXPENSES (INCLUDING REASONABLE ATTORNEY FEES), ARISING OUT OF, DIRECTLY OR
-INDIRECTLY, THE DISTRIBUTION OF THE SOFTWARE AND ANY CLAIM OF PRODUCT
-LIABILITY, PERSONAL INJURY OR DEATH ASSOCIATED WITH ANY UNINTENDED USE, EVEN IF
-SUCH CLAIM ALLEGES THAT INTEL OR AN INTEL AFFILIATE, LICENSORS OR SUPPLIER WAS
-NEGLIGENT REGARDING THE DESIGN OR MANUFACTURE OF THE SOFTWARE.
-
-11. TERMINATION AND SURVIVAL. Intel may terminate this Agreement for any reason
-with thirty (30) days' notice and immediately if You or someone acting on Your
-behalf or at Your behest violates any of its terms or conditions. Upon
-termination, You will immediately destroy and ensure the destruction of the
-Software or return all copies of the Software to Intel (including providing
-certification of such destruction or return back to Intel). Upon termination of
-this Agreement, all licenses granted to You hereunder terminate immediately.
-All Sections of this Agreement, except Section 2, will survive termination.
-
-12. GOVERNING LAW AND JURISDICTION. This Agreement and any dispute arising out
-of or relating to it will be governed by the laws of the U.S.A. and Delaware,
-without regard to conflict of laws principles. The Parties exclude the
-application of the United Nations Convention on Contracts for the International
-Sale of Goods (1980). The state and federal courts sitting in Delaware, U.S.A.
-will have exclusive jurisdiction over any dispute arising out of or relating to
-this Agreement. The Parties consent to personal jurisdiction and venue in those
-courts. A Party that obtains a judgment against the other Party in the courts
-identified in this section may enforce that judgment in any court that has
-jurisdiction over the Parties.
-
-13. EXPORT REGULATIONS/EXPORT CONTROL. You agree that neither You nor Your
-subsidiaries will export/re-export the Software, directly or indirectly, to any
-country for which the U.S. Department of Commerce or any other agency or
-department of the U.S. Government or the foreign government from where it is
-shipping requires an export license, or other governmental approval, without
-first obtaining any such required license or approval. In the event the
-Software is exported from the U.S.A. or re-exported from a foreign destination
-by You or Your subsidiary, You will ensure that the distribution and
-export/re-export or import of the Software complies with all laws, regulations,
-orders, or other restrictions of the U.S. Export Administration Regulations and
-the appropriate foreign government.
-
-14. GOVERNMENT RESTRICTED RIGHTS. The Software is a commercial item (as defined
-in 48 C.F.R. 2.101) consisting of commercial computer software and commercial
-computer software documentation (as those terms are used in 48 C.F.R. 12.212).
-Consistent with 48 C.F.R. 12.212 and 48 C.F.R 227.7202-1 through 227.7202-4,
-You will not provide the Software to the U.S. Government. Contractor or
-Manufacturer is Intel Corporation, 2200 Mission College Blvd., Santa Clara, CA
-95054.
-
-15. ASSIGNMENT. You may not delegate, assign or transfer this Agreement, the
-license(s) granted or any of Your rights or duties hereunder, expressly, by
-implication, by operation of law, or otherwise and any attempt to do so,
-without Intel's express prior written consent, will be null and void. Intel may
-assign, delegate and transfer this Agreement, and its rights and obligations
-hereunder, in its sole discretion.
-
-16. ENTIRE AGREEMENT; SEVERABILITY. The terms and conditions of this Agreement
-and any NDA with Intel constitute the entire agreement between the parties with
-respect to the subject matter hereof, and merge and supersede all prior or
-contemporaneous agreements, understandings, negotiations and discussions.
-Neither Party will be bound by any terms, conditions, definitions, warranties,
-understandings, or representations with respect to the subject matter hereof
-other than as expressly provided herein. In the event any provision of this
-Agreement is unenforceable or invalid under any applicable law or applicable
-court decision, such unenforceability or invalidity will not render this
-Agreement unenforceable or invalid as a whole, instead such provision will be
-changed and interpreted so as to best accomplish the objectives of such
-provision within legal limits.
-
-17. WAIVER. The failure of a Party to require performance by the other Party of
-any provision hereof will not affect the full right to require such performance
-at any time thereafter; nor will waiver by a Party of a breach of any provision
-hereof constitute a waiver of the provision itself.
-
-18. PRIVACY. YOUR PRIVACY RIGHTS ARE SET FORTH IN INTEL'S PRIVACY NOTICE, WHICH
-FORMS A PART OF THIS AGREEMENT. PLEASE REVIEW THE PRIVACY NOTICE AT
-HTTP://WWW.INTEL.COM/PRIVACY TO LEARN HOW INTEL COLLECTS, USES AND SHARES
-INFORMATION ABOUT YOU.
-
-APPENDIX A
-INTEL END USER SOFTWARE LICENSE AGREEMENT
-
-IMPORTANT - READ BEFORE COPYING, INSTALLING OR USING.
-THE FOLLOWING NOTICE, OR TERMS AND CONDITIONS SUBSTANTIALLY IDENTICAL IN NATURE
-AND EFFECT, MUST APPEAR IN THE DOCUMENTATION ASSOCIATED WITH THE INTEL-BASED
-PRODUCT INTO WHICH THE SOFTWARE IS INSTALLED. MINIMALLY, SUCH NOTICE MUST
-APPEAR IN THE USER GUIDE FOR THE PRODUCT. THE TERM "LICENSEE" IN THIS TEXT
-REFERS TO THE END USER OF THE PRODUCT.
-
-LICENSE. Licensee has a license under Intel's copyrights to reproduce Intel's
-Software only in its unmodified and binary form, (with the accompanying
-documentation, the "Software") for Licensee's personal use only, and not
-commercial use, in connection with Intel-based products for which the Software
-has been provided, subject to the following conditions:
-(a) Licensee may not disclose, distribute or transfer any part of the
-Software, and You agree to prevent unauthorized copying of the Software.
-(b) Licensee may not reverse engineer, decompile, or disassemble the
-Software.
-(c) Licensee may not sublicense the Software.
-(d) The Software may contain the software and other intellectual property
-of third party suppliers, some of which may be identified in, and licensed in
-accordance with, an enclosed license.txt file or other text or file.
-(e) Intel has no obligation to provide any support, technical assistance or
-updates for the Software.
-
-OWNERSHIP OF SOFTWARE AND COPYRIGHTS. Title to all copies of the Software
-remains with Intel or its licensors or suppliers. The Software is copyrighted
-and protected by the laws of the United States and other countries, and
-international treaty provisions. Licensee may not remove any copyright notices
-from the Software. Except as otherwise expressly provided above, Intel grants
-no express or implied right under Intel patents, copyrights, trademarks, or
-other intellectual property rights. Transfer of the license terminates
-Licensee's right to use the Software.
-DISCLAIMER OF WARRANTY. The Software is provided "AS IS" without warranty of
-any kind, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION, WARRANTIES
-OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE.
-
-LIMITATION OF LIABILITY. NEITHER INTEL NOR ITS LICENSORS OR SUPPLIERS WILL BE
-LIABLE FOR ANY LOSS OF PROFITS, LOSS OF USE, INTERRUPTION OF BUSINESS, OR
-INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY KIND WHETHER
-UNDER THIS AGREEMENT OR OTHERWISE, EVEN IF INTEL HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-LICENSE TO USE COMMENTS AND SUGGESTIONS. This Agreement does NOT obligate
-Licensee to provide Intel with comments or suggestions regarding the Software.
-However, if Licensee provides Intel with comments or suggestions for the
-modification, correction, improvement or enhancement of (a) the Software or (b)
-Intel products or processes that work with the Software, Licensee grants to
-Intel a non-exclusive, worldwide, perpetual, irrevocable, transferable,
-royalty-free license, with the right to sublicense, under Licensee's
-intellectual property rights, to incorporate or otherwise utilize those
-comments and suggestions.
-
-TERMINATION OF THIS LICENSE. Intel or the sublicensor may terminate this
-license at any time if Licensee is in breach of any of its terms or conditions.
-Upon termination, Licensee will immediately destroy or return to Intel all
-copies of the Software.
-THIRD PARTY BENEFICIARY. Intel is an intended beneficiary of the End User
-License Agreement and has the right to enforce all of its terms.
-
-U.S. GOVERNMENT RESTRICTED RIGHTS. The Software is a commercial item (as
-defined in 48 C.F.R. 2.101) consisting of commercial computer software and
-commercial computer software documentation (as those terms are used in 48
-C.F.R. 12.212), consistent with 48 C.F.R. 12.212 and 48 C.F.R 227.7202-1
-through 227.7202-4. You will not provide the Software to the U.S. Government.
-Contractor or Manufacturer is Intel Corporation, 2200 Mission College Blvd.,
-Santa Clara, CA 95054.
-
-EXPORT LAWS. Licensee agrees that neither Licensee nor Licensee's subsidiaries
-will export/re-export the Software, directly or indirectly, to any country for
-which the U.S. Department of Commerce or any other agency or department of the
-U.S. Government or the foreign government from where it is shipping requires an
-export license, or other governmental approval, without first obtaining any
-such required license or approval. In the event the Software is exported from
-the U.S.A. or re-exported from a foreign destination by Licensee, Licensee will
-ensure that the distribution and export/re-export or import of the Software
-complies with all laws, regulations, orders, or other restrictions of the U.S.
-Export Administration Regulations and the appropriate foreign government.
-
-APPLICABLE LAWS. This Agreement and any dispute arising out of or relating to
-it will be governed by the laws of the U.S.A. and Delaware, without regard to
-conflict of laws principles. The Parties to this Agreement exclude the
-application of the United Nations Convention on Contracts for the International
-Sale of Goods (1980). The state and federal courts sitting in Delaware, U.S.A.
-will have exclusive jurisdiction over any dispute arising out of or relating to
-this Agreement. The Parties consent to personal jurisdiction and venue in those
-courts. A Party that obtains a judgment against the other Party in the courts
-identified in this section may enforce that judgment in any court that has
-jurisdiction over the Parties.
-
-Licensee's specific rights may vary from country to country.
+Redistribution and use in binary form, without modification, are permitted,
+provided that the following conditions are met:
+1. Redistributions must reproduce the above copyright notice and the
+ following disclaimer in the documentation and/or other materials provided
+ with the distribution.
+
+2. Neither the name of Intel Corporation nor the names of its suppliers may
+ be used to endorse or promote products derived from this software without
+ specific prior written permission.
+
+3. No reverse engineering, decompilation, or disassembly of this software
+ is permitted.
+
+
+"Binary form" includes any format that is commonly used for electronic
+conveyance that is a reversible, bit-exact translation of binary
+representation to ASCII or ISO text, for example "uuencode".
+
+DISCLAIMER.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
1
0
Hello community,
here is the log from the commit of package qpid-cpp for openSUSE:Factory checked in at 2018-08-31 10:43:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qpid-cpp (Old)
and /work/SRC/openSUSE:Factory/.qpid-cpp.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qpid-cpp"
Fri Aug 31 10:43:29 2018 rev:9 rq:631353 version:1.38.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/qpid-cpp/qpid-cpp.changes 2018-01-22 16:20:22.508723461 +0100
+++ /work/SRC/openSUSE:Factory/.qpid-cpp.new/qpid-cpp.changes 2018-08-31 10:44:07.287179375 +0200
@@ -1,0 +2,25 @@
+Fri Aug 24 09:06:19 UTC 2018 - mcalabkova(a)suse.com
+
+- removed useless patch qpid-cpp-DisableWerror.patch
+ * it can be solved by giving additional parameter to cmake
+
+-------------------------------------------------------------------
+Wed Aug 22 13:28:29 UTC 2018 - mcalabkova(a)suse.com
+
+- Update to upstream 1.38.0
+ * define test script dependencies in CMake so make test picks up
+ changes
+ * add a CMake switch to allow -Werror to be switched off
+ + -Werror switched off by patch qpid-cpp-DisableWerror.patch
+ * various documentation fixes and added man pages
+ + manual pages added to packages client-devel and
+ qpid-qmf-devel
+ * remove the obsolete Python management API
+ + obsolete package python-qpid-qmf removed
+- Added patches:
+ * qpid-cpp-DisableWerror.patch (see above)
+- Removed patches:
+ * Suppress-maybe-uninitialized-warning.diff (obsolete)
+ * qpid-cpp-0.30-cmake.patch (obsolete)
+
+-------------------------------------------------------------------
Old:
----
Suppress-maybe-uninitialized-warning.diff
qpid-cpp-0.30-cmake.patch
qpid-cpp-1.37.0.tar.gz
New:
----
qpid-cpp-1.38.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-qpid.spec ++++++
--- /var/tmp/diff_new_pack.dpdRd4/_old 2018-08-31 10:44:07.871180072 +0200
+++ /var/tmp/diff_new_pack.dpdRd4/_new 2018-08-31 10:44:07.875180077 +0200
@@ -17,7 +17,7 @@
Name: perl-qpid
-Version: 1.37.0
+Version: 1.38.0
Release: 0
Summary: Perl bindings for the Qpid messaging framework
License: Apache-2.0
@@ -30,7 +30,7 @@
Requires: perl = %{perl_version}
%description
-Perl bindings for the Qpid messaging framework.
+Perl bindings needed for the Qpid messaging framework.
%prep
%setup -q -n qpid-cpp-%{version}
++++++ qpid-cpp.spec ++++++
--- /var/tmp/diff_new_pack.dpdRd4/_old 2018-08-31 10:44:07.895180101 +0200
+++ /var/tmp/diff_new_pack.dpdRd4/_new 2018-08-31 10:44:07.899180105 +0200
@@ -17,22 +17,19 @@
Name: qpid-cpp
-Version: 1.37.0
+Version: 1.38.0
Release: 0
Summary: Libraries for Qpid C++ client applications
License: Apache-2.0
Group: Productivity/Networking/Other
-Url: http://qpid.apache.org
+URL: http://qpid.apache.org
Source0: http://www.apache.org/dist/qpid/cpp/%{version}/%{name}-%{version}.tar.gz
Source1000: %{name}-rpmlintrc
Patch0: 0001-NO-JIRA-qpidd.service-file-for-use-on-Fedora.patch
Patch1: qpid-0.24-date.patch
Patch2: qpid-cpp-tests.patch
Patch3: qpid-cpp-initdir.patch
-Patch4: %{name}-0.30-cmake.patch
Patch5: %{name}-aarch64.patch
-# PATCH-FIX-OPENSUSE Suppress-maybe-uninitialized-warning.diff
-Patch6: Suppress-maybe-uninitialized-warning.diff
BuildRequires: cmake
BuildRequires: cyrus-sasl
BuildRequires: cyrus-sasl-devel
@@ -80,7 +77,7 @@
the AMQP protocol.
%files client
-%doc LICENSE.txt
+%license LICENSE.txt
%doc NOTICE.txt
%doc README.md
%doc INSTALL.txt
@@ -140,6 +137,7 @@
%dir %{_libexecdir}/qpid
%{_libexecdir}/qpid/tests
%{_libdir}/cmake/Qpid
+%{_mandir}/man1/qpid-*.1%{?ext_man}
%post client-devel -p /sbin/ldconfig
%postun client-devel -p /sbin/ldconfig
@@ -220,13 +218,11 @@
License: Apache-2.0
Group: Productivity/Networking/Other
Requires: %{name}-server = %{version}-%{release}
-Requires: python-qpid-qmf = %{version}-%{release}
%description server-ha
Provides extensions to the AMQP message broker to provide high availability.
%files server-ha
-# %{_bindir}/qpid-ha
%dir %{_libdir}/qpid
%dir %{_libdir}/qpid/daemon
%{_libdir}/qpid/daemon/ha.so
@@ -260,7 +256,7 @@
%package server-store
Summary: Red Hat persistence extension to the Qpid messaging system
-License: LGPL-2.1+
+License: LGPL-2.1-or-later
Group: Productivity/Networking/Other
Requires: %{name}-server = %{version}
@@ -284,7 +280,7 @@
Requires: python-qpid-common
%description -n python-qpid_messaging
-Python bindings for the Qpid messaging framework.
+Manual pages and Python bindings for the Qpid messaging framework.
%files -n python-qpid_messaging
%{python_sitearch}/qpid_messaging.py
@@ -297,7 +293,6 @@
License: Apache-2.0
Group: Productivity/Networking/Other
Requires: python-qpid >= 0.32
-Requires: python-qpid-qmf = %{version}
Requires: qpid-cpp-client >= %{version}
%description -n qpid-qmf
@@ -315,7 +310,7 @@
%package -n qpid-qmf-devel
Summary: Header files and tools for developing QMF extensions
License: Apache-2.0
-Group: Productivity/Networking/Other
+Group: Development/Tools/Other
Requires: qpid-cpp-client-devel >= %{version}
Requires: qpid-qmf = %{version}-%{release}
@@ -329,42 +324,23 @@
%{_bindir}/qmf-gen
%{python_sitelib}/qmfgen
%{_libdir}/pkgconfig/qmf2.pc
+%{_mandir}/man1/qmf-gen.1%{?ext_man}
%post -n qpid-qmf-devel -p /sbin/ldconfig
%postun -n qpid-qmf-devel -p /sbin/ldconfig
-%package -n python-qpid-qmf
-Summary: The QPID Management Framework bindings for python
-License: Apache-2.0
-Group: Productivity/Networking/Other
-Requires: qpid-qmf = %{version}-%{release}
-
-%description -n python-qpid-qmf
-An extensible management framework layered on QPID messaging, bindings
-for python.
-
-%files -n python-qpid-qmf
-%{python_sitearch}/qmf2.py*
-%{python_sitearch}/cqmf2.py*
-%{python_sitearch}/*_cqmf2.so
-
-%post -n python-qpid-qmf -p /sbin/ldconfig
-%postun -n python-qpid-qmf -p /sbin/ldconfig
-
%prep
%setup -q
%patch0 -p3
%patch1 -p2 -b .date
%patch2 -p1 -b .tests
%patch3 -p1 -b .initdir
-%patch4 -p1
%patch5 -p2
-%patch6 -p1
%global perftests "qpid-perftest qpid-topic-listener qpid-topic-publisher qpid-latency-test qpid-client-test qpid-txtest"
%build
-%cmake -DLIBEXEC_INSTALL_DIR=%{_libexecdir}
+%cmake -DLIBEXEC_INSTALL_DIR=%{_libexecdir} -DENABLE_WARNING_ERROR=OFF
make %{?_smp_mflags}
make docs-user-api %{?_smp_mflags}
pushd bindings/qpid/python
@@ -372,6 +348,7 @@
popd
%install
+
mkdir -p -m0755 %{buildroot}%{_unitdir}
%cmake_install
@@ -427,9 +404,6 @@
ln -s /sbin/service %{buildroot}%{_sbindir}/rcqpidd
%endif
-# clean up leftover ruby files
-rm -rf %{buildroot}%{_prefix}/local/%{_lib}/ruby/site_ruby
-
%fdupes -s %{buildroot}
%check
++++++ qpid-cpp-1.37.0.tar.gz -> qpid-cpp-1.38.0.tar.gz ++++++
++++ 8205 lines of diff (skipped)
1
0