May 2014 - openSUSE Commits - openSUSE Mailing Lists

commit gstreamer-plugins-bad for openSUSE:Factory
by root＠hilbert.suse.de 02 May '14

02 May '14

Hello community, here is the log from the commit of package gstreamer-plugins-bad for openSUSE:Factory checked in at 2014-05-02 13:55:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gstreamer-plugins-bad (Old) and /work/SRC/openSUSE:Factory/.gstreamer-plugins-bad.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gstreamer-plugins-bad" Changes: -------- --- /work/SRC/openSUSE:Factory/gstreamer-plugins-bad/gstreamer-plugins-bad.changes 2014-04-26 10:01:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gstreamer-plugins-bad.new/gstreamer-plugins-bad.changes 2014-05-02 13:55:54.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Apr 28 16:29:09 UTC 2014 - fcrozat(a)suse.com + +- Do not build libopenjpeg support on SLE12. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gstreamer-plugins-bad.spec ++++++ --- /var/tmp/diff_new_pack.tuAgWU/_old 2014-05-02 13:55:55.000000000 +0200 +++ /var/tmp/diff_new_pack.tuAgWU/_new 2014-05-02 13:55:55.000000000 +0200 @@ -97,7 +97,10 @@ BuildRequires: pkgconfig(libmodplug) BuildRequires: pkgconfig(libmusicbrainz) >= 2.1.0 BuildRequires: pkgconfig(libofa) >= 0.9.3 +# SLE12 doesn't ship libopenjpeg +%if 0%{?suse_version} != 1315 BuildRequires: pkgconfig(libopenjpeg1) +%endif BuildRequires: pkgconfig(libpng) >= 1.2 BuildRequires: pkgconfig(librsvg-2.0) >= 2.14 # Not yet in openSUSE @@ -500,7 +503,9 @@ #%{_libdir}/gstreamer-%{gst_branch}/libgstmve.so %{_libdir}/gstreamer-%{gst_branch}/libgstmxf.so %{_libdir}/gstreamer-%{gst_branch}/libgstopenal.so +%if 0%{?suse_version} != 1315 %{_libdir}/gstreamer-%{gst_branch}/libgstopenjpeg.so +%endif %{_libdir}/gstreamer-%{gst_branch}/libgstopus.so %{_libdir}/gstreamer-%{gst_branch}/libgstneonhttpsrc.so #%{_libdir}/gstreamer-%{gst_branch}/libgstnsf.so -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gcc49 for openSUSE:Factory
by root＠hilbert.suse.de 02 May '14

02 May '14

