June 2016 - openSUSE Commits - openSUSE Mailing Lists

commit glib2-branding-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '16

29 Jun '16

Hello community, here is the log from the commit of package glib2-branding-openSUSE for openSUSE:Factory checked in at 2016-06-29 15:03:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/glib2-branding-openSUSE (Old) and /work/SRC/openSUSE:Factory/.glib2-branding-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "glib2-branding-openSUSE" Changes: -------- --- /work/SRC/openSUSE:Factory/glib2-branding-openSUSE/glib2-branding-openSUSE.changes 2016-03-29 14:30:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.glib2-branding-openSUSE.new/glib2-branding-openSUSE.changes 2016-06-29 15:03:21.000000000 +0200 @@ -1,0 +2,9 @@ +Mon Jun 20 13:08:25 UTC 2016 - fcrozat(a)suse.com + +- Add some settings from SLE12 SP2, not enabled when building on + openSUSE (default zoom on nautilus). +- Update favorite applications default to use new names from + upstream, prevent writing some defaults to dconf (partially fixes + bsc#979947). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glib2-branding.gschema.override.in ++++++ --- /var/tmp/diff_new_pack.ZTUrht/_old 2016-06-29 15:03:22.000000000 +0200 +++ /var/tmp/diff_new_pack.ZTUrht/_new 2016-06-29 15:03:22.000000000 +0200 @@ -68,8 +68,10 @@ [org.gnome.shell] ## Default apps shown in the gnome-shell dash -@@IF_openSUSE@@favorite-apps = [ 'firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'gnome-music.desktop', 'shotwell.desktop', 'writer.desktop', 'nautilus.desktop', 'gnome-documents.desktop' ] -@@IF_SLE@@favorite-apps = [ 'firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'shotwell.desktop', 'startcenter.desktop', 'nautilus.desktop', 'gnome-documents.desktop', 'yelp.desktop' ] +@@IF_openSUSE@@favorite-apps = [ 'firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'gnome-music.desktop', 'shotwell.desktop', 'writer.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Documents.desktop' ] +@@IF_SLE@@favorite-apps = [ 'firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'shotwell.desktop', 'startcenter.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Documents.desktop', 'yelp.desktop' ] +@@IF_SLE@@## Default extensions that are enabled +@@IF_SLE@@enabled-extensions = [ 'alternative-status-menu(a)gnome-shell-extensions.gcampax.github.com' ] [org.gnome.gnome-panel.applet.window-list] ## Display all workspaces in the gnome-panel window list applet @@ -79,3 +81,5 @@ ## Disable indexing on removable media index-removable-devices = false +@@IF_SLE@@[org.gnome.nautilus.icon-view] +@@IF_SLE@@default-zoom-level = 'small'

1 0

commit llvm for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '16

29 Jun '16

Hello community, here is the log from the commit of package llvm for openSUSE:Factory checked in at 2016-06-29 15:03:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/llvm (Old) and /work/SRC/openSUSE:Factory/.llvm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "llvm" Changes: -------- --- /work/SRC/openSUSE:Factory/llvm/lldb.changes 2016-05-23 16:38:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.llvm.new/lldb.changes 2016-06-29 15:03:15.000000000 +0200 @@ -1,0 +2,6 @@ +Fri May 20 07:44:49 UTC 2016 - jengelh(a)inai.de + +- Set RPM group, drop marketing words from summary in lieu of + something useful. Implement shared library guideline. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lldb.spec ++++++ --- /var/tmp/diff_new_pack.1mLOW8/_old 2016-06-29 15:03:17.000000000 +0200 +++ /var/tmp/diff_new_pack.1mLOW8/_new 2016-06-29 15:03:17.000000000 +0200 @@ -20,9 +20,9 @@ Name: lldb Version: 3.8.0 Release: 0 -Summary: Next generation high-performance debugger +Summary: Software debugger built using LLVM libraries License: NCSA -Group: Development/Languages/Other +Group: Development/Tools/Debuggers Url: http://lldb.llvm.org Source: http://llvm.org/releases/%{version}/lldb-%{version}.src.tar.xz # PATCH-FIX-OPENSUSE lldb-cmake.patch -- Let us set LLDB_REVISION and fix ncurses include path. @@ -55,11 +55,18 @@ larger LLVM Project, such as the Clang expression parser and LLVM disassembler. +%package -n liblldb3_8 +Summary: LLDB software debugger runtime library +Group: System/Libraries + +%description -n liblldb3_8 +This subpackage contains the main LLDB component. + %package devel Summary: Development files for LLDB Group: Development/Languages/Other Requires: libedit-devel -Requires: lldb = %{version} +Requires: liblldb3_8 = %{version} Requires: zlib-devel %description devel @@ -114,16 +121,19 @@ # Fix duplicated files. %fdupes %{_includedir}/%{name}/Host/ -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%post -n liblldb3_8 -p /sbin/ldconfig +%postun -n liblldb3_8 -p /sbin/ldconfig %files %defattr(-,root,root,-) %{_bindir}/lldb* -%{_libdir}/liblldb.so.* %{py_sitedir}/lldb %{py_sitedir}/readline.so +%files -n liblldb3_8 +%defattr(-,root,root) +%{_libdir}/liblldb.so.* + %files devel %defattr(-,root,root,-) %{_includedir}/lldb

1 0

commit lmdb for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '16

29 Jun '16

Hello community, here is the log from the commit of package lmdb for openSUSE:Factory checked in at 2016-06-29 15:03:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lmdb (Old) and /work/SRC/openSUSE:Factory/.lmdb.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lmdb" Changes: -------- --- /work/SRC/openSUSE:Factory/lmdb/lmdb.changes 2016-02-18 12:35:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.lmdb.new/lmdb.changes 2016-06-29 15:03:02.000000000 +0200 @@ -1,0 +2,10 @@ +------------------------------------------------------------------- +Sun Jun 19 01:07:37 UTC 2016 - stefan.bruens(a)rwth-aachen.de + +- Update 0001-Add-extra-tools-and-CFEngine-modifications-for-LMDB.patch + * do not force enable NOSUBDIR option in mdb_copy +- Update 0002-Autoconf-files.patch + * build mdb_dump, mdb_load + * distribute manpages + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lmdb.spec ++++++ --- /var/tmp/diff_new_pack.iDtPJF/_old 2016-06-29 15:03:03.000000000 +0200 +++ /var/tmp/diff_new_pack.iDtPJF/_new 2016-06-29 15:03:03.000000000 +0200 @@ -110,6 +110,7 @@ %doc libraries/liblmdb/COPYRIGHT %doc libraries/liblmdb/LICENSE %{_bindir}/* +%doc %{_mandir}/man1/*.1.gz %files -n %lname %defattr(-,root,root) ++++++ 0001-Add-extra-tools-and-CFEngine-modifications-for-LMDB.patch ++++++ --- /var/tmp/diff_new_pack.iDtPJF/_old 2016-06-29 15:03:03.000000000 +0200 +++ /var/tmp/diff_new_pack.iDtPJF/_new 2016-06-29 15:03:03.000000000 +0200 @@ -352,19 +352,3 @@ + + return 1; +} -diff --git a/libraries/liblmdb/mdb_copy.c b/libraries/liblmdb/mdb_copy.c -index f37ccbcc213e..bbe43bf601ae 100644 ---- a/libraries/liblmdb/mdb_copy.c -+++ b/libraries/liblmdb/mdb_copy.c -@@ -32,7 +32,7 @@ int main(int argc,char * argv[]) - int rc; - MDB_env *env; - const char *progname = argv[0], *act; -- unsigned flags = MDB_RDONLY; -+ unsigned flags = MDB_NOSUBDIR|MDB_RDONLY; - unsigned cpflags = 0; - - for (; argc > 1 && argv[1][0] == '-'; argc--, argv++) { --- -2.7.0 - ++++++ 0002-Autoconf-files.patch ++++++ --- /var/tmp/diff_new_pack.iDtPJF/_old 2016-06-29 15:03:03.000000000 +0200 +++ /var/tmp/diff_new_pack.iDtPJF/_new 2016-06-29 15:03:03.000000000 +0200 @@ -135,17 +135,21 @@ index 000000000000..d3a4a4c99c5d --- /dev/null +++ b/libraries/liblmdb/Makefile.am -@@ -0,0 +1,11 @@ +@@ -0,0 +1,15 @@ +lib_LTLIBRARIES = liblmdb.la +liblmdb_la_SOURCES = mdb.c midl.c +liblmdb_la_LDFLAGS=-no-undefined -avoid-version + -+bin_PROGRAMS = mdb_stat mdb_copy lmdump lmmgr ++bin_PROGRAMS = mdb_stat mdb_copy mdb_load mdb_dump lmdump lmmgr +mdb_stat_LDADD = liblmdb.la +mdb_copy_LDADD = liblmdb.la ++mdb_load_LDADD = liblmdb.la ++mdb_dump_LDADD = liblmdb.la +lmdump_LDADD = liblmdb.la +lmmgr_LDADD = liblmdb.la + ++man_MANS = mdb_stat.1 mdb_copy.1 mdb_load.1 mdb_dump.1 ++ +include_HEADERS = lmdb.h diff --git a/libraries/liblmdb/configure.ac b/libraries/liblmdb/configure.ac new file mode 100644

1 0

commit java-1_7_0-openjdk for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '16

29 Jun '16

Hello community, here is the log from the commit of package java-1_7_0-openjdk for openSUSE:Factory checked in at 2016-06-29 15:02:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/java-1_7_0-openjdk (Old) and /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "java-1_7_0-openjdk" Changes: -------- --- /work/SRC/openSUSE:Factory/java-1_7_0-openjdk/java-1_7_0-openjdk-bootstrap.changes 2016-06-14 23:05:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/java-1_7_0-openjdk-bootstrap.changes 2016-06-29 15:02:55.000000000 +0200 @@ -1,0 +2,12 @@ +Sun Jun 19 08:02:26 UTC 2016 - schwab(a)suse.de + +- aarch64-remove-unused-code.patch: remove unsused definition of min + conflicting with macro + +------------------------------------------------------------------- +Tue Jun 14 11:46:16 UTC 2016 - agraf(a)suse.com + +- Fix aarch64 running with 48 bits va space (bsc#984684) + * hotspot-aarch64-fix-48bit-va.patch + +------------------------------------------------------------------- java-1_7_0-openjdk.changes: same change New: ---- aarch64-remove-unused-code.patch hotspot-aarch64-fix-48bit-va.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_7_0-openjdk-bootstrap.spec ++++++ --- /var/tmp/diff_new_pack.xsnMv9/_old 2016-06-29 15:02:57.000000000 +0200 +++ /var/tmp/diff_new_pack.xsnMv9/_new 2016-06-29 15:02:57.000000000 +0200 @@ -17,8 +17,8 @@ %{!?aarch64:%global aarch64 aarch64 arm64 armv8} -%global jit_arches %ix86 x86_64 ppc64 ppc64le %arm %aarch64 -%global test_arches %ix86 x86_64 ppc64 ppc64le +%global jit_arches %{ix86} x86_64 ppc64 ppc64le %{arm} %{aarch64} +%global test_arches %{ix86} x86_64 ppc64 ppc64le %global icedtea_version 2.6.6 %global icedtea_sound_version 1.0.1 %global mauvedate 2008-10-22 @@ -76,7 +76,7 @@ %global archbuild %{_arch} %global archinstall %{_arch} %endif -%ifarch %ix86 +%ifarch %{ix86} %global archbuild i586 %global archinstall i386 %endif @@ -84,11 +84,11 @@ %global archbuild amd64 %global archinstall amd64 %endif -%ifarch %arm +%ifarch %{arm} %global archbuild arm %global archinstall arm %endif -%ifarch %aarch64 +%ifarch %{aarch64} %global archbuild aarch64 %global archinstall aarch64 %endif @@ -102,7 +102,7 @@ %endif # bnc#542545 # 32-bit versus 64-bit specific provides: -%ifarch %ix86 ppc s390 +%ifarch %{ix86} ppc s390 %global bits 32 %endif %ifarch x86_64 ia64 s390x @@ -194,6 +194,8 @@ Patch108: java-1.7.0-openjdk-thread-stack-size.patch # allow to create hs_pid.log in tmp (in 700 permissions) if working directory is unwritable Patch200: abrt_friendly_hs_log_jdk7.patch +# remove unsused definition of min conflicting with macro +Patch201: aarch64-remove-unused-code.patch # # Optional component packages # @@ -212,6 +214,7 @@ Patch1006: java-1_7_0-openjdk-override.patch Patch2000: java-1_7_0-openjdk-gcc6.patch Patch10011: openjdk-7-src-b147-no-return-in-nonvoid-hotspot.patch +Patch10012: hotspot-aarch64-fix-48bit-va.patch BuildRequires: alsa-lib-devel #BuildRequires: xalan-j2 # make sure to use bootstrap requires of ant @@ -359,7 +362,7 @@ %if %{with zero} BuildRequires: libffi-devel %endif -%ifarch %arm +%ifarch %{arm} BuildRequires: libffi-devel %endif @@ -567,7 +570,7 @@ --disable-infinality \ --disable-downloading \ --with-abs-install-dir=%{_jvmdir}/%{sdkdir} \ -%ifnarch %arm %aarch64 +%ifnarch %{arm} %{aarch64} --with-parallel-jobs="${NUM_PROC}" \ %endif --with-pkgversion="suse-%{release}-%{_arch}" \ @@ -616,6 +619,7 @@ patch -p0 -i %{PATCH106} patch -p0 -i %{PATCH108} patch -p0 -i %{PATCH200} +patch -p0 -i %{PATCH201} %if ! %{with zero} patch -p0 -i %{PATCH403} @@ -638,6 +642,7 @@ patch -p1 -i %{PATCH1001} patch -p1 -i %{PATCH10011} +patch -p1 -i %{PATCH10012} %if %{with bootstrap} patch -p0 -i %{PATCH1006} @@ -1138,7 +1143,7 @@ %dir %{_jvmdir}/%{sdkdir}/jre/bin %dir %{_jvmdir}/%{sdkdir}/jre/lib %dir %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall} -%ifarch %ix86 +%ifarch %{ix86} %{_jvmdir}/%{sdkdir}/jre/lib/i386/client/Xusage.txt %endif %dir %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/headless @@ -1162,7 +1167,7 @@ %exclude %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/xawt/libmawt.so %exclude %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/libjavagtk.so -%ifarch %ix86 +%ifarch %{ix86} %dir %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/client %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/client/libjsig.so %attr(755,root,root) %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/client/libjvm.so @@ -1176,7 +1181,7 @@ %config(noreplace) %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/jvm.cfg %if ! %{with zero} -%ifnarch ppc64 ppc64le %arm +%ifnarch ppc64 ppc64le %{arm} %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/server/classes.jsa %endif %endif ++++++ java-1_7_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.xsnMv9/_old 2016-06-29 15:02:57.000000000 +0200 +++ /var/tmp/diff_new_pack.xsnMv9/_new 2016-06-29 15:02:57.000000000 +0200 @@ -17,8 +17,8 @@ %{!?aarch64:%global aarch64 aarch64 arm64 armv8} -%global jit_arches %ix86 x86_64 ppc64 ppc64le %arm %aarch64 -%global test_arches %ix86 x86_64 ppc64 ppc64le +%global jit_arches %{ix86} x86_64 ppc64 ppc64le %{arm} %{aarch64} +%global test_arches %{ix86} x86_64 ppc64 ppc64le %global icedtea_version 2.6.6 %global icedtea_sound_version 1.0.1 %global mauvedate 2008-10-22 @@ -76,7 +76,7 @@ %global archbuild %{_arch} %global archinstall %{_arch} %endif -%ifarch %ix86 +%ifarch %{ix86} %global archbuild i586 %global archinstall i386 %endif @@ -84,11 +84,11 @@ %global archbuild amd64 %global archinstall amd64 %endif -%ifarch %arm +%ifarch %{arm} %global archbuild arm %global archinstall arm %endif -%ifarch %aarch64 +%ifarch %{aarch64} %global archbuild aarch64 %global archinstall aarch64 %endif @@ -102,7 +102,7 @@ %endif # bnc#542545 # 32-bit versus 64-bit specific provides: -%ifarch %ix86 ppc s390 +%ifarch %{ix86} ppc s390 %global bits 32 %endif %ifarch x86_64 ia64 s390x @@ -194,6 +194,8 @@ Patch108: java-1.7.0-openjdk-thread-stack-size.patch # allow to create hs_pid.log in tmp (in 700 permissions) if working directory is unwritable Patch200: abrt_friendly_hs_log_jdk7.patch +# remove unsused definition of min conflicting with macro +Patch201: aarch64-remove-unused-code.patch # # Optional component packages # @@ -212,6 +214,7 @@ Patch1006: java-1_7_0-openjdk-override.patch Patch2000: java-1_7_0-openjdk-gcc6.patch Patch10011: openjdk-7-src-b147-no-return-in-nonvoid-hotspot.patch +Patch10012: hotspot-aarch64-fix-48bit-va.patch BuildRequires: alsa-lib-devel #BuildRequires: xalan-j2 # make sure to use bootstrap requires of ant @@ -359,7 +362,7 @@ %if %{with zero} BuildRequires: libffi-devel %endif -%ifarch %arm +%ifarch %{arm} BuildRequires: libffi-devel %endif @@ -567,7 +570,7 @@ --disable-infinality \ --disable-downloading \ --with-abs-install-dir=%{_jvmdir}/%{sdkdir} \ -%ifnarch %arm %aarch64 +%ifnarch %{arm} %{aarch64} --with-parallel-jobs="${NUM_PROC}" \ %endif --with-pkgversion="suse-%{release}-%{_arch}" \ @@ -616,6 +619,7 @@ patch -p0 -i %{PATCH106} patch -p0 -i %{PATCH108} patch -p0 -i %{PATCH200} +patch -p0 -i %{PATCH201} %if ! %{with zero} patch -p0 -i %{PATCH403} @@ -638,6 +642,7 @@ patch -p1 -i %{PATCH1001} patch -p1 -i %{PATCH10011} +patch -p1 -i %{PATCH10012} %if %{with bootstrap} patch -p0 -i %{PATCH1006} @@ -1138,7 +1143,7 @@ %dir %{_jvmdir}/%{sdkdir}/jre/bin %dir %{_jvmdir}/%{sdkdir}/jre/lib %dir %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall} -%ifarch %ix86 +%ifarch %{ix86} %{_jvmdir}/%{sdkdir}/jre/lib/i386/client/Xusage.txt %endif %dir %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/headless @@ -1162,7 +1167,7 @@ %exclude %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/xawt/libmawt.so %exclude %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/libjavagtk.so -%ifarch %ix86 +%ifarch %{ix86} %dir %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/client %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/client/libjsig.so %attr(755,root,root) %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/client/libjvm.so @@ -1176,7 +1181,7 @@ %config(noreplace) %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/jvm.cfg %if ! %{with zero} -%ifnarch ppc64 ppc64le %arm +%ifnarch ppc64 ppc64le %{arm} %{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/server/classes.jsa %endif %endif ++++++ aarch64-remove-unused-code.patch ++++++ # HG changeset patch # User aph # Date 1456412384 0 # Thu Feb 25 14:59:44 2016 +0000 # Node ID 5e587a29a6aac06d6b5a7ebeea99a291d82520c8 # Parent 15b7a15b93103e76338d1bc3d6c6fc37f1805b88 8150652, PR2922: Remove unused code in AArch64 back end Reviewed-by: kvn diff --git a/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp b/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp --- openjdk/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp +++ openjdk/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp @@ -207,10 +207,6 @@ return (r->reg2stack() + SharedRuntime::out_preserve_stack_slots()) * VMRegImpl::stack_slot_size; } -template <class T> static const T& min (const T& a, const T& b) { - return (a > b) ? b : a; -} - // --------------------------------------------------------------------------- // Read the array of BasicTypes from a signature, and compute where the // arguments should go. Values in the VMRegPair regs array refer to 4-byte ++++++ hotspot-aarch64-fix-48bit-va.patch ++++++ # HG changeset patch # User enevill # Date 1454603068 0 # Thu Feb 04 16:24:28 2016 +0000 # Node ID ded2073b67bdd9c9f2ae924397341b762329aaef # Parent f918c20107d9acb189498095308c2f49c8dbc84e 8148783: aarch64: SEGV running SpecJBB2013 Summary: Fix calculation of offset for adrp Reviewed-by: aph diff --git a/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp b/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp --- a/openjdk/hotspot/src/cpu/aarch64/vm/assembler_aarch64.cpp +++ b/openjdk/hotspot/src/cpu/aarch64/vm/assembler_aarch64.cpp @@ -1632,7 +1632,10 @@ int MacroAssembler::pd_patch_instruction_size(address branch, address target) { Instruction_aarch64::extract(insn2, 4, 0)) { // movk #imm16<<32 Instruction_aarch64::patch(branch + 4, 20, 5, (uint64_t)target >> 32); - offset &= (1<<20)-1; + long dest = ((long)target & 0xffffffffL) | ((long)branch & 0xffff00000000L); + long pc_page = (long)branch >> 12; + long adr_page = (long)dest >> 12; + offset = adr_page - pc_page; instructions = 2; } } @@ -4920,11 +4923,12 @@ void MacroAssembler::adrp(Register reg1, const Address &dest, unsigned long &byt if (offset_high >= -(1<<20) && offset_low < (1<<20)) { _adrp(reg1, dest.target()); } else { - unsigned long pc_page = (unsigned long)pc() >> 12; - long offset = dest_page - pc_page; - offset = (offset & ((1<<20)-1)) << 12; - _adrp(reg1, pc()+offset); - movk(reg1, ((unsigned long)dest.target() >> 32), 32); + unsigned long source = (unsigned long)pc(); + unsigned long target = (unsigned long)dest.target(); + unsigned long adrp_target = (target & 0xffffffffUL) | (source & 0xffff00000000UL); + + _adrp(reg1, (address)adrp_target); + movk(reg1, target >> 32, 32); } byte_offset = (unsigned long)dest.target() & 0xfff; }

1 0

commit postfix for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '16

29 Jun '16

Hello community, here is the log from the commit of package postfix for openSUSE:Factory checked in at 2016-06-29 15:02:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/postfix (Old) and /work/SRC/openSUSE:Factory/.postfix.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "postfix" Changes: -------- --- /work/SRC/openSUSE:Factory/postfix/postfix.changes 2016-06-02 12:38:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.postfix.new/postfix.changes 2016-06-29 15:02:49.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jun 2 12:26:17 UTC 2016 - schwab(a)suse.de + +- postfix-post-install.patch: remove empty patch + +------------------------------------------------------------------- Old: ---- postfix-post-install.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ postfix.spec ++++++ --- /var/tmp/diff_new_pack.kDGoBC/_old 2016-06-29 15:02:50.000000000 +0200 +++ /var/tmp/diff_new_pack.kDGoBC/_new 2016-06-29 15:02:50.000000000 +0200 @@ -76,7 +76,6 @@ Patch3: ipv6_disabled.patch Patch4: %{name}-main.cf.patch Patch5: %{name}-master.cf.patch -Patch6: %{name}-post-install.patch Patch7: %{name}-ssl-release-buffers.patch Patch8: %{name}-vda-v13-3.10.0.patch @@ -183,7 +182,6 @@ %patch3 %patch4 %patch5 -%patch6 %patch7 %patch8 -p1

1 0

commit python-mock for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '16

29 Jun '16

Hello community, here is the log from the commit of package python-mock for openSUSE:Factory checked in at 2016-06-29 15:02:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-mock (Old) and /work/SRC/openSUSE:Factory/.python-mock.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-mock" Changes: -------- --- /work/SRC/openSUSE:Factory/python-mock/python-mock.changes 2016-01-15 10:38:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-mock.new/python-mock.changes 2016-06-29 15:02:43.000000000 +0200 @@ -1,0 +2,26 @@ +Thu Jun 2 07:33:30 UTC 2016 - tbechtold(a)suse.com + +- update to 2.0.0: + * Fix #338: depend on a fixed version of funcsigs + * More 3.2 support dropping cleanup + * Update sync point + * Add Mock.assert_called() + * Issue25347 - Format the error message output of mock's assert_has_calls method + * Issue #22138: Fix mock.patch behavior when patching descriptors. Restore original values after patching + * Issue #24857: Comparing call_args to a long sequence now correctly returns a boolean result instead of raising an exception + * Issue #23004: mock_open() now reads binary data correctly when the type of read_data is bytes + * Add version info in the docs + * Update six to a version with raises_from + * Fix #328 - handle unicode __repr__ on Python 2.x + * Drop support for Python 3.2 + * Fix typo in docs/index.txt + * Fix README.rst checking + * Be clearer about Python version compat + * Issue #295: use a setup_requires dependency + * Improve grouping of imports in tests + * Use six to detect python2/3 in main module + * Use six to detect python2/3 in test modules +- adjust Requires +- use pypi.io as Source url + +------------------------------------------------------------------- Old: ---- mock-1.3.0.tar.gz New: ---- mock-2.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-mock.spec ++++++ --- /var/tmp/diff_new_pack.lBkvpU/_old 2016-06-29 15:02:44.000000000 +0200 +++ /var/tmp/diff_new_pack.lBkvpU/_new 2016-06-29 15:02:44.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-mock # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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,13 +17,13 @@ Name: python-mock -Version: 1.3.0 +Version: 2.0.0 Release: 0 Url: http://www.voidspace.org.uk/python/mock/ Summary: A Python Mocking and Patching Library for Testing License: BSD-2-Clause Group: Development/Languages/Python -Source: http://pypi.python.org/packages/source/m/mock/mock-%{version}.tar.gz +Source: https://pypi.io/packages/source/m/mock/mock-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel BuildRequires: python-funcsigs @@ -32,8 +32,9 @@ BuildRequires: python-six Requires: python-funcsigs Requires: python-pbr -Requires: python-six >= 1.7 +Requires: python-six >= 1.9 %if 0%{?suse_version} && 0%{?suse_version} < 1140 +BuildRequires: python-ordereddict BuildRequires: python-unittest2 %endif %if 0%{?suse_version} && 0%{?suse_version} <= 1110 ++++++ mock-1.3.0.tar.gz -> mock-2.0.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mock-1.3.0/.travis.yml new/mock-2.0.0/.travis.yml --- old/mock-1.3.0/.travis.yml 2015-07-15 02:00:29.000000000 +0200 +++ new/mock-2.0.0/.travis.yml 2016-03-21 01:09:59.000000000 +0100 @@ -3,7 +3,6 @@ python: - "2.6" - "2.7" - - "3.2" - "3.3" - "3.4" - pypy @@ -23,4 +22,4 @@ script: - unit2 - if [ -z "$SKIP_DOCS" ]; then python setup.py build_sphinx; fi - - rst2html.py README.rst README.html + - rst2html.py --strict README.rst README.html diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mock-1.3.0/AUTHORS new/mock-2.0.0/AUTHORS --- old/mock-1.3.0/AUTHORS 2015-07-24 01:17:08.000000000 +0200 +++ new/mock-2.0.0/AUTHORS 2016-04-06 03:38:11.000000000 +0200 @@ -2,10 +2,13 @@ Antoine Pitrou <solipsis(a)pitrou.net> Berker Peksag <berker.peksag(a)gmail.com> Darragh Bailey <dbailey(a)hp.com> +Frankie Robertson <frankie(a)robertson.name> +Joachim Jablon <joachim.jablon(a)smart-impulse.com> Konrad Delong <konryd(a)gmail.com> Kumar McMillan <kumar.mcmillan(a)gmail.com> Kushal Das <kushaldas(a)gmail.com> Larry Hastings <larry(a)hastings.org> +Michael Fladischer <FladischerMichael(a)fladi.at> Michael Foord <mfoord(a)python.org> Michael Foord <michael(a)python.org> Michael Foord <michael(a)voidspace.org.uk> @@ -13,10 +16,13 @@ R David Murray <rdmurray(a)bitdance.com> Rob McQueen <rob(a)nylas.com> Robert Collins <rbtcollins(a)hp.com> +Senthil Kumaran <senthil(a)uthcode.com> Serhiy Storchaka <storchaka(a)gmail.com> Terry Jan Reedy <tjreedy(a)udel.edu> +Victor Stinner <victor.stinner(a)gmail.com> convert-repo <convert-repo@localhost> fuzzyman <fuzzyman@localhost> konryd <konryd@localhost> +lord63 <lord63.j(a)gmail.com> unknown <unknown@localhost> Łukasz Langa <lukasz(a)langa.pl> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mock-1.3.0/ChangeLog new/mock-2.0.0/ChangeLog --- old/mock-1.3.0/ChangeLog 2015-07-24 01:17:08.000000000 +0200 +++ new/mock-2.0.0/ChangeLog 2016-04-06 03:38:11.000000000 +0200 @@ -1,6 +1,29 @@ CHANGES ======= +2.0.0 +----- + +* Fix #338: depend on a fixed version of funcsigs +* More 3.2 support dropping cleanup +* Update sync point +* Add Mock.assert_called() +* Issue25347 - Format the error message output of mock's assert_has_calls method +* Issue #22138: Fix mock.patch behavior when patching descriptors. Restore original values after patching +* Issue #24857: Comparing call_args to a long sequence now correctly returns a boolean result instead of raising an exception +* Issue #23004: mock_open() now reads binary data correctly when the type of read_data is bytes +* Add version info in the docs +* Update six to a version with raises_from +* Fix #328 - handle unicode __repr__ on Python 2.x +* Drop support for Python 3.2 +* Fix typo in docs/index.txt +* Fix README.rst checking +* Be clearer about Python version compat +* Issue #295: use a setup_requires dependency +* Improve grouping of imports in tests +* Use six to detect python2/3 in main module +* Use six to detect python2/3 in test modules + 1.3.0 ----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mock-1.3.0/NEWS new/mock-2.0.0/NEWS --- old/mock-1.3.0/NEWS 2015-07-23 21:06:08.000000000 +0200 +++ new/mock-2.0.0/NEWS 2016-03-23 07:00:21.000000000 +0100 @@ -1,6 +1,18 @@ Library ------- +- Issue #26323: Add Mock.assert_called() and Mock.assert_called_once() + methods to unittest.mock. Patch written by Amit Saha. + +- Issue #22138: Fix mock.patch behavior when patching descriptors. Restore + original values after patching. Patch contributed by Sean McCully. + +- Issue #24857: Comparing call_args to a long sequence now correctly returns a + boolean result instead of raising an exception. Patch by A Kaptur. + +- Issue #23004: mock_open() now reads binary data correctly when the type of + read_data is bytes. Initial patch by Aaron Hill. + - Issue #21750: mock_open.read_data can now be read from each instance, as it could in Python 3.3. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mock-1.3.0/PKG-INFO new/mock-2.0.0/PKG-INFO --- old/mock-1.3.0/PKG-INFO 2015-07-24 01:17:08.000000000 +0200 +++ new/mock-2.0.0/PKG-INFO 2016-04-06 03:38:11.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: mock -Version: 1.3.0 +Version: 2.0.0 Summary: Rolling backport of unittest.mock for all Pythons Home-page: https://github.com/testing-cabal/mock Author: Testing Cabal @@ -15,7 +15,7 @@ onwards. This package contains a rolling backport of the standard library mock code - compatible with Python 2.6 and up, and 3.2 and up. + compatible with Python 2.6 and up, and 3.3 and up. Please see the standard library documentation for more details. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mock-1.3.0/README.rst new/mock-2.0.0/README.rst --- old/mock-1.3.0/README.rst 2015-07-15 02:00:52.000000000 +0200 +++ new/mock-2.0.0/README.rst 2016-03-23 23:12:30.000000000 +0100 @@ -7,7 +7,7 @@ onwards. This package contains a rolling backport of the standard library mock code -compatible with Python 2.6 and up, and 3.2 and up. +compatible with Python 2.6 and up, and 3.3 and up. Please see the standard library documentation for more details. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mock-1.3.0/docs/conf.py new/mock-2.0.0/docs/conf.py --- old/mock-1.3.0/docs/conf.py 2015-07-10 01:46:09.000000000 +0200 +++ new/mock-2.0.0/docs/conf.py 2016-03-21 01:47:08.000000000 +0100 @@ -14,6 +14,8 @@ import sys, os sys.path.insert(0, os.path.abspath('..')) +import mock + # If your extensions are in another directory, add it here. If the directory # is relative to the documentation root, use os.path.abspath to make it # absolute, like shown here. @@ -71,9 +73,9 @@ # other places throughout the built documents. Supplied by pbr. # # The short X.Y version. -version = None +version = mock.mock._v.brief_string() # The full version, including alpha/beta/rc tags. -release = None +release = mock.__version__ # There are two options for replacing |today|: either, you set today to some # non-false value, then it is used: (Set from pbr) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mock-1.3.0/docs/index.txt new/mock-2.0.0/docs/index.txt --- old/mock-1.3.0/docs/index.txt 2015-07-23 21:51:56.000000000 +0200 +++ new/mock-2.0.0/docs/index.txt 2016-03-23 07:08:35.000000000 +0100 @@ -12,7 +12,7 @@ <http://lists.idyll.org/listinfo/testing-in-python>`_ :Issue tracker: `Github Issues <https://github.com/testing-cabal/mock/issues>`_ -:Last sync: 3f409f756b7b8f75c4543b2c31566bd8b8dbb3dd +:Last sync: cb6aab1248c4aec4dd578bea717854505a6fb55d .. _Mock Homepage: https://github.com/testing-cabal/mock .. _BSD License: http://github.com/testing-cabal/mock/blob/master/LICENSE.txt @@ -45,7 +45,9 @@ Pythons. The ``mock`` package contains a rolling backport of the standard library mock -code compatible with Python 2.6 and up, and 3.2 and up. +code compatible with Python 2.6 and up, and 3.3 and up. Python 3.2 is supported +by mock 1.3.0 and below - with pip no longer supporting 3.2, we cannot test +against that version anymore. Please see the standard library documentation for usage details. @@ -103,10 +105,10 @@ .. index:: older versions -Older Versions -++++++++++++++ +Older Versions of Python +++++++++++++++++++++++++ -Version 1.0.1 is the last version compatible with Python 2.6. +Version 1.0.1 is the last version compatible with Python < 2.6. .. index:: maintainer notes @@ -121,9 +123,9 @@ Committers can just push as desired: since all semantic development takes place in cPython, the backport process is as lightweight as we can make it. -mock is CI tested using Travis-CI on Python versions 2.6, 2.7, 3.2, 3.3, 3.4, +mock is CI tested using Travis-CI on Python versions 2.6, 2.7, 3.3, 3.4, 3.5, nightly Python 3 builds, pypy, pypy3. Jython support is desired, if -someone could contribute a patch to .travis.jml to support it that would be +someone could contribute a patch to .travis.yml to support it that would be excellent. Releasing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mock-1.3.0/mock/mock.py new/mock-2.0.0/mock/mock.py --- old/mock-1.3.0/mock/mock.py 2015-07-23 21:20:55.000000000 +0200 +++ new/mock-2.0.0/mock/mock.py 2016-04-06 02:42:22.000000000 +0200 @@ -74,29 +74,11 @@ import mock -inPy3k = sys.version_info[0] == 3 - - try: inspectsignature = inspect.signature except AttributeError: import funcsigs inspectsignature = funcsigs.signature - # Has funcsigs been fixed? - try: - class F: - def f(a, self): - pass - inspectsignature(partial(F.f, None)).bind(self=10) - except TypeError: - def fixedbind(*args, **kwargs): - self = args[0] - args = args[1:] - return self._bind(args, kwargs) - funcsigs.Signature.bind = fixedbind - del fixedbind - finally: - del F # TODO: use six. @@ -118,7 +100,7 @@ # Python 2.4 compatibility BaseException = Exception -if not inPy3k: +if six.PY2: # Python 2's next() can't handle a non-iterator with a __next__ method. _next = next def next(obj, _next=_next): @@ -151,7 +133,7 @@ self = 'im_self' builtin = '__builtin__' -if inPy3k: +if six.PY3: self = '__self__' builtin = 'builtins' @@ -250,7 +232,7 @@ funcopy.__kwdefaults__ = func.__kwdefaults__ except AttributeError: pass - if not inPy3k: + if six.PY2: funcopy.func_defaults = func.func_defaults return @@ -276,7 +258,7 @@ # already an instance return getattr(obj, '__call__', None) is not None - if inPy3k: + if six.PY3: # *could* be broken by a class overriding __mro__ or __dict__ via # a metaclass for base in (obj,) + obj.__mro__: @@ -410,7 +392,7 @@ ClassTypes = (type,) -if not inPy3k: +if six.PY2: ClassTypes = (type, ClassType) _allowed_names = set(( @@ -914,6 +896,24 @@ (self._mock_name or 'mock', self.call_count)) raise AssertionError(msg) + def assert_called(_mock_self): + """assert that the mock was called at least once + """ + self = _mock_self + if self.call_count == 0: + msg = ("Expected '%s' to have been called." % + self._mock_name or 'mock') + raise AssertionError(msg) + + def assert_called_once(_mock_self): + """assert that the mock was called only once. + """ + self = _mock_self + if not self.call_count == 1: + msg = ("Expected '%s' to have been called once. Called %s times." % + (self._mock_name or 'mock', self.call_count)) + raise AssertionError(msg) + def assert_called_with(_mock_self, *args, **kwargs): """assert that the mock was called with the specified arguments. @@ -926,7 +926,7 @@ def _error_message(cause): msg = self._format_mock_failure_message(args, kwargs) - if not inPy3k and cause is not None: + if six.PY2 and cause is not None: # Tack on some diagnostics for Python without __cause__ msg = '%s\n%s' % (msg, str(cause)) return msg @@ -965,7 +965,7 @@ if expected not in all_calls: six.raise_from(AssertionError( 'Calls not found.\nExpected: %r\n' - 'Actual: %r' % (calls, self.mock_calls) + 'Actual: %r' % (_CallList(calls), self.mock_calls) ), cause) return @@ -1480,7 +1480,10 @@ setattr(self.target, self.attribute, self.temp_original) else: delattr(self.target, self.attribute) - if not self.create and not hasattr(self.target, self.attribute): + if not self.create and (not hasattr(self.target, self.attribute) or + self.attribute in ('__doc__', '__module__', + '__defaults__', '__annotations__', + '__kwdefaults__')): # needed for proxy objects like django settings setattr(self.target, self.attribute, self.temp_original) @@ -1826,12 +1829,12 @@ numerics = ( "add sub mul matmul div floordiv mod lshift rshift and xor or pow" ) -if inPy3k: +if six.PY3: numerics += ' truediv' inplace = ' '.join('i%s' % n for n in numerics.split()) right = ' '.join('r%s' % n for n in numerics.split()) extra = '' -if inPy3k: +if six.PY3: extra = 'bool next ' else: extra = 'unicode long nonzero oct hex truediv rtruediv ' @@ -2062,8 +2065,15 @@ message = '%s(%%s)' % name formatted_args = '' args_string = ', '.join([repr(arg) for arg in args]) + + def encode_item(item): + if six.PY2 and isinstance(item, unicode): + return item.encode("utf-8") + else: + return item + kwargs_string = ', '.join([ - '%s=%r' % (key, value) for key, value in sorted(kwargs.items()) + '%s=%r' % (encode_item(key), value) for key, value in sorted(kwargs.items()) ]) if args_string: formatted_args = args_string @@ -2165,8 +2175,7 @@ else: other_args = () other_kwargs = value - else: - # len 2 + elif len_other == 2: # could be (name, args) or (name, kwargs) or (args, kwargs) first, second = other if isinstance(first, basestring): @@ -2177,6 +2186,8 @@ other_args, other_kwargs = (), second else: other_args, other_kwargs = first, second + else: + return False if self_name and other_name != self_name: return False @@ -2438,9 +2449,10 @@ # Helper for mock_open: # Retrieve lines from read_data via a generator so that separate calls to # readline, read, and readlines are properly interleaved - data_as_list = ['{0}\n'.format(l) for l in read_data.split('\n')] + sep = b'\n' if isinstance(read_data, bytes) else '\n' + data_as_list = [l + sep for l in read_data.split(sep)] - if data_as_list[-1] == '\n': + if data_as_list[-1] == sep: # If the last line ended in a newline, the list comprehension will have an # extra entry that's just a newline. Remove this. data_as_list = data_as_list[:-1] @@ -2473,7 +2485,7 @@ def _read_side_effect(*args, **kwargs): if handle.read.return_value is not None: return handle.read.return_value - return ''.join(_state[0]) + return type(read_data)().join(_state[0]) def _readline_side_effect(): if handle.readline.return_value is not None: @@ -2486,7 +2498,7 @@ global file_spec if file_spec is None: # set on first use - if inPy3k: + if six.PY3: import _io file_spec = list(set(dir(_io.TextIOWrapper)).union(set(dir(_io.BytesIO)))) else: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mock-1.3.0/mock/tests/support.py new/mock-2.0.0/mock/tests/support.py --- old/mock-1.3.0/mock/tests/support.py 2015-07-14 04:07:05.000000000 +0200 +++ new/mock-2.0.0/mock/tests/support.py 2015-07-31 08:28:54.000000000 +0200 @@ -11,7 +11,6 @@ return hasattr(obj, '__call__') -inPy3k = sys.version_info[0] == 3 with_available = sys.version_info[:2] >= (2, 5) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mock-1.3.0/mock/tests/testhelpers.py new/mock-2.0.0/mock/tests/testhelpers.py --- old/mock-1.3.0/mock/tests/testhelpers.py 2015-07-14 04:07:05.000000000 +0200 +++ new/mock-2.0.0/mock/tests/testhelpers.py 2016-03-21 01:26:20.000000000 +0100 @@ -2,8 +2,8 @@ # E-mail: fuzzyman AT voidspace DOT org DOT uk # http://www.voidspace.org.uk/python/mock/ +import six import unittest2 as unittest -from mock.tests.support import inPy3k from mock import ( call, create_autospec, MagicMock, @@ -403,7 +403,7 @@ m = create_autospec(Foo, a='3') self.assertEqual(m.a, '3') - @unittest.skipUnless(inPy3k, "Keyword only arguments Python 3 specific") + @unittest.skipUnless(six.PY3, "Keyword only arguments Python 3 specific") def test_create_autospec_keyword_only_arguments(self): func_def = "def foo(a, *, b=None):\n pass\n" namespace = {} @@ -558,7 +558,7 @@ mock.g.assert_called_once_with(3, 4) - @unittest.skipIf(inPy3k, "No old style classes in Python 3") + @unittest.skipIf(six.PY3, "No old style classes in Python 3") def test_old_style_classes(self): class Foo: def f(self, a, b): @@ -745,7 +745,7 @@ mock.assert_called_with(4, 5) - @unittest.skipIf(inPy3k, 'no old style classes in Python 3') + @unittest.skipIf(six.PY3, 'no old style classes in Python 3') def test_signature_old_style_class(self): class Foo: def __init__(self, a, b=3): @@ -773,7 +773,7 @@ create_autospec(Foo) - @unittest.skipIf(inPy3k, 'no old style classes in Python 3') + @unittest.skipIf(six.PY3, 'no old style classes in Python 3') def test_old_style_class_with_no_init(self): # this used to raise an exception # due to Foo.__init__ raising an AttributeError @@ -928,6 +928,20 @@ self.assertEqual(str(mock.mock_calls), expected) + @unittest.skipIf(six.PY3, "Unicode is properly handled with Python 3") + def test_call_list_unicode(self): + # See github issue #328 + mock = Mock() + + class NonAsciiRepr(object): + def __repr__(self): + return "\xe9" + + mock(**{unicode("a"): NonAsciiRepr()}) + + self.assertEqual(str(mock.mock_calls), "[call(a=\xe9)]") + + def test_propertymock(self): p = patch('%s.SomeClass.one' % __name__, new_callable=PropertyMock) mock = p.start() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mock-1.3.0/mock/tests/testmagicmethods.py new/mock-2.0.0/mock/tests/testmagicmethods.py --- old/mock-1.3.0/mock/tests/testmagicmethods.py 2015-07-14 04:07:05.000000000 +0200 +++ new/mock-2.0.0/mock/tests/testmagicmethods.py 2015-07-31 08:28:54.000000000 +0200 @@ -4,10 +4,6 @@ from __future__ import division -import unittest2 as unittest - -from mock.tests.support import inPy3k - try: unicode except NameError: @@ -18,6 +14,10 @@ import inspect import sys import textwrap + +import six +import unittest2 as unittest + from mock import Mock, MagicMock from mock.mock import _magics @@ -86,7 +86,7 @@ self.assertEqual(str(mock), 'foo') - @unittest.skipIf(inPy3k, "no unicode in Python 3") + @unittest.skipIf(six.PY3, "no unicode in Python 3") def test_unicode(self): mock = Mock() self.assertEqual(unicode(mock), unicode(str(mock))) @@ -166,7 +166,7 @@ self.assertEqual(mock.value, 16) del mock.__truediv__ - if inPy3k: + if six.PY3: def itruediv(mock): mock /= 4 self.assertRaises(TypeError, itruediv, mock) @@ -198,7 +198,7 @@ self.assertTrue(bool(m)) nonzero = lambda s: False - if not inPy3k: + if six.PY2: m.__nonzero__ = nonzero else: m.__bool__ = nonzero @@ -216,7 +216,7 @@ self. assertTrue(mock <= 3) self. assertTrue(mock >= 3) - if not inPy3k: + if six.PY2: # incomparable in Python 3 self.assertEqual(Mock() < 3, object() < 3) self.assertEqual(Mock() > 3, object() > 3) @@ -294,7 +294,7 @@ name = '__nonzero__' other = '__bool__' - if inPy3k: + if six.PY3: name, other = other, name getattr(mock, name).return_value = False self.assertFalse(hasattr(mock, other)) @@ -330,7 +330,7 @@ self.assertEqual(unicode(mock), object.__str__(mock)) self.assertIsInstance(unicode(mock), unicode) self.assertTrue(bool(mock)) - if not inPy3k: + if six.PY2: self.assertEqual(oct(mock), '1') else: # in Python 3 oct and hex use __index__ @@ -340,7 +340,7 @@ # how to test __sizeof__ ? - @unittest.skipIf(inPy3k, "no __cmp__ in Python 3") + @unittest.skipIf(six.PY3, "no __cmp__ in Python 3") def test_non_default_magic_methods(self): mock = MagicMock() self.assertRaises(AttributeError, lambda: mock.__cmp__) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mock-1.3.0/mock/tests/testmock.py new/mock-2.0.0/mock/tests/testmock.py --- old/mock-1.3.0/mock/tests/testmock.py 2015-07-23 21:20:55.000000000 +0200 +++ new/mock-2.0.0/mock/tests/testmock.py 2016-03-23 06:59:31.000000000 +0100 @@ -2,16 +2,14 @@ # E-mail: fuzzyman AT voidspace DOT org DOT uk # http://www.voidspace.org.uk/python/mock/ -import unittest2 as unittest -from mock.tests.support import ( - callable, inPy3k, is_instance, next -) - import copy import pickle import sys import tempfile +import six +import unittest2 as unittest + import mock from mock import ( call, DEFAULT, patch, sentinel, @@ -20,6 +18,9 @@ create_autospec ) from mock.mock import _CallList +from mock.tests.support import ( + callable, is_instance, next +) try: @@ -325,6 +326,9 @@ self.assertEqual(mock.call_args, ((sentinel.Arg,), {"kw": sentinel.Kwarg})) + # Comparing call_args to a long sequence should not raise + # an exception. See issue 24857. + self.assertFalse(mock.call_args == "a long sequence") def test_assert_called_with(self): mock = Mock() @@ -663,7 +667,7 @@ copy.copy(Mock()) - @unittest.skipIf(inPy3k, "no old style classes in Python 3") + @unittest.skipIf(six.PY3, "no old style classes in Python 3") def test_spec_old_style_classes(self): class Foo: bar = 7 @@ -677,7 +681,7 @@ self.assertRaises(AttributeError, lambda: mock.foo) - @unittest.skipIf(inPy3k, "no old style classes in Python 3") + @unittest.skipIf(six.PY3, "no old style classes in Python 3") def test_spec_set_old_style_classes(self): class Foo: bar = 7 @@ -1284,6 +1288,27 @@ with self.assertRaises(AssertionError): m.hello.assert_not_called() + def test_assert_called(self): + m = Mock() + with self.assertRaises(AssertionError): + m.hello.assert_called() + m.hello() + m.hello.assert_called() + + m.hello() + m.hello.assert_called() + + def test_assert_called_once(self): + m = Mock() + with self.assertRaises(AssertionError): + m.hello.assert_called_once() + m.hello() + m.hello.assert_called_once() + + m.hello() + with self.assertRaises(AssertionError): + m.hello.assert_called_once() + #Issue21256 printout of keyword args should be in deterministic order def test_sorted_call_signature(self): m = Mock() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mock-1.3.0/mock/tests/testpatch.py new/mock-2.0.0/mock/tests/testpatch.py --- old/mock-1.3.0/mock/tests/testpatch.py 2015-07-14 04:07:05.000000000 +0200 +++ new/mock-2.0.0/mock/tests/testpatch.py 2016-03-23 06:54:59.000000000 +0100 @@ -5,10 +5,11 @@ import os import sys +import six import unittest2 as unittest from mock.tests import support -from mock.tests.support import inPy3k, SomeClass, is_instance, callable +from mock.tests.support import SomeClass, is_instance, callable from mock import ( NonCallableMock, CallableMixin, patch, sentinel, @@ -18,7 +19,7 @@ from mock.mock import _patch, _get_target builtin_string = '__builtin__' -if inPy3k: +if six.PY3: builtin_string = 'builtins' unicode = str @@ -1851,5 +1852,32 @@ self.assertEqual(stopped, ["three", "two", "one"]) + def test_special_attrs(self): + def foo(x=0): + """TEST""" + return x + with patch.object(foo, '__defaults__', (1, )): + self.assertEqual(foo(), 1) + self.assertEqual(foo(), 0) + + with patch.object(foo, '__doc__', "FUN"): + self.assertEqual(foo.__doc__, "FUN") + self.assertEqual(foo.__doc__, "TEST") + + with patch.object(foo, '__module__', "testpatch2"): + self.assertEqual(foo.__module__, "testpatch2") + self.assertEqual(foo.__module__, __name__) + + if hasattr(self.test_special_attrs, '__annotations__'): + with patch.object(foo, '__annotations__', dict([('s', 1, )])): + self.assertEqual(foo.__annotations__, dict([('s', 1, )])) + self.assertEqual(foo.__annotations__, dict()) + + if hasattr(self.test_special_attrs, '__kwdefaults__'): + foo = eval("lambda *a, x=0: x") + with patch.object(foo, '__kwdefaults__', dict([('x', 1, )])): + self.assertEqual(foo(), 1) + self.assertEqual(foo(), 0) + if __name__ == '__main__': unittest.main() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mock-1.3.0/mock/tests/testwith.py new/mock-2.0.0/mock/tests/testwith.py --- old/mock-1.3.0/mock/tests/testwith.py 2015-07-23 21:20:55.000000000 +0200 +++ new/mock-2.0.0/mock/tests/testwith.py 2016-03-23 06:31:30.000000000 +0100 @@ -229,6 +229,34 @@ self.assertEqual(result, ['foo\n', 'bar\n', 'baz']) + def test_read_bytes(self): + mock = mock_open(read_data=b'\xc6') + with patch('%s.open' % __name__, mock, create=True): + with open('abc', 'rb') as f: + result = f.read() + self.assertEqual(result, b'\xc6') + + + def test_readline_bytes(self): + m = mock_open(read_data=b'abc\ndef\nghi\n') + with patch('%s.open' % __name__, m, create=True): + with open('abc', 'rb') as f: + line1 = f.readline() + line2 = f.readline() + line3 = f.readline() + self.assertEqual(line1, b'abc\n') + self.assertEqual(line2, b'def\n') + self.assertEqual(line3, b'ghi\n') + + + def test_readlines_bytes(self): + m = mock_open(read_data=b'abc\ndef\nghi\n') + with patch('%s.open' % __name__, m, create=True): + with open('abc', 'rb') as f: + result = f.readlines() + self.assertEqual(result, [b'abc\n', b'def\n', b'ghi\n']) + + def test_mock_open_read_with_argument(self): # At one point calling read with an argument was broken # for mocks returned by mock_open diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mock-1.3.0/mock.egg-info/PKG-INFO new/mock-2.0.0/mock.egg-info/PKG-INFO --- old/mock-1.3.0/mock.egg-info/PKG-INFO 2015-07-24 01:17:08.000000000 +0200 +++ new/mock-2.0.0/mock.egg-info/PKG-INFO 2016-04-06 03:38:10.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: mock -Version: 1.3.0 +Version: 2.0.0 Summary: Rolling backport of unittest.mock for all Pythons Home-page: https://github.com/testing-cabal/mock Author: Testing Cabal @@ -15,7 +15,7 @@ onwards. This package contains a rolling backport of the standard library mock code - compatible with Python 2.6 and up, and 3.2 and up. + compatible with Python 2.6 and up, and 3.3 and up. Please see the standard library documentation for more details. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mock-1.3.0/mock.egg-info/pbr.json new/mock-2.0.0/mock.egg-info/pbr.json --- old/mock-1.3.0/mock.egg-info/pbr.json 2015-07-24 01:17:08.000000000 +0200 +++ new/mock-2.0.0/mock.egg-info/pbr.json 2016-04-06 03:38:10.000000000 +0200 @@ -1 +1 @@ -{"is_release": true, "git_version": "e34a7cb"} \ No newline at end of file +{"is_release": true, "git_version": "286792b"} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mock-1.3.0/mock.egg-info/requires.txt new/mock-2.0.0/mock.egg-info/requires.txt --- old/mock-1.3.0/mock.egg-info/requires.txt 2015-07-24 01:17:08.000000000 +0200 +++ new/mock-2.0.0/mock.egg-info/requires.txt 2016-04-06 03:38:10.000000000 +0200 @@ -1,8 +1,8 @@ pbr>=0.11 -six>=1.7 +six>=1.9 [:(python_version<"3.3")] -funcsigs +funcsigs>=1 [docs:(python_version<"3" or python_version>="3.3")] sphinx diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mock-1.3.0/requirements.txt new/mock-2.0.0/requirements.txt --- old/mock-1.3.0/requirements.txt 2015-07-10 11:17:51.000000000 +0200 +++ new/mock-2.0.0/requirements.txt 2016-04-06 02:41:15.000000000 +0200 @@ -1,6 +1,6 @@ -funcsigs;python_version<"3.3" +funcsigs>=1;python_version<"3.3" # For runtime needs this is correct. For setup_requires needs, 1.2.0 is needed # but setuptools can't cope with conflicts in setup_requires, so thats # unversioned. pbr>=0.11 -six>=1.7 +six>=1.9 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mock-1.3.0/setup.py new/mock-2.0.0/setup.py --- old/mock-1.3.0/setup.py 2015-07-15 02:06:46.000000000 +0200 +++ new/mock-2.0.0/setup.py 2015-07-31 08:33:00.000000000 +0200 @@ -1,18 +1,6 @@ #!/usr/bin/env python -from distutils.version import StrictVersion import setuptools -import sys - - -# Setuptools 17.1 is required, and setup_requires cannot upgrade setuptools -# in-place, nor trigger the use of a newer version. Abort cleanly up-front. -setuptools_required = StrictVersion("17.1") -setuptools_installed = StrictVersion(setuptools.__version__) -if setuptools_installed < setuptools_required: - sys.stderr.write( - "mock requires setuptools>=17.1. Aborting installation\n") - sys.exit(1) setuptools.setup( - setup_requires=['pbr>=1.3'], + setup_requires=['pbr>=1.3', 'setuptools>=17.1'], pbr=True) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mock-1.3.0/tools/pre-applypatch new/mock-2.0.0/tools/pre-applypatch --- old/mock-1.3.0/tools/pre-applypatch 2015-07-15 08:37:29.000000000 +0200 +++ new/mock-2.0.0/tools/pre-applypatch 2016-03-23 23:12:53.000000000 +0100 @@ -28,7 +28,6 @@ test_version 2.6 test_version 2.7 -test_version 3.2 test_version 3.3 test_version 3.4 test_version 3.5

1 0

commit python-funcsigs for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '16

29 Jun '16

Hello community, here is the log from the commit of package python-funcsigs for openSUSE:Factory checked in at 2016-06-29 15:02:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-funcsigs (Old) and /work/SRC/openSUSE:Factory/.python-funcsigs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-funcsigs" Changes: -------- --- /work/SRC/openSUSE:Factory/python-funcsigs/python-funcsigs.changes 2016-06-05 14:18:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-funcsigs.new/python-funcsigs.changes 2016-06-29 15:02:38.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jun 16 09:44:43 UTC 2016 - aloisio(a)gmx.com + +- Fixed SLE11 build + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-funcsigs.spec ++++++ --- /var/tmp/diff_new_pack.LCUd4u/_old 2016-06-29 15:02:39.000000000 +0200 +++ /var/tmp/diff_new_pack.LCUd4u/_new 2016-06-29 15:02:39.000000000 +0200 @@ -30,6 +30,7 @@ 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()")} +BuildRequires: python-ordereddict %else BuildArch: noarch %endif