Hello community, here is the log from the commit of package gcc49 for openSUSE:Factory checked in at 2014-05-02 13:55:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gcc49 (Old) and /work/SRC/openSUSE:Factory/.gcc49.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gcc49" Changes: -------- --- /work/SRC/openSUSE:Factory/gcc49/cross-aarch64-gcc49.changes 2014-04-22 11:54:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gcc49.new/cross-aarch64-gcc49.changes 2014-05-02 13:55:44.000000000 +0200 @@ -1,0 +2,26 @@ +Mon Apr 28 08:28:58 UTC 2014 - rguenther(a)suse.com + +- Drop cross-ppc-gcc49 packages, they conflict with cross-ppc64-gcc49 + because they share the same target triplet. Obsolete older + cross-ppc-gcc49 from cross-ppc64-gcc49. + +------------------------------------------------------------------- +Fri Apr 25 09:21:16 UTC 2014 - rguenther(a)suse.com + +- Update to gcc-4_9-branch head (r209782). + * includes gcc49-pr60720.patch +- Add requires to libgo from gcc-go. [bnc#875128] + +------------------------------------------------------------------- +Tue Apr 22 07:54:46 UTC 2014 - rguenther(a)suse.com + +- Update to gcc 4.9.0. +- Switch to release checking and enable profiledbootstrap where + applicable. + +------------------------------------------------------------------- +Sat Apr 19 10:47:34 UTC 2014 - schwab(a)suse.de + +- Add aarch64 to atomic_arch + +------------------------------------------------------------------- cross-armv6hl-gcc49.changes: same change cross-armv7hl-gcc49.changes: same change cross-i386-gcc49.changes: same change cross-ppc64-gcc49.changes: same change cross-ppc64le-gcc49.changes: same change cross-s390-gcc49.changes: same change cross-s390x-gcc49.changes: same change cross-x86_64-gcc49.changes: same change gcc49-testresults.changes: same change gcc49.changes: same change libffi49.changes: same change libgcj49.changes: same change Old: ---- cross-ppc-gcc49.changes cross-ppc-gcc49.spec gcc-4.9.0-r209354.tar.bz2 gcc49-pr60720.patch New: ---- gcc-4.9.0-r209782.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cross-aarch64-gcc49.spec ++++++ --- /var/tmp/diff_new_pack.P3lwA9/_old 2014-05-02 13:55:52.000000000 +0200 +++ /var/tmp/diff_new_pack.P3lwA9/_new 2014-05-02 13:55:52.000000000 +0200 @@ -86,11 +86,16 @@ %endif ExclusiveArch: ppc64 x86_64 ia64 s390x aarch64 %define _binary_payload w.ufdio +# Obsolete cross-ppc-gcc49 from cross-ppc64-gcc49 which has +# file conflicts with it and is no longer packaged +%if "%pkgname" == "cross-ppc64-gcc49" +Obsoletes: cross-ppc-gcc49 <= 4.9.0+r209354 +%endif %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 4.9.0+r209354 +Version: 4.9.0+r209782 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) @@ -114,7 +119,6 @@ Patch23: libjava-no-multilib.diff Patch24: tls-no-direct.diff Patch30: gcc43-no-unwind-tables.diff -Patch33: gcc49-pr60720.patch # A set of patches from the RH srpm Patch51: gcc41-ia64-stack-protector.patch Patch55: gcc41-java-slow_pthread_self.patch @@ -181,7 +185,6 @@ %patch23 %patch24 %patch30 -%patch33 %patch51 %patch55 %patch57 @@ -294,8 +297,8 @@ # In general we want to ship release checking enabled compilers # and run BETA with checking enabled. -ENABLE_CHECKING="--enable-checking=yes" -#ENABLE_CHECKING="--enable-checking=release" +#ENABLE_CHECKING="--enable-checking=yes" +ENABLE_CHECKING="--enable-checking=release" # Work around tail/head -1 changes export _POSIX2_VERSION=199209 cross-armv6hl-gcc49.spec: same change cross-armv7hl-gcc49.spec: same change cross-i386-gcc49.spec: same change ++++++ cross-ppc64-gcc49.spec ++++++ --- /var/tmp/diff_new_pack.P3lwA9/_old 2014-05-02 13:55:52.000000000 +0200 +++ /var/tmp/diff_new_pack.P3lwA9/_new 2014-05-02 13:55:52.000000000 +0200 @@ -86,11 +86,16 @@ %endif ExclusiveArch: x86_64 ia64 s390x aarch64 %define _binary_payload w.ufdio +# Obsolete cross-ppc-gcc49 from cross-ppc64-gcc49 which has +# file conflicts with it and is no longer packaged +%if "%pkgname" == "cross-ppc64-gcc49" +Obsoletes: cross-ppc-gcc49 <= 4.9.0+r209354 +%endif %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 4.9.0+r209354 +Version: 4.9.0+r209782 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) @@ -114,7 +119,6 @@ Patch23: libjava-no-multilib.diff Patch24: tls-no-direct.diff Patch30: gcc43-no-unwind-tables.diff -Patch33: gcc49-pr60720.patch # A set of patches from the RH srpm Patch51: gcc41-ia64-stack-protector.patch Patch55: gcc41-java-slow_pthread_self.patch @@ -181,7 +185,6 @@ %patch23 %patch24 %patch30 -%patch33 %patch51 %patch55 %patch57 @@ -294,8 +297,8 @@ # In general we want to ship release checking enabled compilers # and run BETA with checking enabled. -ENABLE_CHECKING="--enable-checking=yes" -#ENABLE_CHECKING="--enable-checking=release" +#ENABLE_CHECKING="--enable-checking=yes" +ENABLE_CHECKING="--enable-checking=release" # Work around tail/head -1 changes export _POSIX2_VERSION=199209 ++++++ cross-ppc64le-gcc49.spec ++++++ --- /var/tmp/diff_new_pack.P3lwA9/_old 2014-05-02 13:55:52.000000000 +0200 +++ /var/tmp/diff_new_pack.P3lwA9/_new 2014-05-02 13:55:52.000000000 +0200 @@ -86,11 +86,16 @@ %endif ExclusiveArch: ppc64 x86_64 ia64 s390x aarch64 %define _binary_payload w.ufdio +# Obsolete cross-ppc-gcc49 from cross-ppc64-gcc49 which has +# file conflicts with it and is no longer packaged +%if "%pkgname" == "cross-ppc64-gcc49" +Obsoletes: cross-ppc-gcc49 <= 4.9.0+r209354 +%endif %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 4.9.0+r209354 +Version: 4.9.0+r209782 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) @@ -114,7 +119,6 @@ Patch23: libjava-no-multilib.diff Patch24: tls-no-direct.diff Patch30: gcc43-no-unwind-tables.diff -Patch33: gcc49-pr60720.patch # A set of patches from the RH srpm Patch51: gcc41-ia64-stack-protector.patch Patch55: gcc41-java-slow_pthread_self.patch @@ -181,7 +185,6 @@ %patch23 %patch24 %patch30 -%patch33 %patch51 %patch55 %patch57 @@ -294,8 +297,8 @@ # In general we want to ship release checking enabled compilers # and run BETA with checking enabled. -ENABLE_CHECKING="--enable-checking=yes" -#ENABLE_CHECKING="--enable-checking=release" +#ENABLE_CHECKING="--enable-checking=yes" +ENABLE_CHECKING="--enable-checking=release" # Work around tail/head -1 changes export _POSIX2_VERSION=199209 cross-s390-gcc49.spec: same change ++++++ cross-s390x-gcc49.spec ++++++ --- /var/tmp/diff_new_pack.P3lwA9/_old 2014-05-02 13:55:52.000000000 +0200 +++ /var/tmp/diff_new_pack.P3lwA9/_new 2014-05-02 13:55:52.000000000 +0200 @@ -86,11 +86,16 @@ %endif ExclusiveArch: ppc64 x86_64 ia64 aarch64 %define _binary_payload w.ufdio +# Obsolete cross-ppc-gcc49 from cross-ppc64-gcc49 which has +# file conflicts with it and is no longer packaged +%if "%pkgname" == "cross-ppc64-gcc49" +Obsoletes: cross-ppc-gcc49 <= 4.9.0+r209354 +%endif %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 4.9.0+r209354 +Version: 4.9.0+r209782 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) @@ -114,7 +119,6 @@ Patch23: libjava-no-multilib.diff Patch24: tls-no-direct.diff Patch30: gcc43-no-unwind-tables.diff -Patch33: gcc49-pr60720.patch # A set of patches from the RH srpm Patch51: gcc41-ia64-stack-protector.patch Patch55: gcc41-java-slow_pthread_self.patch @@ -181,7 +185,6 @@ %patch23 %patch24 %patch30 -%patch33 %patch51 %patch55 %patch57 @@ -294,8 +297,8 @@ # In general we want to ship release checking enabled compilers # and run BETA with checking enabled. -ENABLE_CHECKING="--enable-checking=yes" -#ENABLE_CHECKING="--enable-checking=release" +#ENABLE_CHECKING="--enable-checking=yes" +ENABLE_CHECKING="--enable-checking=release" # Work around tail/head -1 changes export _POSIX2_VERSION=199209 ++++++ cross-x86_64-gcc49.spec ++++++ --- /var/tmp/diff_new_pack.P3lwA9/_old 2014-05-02 13:55:52.000000000 +0200 +++ /var/tmp/diff_new_pack.P3lwA9/_new 2014-05-02 13:55:52.000000000 +0200 @@ -86,11 +86,16 @@ %endif ExclusiveArch: ppc64 ia64 s390x aarch64 %define _binary_payload w.ufdio +# Obsolete cross-ppc-gcc49 from cross-ppc64-gcc49 which has +# file conflicts with it and is no longer packaged +%if "%pkgname" == "cross-ppc64-gcc49" +Obsoletes: cross-ppc-gcc49 <= 4.9.0+r209354 +%endif %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 4.9.0+r209354 +Version: 4.9.0+r209782 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) @@ -114,7 +119,6 @@ Patch23: libjava-no-multilib.diff Patch24: tls-no-direct.diff Patch30: gcc43-no-unwind-tables.diff -Patch33: gcc49-pr60720.patch # A set of patches from the RH srpm Patch51: gcc41-ia64-stack-protector.patch Patch55: gcc41-java-slow_pthread_self.patch @@ -181,7 +185,6 @@ %patch23 %patch24 %patch30 -%patch33 %patch51 %patch55 %patch57 @@ -294,8 +297,8 @@ # In general we want to ship release checking enabled compilers # and run BETA with checking enabled. -ENABLE_CHECKING="--enable-checking=yes" -#ENABLE_CHECKING="--enable-checking=release" +#ENABLE_CHECKING="--enable-checking=yes" +ENABLE_CHECKING="--enable-checking=release" # Work around tail/head -1 changes export _POSIX2_VERSION=199209 ++++++ gcc49-testresults.spec ++++++ --- /var/tmp/diff_new_pack.P3lwA9/_old 2014-05-02 13:55:52.000000000 +0200 +++ /var/tmp/diff_new_pack.P3lwA9/_new 2014-05-02 13:55:52.000000000 +0200 @@ -49,7 +49,7 @@ %define tsan_arch x86_64 %define asan_arch x86_64 %ix86 ppc ppc64 %sparc %arm %define itm_arch x86_64 %ix86 %arm ppc ppc64 ppc64le s390 s390x %sparc -%define atomic_arch x86_64 %ix86 %arm ppc ppc64 ppc64le s390 s390x %sparc m68k +%define atomic_arch x86_64 %ix86 %arm aarch64 ppc ppc64 ppc64le s390 s390x %sparc m68k %define lsan_arch x86_64 %define ubsan_arch x86_64 %ix86 ppc ppc64 %arm %if 0%{?build_libvtv:1} @@ -238,7 +238,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 4.9.0+r209354 +Version: 4.9.0+r209782 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) @@ -296,7 +296,6 @@ Patch23: libjava-no-multilib.diff Patch24: tls-no-direct.diff Patch30: gcc43-no-unwind-tables.diff -Patch33: gcc49-pr60720.patch # A set of patches from the RH srpm Patch51: gcc41-ia64-stack-protector.patch Patch55: gcc41-java-slow_pthread_self.patch @@ -414,7 +413,6 @@ %patch23 %patch24 %patch30 -%patch33 %patch51 %patch55 %patch57 @@ -527,8 +525,8 @@ # In general we want to ship release checking enabled compilers # and run BETA with checking enabled. -ENABLE_CHECKING="--enable-checking=yes" -#ENABLE_CHECKING="--enable-checking=release" +#ENABLE_CHECKING="--enable-checking=yes" +ENABLE_CHECKING="--enable-checking=release" # Work around tail/head -1 changes export _POSIX2_VERSION=199209 @@ -706,11 +704,11 @@ %else STAGE1_FLAGS="-g" # Only run profiled bootstrap on archs where it works and matters -#%ifarch x86_64 ppc64le s390x -#make profiledbootstrap STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL -#%else +%ifarch x86_64 ppc64le s390x +make profiledbootstrap STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL +%else make STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL -#%endif +%endif make info %if 0%{?run_tests:1} echo "Run testsuite" ++++++ gcc49.spec ++++++ --- /var/tmp/diff_new_pack.P3lwA9/_old 2014-05-02 13:55:52.000000000 +0200 +++ /var/tmp/diff_new_pack.P3lwA9/_new 2014-05-02 13:55:52.000000000 +0200 @@ -31,7 +31,7 @@ %define tsan_arch x86_64 %define asan_arch x86_64 %ix86 ppc ppc64 %sparc %arm %define itm_arch x86_64 %ix86 %arm ppc ppc64 ppc64le s390 s390x %sparc -%define atomic_arch x86_64 %ix86 %arm ppc ppc64 ppc64le s390 s390x %sparc m68k +%define atomic_arch x86_64 %ix86 %arm aarch64 ppc ppc64 ppc64le s390 s390x %sparc m68k %define lsan_arch x86_64 %define ubsan_arch x86_64 %ix86 ppc ppc64 %arm %if 0%{?build_libvtv:1} @@ -220,7 +220,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 4.9.0+r209354 +Version: 4.9.0+r209782 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) @@ -278,7 +278,6 @@ Patch23: libjava-no-multilib.diff Patch24: tls-no-direct.diff Patch30: gcc43-no-unwind-tables.diff -Patch33: gcc49-pr60720.patch # A set of patches from the RH srpm Patch51: gcc41-ia64-stack-protector.patch Patch55: gcc41-java-slow_pthread_self.patch @@ -1548,6 +1547,7 @@ License: GPL-3.0+ Group: Development/Languages/Other Requires: gcc49 = %{version}-%{release} +Requires: libgo%{libgo_sover} >= %{version}-%{release} %description go This package contains a Go compiler and associated development @@ -1557,6 +1557,7 @@ License: GPL-3.0+ Group: Development/Languages/Other Requires: gcc49-32bit = %{version}-%{release} +Requires: libgo%{libgo_sover}-32bit >= %{version}-%{release} %description go-32bit This package contains a Go compiler and associated development @@ -1566,6 +1567,7 @@ License: GPL-3.0+ Group: Development/Languages/Other Requires: gcc49-64bit = %{version}-%{release} +Requires: libgo%{libgo_sover}-64bit >= %{version}-%{release} %description go-64bit This package contains a Go compiler and associated development @@ -1725,7 +1727,6 @@ %patch23 %patch24 %patch30 -%patch33 %patch51 %patch55 %patch57 @@ -1838,8 +1839,8 @@ # In general we want to ship release checking enabled compilers # and run BETA with checking enabled. -ENABLE_CHECKING="--enable-checking=yes" -#ENABLE_CHECKING="--enable-checking=release" +#ENABLE_CHECKING="--enable-checking=yes" +ENABLE_CHECKING="--enable-checking=release" # Work around tail/head -1 changes export _POSIX2_VERSION=199209 @@ -2017,11 +2018,11 @@ %else STAGE1_FLAGS="-g" # Only run profiled bootstrap on archs where it works and matters -#%ifarch x86_64 ppc64le s390x -#make profiledbootstrap STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL -#%else +%ifarch x86_64 ppc64le s390x +make profiledbootstrap STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL +%else make STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL -#%endif +%endif make info %if 0%{?run_tests:1} echo "Run testsuite" ++++++ libffi49.spec ++++++ --- /var/tmp/diff_new_pack.P3lwA9/_old 2014-05-02 13:55:52.000000000 +0200 +++ /var/tmp/diff_new_pack.P3lwA9/_new 2014-05-02 13:55:52.000000000 +0200 @@ -48,7 +48,7 @@ %define tsan_arch x86_64 %define asan_arch x86_64 %ix86 ppc ppc64 %sparc %arm %define itm_arch x86_64 %ix86 %arm ppc ppc64 ppc64le s390 s390x %sparc -%define atomic_arch x86_64 %ix86 %arm ppc ppc64 ppc64le s390 s390x %sparc m68k +%define atomic_arch x86_64 %ix86 %arm aarch64 ppc ppc64 ppc64le s390 s390x %sparc m68k %define lsan_arch x86_64 %define ubsan_arch x86_64 %ix86 ppc ppc64 %arm %if 0%{?build_libvtv:1} @@ -237,7 +237,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 4.9.0+r209354 +Version: 4.9.0+r209782 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) @@ -295,7 +295,6 @@ Patch23: libjava-no-multilib.diff Patch24: tls-no-direct.diff Patch30: gcc43-no-unwind-tables.diff -Patch33: gcc49-pr60720.patch # A set of patches from the RH srpm Patch51: gcc41-ia64-stack-protector.patch Patch55: gcc41-java-slow_pthread_self.patch @@ -399,6 +398,7 @@ License: GPL-3.0+ Group: Development/Languages/Other Requires: gcc49 = %{version}-%{release} +Requires: libgo%{libgo_sover} >= %{version}-%{release} %description go This package contains a Go compiler and associated development @@ -408,6 +408,7 @@ License: GPL-3.0+ Group: Development/Languages/Other Requires: gcc49-32bit = %{version}-%{release} +Requires: libgo%{libgo_sover}-32bit >= %{version}-%{release} %description go-32bit This package contains a Go compiler and associated development @@ -417,6 +418,7 @@ License: GPL-3.0+ Group: Development/Languages/Other Requires: gcc49-64bit = %{version}-%{release} +Requires: libgo%{libgo_sover}-64bit >= %{version}-%{release} %description go-64bit This package contains a Go compiler and associated development @@ -576,7 +578,6 @@ %patch23 %patch24 %patch30 -%patch33 %patch51 %patch55 %patch57 @@ -689,8 +690,8 @@ # In general we want to ship release checking enabled compilers # and run BETA with checking enabled. -ENABLE_CHECKING="--enable-checking=yes" -#ENABLE_CHECKING="--enable-checking=release" +#ENABLE_CHECKING="--enable-checking=yes" +ENABLE_CHECKING="--enable-checking=release" # Work around tail/head -1 changes export _POSIX2_VERSION=199209 @@ -868,11 +869,11 @@ %else STAGE1_FLAGS="-g" # Only run profiled bootstrap on archs where it works and matters -#%ifarch x86_64 ppc64le s390x -#make profiledbootstrap STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL -#%else +%ifarch x86_64 ppc64le s390x +make profiledbootstrap STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL +%else make STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL -#%endif +%endif make info %if 0%{?run_tests:1} echo "Run testsuite" libgcj49.spec: same change ++++++ change_spec ++++++ --- /var/tmp/diff_new_pack.P3lwA9/_old 2014-05-02 13:55:53.000000000 +0200 +++ /var/tmp/diff_new_pack.P3lwA9/_new 2014-05-02 13:55:53.000000000 +0200 @@ -137,7 +137,8 @@ add_cross cross-x86_64-gcc$base_ver x86_64 x86_64-suse-linux %define gcc_icecream 1 add_cross cross-s390-gcc$base_ver s390 s390-suse-linux %define gcc_icecream 1 add_cross cross-s390x-gcc$base_ver s390x s390x-suse-linux %define gcc_icecream 1 -add_cross cross-ppc-gcc$base_ver ppc powerpc64-suse-linux %define gcc_icecream 1 +# No cross-ppc because it shares the target triplet with cross-ppc64 +#add_cross cross-ppc-gcc$base_ver ppc powerpc64-suse-linux %define gcc_icecream 1 add_cross cross-ppc64-gcc$base_ver ppc64 powerpc64-suse-linux %define gcc_icecream 1 add_cross cross-ppc64le-gcc$base_ver ppc64le powerpc64le-suse-linux %define gcc_icecream 1 fi ++++++ cross.spec.in ++++++ --- /var/tmp/diff_new_pack.P3lwA9/_old 2014-05-02 13:55:53.000000000 +0200 +++ /var/tmp/diff_new_pack.P3lwA9/_new 2014-05-02 13:55:53.000000000 +0200 @@ -66,6 +66,11 @@ %endif ExclusiveArch: ppc64 x86_64 ia64 s390x aarch64 %define _binary_payload w.ufdio +# Obsolete cross-ppc-gcc49 from cross-ppc64-gcc49 which has +# file conflicts with it and is no longer packaged +%if "%pkgname" == "cross-ppc64-gcc49" +Obsoletes: cross-ppc-gcc49 <= 4.9.0+r209354 +%endif # COMMON-BEGIN # COMMON-END ++++++ gcc-4.9.0-r209354.tar.bz2 -> gcc-4.9.0-r209782.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/gcc49/gcc-4.9.0-r209354.tar.bz2 /work/SRC/openSUSE:Factory/.gcc49.new/gcc-4.9.0-r209782.tar.bz2 differ: char 11, line 1 ++++++ gcc.spec.in ++++++ --- /var/tmp/diff_new_pack.P3lwA9/_old 2014-05-02 13:55:53.000000000 +0200 +++ /var/tmp/diff_new_pack.P3lwA9/_new 2014-05-02 13:55:53.000000000 +0200 @@ -33,7 +33,7 @@ %define tsan_arch x86_64 %define asan_arch x86_64 %ix86 ppc ppc64 %sparc %arm %define itm_arch x86_64 %ix86 %arm ppc ppc64 ppc64le s390 s390x %sparc -%define atomic_arch x86_64 %ix86 %arm ppc ppc64 ppc64le s390 s390x %sparc m68k +%define atomic_arch x86_64 %ix86 %arm aarch64 ppc ppc64 ppc64le s390 s390x %sparc m68k %define lsan_arch x86_64 %define ubsan_arch x86_64 %ix86 ppc ppc64 %arm %if 0%{?build_libvtv:1} @@ -225,7 +225,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 URL: http://gcc.gnu.org/ -Version: 4.9.0+r209354 +Version: 4.9.0+r209782 Release: 1 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) @@ -285,7 +285,6 @@ Patch23: libjava-no-multilib.diff Patch24: tls-no-direct.diff Patch30: gcc43-no-unwind-tables.diff -Patch33: gcc49-pr60720.patch # A set of patches from the RH srpm Patch51: gcc41-ia64-stack-protector.patch Patch55: gcc41-java-slow_pthread_self.patch @@ -962,6 +961,7 @@ License: GPL-3.0+ Group: Development/Languages/Other Requires: gcc@base_ver@@variant@ = %{version}-%{release} +Requires: libgo%{libgo_sover}@variant@ >= %{version}-%{release} %description go@variant@ This package contains a Go compiler and associated development @@ -1103,7 +1103,6 @@ %patch23 %patch24 %patch30 -%patch33 %patch51 %patch55 %patch57 @@ -1216,8 +1215,8 @@ # In general we want to ship release checking enabled compilers # and run BETA with checking enabled. -ENABLE_CHECKING="--enable-checking=yes" -#ENABLE_CHECKING="--enable-checking=release" +#ENABLE_CHECKING="--enable-checking=yes" +ENABLE_CHECKING="--enable-checking=release" # Work around tail/head -1 changes export _POSIX2_VERSION=199209 @@ -1397,11 +1396,11 @@ %else STAGE1_FLAGS="-g" # Only run profiled bootstrap on archs where it works and matters -#%ifarch x86_64 ppc64le s390x -#make profiledbootstrap STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL -#%else +%ifarch x86_64 ppc64le s390x +make profiledbootstrap STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL +%else make STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL -#%endif +%endif make info %if 0%{?run_tests:1} echo "Run testsuite" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit flickcurl for openSUSE:Factory
by root＠hilbert.suse.de 02 May '14

02 May '14

Hello community, here is the log from the commit of package flickcurl for openSUSE:Factory checked in at 2014-05-02 13:55:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/flickcurl (Old) and /work/SRC/openSUSE:Factory/.flickcurl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "flickcurl" Changes: -------- --- /work/SRC/openSUSE:Factory/flickcurl/flickcurl.changes 2012-12-14 06:43:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.flickcurl.new/flickcurl.changes 2014-05-02 13:55:39.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Apr 28 06:22:01 UTC 2014 - fcrozat(a)suse.com + +- Update for version 1.25: + - more OAuth fixes, including uploading fully working + - Multiple internal OAuth changes to simplify code. +- Remove flickcurl-wrong-memset.patch, merged upstream + +------------------------------------------------------------------- Old: ---- flickcurl-1.23.tar.bz2 flickcurl-wrong-memset.patch New: ---- flickcurl-1.25.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ flickcurl.spec ++++++ --- /var/tmp/diff_new_pack.c6mz7z/_old 2014-05-02 13:55:40.000000000 +0200 +++ /var/tmp/diff_new_pack.c6mz7z/_new 2014-05-02 13:55:40.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package flickcurl # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,31 +19,30 @@ %define soname 0 Name: flickcurl -Version: 1.23 +Version: 1.25 Release: 0 Summary: Command-Line Tools for the Flickr Web Service License: LGPL-2.1 Group: Productivity/Networking/Other Url: http://librdf.org/flickcurl/ # http://download.dajobe.org/flickcurl/flickcurl-%{version}.tar.gz -Source: flickcurl-%{version}.tar.bz2 +Source: flickcurl-%{version}.tar.gz Source99: flickcurl-rpmlintrc BuildRequires: autoconf BuildRequires: automake +BuildRequires: chrpath BuildRequires: curl BuildRequires: fdupes BuildRequires: gtkdoc -BuildRequires: libcurl-devel -BuildRequires: libraptor-devel >= 1.4.0 +BuildRequires: libcurl-devel >= 7.10.0 +BuildRequires: libraptor-devel >= 2.0.0 BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: update-desktop-files -BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gobject-2.0) -BuildRequires: chrpath +BuildRequires: pkgconfig(libxml-2.0) BuildRoot: %{_tmppath}/%{name}-%{version}-build -Patch1: flickcurl-wrong-memset.patch %description Flickcurl is a C library for calling the Flickr Web service API. It handles the @@ -106,10 +105,8 @@ %prep %setup -q -%patch1 -p1 %build -autoreconf -fiv %configure \ --enable-gtk-doc \ --disable-static \ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit fcitx-table-extra for openSUSE:Factory
by root＠hilbert.suse.de 02 May '14

02 May '14

Hello community, here is the log from the commit of package fcitx-table-extra for openSUSE:Factory checked in at 2014-05-02 13:55:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fcitx-table-extra (Old) and /work/SRC/openSUSE:Factory/.fcitx-table-extra.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "fcitx-table-extra" Changes: -------- --- /work/SRC/openSUSE:Factory/fcitx-table-extra/fcitx-table-extra.changes 2013-09-26 19:32:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.fcitx-table-extra.new/fcitx-table-extra.changes 2014-05-02 13:55:30.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Feb 25 09:04:47 UTC 2014 - fcrozat(a)suse.com + +- Update license tag and add COPYING, based on legal team + feedback. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fcitx-table-extra.spec ++++++ --- /var/tmp/diff_new_pack.Otc5sj/_old 2014-05-02 13:55:30.000000000 +0200 +++ /var/tmp/diff_new_pack.Otc5sj/_new 2014-05-02 13:55:30.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package fcitx-table-extra # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ Version: 0.3.5 Release: 0 Summary: Extra table for Fcitx -License: GPL-2.0+ and SUSE-Public-Domain +License: GPL-2.0+ Group: System/I18n/Chinese Url: https://github.com/fcitx/fcitx-table-extra Source: http://download.fcitx-im.org/fcitx-table-extra/%{name}-%{version}.tar.xz @@ -341,113 +341,134 @@ %fdupes %{buildroot} %files lang -f %{name}.lang +%doc COPYING %files -n fcitx-table-tw-boshiamy %defattr(-,root,root) +%doc COPYING %{_fcitx_tabledir}/boshiamy.* %{_datadir}/icons/hicolor/*/apps/fcitx-boshiamy.png %{_fcitx_imicondir}/boshiamy.png %files -n fcitx-table-tw-cangjie3 %defattr(-,root,root) +%doc COPYING %{_fcitx_tabledir}/cangjie3.* %files -n fcitx-table-tw-cangjie5 %defattr(-,root,root) +%doc COPYING %{_fcitx_tabledir}/cangjie5.* %files -n fcitx-table-tw-cangjie-large %defattr(-,root,root) +%doc COPYING %{_fcitx_tabledir}/cangjie-big.* %files -n fcitx-table-tw-smart-cangjie6 %defattr(-,root,root) +%doc COPYING %{_fcitx_tabledir}/scj6.* %{_datadir}/icons/hicolor/*/apps/fcitx-scj6.png %{_fcitx_imicondir}/scj6.png %files -n fcitx-table-cn-cantonese %defattr(-,root,root) +%doc COPYING %{_fcitx_tabledir}/cantonese.* %{_datadir}/icons/hicolor/*/apps/fcitx-cantonese.png %{_fcitx_imicondir}/cantonese.png %files -n fcitx-table-hk-cantonese %defattr(-,root,root) +%doc COPYING %{_fcitx_tabledir}/cantonhk.* %{_datadir}/icons/hicolor/*/apps/fcitx-cantonhk.png %{_fcitx_imicondir}/cantonhk.png %files -n fcitx-table-hk-jyutping %defattr(-,root,root) +%doc COPYING %{_fcitx_tabledir}/jyutping.* %{_datadir}/icons/hicolor/*/apps/fcitx-jyutping.png %{_fcitx_imicondir}/jyutping.png %files -n fcitx-table-hk-stroke5 %defattr(-,root,root) +%doc COPYING %{_fcitx_tabledir}/stroke5.* %{_datadir}/icons/hicolor/*/apps/fcitx-stroke5.png %{_fcitx_imicondir}/stroke5.png %files -n fcitx-table-tw-easy-large %defattr(-,root,root) +%doc COPYING %{_fcitx_tabledir}/easy-big.* %{_datadir}/icons/hicolor/*/apps/fcitx-easy-big.png %{_fcitx_imicondir}/easy-big.png %files -n fcitx-table-tw-quick3 %defattr(-,root,root) +%doc COPYING %{_fcitx_tabledir}/quick3.* %{_datadir}/icons/hicolor/*/apps/fcitx-quick3.png %{_fcitx_imicondir}/quick3.png %files -n fcitx-table-tw-quick5 %defattr(-,root,root) +%doc COPYING %{_fcitx_tabledir}/quick5.* %{_datadir}/icons/hicolor/*/apps/fcitx-quick5.png %{_fcitx_imicondir}/quick5.png %files -n fcitx-table-tw-quick-classic %defattr(-,root,root) +%doc COPYING %{_fcitx_tabledir}/quick-classic.* %{_datadir}/icons/hicolor/*/apps/fcitx-quick-classic.png %{_fcitx_imicondir}/quick-classic.png %files -n fcitx-table-tw-array30 %defattr(-,root,root) +%doc COPYING %{_fcitx_tabledir}/array30.* %{_datadir}/icons/hicolor/*/apps/fcitx-array30.png %{_fcitx_imicondir}/array30.png %files -n fcitx-table-tw-array30-large %defattr(-,root,root) +%doc COPYING %{_fcitx_tabledir}/array30-big.* %{_datadir}/icons/hicolor/*/apps/fcitx-array30-big.png %{_fcitx_imicondir}/array30-big.png %files -n fcitx-table-cn-wubi-large %defattr(-,root,root) +%doc COPYING %{_fcitx_tabledir}/wubi-large.* %files -n fcitx-table-cn-wu %defattr(-,root,root) +%doc COPYING %{_fcitx_tabledir}/wu.* %{_datadir}/icons/hicolor/*/apps/fcitx-wu.png %{_fcitx_imicondir}/wu.png %files -n fcitx-table-cn-zhengma %defattr(-,root,root) +%doc COPYING %{_fcitx_tabledir}/zhengma.* %{_datadir}/icons/hicolor/*/apps/fcitx-zhengma.png %{_fcitx_imicondir}/zhengma.png %files -n fcitx-table-cn-zhengma-large %defattr(-,root,root) +%doc COPYING %{_fcitx_tabledir}/zhengma-large.* %files -n fcitx-table-t9 %defattr(-,root,root) +%doc COPYING %{_fcitx_tabledir}/t9.* %{_fcitx_imicondir}/t9.png %{_datadir}/icons/hicolor/64x64/apps/fcitx-t9.png -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit fcitx for openSUSE:Factory
by root＠hilbert.suse.de 02 May '14

02 May '14