1 0

commit haveged for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '16

29 Jun '16

Hello community, here is the log from the commit of package haveged for openSUSE:Factory checked in at 2016-06-29 15:02:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/haveged (Old) and /work/SRC/openSUSE:Factory/.haveged.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "haveged" Changes: -------- --- /work/SRC/openSUSE:Factory/haveged/haveged.changes 2015-12-18 21:53:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.haveged.new/haveged.changes 2016-06-29 15:02:33.000000000 +0200 @@ -1,0 +2,22 @@ +Sun Jun 19 13:16:01 UTC 2016 - jengelh(a)inai.de + +- reset rpm groups + +------------------------------------------------------------------- +Fri Jun 17 14:15:05 UTC 2016 - psimons(a)suse.com + +- Add haveged-no-syslog.patch to remedy the potential for deadlocks + when booting the system: journald reads from /dev/random, which + receives entropy from haveged, which in turn logs to syslog + before providing any. Ideally, haveged would provide a proper + command-line flag to disable use of syslog. Will work with + upstream to resolve this in a cleaner way. (bnc#959237) + +- Remove "After=systemd-random-seed.service" from systemd service + file to avoid the potential for deadlocks when booting the + system: systemd-random-seed needs /var to read its previous + state; mounting /var needs journald; journald needs entropy; and + entropy is provided by haveged, which needs systemd-random-seed. + (bnc#959237) + +------------------------------------------------------------------- New: ---- haveged-no-syslog.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ haveged.spec ++++++ --- /var/tmp/diff_new_pack.6iJb8j/_old 2016-06-29 15:02:34.000000000 +0200 +++ /var/tmp/diff_new_pack.6iJb8j/_new 2016-06-29 15:02:34.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package haveged # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -32,6 +32,8 @@ Patch1: haveged-conditional-enttest.patch # PATCH-FIX-OPENSUSE: ignore clock-gettime enablement on generic architectures Patch2: fix-enforced-clock-gettime.patch +# PATCH-FIX-UPSTREAM: don't write to syslog at startup to avoid deadlocks psimons(a)suse.com bnc#959237 +Patch3: haveged-no-syslog.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool @@ -58,7 +60,7 @@ %package devel Summary: Haveged development files -Group: Development/Libraries +Group: Development/Libraries/C and C++ Requires: libhavege1 = %{version} %description devel @@ -69,7 +71,7 @@ %package -n libhavege1 Summary: Haveged interface library -Group: Development/Libraries/C and C++ +Group: System/Libraries %description -n libhavege1 Shared object for the haveged library @@ -81,6 +83,7 @@ %patch0 -p1 %patch1 -p1 %patch2 +%patch3 -p1 %build autoreconf -fvi ++++++ haveged-no-syslog.patch ++++++ Index: haveged-1.9.1/src/haveged.c =================================================================== --- haveged-1.9.1.orig/src/haveged.c +++ haveged-1.9.1/src/haveged.c @@ -361,8 +361,10 @@ static void daemonize( /* RETURN: no void) /* IN: nothing */ { FILE *fh; +#if 0 openlog(params->daemon, LOG_CONS, LOG_DAEMON); syslog(LOG_NOTICE, "%s starting up", params->daemon); +#endif if (daemon(0, 0) == -1) error_exit("Cannot fork into the background"); fh = fopen(params->pid_file, "w"); @@ -499,7 +501,9 @@ static void error_exit( /* RETURN: no #ifndef NO_DAEMON if (params->detached!=0) { unlink(params->pid_file); +#if 0 syslog(LOG_INFO, "%s: %s", params->daemon, buffer); +#endif } else #endif @@ -609,11 +613,13 @@ static void print_msg( /* RETURN: no va_list ap; va_start(ap, format); snprintf(buffer, sizeof(buffer), "%s: %s", params->daemon, format); +#if 0 #ifndef NO_DAEMON if (params->detached != 0) vsyslog(LOG_INFO, buffer, ap); else #endif +#endif vfprintf(stderr, buffer, ap); va_end(ap); } ++++++ haveged.service ++++++ --- /var/tmp/diff_new_pack.6iJb8j/_old 2016-06-29 15:02:35.000000000 +0200 +++ /var/tmp/diff_new_pack.6iJb8j/_new 2016-06-29 15:02:35.000000000 +0200 @@ -4,7 +4,8 @@ DefaultDependencies=no ConditionVirtualization=!container #Conflicts=shutdown.target -After=systemd-random-seed.service +# Don't wait for systemd-random-seed.service, leads to deadlock with fips=1 +#After=systemd-random-seed.service Before=sysinit.target shutdown.target systemd-journald.service [Service]

1 0

commit libsigc++2 for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '16

29 Jun '16

Hello community, here is the log from the commit of package libsigc++2 for openSUSE:Factory checked in at 2016-06-29 15:02:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libsigc++2 (Old) and /work/SRC/openSUSE:Factory/.libsigc++2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libsigc++2" Changes: -------- --- /work/SRC/openSUSE:Factory/libsigc++2/libsigc++2.changes 2016-03-29 14:30:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libsigc++2.new/libsigc++2.changes 2016-06-29 15:02:27.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Jun 16 19:19:09 UTC 2016 - zaitor(a)opensuse.org + +- No longer apply libsigc++-std-c11.patch for Tumbleweed, not + needed anymore since GCC 6. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsigc++2.spec ++++++ --- /var/tmp/diff_new_pack.TKtDCg/_old 2016-06-29 15:02:28.000000000 +0200 +++ /var/tmp/diff_new_pack.TKtDCg/_new 2016-06-29 15:02:28.000000000 +0200 @@ -70,11 +70,11 @@ %prep %setup -q -n %{_name}-%{version} +if [ $(gcc -dumpversion | awk -F. '{print $1}') -lt 6 ]; then %patch0 -p1 +fi %build -# FIXME: Cannot autoreconf, bad templates: -#ACLOCAL="aclocal -I scripts" autoreconf -f -i %configure --disable-static --with-pic make %{?_smp_mflags}

1 0

commit kjots for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '16

29 Jun '16

Hello community, here is the log from the commit of package kjots for openSUSE:Factory checked in at 2016-06-29 15:02:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kjots (Old) and /work/SRC/openSUSE:Factory/.kjots.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kjots" Changes: -------- --- /work/SRC/openSUSE:Factory/kjots/kjots.changes 2016-05-20 11:55:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kjots.new/kjots.changes 2016-06-29 15:02:22.000000000 +0200 @@ -1,0 +2,8 @@ +Sat Jun 18 20:27:38 UTC 2016 - asterios.dramis(a)gmail.com + +- Update to version 5.0.1: + * Make it compile with Applications/15.12. + * Add COPYING files. +- Removed make-it-build.diff (fixed upstream). + +------------------------------------------------------------------- Old: ---- kjots-5.0.0.tar.xz make-it-build.diff New: ---- kjots-5.0.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kjots.spec ++++++ --- /var/tmp/diff_new_pack.xIUu2R/_old 2016-06-29 15:02:23.000000000 +0200 +++ /var/tmp/diff_new_pack.xIUu2R/_new 2016-06-29 15:02:23.000000000 +0200 @@ -17,16 +17,15 @@ Name: kjots -Version: 5.0.0 +Version: 5.0.1 Release: 0 Summary: A note taking application for KDE using Akonadi License: GPL-2.0 and LGPL-2.1+ Group: System/GUI/KDE Url: http://www.kde.org -Source0: %{name}-%{version}.tar.xz -Patch1: make-it-build.diff +Source0: http://download.kde.org/stable/kjots/%{version}/src/%{name}-%{version}.tar.… # PATCH-FIX-UPSTREAM fix-desktop-file.patch -- Make sure that the desktop file is Qt5/Plasma5 compatible -Patch2: fix-desktop-file.patch +Patch0: fix-desktop-file.patch BuildRequires: boost-devel BuildRequires: extra-cmake-modules BuildRequires: grantlee5-devel @@ -55,8 +54,7 @@ %prep %setup -q -%patch1 -p1 -%patch2 -p1 +%patch0 -p1 %build %cmake_kf5 -d build @@ -81,17 +79,17 @@ %files %defattr(-,root,root) -%doc COPYING COPYING.LIB -%_datadir/kjots/ +%doc ANNOUNCE CHANGES COPYING COPYING.LIB README %_datadir/appdata/ %_kf5_applicationsdir/org.kde.kjots.desktop -%_bindir/kjots -%_kf5_configkcfgdir/ +%_kf5_bindir/kjots +%_kf5_configkcfgdir/kjots.kcfg %_kf5_kxmlguidir/kjots/ %_kf5_servicesdir/kjotspart.desktop %_kf5_plugindir/kjotspart.so %_kf5_plugindir/kcm_kjots.so %_kf5_servicesdir/kjots_config_misc.desktop +%_kf5_sharedir/kjots/ %_kf5_iconsdir/hicolor/*/apps/kjots.* %_kf5_iconsdir/oxygen/*/actions/edit-delete-page.* ++++++ kjots-5.0.0.tar.xz -> kjots-5.0.1.tar.xz ++++++ ++++ 2061 lines of diff (skipped)

1 0