Hello community, here is the log from the commit of package fcitx for openSUSE:Factory checked in at 2014-05-02 13:55:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fcitx (Old) and /work/SRC/openSUSE:Factory/.fcitx.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "fcitx" Changes: -------- --- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2014-04-25 16:09:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2014-05-02 13:55:23.000000000 +0200 @@ -1,0 +2,10 @@ +Thu May 1 14:14:02 UTC 2014 - i(a)marguerite.su + +- Fix bnc#851983: "fcitx tray icon is incompatible with other + systray icons" by refreshing input.svgz +- Fix environment variables: QT_IM_MODULE supports Qt4 & Qt5 now + we need a new QT4_IM_MODULE variable set to prepare for the + worst +- new skin: New Air. Idea from KDE Air theme. + +------------------------------------------------------------------- Old: ---- openSUSE-default.tar.gz New: ---- input.svgz openSUSE-themes.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fcitx.spec ++++++ --- /var/tmp/diff_new_pack.tTQB6l/_old 2014-05-02 13:55:24.000000000 +0200 +++ /var/tmp/diff_new_pack.tTQB6l/_new 2014-05-02 13:55:24.000000000 +0200 @@ -31,12 +31,13 @@ Source3: xim.fcitx.suse.template # for fedora auto-start Source7: xinput-fcitx -Source8: openSUSE-default.tar.gz +Source8: openSUSE-themes.tar.gz Source9: macros.%{name} -BuildRequires: cairo-devel +Source10: input.svgz #PATCH-FEATURE-OPENSUSE marguerite(a)opensuse.org To support sougou IM, we need a context # variable to disable punc on the fly Patch: fcitx-context-variable-disable-punc-on-the-fly.patch +BuildRequires: cairo-devel %if 0%{?suse_version} BuildRequires: dbus-1-devel BuildRequires: dbus-1-glib-devel @@ -340,6 +341,20 @@ You can either use this package or download from kde-look.org using knewstaff in fcitx-config-kde4. +%package skin-new-air +Summary: New Air skin for Fcitx +Group: System/I18n/Chinese +Requires: %{name} = %{version} +%if 0%{?suse_version} >= 1140 +BuildArch: noarch +%endif + +%description skin-new-air +New Air skin for Fcitx, inspired by KDE Air theme. + +You can either use this package or download from kde-look.org using knewstaff in +fcitx-config-kde4. + %endif %package skin-classic @@ -417,13 +432,19 @@ cd .. %if 0%{?suse_version} -# install openSUSE branding +# install openSUSE skins pushd %{buildroot}%{_datadir}/%{name}/skin/ tar -xzf %{SOURCE8} +mv openSUSE-themes/Dartmouth ./openSUSE-default +mv openSUSE-themes/New_Air ./New_Air +rm -rf openSUSE-themes +popd + # fcitx 4.2.8 use new dbus systray mechanism, so fix the ugly oxygen keyboard icon mkdir -p %{buildroot}%{_kde4_appsdir}/desktoptheme/openSUSE/icons/ -cp -r openSUSE-default/source/inactive.svg %{buildroot}%{_kde4_appsdir}/desktoptheme/openSUSE/icons/input.svg -popd +cp -r %{SOURCE10} %{buildroot}%{_kde4_appsdir}/desktoptheme/openSUSE/icons/ + +# Change default skin pushd %{buildroot}%{_datadir}/%{name}/configdesc sed -i 's/DefaultValue=default/DefaultValue=openSUSE-default/' %{buildroot}%{_datadir}/%{name}/configdesc/fcitx-classic-ui.desc popd @@ -612,6 +633,7 @@ %exclude %{_libdir}/%{name}/libexec/fcitx-scanner %if 0%{?suse_version} %exclude %{_datadir}/%{name}/skin/openSUSE-default +%exclude %{_datadir}/%{name}/skin/New_Air %endif %exclude %{_datadir}/%{name}/skin/classic %exclude %{_datadir}/%{name}/skin/dark @@ -722,13 +744,17 @@ %files branding-openSUSE %defattr(-,root,root) %{_datadir}/%{name}/skin/openSUSE-default -%{_kde4_appsdir}/desktoptheme/openSUSE/icons/input.svg +%{_kde4_appsdir}/desktoptheme/openSUSE/icons/input.svgz %if 0%{?suse_version} <= 1220 %dir %{_kde4_appsdir}/desktoptheme %dir %{_kde4_appsdir}/desktoptheme/openSUSE %dir %{_kde4_appsdir}/desktoptheme/openSUSE/icons %endif +%files skin-new-air +%defattr(-,root,root) +%{_datadir}/%{name}/skin/New_Air + %endif %files skin-classic ++++++ xim.d-fcitx ++++++ --- /var/tmp/diff_new_pack.tTQB6l/_old 2014-05-02 13:55:24.000000000 +0200 +++ /var/tmp/diff_new_pack.tTQB6l/_new 2014-05-02 13:55:24.000000000 +0200 @@ -10,6 +10,7 @@ export GTK3_IM_MODULE=fcitx export QT_IM_SWITCHER=imsw-multi export QT_IM_MODULE=fcitx +export QT4_IM_MODULE=fcitx # Avoid relying on autolaunch to improvise D-Bus sessions for each process if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then ++++++ xim.fcitx.suse.template ++++++ --- /var/tmp/diff_new_pack.tTQB6l/_old 2014-05-02 13:55:24.000000000 +0200 +++ /var/tmp/diff_new_pack.tTQB6l/_new 2014-05-02 13:55:24.000000000 +0200 @@ -22,4 +22,5 @@ export GTK3_IM_MODULE=fcitx export QT_IM_SWITCHER=imsw-multi export QT_IM_MODULE=fcitx +export QT4_IM_MODULE=fcitx fcitx -d ++++++ xinput-fcitx ++++++ --- /var/tmp/diff_new_pack.tTQB6l/_old 2014-05-02 13:55:24.000000000 +0200 +++ /var/tmp/diff_new_pack.tTQB6l/_new 2014-05-02 13:55:24.000000000 +0200 @@ -10,6 +10,11 @@ test -f /usr/lib64/qt4/plugins/inputmethods/qtim-fcitx.so; then QT_IM_MODULE=fcitx + if test -f /usr/lib/qt5/plugins/platforminputcontexts/libfcitxplatforminputcontextplugin.so || \ + test -f /usr/lib64/qt5/plugins/platforminputcontexts/libfcitxplatforminputcontextplugin.so; + then + QT4_IM_MODULE=fcitx + fi else QT_IM_MODULE=xim fi -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit fail2ban for openSUSE:Factory
by root＠hilbert.suse.de 02 May '14

02 May '14

Hello community, here is the log from the commit of package fail2ban for openSUSE:Factory checked in at 2014-05-02 13:55:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fail2ban (Old) and /work/SRC/openSUSE:Factory/.fail2ban.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "fail2ban" Changes: -------- --- /work/SRC/openSUSE:Factory/fail2ban/fail2ban.changes 2014-01-30 14:54:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.fail2ban.new/fail2ban.changes 2014-05-02 13:55:19.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Feb 18 00:03:12 UTC 2014 - jengelh(a)inai.de + +- Add a new subpackage to install systemd drop-ins that couple + SuSEfirewall2 and fail2ban. Added sfw-fail2ban.conf, + f2b-restart.conf. + +------------------------------------------------------------------- New: ---- f2b-restart.conf sfw-fail2ban.conf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fail2ban.spec ++++++ --- /var/tmp/diff_new_pack.B7fkRS/_old 2014-05-02 13:55:20.000000000 +0200 +++ /var/tmp/diff_new_pack.B7fkRS/_new 2014-05-02 13:55:20.000000000 +0200 @@ -20,11 +20,10 @@ Version: 0.8.12 Release: 0 Url: http://www.fail2ban.org/ -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch Summary: Bans IP addresses that make too many authentication failures License: GPL-2.0+ Group: Productivity/Networking/Security + Source0: https://github.com/%{name}/%{name}/releases/download/%{version}/%{name}-%{v… %if 0%{?suse_version} < 1230 # the init-script requires lsof @@ -33,12 +32,20 @@ %endif Source2: %{name}.sysconfig Source3: %{name}.logrotate -%if 0%{?suse_version} >= 1230 Source4: %{name}.service Source5: %{name}.tmpfiles -%endif +Source6: sfw-fail2ban.conf +Source7: f2b-restart.conf # PATCH-FIX-UPSTREAM fix-for-upstream-firewallcmd-ipset.conf.patch rh#1046816 Patch0: fix-for-upstream-firewallcmd-ipset.conf.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch +%if 0%{?suse_version} >= 1230 +%{?systemd_requires} +BuildRequires: systemd +%endif +BuildRequires: logrotate +BuildRequires: python-devel Requires: cron Requires: iptables Requires: logrotate @@ -49,12 +56,6 @@ %if 0%{?suse_version} >= 1220 Requires: python-gamin %endif -%if 0%{?suse_version} >= 1230 -%{?systemd_requires} -BuildRequires: systemd -%endif -BuildRequires: logrotate -BuildRequires: python-devel %description Fail2ban scans log files like /var/log/messages and bans IP addresses @@ -63,6 +64,18 @@ These rules can be defined by the user. Fail2Ban can read multiple log files such as sshd or Apache web server ones. +%package -n SuSEfirewall2-fail2ban +Summary: systemd files for integrating fail2ban into SuSEfirewall2 +Group: Productivity/Networking/Security +BuildArch: noarch +Requires: SuSEfirewall2 +Requires: fail2ban + +%description -n SuSEfirewall2-fail2ban +This package ships systemd files which will cause fail2ban to be ordered +in relation to SuSEfirewall2 such that the two can be run concurrently +within reason, i.e. SFW will always run first because it does a table flush. + %prep %setup %patch0 -p1 @@ -101,6 +114,12 @@ install -d -m755 $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/ install -m644 %{SOURCE5} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf %endif +%if "%_unitdir" != "" +install -Dm0644 "%_sourcedir/sfw-fail2ban.conf" \ + "%buildroot/%_unitdir/SuSEfirewall2.service.d/fail2ban.conf" +install -Dm0644 "%_sourcedir/f2b-restart.conf" \ + "%buildroot/%_unitdir/fail2ban.service.d/SuSEfirewall2.conf" +%endif %pre %if 0%{?suse_version} >= 1230 @@ -129,6 +148,14 @@ %insserv_cleanup %endif +%if "%_unitdir" != "" +%post -n SuSEfirewall2-fail2ban +%_bindir/systemctl daemon-reload >/dev/null 2>&1 || : + +%postun -n SuSEfirewall2-fail2ban +%_bindir/systemctl daemon-reload >/dev/null 2>&1 || : +%endif + %files %defattr(-, root, root) %dir %{_sysconfdir}/%{name} @@ -152,4 +179,11 @@ %doc %{_mandir}/man1/* %doc COPYING ChangeLog DEVELOP README.md TODO files/cacti +%if "%{?_unitdir}" != "" +%files -n SuSEfirewall2-fail2ban +%defattr(-,root,root) +%_unitdir/SuSEfirewall2.service.d +%_unitdir/fail2ban.service.d +%endif + %changelog ++++++ f2b-restart.conf ++++++ # When a restart is issued for SuSEfirewall2, fail2ban.service too must be # restarted, which is what this drop-in file does. [Unit] PartOf=SuSEfirewall2.service ++++++ sfw-fail2ban.conf ++++++ # This drop-in file extends SuSEfirewall2.service to also start # fail2ban.service, and to make sure that fail2ban is only (re)started after # SFW has completed. [Unit] Wants=fail2ban.service Before=fail2ban.service -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit darktable for openSUSE:Factory
by root＠hilbert.suse.de 02 May '14

02 May '14

Hello community, here is the log from the commit of package darktable for openSUSE:Factory checked in at 2014-05-02 13:55:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/darktable (Old) and /work/SRC/openSUSE:Factory/.darktable.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "darktable" Changes: -------- --- /work/SRC/openSUSE:Factory/darktable/darktable.changes 2014-02-16 20:02:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.darktable.new/darktable.changes 2014-05-02 13:55:15.000000000 +0200 @@ -1,0 +2,30 @@ +Sat Apr 26 15:19:33 UTC 2014 - fcrozat(a)suse.com + +- update to version 1.4.2: + + masks fixes + + Explicitly try to load live view frames as JPEG + + Silence calculator error messages + + Translations updates + + Aspect ratio modes for Panasonic DMC-G2 + + WB presets for Olympus E-PL5/E-PM2, Nikon D610, D3300 + + Various TIF fixes + + Fix potential format string attacks via .po files + + Add $(TITLE) to export variables + + opencl: fix border handling in lens correction module + + Experimental support and matrix for samsung nx30, nx1100, + Olympus E-M10, Canon 1200d, Nikon D3300, D5300 + + Fix memory bugs spotted by Coverity + + Various crash fixes + + Update amaze code (SSE2 code) + + Set lt position when changing image in dr with keys + + Tonecurve: fix serious logical flaw. + + Colorout: map shortkeys of gamut check/softproof to + ctrl-g/ctrl-s + + Fix crash when exporting to Picasa. + + Noise profile: panasonic dmc-lx7 + + TIFF output: several fixes + + Fix for Olympus focus distances + + Tonecurve revamped + + Try to limit network traffic of map view + +------------------------------------------------------------------- Old: ---- darktable-1.4.1-nopatents.tar.xz New: ---- darktable-1.4.2-nopatents.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ darktable.spec ++++++ --- /var/tmp/diff_new_pack.1KYI9k/_old 2014-05-02 13:55:16.000000000 +0200 +++ /var/tmp/diff_new_pack.1KYI9k/_new 2014-05-02 13:55:16.000000000 +0200 @@ -17,7 +17,7 @@ Name: darktable -Version: 1.4.1 +Version: 1.4.2 Release: 0 Url: http://darktable.sourceforge.net # darktable contains patented code that we cannot ship. Therefore we use ++++++ darktable-1.4.1-nopatents.tar.xz -> darktable-1.4.2-nopatents.tar.xz ++++++ ++++ 74577 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit daps for openSUSE:Factory
by root＠hilbert.suse.de 02 May '14

02 May '14

Hello community, here is the log from the commit of package daps for openSUSE:Factory checked in at 2014-05-02 13:55:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/daps (Old) and /work/SRC/openSUSE:Factory/.daps.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "daps" Changes: -------- --- /work/SRC/openSUSE:Factory/daps/daps.changes 2014-03-18 14:13:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.daps.new/daps.changes 2014-05-02 13:55:10.000000000 +0200 @@ -1,0 +2,16 @@ +Wed Apr 23 15:31:09 UTC 2014 - fsundermeyer(a)opensuse.org + +New release DAPS 2.0~beta5: + +- fully supporting the suse-doc-style-checker (target stylecheck) +- fix for "online-docs": only tar'ing png and jpg if respective + images are available +- fix for ticket #225 (Misleading error message when xml files do + not reside in a directory named xml/) +- fix for ticket #218 (Improve error handling for --rootid + parameter) +- added tests for targets "package-html and "package-pdf" +- resulting filenames for package-html and package-pdf can now + be queried via "showvariable" + +------------------------------------------------------------------- Old: ---- daps-2.0~beta4.tar.bz2 New: ---- daps-2.0~beta5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ daps.spec ++++++ --- /var/tmp/diff_new_pack.kNHvzg/_old 2014-05-02 13:55:11.000000000 +0200 +++ /var/tmp/diff_new_pack.kNHvzg/_new 2014-05-02 13:55:11.000000000 +0200 @@ -17,7 +17,7 @@ Name: daps -Version: 2.0~beta4 +Version: 2.0~beta5 Release: 0 ############################################################### @@ -134,6 +134,7 @@ Recommends: checkbot %endif Recommends: remake +Recommends: suse-doc-style-checker # Internal XEP package: Recommends: xep Recommends: xmlformat ++++++ daps-2.0~beta4.tar.bz2 -> daps-2.0~beta5.tar.bz2 ++++++ ++++ 2394 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/daps/bin/daps.in new/daps/bin/daps.in --- old/daps/bin/daps.in 2014-01-14 13:56:19.000000000 +0100 +++ new/daps/bin/daps.in 2014-04-24 14:43:23.000000000 +0200 @@ -1,11 +1,11 @@ -#!/bin/bash +#!/bin/bash # -# Copyright (C) 2011,2012 Frank Sundermeyer <fsundermeyer(a)opensuse.org> +# Copyright (C) 2011-2014 Frank Sundermeyer <fsundermeyer(a)opensuse.org> # # Author: # Frank Sundermeyer <fsundermeyer(a)opensuse.org> # -# daps = DocBook Authoring and Publishing Suite +# DAPS = DocBook Authoring and Publishing Suite VERSION=@PACKAGE_VERSION@ @@ -342,7 +342,7 @@ HELP_SUBCOMMAND+=("package-pdf-dir-name=Print the directory name that would result when building\na pdf package.") SUBCOMMANDS+=("package-src=package-src") -HELP_SUBCOMMAND+=("package-src=Creates a distributable source archive containg the profiled sources of the complete set\nincluding the original source images.") +HELP_SUBCOMMAND+=("package-src=creates a distributable source archive containg the profiled sources of the complete set\nincluding the original source images.") SUBCOMMANDS+=("package-src-name=show_names") HELP_SUBCOMMAND+=("package-src-name=Print the file name that would result when building a distributable source\narchive.") @@ -505,7 +505,7 @@ HELP_SUBCOMMAND+=("jsp=This command is deprecated, use \"html --jsp\" instead.") SUBCOMMANDS+=("jsp-dir-name=deprecated") -HELP_SUBCOMMAND+=("jsp-dir-name=This command is deprecated, use \"html --jsp\" instead.") +HELP_SUBCOMMAND+=("jsp-dir-name=This command is deprecated, use \"html-dir-name --jsp\" instead.") SUBCOMMANDS+=("link-entity-dist=deprecated") HELP_SUBCOMMAND+=("link-entity-dist=This command is no longer supported.") @@ -933,6 +933,7 @@ DOC_DIR=$(dirname "$MAIN_CMDL") DOC_DIR=${DOC_DIR%/xml*} #remove xml directory fi + [[ -e ${DOC_DIR}/xml/$(basename $MAIN_CMDL) ]] || exit_on_error "XML files must reside in an \"xml/\" directory. \"$MAIN_CMDL\" is not a valid location." else if [[ -e "xml/$MAINFILE" ]]; then # MAIN is not a valid file, but ./xml/$MAIN exists @@ -945,13 +946,8 @@ fi else if [[ -n "$DOC_DIR" ]]; then - if [[ -e "${DOC_DIR}/xml/$MAINFILE" ]]; then - MAIN_CMDL="${DOC_DIR}/xml/$MAINFILE" - elif [[ -e "${DOC_DIR}/$MAINFILE" ]]; then - MAIN_CMDL="${DOC_DIR}/$MAINFILE" - else - exit_on_error "Fatal error: ${DOC_DIR}/xml/$MAINFILE does not exist." - fi + MAIN_CMDL="${DOC_DIR}/xml/$(basename $MAINFILE)" + [[ -e $MAIN_CMDL ]] || exit_on_error "XML files must reside in an \"xml/\" directory. \"$MAIN_CMDL\" is not a valid location." else exit_on_error "Fatal error: ${PWD}/$MAINFILE does not exist." fi 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/daps/configure.ac new/daps/configure.ac --- old/daps/configure.ac 2014-03-14 17:09:18.000000000 +0100 +++ new/daps/configure.ac 2014-04-23 15:07:42.000000000 +0200 @@ -19,7 +19,7 @@ m4_define(daps_version_micro, 9dev) AC_PREREQ([2.68]) -AC_INIT([DAPS], [2.0~beta4], [https://sourceforge.net/p/daps/tickets/], [daps], [http://daps.sf.net]) +AC_INIT([DAPS], [2.0~beta5], [https://sourceforge.net/p/daps/tickets/], [daps], [http://daps.sf.net]) AC_CONFIG_MACRO_DIR([m4]) AC_MSG_NOTICE([ 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/daps/lib/daps_functions new/daps/lib/daps_functions --- old/daps/lib/daps_functions 2013-12-19 15:42:06.000000000 +0100 +++ new/daps/lib/daps_functions 2014-04-23 15:07:42.000000000 +0200 @@ -1621,7 +1621,7 @@ shift SHORT_OPTS="h" - LONG_OPTS="help,name:,rootid:,show" + LONG_OPTS="file:,help,name:,rootid:,show" parse_args $SHORT_OPTS $LONG_OPTS $SUB_CMD "$@" eval set -- "$P_REMAIN_ARGS" @@ -1629,18 +1629,35 @@ #------ Computing the values returned from the parser ----- if [[ 1 = $P_HELP ]]; then help_scmd_head "$SUB_CMD" "$HELP_SUBCMD" + help_file help_help help_name help_rootid help_show_check - echo + echo -e " NOTES: * Options --file (-f) and --rootid exclude one another.\n * If neither file nor rootid is specified, the rootid\n from the DC-file is used\n * $SUB_CMD follows xi:includes\n" exit 0 fi + if [[ -z "$P_ROOTID" && -z "$P_FILE" ]]; then + if [[ 0 != $VERBOSITY ]]; then + ccecho "info" "Neither file nor rootid specified, using rootid from DC-file" + fi + elif [[ -n "$P_ROOTID" && -n "$P_FILE" ]]; then + exit_on_error "Options --file (-f) and --rootid exclude one another.\nPlease specify only one of these options" + fi + [[ -n "$P_NAME" ]] && export PDFNAME="$P_NAME" BOOK="$P_NAME" [[ -n "$P_ROOTID" ]] && export ROOTID="$P_ROOTID" [[ -n "$P_SHOW" ]] && export SHOW=1 + if [[ -n "$P_FILE" ]]; then + if [[ -f $P_FILE ]]; then + export ROOTID=$($XSLTPROC --stylesheet $DAPSROOT/daps-xslt/common/get-rootelement-id.xsl --file $P_FILE $XSLTPROCESSOR) || exit_on_error "Cannot get a rootid from file $FILE" + else + exit_on_error "File $P_FILE does not exist" + fi + fi + call_make "$SUB_CMD" "$@" } 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/daps/make/clean.mk new/daps/make/clean.mk --- old/daps/make/clean.mk 2013-10-21 16:08:24.000000000 +0200 +++ new/daps/make/clean.mk 2014-03-19 17:59:41.000000000 +0100 @@ -21,12 +21,12 @@ .PHONY: clean-package clean-package: rm -rf $(PACK_DIR) - @ccecho "info" "Successfully removed all generated package data for $(DOCCONF)" + @ccecho "info" "Successfully removed all generated package data for $(notdir $(DOCCONF))" .PHONY: clean-results clean-results: rm -rf $(RESULT_DIR) - @ccecho "info" "Successfully removed all generated books for $(DOCCONF)" + @ccecho "info" "Successfully removed all generated books for $(notdir $(DOCCONF))" .PHONY: clean-all real-clean clean-all real-clean: 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/daps/make/common_variables.mk new/daps/make/common_variables.mk --- old/daps/make/common_variables.mk 2014-03-13 23:16:21.000000000 +0100 +++ new/daps/make/common_variables.mk 2014-03-31 16:39:55.000000000 +0200 @@ -336,4 +336,8 @@ HTML_GRAPH_COMMAND := cp -rs --remove-destination endif - +#----- +# Valid ROOT Elements +# A --rootid must belong to one of the following elements: +# +VALID_ROOTELEMENTS := appendix article bibliography book chapter colophon dedication glossary index part preface qandaset refentry reference sect1 section set setindex 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/daps/make/filenames.mk new/daps/make/filenames.mk --- old/daps/make/filenames.mk 2013-12-17 15:51:29.000000000 +0100 +++ new/daps/make/filenames.mk 2014-03-19 17:58:45.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyright (C) 2012 SUSE Linux Products GmbH +# Copyright (C) 2012-2014 SUSE Linux Products GmbH # # Author: Frank Sundermeyer # @@ -51,14 +51,25 @@ #--------------- # Package-pdf, Package-html # -ifeq ($(TARGET),$(filter $(TARGET),package-pdf package-pdf-dir-name)) +ifeq ($(TARGET),$(filter $(TARGET),package-pdf package-pdf-dir-name showvariable)) PACKAGE_PDF_DIR := $(PACK_DIR)/pdf + PACKAGE_PDF_RESULT := $(PACKAGE_PDF_DIR)/$(DOCNAME)$(LANGSTRING).pdf DESKTOPFILES_RESULT := $(PACKAGE_PDF_DIR)/$(DOCNAME)$(LANGSTRING)-desktop.tar.bz2 DOCUMENTFILES_RESULT := $(PACKAGE_PDF_DIR)/$(DOCNAME)$(LANGSTRING).document PAGEFILES_RESULT := $(PACKAGE_PDF_DIR)/$(DOCNAME)$(LANGSTRING).page endif -ifeq ($(TARGET),$(filter $(TARGET),package-html package-html-dir-name online-docs)) - PACKAGE_HTML_DIR := $(PACK_DIR)/html +ifeq ($(TARGET),$(filter $(TARGET),package-html package-html-dir-name online-docs showvariable)) + ifeq ($(JSP),1) + PACKAGE_HTML_DIR := $(PACK_DIR)/jsp + PACKAGE_HTML_RESULT := $(PACKAGE_HTML_DIR)/$(DOCNAME)$(LANGSTRING)-jsp.tar.bz2 + else + PACKAGE_HTML_DIR := $(PACK_DIR)/html + ifeq ($(HTMLSINGLE),1) + PACKAGE_HTML_RESULT := $(PACKAGE_HTML_DIR)/$(DOCNAME)$(LANGSTRING)-single-html.tar.bz2 + else + PACKAGE_HTML_RESULT := $(PACKAGE_HTML_DIR)/$(DOCNAME)$(LANGSTRING)-html.tar.bz2 + endif + endif DESKTOPFILES_RESULT := $(PACKAGE_HTML_DIR)/$(DOCNAME)$(LANGSTRING)-desktop.tar.bz2 DOCUMENTFILES_RESULT := $(PACKAGE_HTML_DIR)/$(DOCNAME)$(LANGSTRING).document PAGEFILES_RESULT := $(PACKAGE_HTML_DIR)/$(DOCNAME)$(LANGSTRING).page 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/daps/make/misc.mk new/daps/make/misc.mk --- old/daps/make/misc.mk 2013-11-08 12:42:56.000000000 +0100 +++ new/daps/make/misc.mk 2014-04-23 15:07:42.000000000 +0200 @@ -74,13 +74,13 @@ stylecheck: $(BIGFILE) ifeq ($(SHOW),1) ifdef BROWSER - @docstylecheck.py --show $(BIGFILE) $(STYLECHECK_OUTFILE) + @sdsc --show $(BIGFILE) $(STYLECHECK_OUTFILE) else - @docstylecheck.py $(BIGFILE) $(STYLECHECK_OUTFILE) >/dev/null + @sdsc $(BIGFILE) $(STYLECHECK_OUTFILE) >/dev/null xdg-open $(STYLECHECK_OUTFILE) & endif else - @docstylecheck.py $(BIGFILE) $(STYLECHECK_OUTFILE) >/dev/null + @sdsc $(BIGFILE) $(STYLECHECK_OUTFILE) >/dev/null endif @ccecho "result" "Find the stylecheck report at:\n$(STYLECHECK_OUTFILE)" 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/daps/make/packaging.mk new/daps/make/packaging.mk --- old/daps/make/packaging.mk 2013-12-17 16:48:11.000000000 +0100 +++ new/daps/make/packaging.mk 2014-04-22 13:42:29.000000000 +0200 @@ -73,8 +73,8 @@ @echo -e "$(subst $(SPACE),\n,$(sort $(MISSING)))" exit 1 else - cp $(PDF_RESULT) $(PACKAGE_PDF_DIR)/$(DOCNAME)$(LANGSTRING).pdf - @ccecho "result" "Find the package-pdf results at:\n$(PACKAGE_PDF_DIR)" + cp $(PDF_RESULT) $(PACKAGE_PDF_RESULT) + @ccecho "result" "Find the package-pdf results at:\n$(PACKAGE_PDF_DIR)/" endif #-------------- @@ -85,15 +85,6 @@ .PHONY: package-html package-html: | $(PACKAGE_HTML_DIR) -ifeq ($(JSP),1) - package-html: TARBALL := $(PACKAGE_HTML_DIR)/$(DOCNAME)$(LANGSTRING)-jsp.tar.bz2 -else - ifeq ($(HTMLSINGLE),1) - package-html: TARBALL := $(PACKAGE_HTML_DIR)/$(DOCNAME)$(LANGSTRING)-single-html.tar.bz2 - else - package-html: TARBALL := $(PACKAGE_HTML_DIR)/$(DOCNAME)$(LANGSTRING)-html.tar.bz2 - endif -endif ifeq ($(DESKTOPFILES),1) package-html: $(DESKTOPFILES_RESULT) endif @@ -109,9 +100,9 @@ @echo -e "$(subst $(SPACE),\n,$(sort $(MISSING)))" exit 1 else - BZIP2="--best" tar cfhj $(TARBALL) -C $(dir $(HTML_DIR)) $(notdir $(HTML_DIR:%/=%)) + BZIP2="--best" tar cfhj $(PACKAGE_HTML_RESULT) -C $(dir $(HTML_DIR)) $(notdir $(HTML_DIR:%/=%)) ifeq ($(TARGET),package-html) - @ccecho "result" "Find the package-html results at:\n$(PACKAGE_HTML_DIR)" + @ccecho "result" "Find the package-html results at:\n$(PACKAGE_HTML_DIR)/" endif endif @@ -245,12 +236,16 @@ ifeq ($(VERBOSITY),2) @ccecho "info" "Creating online-docs graphics tarball..." endif + ifneq "$(strip $(PNGONLINE))" "" tar chf $(OD_GRAPHICS_TMP) --exclude-vcs --ignore-failed-read \ --absolute-names --transform=s%$(IMG_GENDIR)/color%images/src/png% \ $(IMG_GENDIR)/color/*.png + endif + ifneq "$(strip $(JPGONLINE))" "" tar rhf $(OD_GRAPHICS_TMP) --exclude-vcs --ignore-failed-read \ --absolute-names --transform=s%$(IMG_GENDIR)/color%images/src/jpg% \ $(IMG_GENDIR)/color/*.jpg + endif bzip2 -9f $(OD_GRAPHICS_TMP) else @ccecho "info" "Selected set or book contains no graphics" 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/daps/make/setfiles.mk new/daps/make/setfiles.mk --- old/daps/make/setfiles.mk 2013-06-12 16:53:21.000000000 +0200 +++ new/daps/make/setfiles.mk 2014-03-31 16:39:55.000000000 +0200 @@ -97,6 +97,14 @@ # XML source files for the currently used document (defined by the rootid) # ifdef ROOTSTRING + # check if ROOTID is a valid root element + # + ROOTELEMENT := $(shell xml sel -t -v "//div[@id='$(ROOTID)']/@remap" $(SETFILES_TMP)) + ifneq ($(ROOTELEMENT),$(filter $(ROOTELEMENT),$(VALID_ROOTELEMENTS))) + $(error Fatal error: ROOTID belongs to an unsupported root element ($(ROOTELEMENT)). Must be one of $(VALID_ROOTELEMENTS)) + endif + + DOCFILES := $(sort $(shell $(XSLTPROC) --stringparam "xml.or.img=xml" \ $(ROOTSTRING) --file $(SETFILES_TMP) \ --stylesheet $(DAPSROOT)/daps-xslt/common/extract-files-and-images.xsl $(XSLTPROCESSOR) )) 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/daps/man/xml/daps-envconvert.xml new/daps/man/xml/daps-envconvert.xml --- old/daps/man/xml/daps-envconvert.xml 2014-03-14 17:09:18.000000000 +0100 +++ new/daps/man/xml/daps-envconvert.xml 2014-04-23 15:07:42.000000000 +0200 @@ -4,7 +4,7 @@ "http://www.docbook.org/xml/4.5/docbookx.dtd" [ <!ENTITY daps_command "daps"> -<!ENTITY daps_version "2.0~beta4"> +<!ENTITY daps_version "2.0~beta5"> <!ENTITY daps_envconvert "daps-envconvert"> ]> <refentry lang="en" id="daps_envconvert"> 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/daps/man/xml/daps-init.xml new/daps/man/xml/daps-init.xml --- old/daps/man/xml/daps-init.xml 2014-03-14 17:09:18.000000000 +0100 +++ new/daps/man/xml/daps-init.xml 2014-04-23 15:07:42.000000000 +0200 @@ -4,7 +4,7 @@ "http://www.docbook.org/xml/4.5/docbookx.dtd" [ <!ENTITY daps_command "daps"> -<!ENTITY daps_version "2.0~beta4"> +<!ENTITY daps_version "2.0~beta5"> <!ENTITY daps_init "daps_init"> ]> <refentry lang="en" id="daps_init"> 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/daps/man/xml/daps.xml new/daps/man/xml/daps.xml --- old/daps/man/xml/daps.xml 2014-03-14 17:09:18.000000000 +0100 +++ new/daps/man/xml/daps.xml 2014-04-23 15:07:42.000000000 +0200 @@ -4,7 +4,7 @@ "http://www.docbook.org/xml/4.5/docbookx.dtd" [ <!ENTITY daps_command "daps"> - <!ENTITY daps_version "2.0~beta4"> + <!ENTITY daps_version "2.0~beta5"> ]> <refentry lang="en" id="daps"> 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/daps/missing new/daps/missing --- old/daps/missing 2013-12-04 16:35:10.000000000 +0100 +++ new/daps/missing 2014-04-23 15:07:42.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-01-06.18; # UTC +scriptversion=2012-06-26.16; # UTC -# Copyright (C) 1996-2012 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -29,61 +29,33 @@ exit 1 fi -run=: -sed_output='s/.* --output[ =]$[^ ]*$.*/\1/p' -sed_minuso='s/.* -o $[^ ]*$.*/\1/p' - -# In the cases where this matters, 'missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file 'aclocal.m4' - autoconf touch file 'configure' - autoheader touch file 'config.h.in' - autom4te touch the output file, or create a stub one - automake touch all 'Makefile.in' files - bison create 'y.tab.[ch]', if possible, from existing .[ch] - flex create 'lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create 'lex.yy.c', if possible, from existing .c - makeinfo touch the output file - yacc create 'y.tab.[ch]', if possible, from existing .[ch] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and 'g' are ignored when checking the name. @@ -98,228 +70,141 @@ ;; -*) - echo 1>&2 "$0: Unknown '$1' option" + echo 1>&2 "$0: unknown '$1' option" echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; +# Run the given program, remember its exit status. +"$@"; st=$? - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running '$TOOL --version' or '$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified 'acinclude.m4' or '${configure_ac}'. You might want - to install the Automake and Perl packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified '${configure_ac}'. You might want to install the - Autoconf and GNU m4 packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified 'acconfig.h' or '${configure_ac}'. You might want - to install the Autoconf and GNU m4 packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER($[^)]*$).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; +# If it succeeded, we are done. +test $st -eq 0 && exit 0 - automake*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'. - You might want to install the Automake and Perl packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te*) - echo 1>&2 "\ -WARNING: '$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get '$1' as part of Autoconf from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: '$1' $msg. You should only need it if - you modified a '.y' file. You may need the Bison package - in order for those modifications to take effect. You can get - Bison from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified a '.l' file. You may need the Flex package - in order for those modifications to take effect. You can get - Flex from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - Help2man package in order for those modifications to take - effect. You can get Help2man from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified a '.texi' or '.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy 'make' (AIX, - DU, IRIX). You might want to install the Texinfo package or - the GNU make package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* $[^ ]*$ *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - *) - echo 1>&2 "\ -WARNING: '$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the 'README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing '$1' program." - exit 1 - ;; -esac +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi -exit 0 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'automa4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) 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/daps/suse/xslt2005/xhtml/sections.xsl new/daps/suse/xslt2005/xhtml/sections.xsl --- old/daps/suse/xslt2005/xhtml/sections.xsl 2012-04-11 13:10:06.000000000 +0200 +++ new/daps/suse/xslt2005/xhtml/sections.xsl 2014-03-20 14:50:58.000000000 +0100 @@ -19,7 +19,7 @@ self::sect1 or self::sect2 or self::sect3 or - self::sect4]/@xml:base"/> + self::sect4][1]/@xml:base"/> <xsl:if test="$draft.mode = 'yes' and $xmlbase != ''"> <div class="filenameblock"> 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/daps/suse/xslt2013/static/css/style.css new/daps/suse/xslt2013/static/css/style.css --- old/daps/suse/xslt2013/static/css/style.css 2014-03-13 14:16:42.000000000 +0100 +++ new/daps/suse/xslt2013/static/css/style.css 2014-04-14 11:53:11.000000000 +0200 @@ -1428,7 +1428,7 @@ line-height: 15px; overflow: hidden; padding: 0 3px; - border-bottom: 1px solid #FFF; + border-bottom: 1px solid transparent; background-color: #EEE; text-transform: uppercase; display: inline-block; @@ -1902,7 +1902,6 @@ max-width: 100%; min-height: 60px; text-align: center; - color: #999; margin: 24px 0 -9px; overflow: hidden; position: relative; @@ -1916,16 +1915,13 @@ text-align: center; color: #999; padding: 12px 10px; - background-color: #333; + background-color: #FFF; overflow: hidden; - border-top: 1px solid #202020; - border-left: 1px solid #202020; - border-right: 1px solid #202020; + border: 1px solid #EFEFF0; } .figure img { padding: 0; - background-color: #FFF; width: auto; margin: 0 auto; /* Please clean this mess out in ~2014 -- leave only the line with "calc" in there */ @@ -1934,7 +1930,7 @@ max-width: calc(100% - 2px); max-width: -moz-calc(100% - 2px); max-width: -webkit-calc(100% - 2px); - display: block; /* inline images weirdly have some whitespace below them, thus block'ing */ + display: block; /* inline images weirdly have some whitespace below them, thus blocking */ } .figure-title { @@ -1944,21 +1940,11 @@ } div.figure .figure-title-wrap { - background-color: #202020; + background-color: #EFEFF0; width: 100%; overflow: hidden; } -div.figure .number, div.figure .permalink:hover, div.figure .permalink:focus, div.figure .permalink:active { - color: #76AD2D; - text-decoration: none; - font-weight: normal; -} - -div.figure .name, div.figure .permalink { - color: #FFF; -} - .informalfigure img { min-width: 50px; max-width: 100%; @@ -1966,7 +1952,7 @@ color: #999; margin: 17px 0 24px; padding: 1px; - border: 1px solid #202020; + border: 1px solid #EFEFF0; width: auto; } @@ -2333,6 +2319,36 @@ font-size: 22px; } +.hidden { + background-color: #E3C1C1; + position: static; + margin-top: 20px; + margin-left: -10px; + margin-right: -10px; + padding-left: 10px; + padding-right: 10px; + padding-bottom: 10px; +} + +.hidden:before { + content: 'Hidden'; + display: block; + float: left; + background-color: #8C0000; + color: #FFF; + padding: 3px 5px; + margin-top: 10px; +} + +.hidden .hidden { + margin-top: 0; + padding-bottom: 0; +} + +.hidden .hidden:before { + content: none; +} + body.draft { background: url(../images/draft.png) no-repeat fixed left 50%; } 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/daps/suse/xslt2013/static-daps/css/style.css new/daps/suse/xslt2013/static-daps/css/style.css --- old/daps/suse/xslt2013/static-daps/css/style.css 2014-03-13 14:16:42.000000000 +0100 +++ new/daps/suse/xslt2013/static-daps/css/style.css 2014-04-14 11:53:11.000000000 +0200 @@ -1901,7 +1901,6 @@ max-width: 100%; min-height: 60px; text-align: center; - color: #999; margin: 24px 0 -9px; overflow: hidden; position: relative; @@ -1915,16 +1914,13 @@ text-align: center; color: #999; padding: 12px 10px; - background-color: #333; + background-color: #FFF; overflow: hidden; - border-top: 1px solid #202020; - border-left: 1px solid #202020; - border-right: 1px solid #202020; + border: 1px solid #EFEFF0; } .figure img { padding: 0; - background-color: #FFF; width: auto; margin: 0 auto; /* Please clean this mess out in ~2014 -- leave only the line with "calc" in there */ @@ -1932,7 +1928,7 @@ max-width: calc(100% - 2px); max-width: -moz-calc(100% - 2px); max-width: -webkit-calc(100% - 2px); - display: block; /* inline images weirdly have some whitespace below them, thus block'ing */ + display: block; /* inline images weirdly have some whitespace below them, thus blocking */ } .figure-title { @@ -1942,28 +1938,18 @@ } div.figure .figure-title-wrap { - background-color: #202020; + background-color: #EFEFF0; width: 100%; overflow: hidden; } -div.figure .number, div.figure .permalink:hover, div.figure .permalink:focus, div.figure .permalink:active { - color: #729FCF; - text-decoration: none; - font-weight: normal; -} - -div.figure .name, div.figure .permalink { - color: #FFF; -} - .informalfigure img { max-width: 100%; display: block; /* inline images weirdly have some whitespace below them, thus block'ing */ color: #999; margin: 17px 0 24px; padding: 1px; - border: 1px solid #202020; + border: 1px solid #EFEFF0; width: auto; } @@ -2330,6 +2316,36 @@ font-size: 22px; } +.hidden { + background-color: #E3C1C1; + position: static; + margin-top: 20px; + margin-left: -10px; + margin-right: -10px; + padding-left: 10px; + padding-right: 10px; + padding-bottom: 10px; +} + +.hidden:before { + content: 'Hidden'; + display: block; + float: left; + background-color: #8C0000; + color: #FFF; + padding: 3px 5px; + margin-top: 10px; +} + +.hidden .hidden { + margin-top: 0; + padding-bottom: 0; +} + +.hidden .hidden:before { + content: none; +} + body.draft { background: url(../images/draft.png) no-repeat fixed left 50%; } 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/daps/suse/xslt2013/xhtml/html.xsl new/daps/suse/xslt2013/xhtml/html.xsl --- old/daps/suse/xslt2013/xhtml/html.xsl 2012-11-07 13:47:52.000000000 +0100 +++ new/daps/suse/xslt2013/xhtml/html.xsl 2014-03-26 19:16:38.000000000 +0100 @@ -36,4 +36,24 @@ </xsl:choose> </xsl:template> -</xsl:stylesheet> \ No newline at end of file + +  + <xsl:template name="common.html.attributes"> + <xsl:param name="inherit" select="0"/> + <xsl:param name="class"> + <xsl:value-of select="local-name(.)"/> + <xsl:text> </xsl:text> + <xsl:if test="($draft.mode = 'yes' or $draft.mode = 'maybe') + and normalize-space(@os) = 'hidden'"> + <xsl:value-of select="@os"/> + </xsl:if> + </xsl:param> + + <xsl:apply-templates select="." mode="common.html.attributes"> + <xsl:with-param name="class" select="$class"/> + <xsl:with-param name="inherit" select="$inherit"/> + </xsl:apply-templates> + </xsl:template> + +</xsl:stylesheet> 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/daps/suse/xslt2013/xhtml/sections.xsl new/daps/suse/xslt2013/xhtml/sections.xsl --- old/daps/suse/xslt2013/xhtml/sections.xsl 2013-09-25 13:27:58.000000000 +0200 +++ new/daps/suse/xslt2013/xhtml/sections.xsl 2014-03-20 15:59:22.000000000 +0100 @@ -229,10 +229,18 @@ <xsl:call-template name="create.permalink"> <xsl:with-param name="object" select="$section"/> </xsl:call-template> + <xsl:call-template name="create.header.line"> + <xsl:with-param name="object" select="$section"/> + </xsl:call-template> </xsl:element> <xsl:call-template name="debug.filename-id"/> </xsl:template> + +<xsl:template name="create.header.line"> + <xsl:param name="object" select="."/> +</xsl:template> + <xsl:template name="debug.filename-id"> <xsl:param name="node" select="."/> <xsl:variable name="xmlbase" @@ -245,7 +253,7 @@ self::sect1 or self::sect2 or self::sect3 or - self::sect4]/@xml:base"/> + self::sect4][1]/@xml:base"/> <xsl:if test="$draft.mode = 'yes' and $xmlbase != ''"> <div class="doc-status"> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit crmsh for openSUSE:Factory
by root＠hilbert.suse.de 02 May '14

02 May '14

Hello community, here is the log from the commit of package crmsh for openSUSE:Factory checked in at 2014-05-02 13:54:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/crmsh (Old) and /work/SRC/openSUSE:Factory/.crmsh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "crmsh" Changes: -------- --- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2014-04-20 11:36:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2014-05-02 13:54:47.000000000 +0200 @@ -1,0 +2,12 @@ +Wed Apr 30 09:10:19 UTC 2014 - kgronlund(a)suse.com + +- ui: Fix garbage characters in prompt (bnc#875788) +- report: Resolve datetime/timestamp mixup (bnc#874162) +- parse: Fix check for action/role in resource set parser (bnc#875787) +- site: pass --force flag through to crm_ticket (bnc#873200) +- cibconf: add comments in the right order (bnc#866434) +- parse: Unify API for err() (bnc#875791) +- crm: Check and complain about python version < 2.6 +- upstream: 2.0.0-38-gc2e94fe366a3 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ crmsh.spec ++++++ --- /var/tmp/diff_new_pack.GxHnEl/_old 2014-05-02 13:54:48.000000000 +0200 +++ /var/tmp/diff_new_pack.GxHnEl/_new 2014-05-02 13:54:48.000000000 +0200 @@ -41,7 +41,7 @@ Summary: High Availability cluster command-line interface License: GPL-2.0+ Group: %{pkg_group} -Version: 2.0+git18 +Version: 2.0+git38 Release: %{?crmsh_release}%{?dist} Url: http://crmsh.github.io Source0: crmsh.tar.bz2 ++++++ crmsh.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/crm new/crmsh/crm --- old/crmsh/crm 2014-04-11 09:31:00.000000000 +0200 +++ new/crmsh/crm 2014-04-30 10:46:19.000000000 +0200 @@ -18,7 +18,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -minimum_version = '2.4' +minimum_version = '2.6' import sys from distutils import version diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/modules/clidisplay.py new/crmsh/modules/clidisplay.py --- old/crmsh/modules/clidisplay.py 2014-04-11 09:31:00.000000000 +0200 +++ new/crmsh/modules/clidisplay.py 2014-04-30 10:46:19.000000000 +0200 @@ -65,6 +65,11 @@ return s + "${RLIGNOREBEGIN}${NORMAL}${RLIGNOREEND}" return s + def prompt_noreadline(self, s): + if self.colors_enabled(): + return "${GREEN}${BOLD}" + s + "${NORMAL}" + return s + def help_header(self, s): return self._colorize(s, config.color.help_header) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/modules/main.py new/crmsh/modules/main.py --- old/crmsh/modules/main.py 2014-04-11 09:31:00.000000000 +0200 +++ new/crmsh/modules/main.py 2014-04-30 10:46:19.000000000 +0200 @@ -291,17 +291,19 @@ rc = 0 while True: try: + rendered_prompt = vars.prompt if options.interactive and not options.batch: # TODO: fix how color interacts with readline, # seems the color prompt messes it up termctrl = TerminalController.getInstance() cli_display = CliDisplay.getInstance() promptstr = "crm(%s)%s# " % (cib_prompt(), context.prompt()) + vars.prompt = promptstr if cli_display.colors_enabled(): - vars.prompt = termctrl.render(cli_display.prompt(promptstr)) + rendered_prompt = termctrl.render(cli_display.prompt(promptstr)) else: - vars.prompt = promptstr - inp = utils.multi_input(vars.prompt) + rendered_prompt = promptstr + inp = utils.multi_input(rendered_prompt) if inp is None: if options.interactive: rc = 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/modules/parse.py new/crmsh/modules/parse.py --- old/crmsh/modules/parse.py 2014-04-11 09:31:00.000000000 +0200 +++ new/crmsh/modules/parse.py 2014-04-30 10:46:19.000000000 +0200 @@ -977,8 +977,7 @@ def __init__(self, type, s, parent): self.parent = parent - self.type = type - self.q_attr = (type == "order") and "action" or "role" + self.q_attr = type self.tokens = s self.cli_list = [] self.reset_set() @@ -1046,9 +1045,9 @@ l = [p, ''] return l - def err(self, token, errmsg): + def err(self, errmsg, token=''): syntax_err(self.parent._cmd, - context=self.type, + context=self.q_attr, token=token, msg=errmsg) raise ParseError @@ -1056,19 +1055,19 @@ def update_attrs(self, bracket, tokpos): if bracket in ('(', '['): if self.opened: - self.err(token=self.tokens[tokpos], - errmsg='Cannot nest resource sets') + self.err('Cannot nest resource sets', + token=self.tokens[tokpos]) self.sequential = False if bracket == '[': self.require_all = False self.opened = bracket elif bracket in (')', ']'): if not self.opened: - self.err(token=self.tokens[tokpos], - errmsg='Unmatched closing bracket') + self.err('Unmatched closing bracket', + token=self.tokens[tokpos]) if bracket != self.matching[self.opened]: - self.err(token=self.tokens[tokpos], - errmsg='Mismatched closing bracket') + self.err('Mismatched closing bracket', + token=self.tokens[tokpos]) self.sequential = True self.require_all = True self.opened = '' @@ -1086,15 +1085,15 @@ if p in self.close_set: # empty sets not allowed if not self.set_pl: - self.err(token=self.tokens[tokpos], - errmsg='Empty resource set') + self.err('Empty resource set', + token=self.tokens[tokpos]) self.save_set() self.update_attrs(p, tokpos) continue if '=' in p: if not self.parseattr(p): - self.err(token=self.tokens[tokpos], - errmsg='Unknown attribute') + self.err('Unknown attribute', + token=self.tokens[tokpos]) continue rsc, q = self.splitrsc(p) if q != self.prev_q: # one set can't have different roles/actions @@ -1107,8 +1106,8 @@ self.curr_attr = '' self.set_pl.append(["resource_ref", ["id", rsc]]) if self.opened: # no close - self.err(token=self.tokens[tokpos], - errmsg='Unmatched opening bracket') + self.err('Unmatched opening bracket', + token=self.tokens[tokpos]) if self.set_pl: # save the final set self.save_set() ret = self.cli_list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/modules/report.py new/crmsh/modules/report.py --- old/crmsh/modules/report.py 2014-04-11 09:31:00.000000000 +0200 +++ new/crmsh/modules/report.py 2014-04-30 10:46:19.000000000 +0200 @@ -64,18 +64,33 @@ def set_year(ts=None): + ''' + ts: optional time in seconds + ''' global YEAR YEAR = time.strftime("%Y", time.localtime(ts)) common_debug("setting year to %s (ts: %s)" % (YEAR, str(ts))) +def make_datetime(t): + ''' + t: time in seconds / datetime / other + returns: datetime object + ''' + if t is None: + return None + elif isinstance(t, datetime.datetime): + return t + return datetime.datetime.fromtimestamp(t) + + def syslog_ts(s): try: # strptime defaults year to 1900 (sigh) # strptime returns a time_struct tm = time.strptime(' '.join([YEAR] + s.split()[0:3]), "%Y %b %d %H:%M:%S") - return datetime.datetime.fromtimestamp(time.mktime(tm)) + return make_datetime(time.mktime(tm)) except: # try the rfc5424 try: return parse_time(s.split()[0]) @@ -141,7 +156,7 @@ badline = 0 maxbadline = 10 common_debug("seek %s:%s in %s" % - (time.ctime(ts), + (ts, to_end and "end" or "start", f.name)) while first <= last: @@ -291,12 +306,8 @@ find out start/end file positions. Logs need to be already open. ''' - if isinstance(from_dt, datetime.datetime): - self.from_ts = convert_dt(from_dt) - self.to_ts = convert_dt(to_dt) - else: - self.from_ts = from_dt - self.to_ts = to_dt + self.from_ts = make_datetime(from_dt) + self.to_ts = make_datetime(to_dt) bad_logs = [] for log in self.f: f = self.f[log] @@ -385,7 +396,7 @@ l.append(top_line[first]) top_line[first] = self.get_match_line(fl[first], patt)[0] if not top_line[first]: - top_line_ts[first] = time.time() + top_line_ts[first] = datetime.datetime.now() else: top_line_ts[first] = syslog_ts(top_line[first]) return l @@ -532,7 +543,7 @@ else: common_warn("end of transition %s not found in logs (transition not complete yet?)" % self) - self.end_ts = time.time() + self.end_ts = datetime.datetime.now() def actions_count(self): if self.run_msg: @@ -1290,7 +1301,7 @@ myts = min([syslog_ts(x) for x in first_log_lines(self.log_l)]) elif whence == "bottom": myts = max([syslog_ts(x) for x in last_log_lines(self.log_l)]) - return datetime.datetime.fromtimestamp(myts) + return myts except: return None diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/modules/ui_configure.py new/crmsh/modules/ui_configure.py --- old/crmsh/modules/ui_configure.py 2014-04-11 09:31:00.000000000 +0200 +++ new/crmsh/modules/ui_configure.py 2014-04-30 10:46:19.000000000 +0200 @@ -26,6 +26,8 @@ import xmlutil import ra from cibconfig import mkset_obj, CibFactory +from clidisplay import CliDisplay +from term import TerminalController import options from msg import ErrorBuffer from msg import common_err, common_info, common_warn @@ -143,7 +145,13 @@ import readline cmdline = readline.get_line_buffer() print "\n%s" % helptxt - print "%s%s" % (vars.prompt, cmdline), + cli_display = CliDisplay.getInstance() + if cli_display.colors_enabled(): + termctrl = TerminalController.getInstance() + print "%s%s" % (termctrl.render(cli_display.prompt_noreadline(vars.prompt)), + cmdline), + else: + print "%s%s" % (vars.prompt, cmdline), cls.laststamp = time.time() cls.lasttopic = topic diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/modules/ui_site.py new/crmsh/modules/ui_site.py --- old/crmsh/modules/ui_site.py 2014-04-11 09:31:00.000000000 +0200 +++ new/crmsh/modules/ui_site.py 2014-04-30 10:46:19.000000000 +0200 @@ -19,17 +19,18 @@ import time import command import completers as compl +import config import utils from msg import no_prog_err _ticket_commands = { - 'grant': "crm_ticket -t '%s' -g", - 'revoke': "crm_ticket -t '%s' -r", - 'delete': "crm_ticket -t '%s' -D granted", - 'standby': "crm_ticket -t '%s' -s", - 'activate': "crm_ticket -t '%s' -a", - 'show': "crm_ticket -t '%s' -G granted", - 'time': "crm_ticket -t '%s' -G last-granted", + 'grant': "%s -t '%s' -g", + 'revoke': "%s -t '%s' -r", + 'delete': "%s -t '%s' -D granted", + 'standby': "%s -t '%s' -s", + 'activate': "%s -t '%s' -a", + 'show': "%s -t '%s' -G granted", + 'time': "%s -t '%s' -G last-granted", } @@ -68,14 +69,19 @@ @command.completers(compl.choice(_ticket_commands.keys())) def do_ticket(self, context, subcmd, ticket): "usage: ticket {grant|revoke|standby|activate|show|time|delete} <ticket>" + + base_cmd = "crm_ticket" + if config.core.force: + base_cmd += " --force" + attr_cmd = _ticket_commands.get(subcmd) if not attr_cmd: context.fatal_error('Expected one of %s' % '|'.join(_ticket_commands.keys())) if not utils.is_name_sane(ticket): return False if subcmd not in ("show", "time"): - return utils.ext_cmd(attr_cmd % ticket) == 0 - rc, l = utils.stdout2list(attr_cmd % ticket) + return utils.ext_cmd(attr_cmd % (base_cmd, ticket)) == 0 + rc, l = utils.stdout2list(attr_cmd % (base_cmd, ticket)) try: val = l[0] except IndexError: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/modules/utils.py new/crmsh/modules/utils.py --- old/crmsh/modules/utils.py 2014-04-11 09:31:00.000000000 +0200 +++ new/crmsh/modules/utils.py 2014-04-30 10:46:19.000000000 +0200 @@ -22,6 +22,7 @@ import re import glob import time +import datetime import shutil import bz2 import config @@ -746,10 +747,14 @@ def shorttime(ts): + if isinstance(ts, datetime.datetime): + return ts.strftime("%X") return time.strftime("%X", time.localtime(ts)) def shortdate(ts): + if isinstance(ts, datetime.datetime): + return ts.strftime("%F") return time.strftime("%F", time.localtime(ts)) @@ -1012,7 +1017,6 @@ common_err("%s: %s" % (t, msg)) return None except ImportError, msg: - import datetime try: tm = time.strptime(t) dt = datetime.datetime(*tm[0:7]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/modules/xmlutil.py new/crmsh/modules/xmlutil.py --- old/crmsh/modules/xmlutil.py 2014-04-11 09:31:00.000000000 +0200 +++ new/crmsh/modules/xmlutil.py 2014-04-30 10:46:19.000000000 +0200 @@ -706,7 +706,9 @@ def stuff_comments(node, comments): - for s in comments: + if not comments: + return + for s in reversed(comments): add_comment(node, s) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/test/unittests/test_parse.py new/crmsh/test/unittests/test_parse.py --- old/crmsh/test/unittests/test_parse.py 2014-04-11 09:31:00.000000000 +0200 +++ new/crmsh/test/unittests/test_parse.py 2014-04-30 10:46:19.000000000 +0200 @@ -216,6 +216,9 @@ self.assertEqual(out.resource, 'thing') self.assertEqual(out.score, None) + out = self.parser.parse('location l { a:foo b:bar }') + self.assertFalse(out) + def test_colocation(self): out = self.parser.parse('colocation col-1 inf: foo:master ( bar wiz sequential=yes )') self.assertEqual(out.id, 'col-1') @@ -270,6 +273,9 @@ out = self.parser.parse('order c_apache_1 Mandatory: apache:start ip_1') self.assertEqual(out.id, 'c_apache_1') + out = self.parser.parse('order c_apache_2 Mandatory: apache:start ip_1 ip_2 ip_3') + self.assertEqual(out.id, 'c_apache_2') + out = self.parser.parse('order o1 Serialize: A ( B C )') self.assertEqual(out.id, 'o1') -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit crash for openSUSE:Factory
by root＠hilbert.suse.de 02 May '14

02 May '14

Hello community, here is the log from the commit of package crash for openSUSE:Factory checked in at 2014-05-02 13:54:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/crash (Old) and /work/SRC/openSUSE:Factory/.crash.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "crash" Changes: -------- --- /work/SRC/openSUSE:Factory/crash/crash.changes 2014-02-21 06:55:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.crash.new/crash.changes 2014-05-02 13:54:42.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 30 07:58:01 UTC 2014 - ptesarik(a)suse.cz + +- crash-x86_64-nested-nmi.patch: Fix NMI backtrace for kernels + patched to handle nested NMIs (bnc#874179). + +------------------------------------------------------------------- New: ---- crash-x86_64-nested-nmi.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ crash.spec ++++++ --- /var/tmp/diff_new_pack.2ZCqnm/_old 2014-05-02 13:54:43.000000000 +0200 +++ /var/tmp/diff_new_pack.2ZCqnm/_new 2014-05-02 13:54:43.000000000 +0200 @@ -70,6 +70,7 @@ Patch11: %{name}-compressed-booted-kernel.patch Patch12: eppic-switch-to-system-lib.patch Patch13: %{name}-patch-gdb.patch +Patch14: %{name}-x86_64-nested-nmi.patch Patch90: %{name}-sial-ps-2.6.29.diff BuildRequires: bison BuildRequires: flex @@ -82,7 +83,7 @@ # Source code says it can do ppc32. Excluded here? ExcludeArch: ppc # crash driver KMP -%if %build_kmp +%if 0%{?build_kmp} BuildRequires: kernel-syms BuildRequires: module-init-tools %if 0%{?suse_version} >= 1130 @@ -90,7 +91,7 @@ %endif %endif -%if %build_kmp +%if 0%{?build_kmp} %if 0%{?suse_version} >= 920 %suse_kernel_module_package -n crash -p %_sourcedir/%{name}-kmp-preamble um %define arch %_target_cpu @@ -221,7 +222,7 @@ %endif -%if %build_kmp +%if 0%{?build_kmp} %package %kmp_pkg Summary: Memory driver for the crash utility @@ -255,6 +256,7 @@ %patch10 -p1 %patch11 -p1 %patch13 -p1 +%patch14 -p1 ## GDB patches for f in %{S:100} %{S:101} %{S:102} %{S:103} %{S:104} \ %{S:105} %{S:106} %{S:107} %{S:108} %{S:109} ; do @@ -278,7 +280,7 @@ export GDB="gdb-%{gdb_version}" make RPMPKG="`cat .rh_rpm_package`" %{?jobs:-j%jobs} make extensions %{?jobs:-j%jobs} -%if %build_kmp +%if 0%{?build_kmp} export EXTRA_CFLAGS='-DVERSION=\"%version\"' for flavor in %flavors_to_build; do rm -rf kbuild/$flavor @@ -316,7 +318,7 @@ install -m 0644 sial-scripts-%{scripts_version}/*.c \ $RPM_BUILD_ROOT/%{_datadir}/sial/crash %endif -%if %build_kmp +%if 0%{?build_kmp} # memory driver module export INSTALL_MOD_PATH=$RPM_BUILD_ROOT export INSTALL_MOD_DIR=updates @@ -396,7 +398,7 @@ %doc extensions/README.gcore %endif -%if build_kmp +%if 0%{?build_kmp} %if 0%{?suse_version} < 920 %files %kmp_pkg ++++++ crash-x86_64-nested-nmi.patch ++++++ From: Petr Tesarik <ptesarik(a)suse.cz> Subject: Fix NMI backtrace for kernels patched to handle nested NMIs References: bnc#874179 Patch-mainline: not yet Kernel commit 3f3c8b8c4b2a34776c3470142a7c8baafcda6eb0 changed the NMI stack layout, adding 12 more values on the stack. The fix has two parts: 1. Determine if this kernel has the nested NMI layout and set a machine-specific flag (NESTED_NMI) if it does. 2. When backtracing an NMI stack, use the saved values instead of those found at the top of stack. Additionally, kernel commit 28696f434fef0efa97534b59986ad33b9c4df7f8 changed the stack layout again, swapping the location of the "saved" and "copied" registers. This can be detected automatically, because the "copied" registers contain either a copy of the "saved" registers, or point to repeat_nmi. So, if restart_nmi is found as the return address, assume that this is the old layout and adjust the stack pointer again. Signed-off-by: Petr Tesarik <ptesarik(a)suse.cz> --- defs.h | 1 x86_64.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++--------------- 2 files changed, 57 insertions(+), 17 deletions(-) --- a/defs.h +++ b/defs.h @@ -5090,6 +5090,7 @@ struct machine_specific { #define VM_XEN_RHEL4 (0x100) #define FRAMEPOINTER (0x200) #define GART_REGION (0x400) +#define NESTED_NMI (0x800) #define VM_FLAGS (VM_ORIG|VM_2_6_11|VM_XEN|VM_XEN_RHEL4) --- a/x86_64.c +++ b/x86_64.c @@ -468,6 +468,8 @@ x86_64_init(int when) else x86_64_per_cpu_init(); x86_64_ist_init(); + if (symbol_exists("repeat_nmi")) + machdep->flags |= NESTED_NMI; machdep->in_alternate_stack = x86_64_in_alternate_stack; if ((machdep->machspec->irqstack = (char *) malloc(machdep->machspec->stkinfo.isize)) == NULL) @@ -3009,6 +3011,8 @@ in_exception_stack: } stacktop = bt->stacktop - SIZE(pt_regs); + if ((machdep->flags & NESTED_NMI) && estack_index == NMI_STACK) + stacktop -= 12*sizeof(ulong); bt->flags &= ~BT_FRAMESIZE_DISABLE; @@ -3046,21 +3050,37 @@ in_exception_stack: } cs = x86_64_exception_frame(EFRAME_PRINT|EFRAME_CS, 0, - bt->stackbuf + (bt->stacktop - bt->stackbase) - - SIZE(pt_regs), bt, ofp); + bt->stackbuf + (stacktop - bt->stackbase), + bt, ofp); if (!BT_REFERENCE_CHECK(bt)) fprintf(fp, "--- <%s exception stack> ---\n", x86_64_exception_stacks[estack_index]); - /* - * stack = (unsigned long *) estack_end[-2]; + /* + * Find the CPU-saved, or handler-saved registers */ up = (ulong *)(&bt->stackbuf[bt->stacktop - bt->stackbase]); - up -= 2; - rsp = bt->stkptr = *up; - up -= 3; - bt->instptr = *up; + up -= 5; + if ((machdep->flags & NESTED_NMI) && + estack_index == NMI_STACK && + bt->stkptr <= bt->stacktop - 17*sizeof(ulong)) { + up -= 12; + /* Copied and saved regs are swapped in pre-3.8 kernels */ + if (*up == symbol_value("repeat_nmi")) + up += 5; + } + + /* Registers (as saved by CPU): + * + * up[4] SS + * up[3] RSP + * up[2] RFLAGS + * up[1] CS + * up[0] RIP + */ + rsp = bt->stkptr = up[3]; + bt->instptr = up[0]; if (cs & 3) done = TRUE; /* user-mode exception */ else @@ -3513,27 +3533,46 @@ in_exception_stack: } stacktop = bt->stacktop - SIZE(pt_regs); - + if ((machdep->flags & NESTED_NMI) && + estack_index == NMI_STACK) + stacktop -= 12*sizeof(ulong); + if (!done) { level = dwarf_backtrace(bt, level, stacktop); done = TRUE; } cs = x86_64_exception_frame(EFRAME_PRINT|EFRAME_CS, 0, - bt->stackbuf + (bt->stacktop - bt->stackbase) - - SIZE(pt_regs), bt, ofp); + bt->stackbuf + (stacktop - bt->stackbase), + bt, ofp); if (!BT_REFERENCE_CHECK(bt)) fprintf(fp, "--- <exception stack> ---\n"); - /* - * stack = (unsigned long *) estack_end[-2]; + /* + * Find the CPU-saved, or handler-saved registers */ up = (ulong *)(&bt->stackbuf[bt->stacktop - bt->stackbase]); - up -= 2; - rsp = bt->stkptr = *up; - up -= 3; - bt->instptr = *up; + up -= 5; + if ((machdep->flags & NESTED_NMI) && + estack_index == NMI_STACK && + bt->stkptr <= bt->stacktop - 17*sizeof(ulong)) { + up -= 12; + /* Copied and saved regs are swapped in pre-3.8 kernels */ + if (*up == symbol_value("repeat_nmi")) + up += 5; + } + + /* Registers (as saved by CPU): + * + * up[4] SS + * up[3] RSP + * up[2] RFLAGS + * up[1] CS + * up[0] RIP + */ + rsp = bt->stkptr = up[3]; + bt->instptr = up[0]; if (cs & 3) done = TRUE; /* user-mode exception */ else -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0