openSUSE Commits
Threads by month
- ----- 2024 -----
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
October 2015
- 1 participants
- 1896 discussions
Hello community,
here is the log from the commit of package suitesparse for openSUSE:Factory checked in at 2015-10-01 12:21:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/suitesparse (Old)
and /work/SRC/openSUSE:Factory/.suitesparse.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "suitesparse"
Changes:
--------
--- /work/SRC/openSUSE:Factory/suitesparse/suitesparse.changes 2015-04-07 09:28:22.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.suitesparse.new/suitesparse.changes 2015-10-01 12:21:55.000000000 +0200
@@ -1,0 +2,12 @@
+Wed Sep 23 08:26:49 UTC 2015 - foss(a)grueninger.de
+
+- Update to version 4.4.5
+ + CHOLMOD 3.0.6:
+ * minor fix to CHOLMOD (-DNGPL did not work as expected)
+ * added MATLAB interface for row add/delete (lurowmod)
+ + KLU 1.3.3: Fix for klu_dump.c (debugging case only)
+ + UFcollection: added additional stats for matrix collection
+ + AMD: changed the license. Was LGPL only, now either LGPL or BSD,
+ at the user's option. See AMD/Doc/License.txt for details.
+
+-------------------------------------------------------------------
Old:
----
SuiteSparse-4.4.4.tar.gz
New:
----
SuiteSparse-4.4.5.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ suitesparse.spec ++++++
--- /var/tmp/diff_new_pack.OrU2ZP/_old 2015-10-01 12:21:56.000000000 +0200
+++ /var/tmp/diff_new_pack.OrU2ZP/_new 2015-10-01 12:21:56.000000000 +0200
@@ -20,7 +20,7 @@
Summary: A collection of sparse matrix libraries
License: GPL-2.0+ and LGPL-2.1+
Group: Development/Libraries
-Version: 4.4.4
+Version: 4.4.5
Release: 0
Url: http://www.cise.ufl.edu/research/sparse/SuiteSparse
Source: SuiteSparse-%{version}.tar.gz
@@ -43,14 +43,14 @@
%define ccolamdso 2_9_1
%define colamdver 2.9.1
%define colamdso 2_9_1
-%define cholmodver 3.0.5
-%define cholmodso 3_0_5
+%define cholmodver 3.0.6
+%define cholmodso 3_0_6
%define csparsever 3.1.4
%define csparseso 3_1_4
%define cxsparsever 3.1.4
%define cxsparseso 3_1_4
-%define kluver 1.3.2
-%define kluso 1_3_2
+%define kluver 1.3.3
+%define kluso 1_3_3
%define ldlver 2.2.1
%define ldlso 2_2_1
%define rbiover 2.2.1
@@ -61,8 +61,8 @@
%define umfpackso 5_7_1
# Your need define even it's just the same as main package
# or the %%build loop will override %%version with umfpack's version.
-%define configver 4.4.4
-%define configso 4_4_4
+%define configver 4.4.5
+%define configso 4_4_5
%define amdlib libamd-%{amdso}
%define btflib libbtf-%{btfso}
%define camdlib libcamd-%{camdso}
++++++ SuiteSparse-4.4.4.tar.gz -> SuiteSparse-4.4.5.tar.gz ++++++
/work/SRC/openSUSE:Factory/suitesparse/SuiteSparse-4.4.4.tar.gz /work/SRC/openSUSE:Factory/.suitesparse.new/SuiteSparse-4.4.5.tar.gz differ: char 5, line 1
1
0
Hello community,
here is the log from the commit of package python-numpy for openSUSE:Factory checked in at 2015-10-01 12:21:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-numpy (Old)
and /work/SRC/openSUSE:Factory/.python-numpy.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-numpy"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-numpy/python-numpy-doc.changes 2015-03-05 18:15:01.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.python-numpy.new/python-numpy-doc.changes 2015-10-01 12:21:44.000000000 +0200
@@ -1,0 +2,14 @@
+Wed Sep 23 07:31:55 UTC 2015 - toddrme2178(a)gmail.com
+
+- update to version 1.9.3:
+ * #5866: fix error finding Python headers when build_ext --include-dirs is set;
+ * #6016: fix np.loadtxt error on Python 3.5 when reading from gzip files;
+ * #5555: Replace deprecated options for ifort;
+ * #6096: remove /GL for VS2015 in check_long_double_representation;
+ * #6141: enable Visual Studio 2015 C99 features;
+ * #6171: revert C99 complex for MSVC14.
+- Fix latex dependencies.
+- Disable building of latex packages on distros that don't support it
+- Disable building of latex packages entirely since it is currently broken
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/python-numpy/python-numpy.changes 2015-03-05 18:15:01.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.python-numpy.new/python-numpy.changes 2015-10-01 12:21:44.000000000 +0200
@@ -1,0 +2,11 @@
+Wed Sep 23 07:31:55 UTC 2015 - toddrme2178(a)gmail.com
+
+- update to version 1.9.3:
+ * #5866: fix error finding Python headers when build_ext --include-dirs is set;
+ * #6016: fix np.loadtxt error on Python 3.5 when reading from gzip files;
+ * #5555: Replace deprecated options for ifort;
+ * #6096: remove /GL for VS2015 in check_long_double_representation;
+ * #6141: enable Visual Studio 2015 C99 features;
+ * #6171: revert C99 complex for MSVC14.
+
+-------------------------------------------------------------------
Old:
----
numpy-1.9.2.tar.gz
New:
----
numpy-1.9.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-numpy-doc.spec ++++++
--- /var/tmp/diff_new_pack.P42vW9/_old 2015-10-01 12:21:45.000000000 +0200
+++ /var/tmp/diff_new_pack.P42vW9/_new 2015-10-01 12:21:45.000000000 +0200
@@ -19,7 +19,7 @@
%define modname numpy
Name: python-numpy-doc
%define docname numpydoc
-Version: 1.9.2
+Version: 1.9.3
Release: 0
%define docvers 0.4
Url: http://www.numpy.org/
@@ -39,8 +39,19 @@
BuildRequires: python-matplotlib
BuildRequires: python-numpy-devel
BuildRequires: python-numpydoc
-BuildRequires: texlive-latex
BuildRequires: zip
+# LaTeX requirements, not available on SLES
+%if 0%{?suse_version} > 1110 && 0%{?suse_version} != 1315
+BuildRequires: python-Sphinx-latex
+BuildRequires: tex(a4wide.sty)
+BuildRequires: tex(abstract.sty)
+BuildRequires: tex(amsmath.sty)
+BuildRequires: tex(epsfig.sty)
+BuildRequires: tex(expdlist.sty)
+BuildRequires: tex(verbatim.sty)
+BuildRequires: tex(xspace.sty)
+BuildRequires: tex(article.cls)
+%endif
%if 0%{?suse_version}
BuildRequires: fdupes
BuildRequires: gcc-fortran
@@ -114,25 +125,44 @@
%build
# make the documentation
-cd doc
-make dist PYVER=%{py_ver}
+pushd doc
+make html PYVER=%{py_ver}
+popd
+
+# LaTeX building currently broken
+# %if 0%{?suse_version} > 1110 && 0%{?suse_version} != 1315
+# pushd doc
+# make latex PYVER=%{py_ver}
+# make -C build/latex all-pdf PYVER=%{py_ver}
+# popd
+# %endif
%install
# install the documentation
-cd doc
-mkdir -p %{buildroot}%{_docdir}/python-numpy/{html,pdf}
-tar -xzf build/dist.tar.gz -C %{buildroot}%{_docdir}/python-numpy/html
-mv %{buildroot}%{_docdir}/python-numpy/html/*.pdf %{buildroot}%{_docdir}/python-numpy/pdf/
+mkdir -p %{buildroot}%{_docdir}/python-numpy/
+pushd doc/build
+cp -r html %{buildroot}%{_docdir}/python-numpy/
+popd
%fdupes %{buildroot}%{_docdir}/python-numpy/html/
-%fdupes %{buildroot}%{_docdir}/python-numpy/pdf/
+
+# LaTeX building currently broken
+# %if 0%{?suse_version} > 1110 && 0%{?suse_version} != 1315
+# pushd doc/build
+# cp -r pdf %{buildroot}%{_docdir}/python-numpy/
+# popd
+# %fdupes %{buildroot}%{_docdir}/python-numpy/pdf/
+# %endif
%files html
%defattr(-,root,root)
%{_docdir}/python-numpy/html/
-%files pdf
-%defattr(-,root,root)
-%{_docdir}/python-numpy/pdf/
+# LaTeX building currently broken
+# %if 0%{?suse_version} > 1110 && 0%{?suse_version} != 1315
+# %files pdf
+# %defattr(-,root,root)
+# %{_docdir}/python-numpy/pdf/
+# %endif
%changelog
++++++ python-numpy.spec ++++++
--- /var/tmp/diff_new_pack.P42vW9/_old 2015-10-01 12:21:45.000000000 +0200
+++ /var/tmp/diff_new_pack.P42vW9/_new 2015-10-01 12:21:45.000000000 +0200
@@ -19,7 +19,7 @@
%define with_atlas 0
Name: python-numpy
-Version: 1.9.2
+Version: 1.9.3
Release: 0
Url: http://www.numpy.org/
Summary: NumPy array processing for numbers, strings, records and objects
++++++ numpy-1.9.2.tar.gz -> numpy-1.9.3.tar.gz ++++++
++++ 23686 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package ocaml for openSUSE:Factory checked in at 2015-10-01 12:21:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ocaml (Old)
and /work/SRC/openSUSE:Factory/.ocaml.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml"
Changes:
--------
--- /work/SRC/openSUSE:Factory/ocaml/ocaml.changes 2015-07-05 17:55:31.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.ocaml.new/ocaml.changes 2015-10-01 12:21:37.000000000 +0200
@@ -1,0 +2,11 @@
+Wed Sep 16 06:12:49 UTC 2015 - ohering(a)suse.de
+
+- update version 4.02.3
+ * http://caml.inria.fr/pub/distrib/ocaml-4.02/notes/Changes
+
+-------------------------------------------------------------------
+Tue Aug 4 08:05:33 UTC 2015 - kstreitova(a)suse.com
+
+- use spec-cleaner
+
+-------------------------------------------------------------------
Old:
----
ocaml-4.02.2.tar.xz
New:
----
ocaml-4.02.3.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ocaml.spec ++++++
--- /var/tmp/diff_new_pack.33ePd4/_old 2015-10-01 12:21:37.000000000 +0200
+++ /var/tmp/diff_new_pack.33ePd4/_new 2015-10-01 12:21:37.000000000 +0200
@@ -18,12 +18,12 @@
#
-Name: ocaml
-Version: 4.02.2
-Release: 0
%define doc_version 4.02
#
%define do_opt 0
+# This ensures that the find_provides/find_requires calls ocamlobjinfo correctly.
+%global __ocaml_requires_opts -c -f "%{buildroot}%{_bindir}/ocamlrun %{buildroot}%{_bindir}/ocamlobjinfo"
+%global __ocaml_provides_opts -f "%{buildroot}%{_bindir}/ocamlrun %{buildroot}%{_bindir}/ocamlobjinfo"
# macros to be set in prjconf:
#Macros:
#_with_ocaml_force_enable_ocaml_opt 1
@@ -44,6 +44,13 @@
%if %{with ocaml_force_disable_ocaml_opt}
%define do_opt 0
%endif
+Name: ocaml
+Version: 4.02.3
+Release: 0
+Summary: The Objective Caml Compiler and Programming Environment
+License: QPL-1.0 and SUSE-LGPL-2.0-with-linking-exception
+Group: Development/Languages/Other
+Url: http://caml.inria.fr/
#
# http://caml.inria.fr/pub/distrib/
Source0: http://caml.inria.fr/pub/distrib/ocaml-%{doc_version}/ocaml-%{version}.tar.…
@@ -61,29 +68,21 @@
Patch9: ocaml-ppc64.patch
# FIX-UPSTREAM enable build on PowerPC 64bit LE platform.
Patch10: ocaml-ppc64le.patch
-Url: http://caml.inria.fr/
-Summary: The Objective Caml Compiler and Programming Environment
-License: QPL-1.0 and SUSE-LGPL-2.0-with-linking-exception
-Group: Development/Languages/Other
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-PreReq: %install_info_prereq
-
+# This gets ocamlobjinfo to work with .cmxs files
+BuildRequires: binutils-devel
BuildRequires: emacs-nox
BuildRequires: fdupes
BuildRequires: ncurses-devel
BuildRequires: pkgconfig(x11)
-# This gets ocamlobjinfo to work with .cmxs files
-BuildRequires: binutils-devel
+Requires: ocaml-runtime = %{version}
+Requires(pre): %{install_info_prereq}
+Requires(post): %{install_info_prereq}
+Provides: ocaml(compiler) = %{version}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %{do_opt}
Requires: gcc
Provides: ocaml(ocaml.opt) = %{version}
%endif
-Provides: ocaml(compiler) = %{version}
-Requires: ocaml-runtime = %{version}
-
-# This ensures that the find_provides/find_requires calls ocamlobjinfo correctly.
-%global __ocaml_requires_opts -c -f "%{buildroot}%{_bindir}/ocamlrun %{buildroot}%{_bindir}/ocamlobjinfo"
-%global __ocaml_provides_opts -f "%{buildroot}%{_bindir}/ocamlrun %{buildroot}%{_bindir}/ocamlobjinfo"
%description
Objective Caml is a high-level, strongly-typed, functional and
@@ -93,7 +92,6 @@
and an optimizing native-code compiler), an interactive top level
system, Lex&Yacc tools, a replay debugger, and a comprehensive library.
-
%package rpm-macros
Summary: RPM macros for building OCaml source packages
License: QPL-1.0 and SUSE-LGPL-2.0-with-linking-exception
@@ -107,7 +105,7 @@
License: QPL-1.0
Group: Development/Languages/Other
Provides: ocaml(runtime) = %{version}
-%if %suse_version < 1210
+%if 0%{?suse_version} < 1210
# Due to lack of generated requires in old rpm, force this
Requires: ocaml-compiler-libs = %{version}
%endif
@@ -119,7 +117,6 @@
This package contains the runtime environment needed to run Objective
Caml bytecode.
-
%package source
Summary: Source code for Objective Caml libraries
License: QPL-1.0 and SUSE-LGPL-2.0-with-linking-exception
@@ -129,7 +126,6 @@
%description source
Source code for Objective Caml libraries.
-
%package x11
Summary: X11 support for Objective Caml
License: SUSE-LGPL-2.0-with-linking-exception
@@ -139,9 +135,6 @@
%description x11
X11 support for Objective Caml.
-
-
-
%package ocamldoc
Summary: The Objective Caml Compiler and Programming Environment
License: QPL-1.0
@@ -154,8 +147,6 @@
This package contains a documentation generator for Objective Caml.
-
-
%package emacs
Summary: The Objective Caml Compiler and Programming Environment
License: GPL-2.0+
@@ -170,8 +161,6 @@
This package provides caml-mode for emacs
-
-
%package docs
Summary: The Objective Caml Compiler and Programming Environment
License: GPL-2.0+ and QPL-1.0
@@ -210,7 +199,6 @@
The %{name}-devel package contains libraries and signature files for
developing applications that use %{name}.
-
%prep
: do_opt %{do_opt}
%setup -q -a 1 -a 2 -a 3
@@ -237,7 +225,7 @@
ulimit -Hs 65536
ulimit -Ss 65536
%endif
-CFLAGS="$RPM_OPT_FLAGS -DUSE_INTERP_RESULT" \
+CFLAGS="%{optflags} -DUSE_INTERP_RESULT" \
./configure -bindir %{_bindir} \
-libdir %{_libdir}/ocaml \
-mandir %{_mandir} \
@@ -254,41 +242,41 @@
%install
make install \
- BINDIR="$RPM_BUILD_ROOT%{_bindir}" \
- LIBDIR="$RPM_BUILD_ROOT%{_libdir}/ocaml" \
- MANDIR="$RPM_BUILD_ROOT%{_mandir}"
-sed -i -e "s|^$RPM_BUILD_ROOT||" $RPM_BUILD_ROOT%{_libdir}/ocaml/ld.conf
+ BINDIR="%{buildroot}%{_bindir}" \
+ LIBDIR="%{buildroot}%{_libdir}/ocaml" \
+ MANDIR="%{buildroot}%{_mandir}"
+sed -i -e "s|^$RPM_BUILD_ROOT||" %{buildroot}%{_libdir}/ocaml/ld.conf
-install -d $RPM_BUILD_ROOT%{_infodir} \
- $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
+install -d %{buildroot}%{_infodir} \
+ %{buildroot}%{_datadir}/emacs/site-lisp
(
cd emacs
- make install BINDIR=$RPM_BUILD_ROOT/%{_bindir} EMACSDIR=$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
- make install-ocamltags BINDIR=$RPM_BUILD_ROOT/%{_bindir}
+ make install BINDIR=%{buildroot}/%{_bindir} EMACSDIR=%{buildroot}%{_datadir}/emacs/site-lisp
+ make install-ocamltags BINDIR=%{buildroot}/%{_bindir}
)
(
- cd infoman; cp -f ocaml* $RPM_BUILD_ROOT%{_infodir}
+ cd infoman; cp -f ocaml* %{buildroot}%{_infodir}
)
# fix bnc#411232
-echo '(load "ocaml.el" nil t t)' >$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/suse-start-ocaml.el
-cat <<EOF >$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/%{name}.el
+echo '(load "ocaml.el" nil t t)' >%{buildroot}%{_datadir}/emacs/site-lisp/suse-start-ocaml.el
+cat <<EOF >%{buildroot}%{_datadir}/emacs/site-lisp/%{name}.el
(autoload 'caml-mode "caml" "Caml editing mode" t)
(add-hook 'caml-mode-hook 'font-lock-mode)
(add-to-list 'auto-mode-alist '("\\\\.mli?$" . caml-mode))
EOF
-sed -i '1s/^/#!\/usr\/bin\/ocaml\n/' $RPM_BUILD_ROOT/%{_bindir}/ocamltags
+sed -i '1s/^/#!\/usr\/bin\/ocaml\n/' %{buildroot}/%{_bindir}/ocamltags
export EXCLUDE_FROM_STRIP="ocamldebug ocamlbrowser"
# Install the compiler libs
-install -d $RPM_BUILD_ROOT%{_libdir}/ocaml/compiler-libs
-cp -a typing/ utils/ parsing/ $RPM_BUILD_ROOT%{_libdir}/ocaml/compiler-libs
-%fdupes $RPM_BUILD_ROOT
+install -d %{buildroot}%{_libdir}/ocaml/compiler-libs
+cp -a typing/ utils/ parsing/ %{buildroot}%{_libdir}/ocaml/compiler-libs
+%fdupes %{buildroot}
-mkdir -vp $RPM_BUILD_ROOT%{_sysconfdir}/rpm
-cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.%{name} <<_EOF_
+mkdir -vp %{buildroot}%{_sysconfdir}/rpm
+cat > %{buildroot}%{_sysconfdir}/rpm/macros.%{name} <<_EOF_
# get rid of /usr/lib/rpm/find-debuginfo.sh
# strip kills the bytecode part of ELF binaries
%if %{do_opt}
@@ -303,7 +291,7 @@
%%ocaml_native_compiler 0
%endif
_EOF_
-cat $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.%{name}
+cat %{buildroot}%{_sysconfdir}/rpm/macros.%{name}
%post
%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
@@ -311,9 +299,6 @@
%postun
%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
%defattr(-,root,root)
%doc Changes LICENSE README
@@ -366,6 +351,8 @@
%dir %{_libdir}/ocaml
%{_libdir}/ocaml/*.cmo
%{_libdir}/ocaml/*.cmi
+%{_libdir}/ocaml/*.cmt
+%{_libdir}/ocaml/*.cmti
%{_libdir}/ocaml/*.cma
%{_libdir}/ocaml/stublibs
%dir %{_libdir}/ocaml/vmthreads
@@ -427,7 +414,7 @@
%if %{with ocaml_make_testsuite}
%check
-make -C testsuite clean
+make %{?_smp_mflags} -C testsuite clean
if make -C testsuite all
then
: passed
++++++ ocaml-4.02.2.tar.xz -> ocaml-4.02.3.tar.xz ++++++
++++ 5947 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package simple-scan for openSUSE:Factory checked in at 2015-10-01 12:21:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/simple-scan (Old)
and /work/SRC/openSUSE:Factory/.simple-scan.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "simple-scan"
Changes:
--------
--- /work/SRC/openSUSE:Factory/simple-scan/simple-scan.changes 2015-05-29 09:47:20.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.simple-scan.new/simple-scan.changes 2015-10-01 12:21:34.000000000 +0200
@@ -1,0 +2,70 @@
+Tue Sep 22 18:45:42 UTC 2015 - zaitor(a)opensuse.org
+
+- Update to version 3.18.0:
+ + Show error message when fail to install drivers.
+ + Bump copyright dates.
+
+-------------------------------------------------------------------
+Thu Sep 17 09:43:48 UTC 2015 - zaitor(a)opensuse.org
+
+- Update to version 3.17.92:
+ + Correctly select the previous device after the device list is
+ updated.
+ + Updated translations.
+
+-------------------------------------------------------------------
+Mon Sep 7 08:27:22 UTC 2015 - zaitor(a)opensuse.org
+
+- Update to version 3.17.91:
+ + Updated translations.
+
+-------------------------------------------------------------------
+Wed Aug 26 20:23:46 UTC 2015 - zaitor(a)opensuse.org
+
+- Update to version 3.17.90:
+ + Default to PDF when saving in all cases.
+ + Always show file format options and use a combo box to fit
+ better into dialog.
+ + Detect HP scanners and install drivers using PackageKit if
+ found.
+ + If SANE detects no scanners but we see USB IDs of Brother,
+ Epson or Samsung scanners then prompt the user to go to their
+ website to install drivers.
+ + Use GUsb instead of GUdev.
+ + Fix error dialogs not showing.
+- Add pkgconfig(packagekit-glib2) BuildRequires: New dependency.
+- Replace pkgconfig(gudev-1.0) for pkgconfig(gusb) following
+ upstream changes.
+
+-------------------------------------------------------------------
+Sun Aug 16 11:16:53 UTC 2015 - zaitor(a)opensuse.org
+
+- Update to version 3.17.4:
+ + Updated translations.
+
+-------------------------------------------------------------------
+Sun Jul 19 20:11:08 UTC 2015 - zaitor(a)opensuse.org
+
+- Update to version 3.17.3:
+ + Stop using gnome-common, use autotools directly.
+
+-------------------------------------------------------------------
+Wed May 27 11:13:52 UTC 2015 - zaitor(a)opensuse.org
+
+- Update to version 3.17.2:
+ + Updated translations.
+
+-------------------------------------------------------------------
+Wed May 27 11:12:05 UTC 2015 - zaitor(a)opensuse.org
+
+- Update to version 3.17.1.1:
+ + Build appdata in a separate directory so it can have
+ translations merged in but gschemas do not.
+
+-------------------------------------------------------------------
+Wed May 27 11:11:19 UTC 2015 - zaitor(a)opensuse.org
+
+- Update to version 3.17.1:
+ + Make appdata translatable and add screenshot.
+
+-------------------------------------------------------------------
Old:
----
simple-scan-3.16.2.tar.xz
New:
----
simple-scan-3.18.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ simple-scan.spec ++++++
--- /var/tmp/diff_new_pack.aTOw3S/_old 2015-10-01 12:21:35.000000000 +0200
+++ /var/tmp/diff_new_pack.aTOw3S/_new 2015-10-01 12:21:35.000000000 +0200
@@ -25,13 +25,13 @@
%endif
Name: simple-scan
-Version: 3.16.2
+Version: 3.18.0
Release: 0
Summary: Simple Scanning Utility
License: GPL-3.0+
Group: System/GUI/GNOME
Url: https://launchpad.net/simple-scan
-Source0: https://launchpad.net/simple-scan/3.16/%{version}/+download/%{name}-%{versi…
+Source0: https://launchpad.net/simple-scan/3.18/%{version}/+download/%{name}-%{versi…
BuildRequires: %{_icontheme}-icon-theme
BuildRequires: fdupes
BuildRequires: intltool
@@ -44,7 +44,8 @@
BuildRequires: pkgconfig(colord)
BuildRequires: pkgconfig(gdk-pixbuf-2.0)
BuildRequires: pkgconfig(gtk+-3.0)
-BuildRequires: pkgconfig(gudev-1.0)
+BuildRequires: pkgconfig(gusb)
+BuildRequires: pkgconfig(packagekit-glib2)
BuildRequires: pkgconfig(zlib)
Requires: xdg-utils
Recommends: %{name}-lang
++++++ simple-scan-3.16.2.tar.xz -> simple-scan-3.18.0.tar.xz ++++++
++++ 100396 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package MozillaFirefox for openSUSE:Factory checked in at 2015-10-01 12:21:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/MozillaFirefox (Old)
and /work/SRC/openSUSE:Factory/.MozillaFirefox.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "MozillaFirefox"
Changes:
--------
--- /work/SRC/openSUSE:Factory/MozillaFirefox/MozillaFirefox.changes 2015-08-29 20:02:23.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.MozillaFirefox.new/MozillaFirefox.changes 2015-10-01 12:21:20.000000000 +0200
@@ -1,0 +2,50 @@
+Sat Sep 19 20:23:29 UTC 2015 - wr(a)rosenauer.org
+
+- update to Firefox 41.0 (bnc#947003)
+ * MFSA 2015-96/CVE-2015-4500/CVE-2015-4501
+ Miscellaneous memory safety hazards
+ * MFSA 2015-97/CVE-2015-4503 (bmo#994337)
+ Memory leak in mozTCPSocket to servers
+ * MFSA 2015-98/CVE-2015-4504 (bmo#1132467)
+ Out of bounds read in QCMS library with ICC V4 profile attributes
+ * MFSA 2015-99/CVE-2015-4476 (bmo#1162372) (Android only)
+ Site attribute spoofing on Android by pasting URL with unknown scheme
+ * MFSA 2015-100/CVE-2015-4505 (bmo#1177861) (Windows only)
+ Arbitrary file manipulation by local user through Mozilla updater
+ * MFSA 2015-101/CVE-2015-4506 (bmo#1192226)
+ Buffer overflow in libvpx while parsing vp9 format video
+ * MFSA 2015-102/CVE-2015-4507 (bmo#1192401)
+ Crash when using debugger with SavedStacks in JavaScript
+ * MFSA 2015-103/CVE-2015-4508 (bmo#1195976)
+ URL spoofing in reader mode
+ * MFSA 2015-104/CVE-2015-4510 (bmo#1200004)
+ Use-after-free with shared workers and IndexedDB
+ * MFSA 2015-105/CVE-2015-4511 (bmo#1200148)
+ Buffer overflow while decoding WebM video
+ * MFSA 2015-106/CVE-2015-4509 (bmo#1198435)
+ Use-after-free while manipulating HTML media content
+ * MFSA 2015-107/CVE-2015-4512 (bmo#1170390)
+ Out-of-bounds read during 2D canvas display on Linux 16-bit
+ color depth systems
+ * MFSA 2015-108/CVE-2015-4502 (bmo#1105045)
+ Scripted proxies can access inner window
+ * MFSA 2015-109/CVE-2015-4516 (bmo#904886)
+ JavaScript immutable property enforcement can be bypassed
+ * MFSA 2015-110/CVE-2015-4519 (bmo#1189814)
+ Dragging and dropping images exposes final URL after redirects
+ * MFSA 2015-111/CVE-2015-4520 (bmo#1200856, bmo#1200869)
+ Errors in the handling of CORS preflight request headers
+ * MFSA 2015-112/CVE-2015-4517/CVE-2015-4521/CVE-2015-4522/
+ CVE-2015-7174/CVE-2015-7175/CVE-2015-7176/CVE-2015-7177/
+ CVE-2015-7180
+ Vulnerabilities found through code inspection
+ * MFSA 2015-113/CVE-2015-7178/CVE-2015-7179 (bmo#1189860,
+ bmo#1190526) (Windows only)
+ Memory safety errors in libGLES in the ANGLE graphics library
+ * MFSA 2015-114 (bmo#1167498, bmo#1153672) (Windows only)
+ Information disclosure via the High Resolution Time API
+- rebased patches
+- removed obsolete patches
+ * mozilla-arm64-libjpeg-turbo.patch
+
+------------------------------------------------------------------
Old:
----
firefox-40.0.3-source.tar.xz
l10n-40.0.3.tar.xz
mozilla-arm64-libjpeg-turbo.patch
New:
----
firefox-41.0-source.tar.xz
l10n-41.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ MozillaFirefox.spec ++++++
--- /var/tmp/diff_new_pack.2lLGnJ/_old 2015-10-01 12:21:33.000000000 +0200
+++ /var/tmp/diff_new_pack.2lLGnJ/_new 2015-10-01 12:21:33.000000000 +0200
@@ -18,10 +18,10 @@
# changed with every update
-%define major 40
-%define mainver %major.0.3
+%define major 41
+%define mainver %major.0
%define update_channel release
-%define releasedate 2015082600
+%define releasedate 2015091800
# general build definitions
%if "%{update_channel}" != "aurora"
@@ -146,8 +146,7 @@
Patch12: mozilla-openaes-decl.patch
Patch14: mozilla-skia-be-le.patch
Patch15: mozilla-bmo1005535.patch
-Patch16: mozilla-arm64-libjpeg-turbo.patch
-Patch17: mozilla-no-stdcxx-check.patch
+Patch16: mozilla-no-stdcxx-check.patch
# Firefox/browser
Patch101: firefox-kde.patch
Patch102: firefox-no-default-ualocale.patch
@@ -261,7 +260,6 @@
%patch14 -p1
%patch15 -p1
%patch16 -p1
-%patch17 -p1
# Firefox
%patch101 -p1
%patch102 -p1
++++++ compare-locales.tar.xz ++++++
++++++ create-tar.sh ++++++
--- /var/tmp/diff_new_pack.2lLGnJ/_old 2015-10-01 12:21:33.000000000 +0200
+++ /var/tmp/diff_new_pack.2lLGnJ/_new 2015-10-01 12:21:33.000000000 +0200
@@ -2,8 +2,8 @@
CHANNEL="release"
BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_40_0_3_RELEASE"
-VERSION="40.0.3"
+RELEASE_TAG="FIREFOX_41_0_RELEASE"
+VERSION="41.0"
# mozilla
if [ -d mozilla ]; then
++++++ firefox-40.0.3-source.tar.xz -> firefox-41.0-source.tar.xz ++++++
/work/SRC/openSUSE:Factory/MozillaFirefox/firefox-40.0.3-source.tar.xz /work/SRC/openSUSE:Factory/.MozillaFirefox.new/firefox-41.0-source.tar.xz differ: char 26, line 1
++++++ firefox-kde.patch ++++++
--- /var/tmp/diff_new_pack.2lLGnJ/_old 2015-10-01 12:21:33.000000000 +0200
+++ /var/tmp/diff_new_pack.2lLGnJ/_new 2015-10-01 12:21:33.000000000 +0200
@@ -1,11 +1,11 @@
# HG changeset patch
-# Parent c6048238765dab77cd0c9a45e7afb1157316938b
+# Parent 8d1e0e3997402b94742eded6477abed4b559f373
diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
new file mode 100644
--- /dev/null
+++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1314 @@
+@@ -0,0 +1,1264 @@
+#filter substitution
+<?xml version="1.0"?>
+# -*- Mode: HTML -*-
@@ -17,6 +17,7 @@
+<?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/skin/devtools/common.css" type="text/css"?>
++<?xml-stylesheet href="chrome://browser/skin/controlcenter/panel.css" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/skin/customizableui/panelUIOverlay.css" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/skin/browser-lightweightTheme.css" type="text/css"?>
@@ -159,7 +160,11 @@
+ work correctly on the menupopup. ContentSelectDropdown expects the
+ popuponly menulist to be its immediate parent. -->
+ <menulist popuponly="true" id="ContentSelectDropdown" hidden="true">
-+ <menupopup rolluponmousewheel="true"/>
++ <menupopup rolluponmousewheel="true"
++#ifdef XP_WIN
++ consumeoutsideclicks="false"
++#endif
++ />
+ </menulist>
+
+ <!-- for invalid form error message -->
@@ -414,67 +419,6 @@
+
+ <menupopup id="placesContext"/>
+
-+ <!-- Popup for site identity information -->
-+ <panel id="identity-popup"
-+ type="arrow"
-+ hidden="true"
-+ noautofocus="true"
-+ onpopupshown="if (event.target == this)
-+ gIdentityHandler.onPopupShown(event);"
-+ orient="vertical"
-+ level="top">
-+ <hbox id="identity-popup-container" align="top">
-+ <image id="identity-popup-icon"/>
-+ <vbox id="identity-popup-content-box">
-+ <label id="identity-popup-brandName"
-+ class="identity-popup-label"
-+ value="&brandFullName;"/>
-+ <label id="identity-popup-chromeLabel"
-+ class="identity-popup-label"/>
-+ <label id="identity-popup-connectedToLabel"
-+ class="identity-popup-label"
-+ value="&identity.connectedTo;"/>
-+ <label id="identity-popup-connectedToLabel2"
-+ class="identity-popup-label"
-+ value="&identity.unverifiedsite2;"/>
-+ <description id="identity-popup-content-host"
-+ class="identity-popup-description"/>
-+ <label id="identity-popup-runByLabel"
-+ class="identity-popup-label"
-+ value="&identity.runBy;"/>
-+ <description id="identity-popup-content-owner"
-+ class="identity-popup-description"/>
-+ <description id="identity-popup-content-supplemental"
-+ class="identity-popup-description"/>
-+ <description id="identity-popup-content-verifier"
-+ class="identity-popup-description"/>
-+ <hbox id="identity-popup-encryption" flex="1">
-+ <vbox>
-+ <image id="identity-popup-encryption-icon"/>
-+ </vbox>
-+ <description id="identity-popup-encryption-label" flex="1"
-+ class="identity-popup-description"/>
-+ </hbox>
-+ <vbox id="identity-popup-permissions">
-+ <separator class="thin"/>
-+ <label class="identity-popup-label header"
-+ value="&identity.permissions;"/>
-+ <vbox id="identity-popup-permission-list" class="indent"/>
-+ </vbox>
-+ </vbox>
-+ </hbox>
-+ <!-- Footer button to open security page info -->
-+ <hbox id="identity-popup-button-container" align="center">
-+ <button id="identity-popup-help-icon"
-+ oncommand="gIdentityHandler.handleHelpCommand(event);"
-+ tooltiptext="&identity.help.tooltip;"/>
-+ <spacer flex="1"/>
-+ <button id="identity-popup-more-info-button"
-+ label="&identity.moreInfoLinkText;"
-+ oncommand="gIdentityHandler.handleMoreInfoClick(event);"/>
-+ </hbox>
-+ </panel>
-+
+ <panel id="ctrlTab-panel" class="KUI-panel" hidden="true" norestorefocus="true" level="top">
+ <hbox>
+ <button class="ctrlTab-preview" flex="1"/>
@@ -557,6 +501,7 @@
+#include popup-notifications.inc
+
+#include ../../components/customizableui/content/panelUI.inc.xul
++#include ../../components/controlcenter/content/panel.inc.xul
+
+ <hbox id="downloads-animation-container" mousethrough="always">
+ <vbox id="downloads-notification-anchor">
@@ -791,6 +736,7 @@
+ <image id="push-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="addons-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/>
++ <image id="login-fill-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="password-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/>
@@ -883,6 +829,8 @@
+ ondrop="PlacesMenuDNDHandler.onDrop(event);"
+ cui-areatype="toolbar"
+ oncommand="BookmarkingUI.onCommand(event);">
++ <observes element="bookmarkThisPageBroadcaster" attribute="starred"/>
++ <observes element="bookmarkThisPageBroadcaster" attribute="buttontooltiptext"/>
+ <menupopup id="BMB_bookmarksPopup"
+ class="cui-widget-panel cui-widget-panelview cui-widget-panelWithFooter PanelUI-subView"
+ placespopup="true"
@@ -1230,6 +1178,8 @@
+ <browser id="social-sidebar-browser"
+ type="content"
+ context="contentAreaContextMenu"
++ message="true"
++ messagemanagergroup="social"
+ disableglobalhistory="true"
+ tooltip="aHTMLTooltip"
+ popupnotificationanchor="social-sidebar-favico"
@@ -1323,7 +1273,7 @@
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
-@@ -179,17 +179,17 @@
+@@ -184,17 +184,17 @@
class="editBookmarkPanelHeaderButton"
oncommand="StarUI.removeBookmarkButtonCommand();"
accesskey="&editBookmark.removeBookmark.accessKey;"/>
@@ -1342,7 +1292,7 @@
<button id="editBookmarkPanelDeleteButton"
class="editBookmarkPanelBottomButton"
label="&editBookmark.cancel.label;"
-@@ -1235,17 +1235,17 @@
+@@ -1185,17 +1185,17 @@
<hbox id="full-screen-warning-container" hidden="true" fadeout="true">
<hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. -->
@@ -1375,14 +1325,14 @@
* content/browser/browser.xul (content/browser.xul)
+* content/browser/browser-kde.xul (content/browser-kde.xul)
+% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde
- content/browser/browser-pocket-en-US.properties (content/browser-pocket-en-US.properties)
- content/browser/browser-pocket.dtd (content/browser-pocket.dtd)
- content/browser/browser-pocket-de.properties (content/browser-pocket-de.properties)
- content/browser/browser-pocket-es-ES.properties (content/browser-pocket-es-ES.properties)
- content/browser/browser-pocket-ja.properties (content/browser-pocket-ja.properties)
- content/browser/browser-pocket-ru.properties (content/browser-pocket-ru.properties)
* content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml)
* content/browser/chatWindow.xul (content/chatWindow.xul)
+ content/browser/tab-content.js (content/tab-content.js)
+ content/browser/content.js (content/content.js)
+ content/browser/social-content.js (content/social-content.js)
+ content/browser/defaultthemes/1.footer.jpg (content/defaultthemes/1.footer.jpg)
+ content/browser/defaultthemes/1.header.jpg (content/defaultthemes/1.header.jpg)
+ content/browser/defaultthemes/1.icon.jpg (content/defaultthemes/1.icon.jpg)
diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp
--- a/browser/components/build/nsModule.cpp
+++ b/browser/components/build/nsModule.cpp
@@ -1469,7 +1419,7 @@
// when the user will select the default. We refresh here periodically
// in case the default changes. On other Windows OS's defaults can also
// be set while the prefs are open.
-@@ -524,16 +530,27 @@ var gMainPane = {
+@@ -527,16 +533,27 @@ var gMainPane = {
*/
setDefaultBrowser: function()
{
++++++ l10n-40.0.3.tar.xz -> l10n-41.0.tar.xz ++++++
/work/SRC/openSUSE:Factory/MozillaFirefox/l10n-40.0.3.tar.xz /work/SRC/openSUSE:Factory/.MozillaFirefox.new/l10n-41.0.tar.xz differ: char 26, line 1
++++++ mozilla-kde.patch ++++++
--- /var/tmp/diff_new_pack.2lLGnJ/_old 2015-10-01 12:21:34.000000000 +0200
+++ /var/tmp/diff_new_pack.2lLGnJ/_new 2015-10-01 12:21:34.000000000 +0200
@@ -1,5 +1,5 @@
# HG changeset patch
-# Parent 5f8cbb078ab0d5696255c2f514c6333666b47da9
+# Parent 3f3d1e5db92a45cf3758ee5ba77c577fcfb364c9
Description: Add KDE integration to Firefox (toolkit parts)
Author: Wolfgang Rosenauer <wolfgang(a)rosenauer.org>
Author: Lubos Lunak <lunak(a)suse.com>
@@ -46,7 +46,7 @@
#include "prefread.h"
#include "prefapi_private_data.h"
-@@ -1154,16 +1155,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
+@@ -1153,16 +1154,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
static nsresult pref_LoadPrefsInDirList(const char *listId)
{
@@ -81,7 +81,7 @@
return NS_OK;
bool hasMore;
-@@ -1179,17 +1198,17 @@ static nsresult pref_LoadPrefsInDirList(
+@@ -1178,17 +1197,17 @@ static nsresult pref_LoadPrefsInDirList(
nsAutoCString leaf;
path->GetNativeLeafName(leaf);
@@ -100,7 +100,7 @@
{
nsZipItemPtr<char> manifest(jarReader, name, true);
NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE);
-@@ -1283,26 +1302,38 @@ static nsresult pref_InitInitialObjects(
+@@ -1282,26 +1301,38 @@ static nsresult pref_InitInitialObjects(
/* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */
static const char* specialFiles[] = {
#if defined(XP_MACOSX)
@@ -142,7 +142,7 @@
diff --git a/python/mozbuild/mozpack/chrome/flags.py b/python/mozbuild/mozpack/chrome/flags.py
--- a/python/mozbuild/mozpack/chrome/flags.py
+++ b/python/mozbuild/mozpack/chrome/flags.py
-@@ -209,16 +209,17 @@ class Flags(OrderedDict):
+@@ -211,16 +211,17 @@ class Flags(OrderedDict):
'contentaccessible': Flag,
'os': StringFlag,
'osversion': VersionFlag,
@@ -163,7 +163,7 @@
diff --git a/python/mozbuild/mozpack/chrome/manifest.py b/python/mozbuild/mozpack/chrome/manifest.py
--- a/python/mozbuild/mozpack/chrome/manifest.py
+++ b/python/mozbuild/mozpack/chrome/manifest.py
-@@ -31,16 +31,17 @@ class ManifestEntry(object):
+@@ -33,16 +33,17 @@ class ManifestEntry(object):
'application',
'platformversion',
'os',
@@ -184,7 +184,7 @@
diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloads/moz.build
--- a/toolkit/components/downloads/moz.build
+++ b/toolkit/components/downloads/moz.build
-@@ -67,14 +67,15 @@ if not CONFIG['MOZ_SUITE']:
+@@ -67,15 +67,16 @@ if not CONFIG['MOZ_SUITE']:
]
FAIL_ON_WARNINGS = True
@@ -199,6 +199,7 @@
]
DEFINES['GOOGLE_PROTOBUF_NO_RTTI'] = True
+ DEFINES['GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER'] = True
CXXFLAGS += CONFIG['TK_CFLAGS']
diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp
@@ -775,7 +776,7 @@
new file mode 100644
--- /dev/null
+++ b/toolkit/content/widgets/preferences-kde.xml
-@@ -0,0 +1,1357 @@
+@@ -0,0 +1,1403 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE bindings [
@@ -1961,6 +1962,10 @@
+ <body>
+ <![CDATA[
+ // Write all values to preferences.
++ if (this._deferredValueUpdateElements.size) {
++ this._finalizeDeferredElements();
++ }
++
+ var preferences = this.preferences;
+ for (var i = 0; i < preferences.length; ++i) {
+ var preference = preferences[i];
@@ -2037,15 +2042,57 @@
+ </body>
+ </method>
+
++ <field name="DeferredTask" readonly="true">
++ let targetObj = {};
++ Components.utils.import("resource://gre/modules/DeferredTask.jsm", targetObj);
++ targetObj.DeferredTask;
++ </field>
++ <method name="_deferredValueUpdate">
++ <parameter name="aElement"/>
++ <body>
++ <![CDATA[
++ delete aElement._deferredValueUpdateTask;
++ let preference = document.getElementById(aElement.getAttribute("preference"));
++ let prefVal = preference.getElementValue(aElement);
++ preference.value = prefVal;
++ this._deferredValueUpdateElements.delete(aElement);
++ ]]>
++ </body>
++ </method>
++ <field name="_deferredValueUpdateElements">
++ new Set();
++ </field>
++ <method name="_finalizeDeferredElements">
++ <body>
++ <![CDATA[
++ for (let el of this._deferredValueUpdateElements) {
++ if (el._deferredValueUpdateTask) {
++ el._deferredValueUpdateTask.finalize();
++ }
++ }
++ ]]>
++ </body>
++ </method>
+ <method name="userChangedValue">
+ <parameter name="aElement"/>
+ <body>
+ <![CDATA[
-+ var element = this.getPreferenceElement(aElement);
++ let element = this.getPreferenceElement(aElement);
+ if (element.hasAttribute("preference")) {
-+ var preference = document.getElementById(element.getAttribute("preference"));
-+ var prefVal = preference.getElementValue(element);
-+ preference.value = prefVal;
++ if (element.getAttribute("delayprefsave") != "true") {
++ var preference = document.getElementById(element.getAttribute("preference"));
++ var prefVal = preference.getElementValue(element);
++ preference.value = prefVal;
++ } else {
++ if (!element._deferredValueUpdateTask) {
++ element._deferredValueUpdateTask = new this.DeferredTask(this._deferredValueUpdate.bind(this, element), 1000);
++ this._deferredValueUpdateElements.add(element);
++ } else {
++ // Each time the preference is changed, restart the delay.
++ element._deferredValueUpdateTask.disarm();
++ }
++ element._deferredValueUpdateTask.arm();
++ }
+ }
+ ]]>
+ </body>
@@ -2230,11 +2277,11 @@
diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build
--- a/toolkit/xre/moz.build
+++ b/toolkit/xre/moz.build
-@@ -45,17 +45,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt
- GENERATED_SOURCES += [
- 'moc_nsNativeAppSupportQt.cpp',
- ]
+@@ -43,17 +43,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co
+ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
+ EXPORTS += ['nsQAppInstance.h']
SOURCES += [
+ '!moc_nsNativeAppSupportQt.cpp',
'nsNativeAppSupportQt.cpp',
'nsQAppInstance.cpp',
]
@@ -3106,7 +3153,7 @@
diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build
--- a/widget/gtk/moz.build
+++ b/widget/gtk/moz.build
-@@ -79,16 +79,17 @@ else:
+@@ -80,16 +80,17 @@ else:
include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'xul'
@@ -3158,11 +3205,11 @@
using namespace mozilla;
#define MAX_PREVIEW_SIZE 180
+ // bug 1184009
+ #define MAX_PREVIEW_SOURCE_SIZE 4096
nsIFile *nsFilePicker::mPrevDisplayDirectory = nullptr;
-
- void
-@@ -238,17 +240,19 @@ nsFilePicker::AppendFilters(int32_t aFil
+@@ -246,17 +248,19 @@ nsFilePicker::AppendFilters(int32_t aFil
return nsBaseFilePicker::AppendFilters(aFilterMask);
}
@@ -3183,7 +3230,7 @@
mFilters.AppendElement(filter);
mFilterNames.AppendElement(name);
-@@ -363,16 +367,32 @@ nsFilePicker::Show(int16_t *aReturn)
+@@ -371,16 +375,32 @@ nsFilePicker::Show(int16_t *aReturn)
NS_IMETHODIMP
nsFilePicker::Open(nsIFilePickerShownCallback *aCallback)
@@ -3216,7 +3263,7 @@
GtkFileChooserAction action = GetGtkFileChooserAction(mMode);
const gchar *accept_button = (action == GTK_FILE_CHOOSER_ACTION_SAVE)
-@@ -551,8 +571,235 @@ nsFilePicker::Done(GtkWidget* file_choos
+@@ -595,8 +615,235 @@ nsFilePicker::Done(GtkWidget* file_choos
if (mCallback) {
mCallback->Done(result);
mCallback = nullptr;
@@ -3455,8 +3502,7 @@
diff --git a/widget/gtk/nsFilePicker.h b/widget/gtk/nsFilePicker.h
--- a/widget/gtk/nsFilePicker.h
+++ b/widget/gtk/nsFilePicker.h
-@@ -68,11 +68,17 @@ protected:
- nsString mDefault;
+@@ -69,14 +69,20 @@ protected:
nsString mDefaultExtension;
nsTArray<nsCString> mFilters;
@@ -3464,12 +3510,16 @@
private:
static nsIFile *mPrevDisplayDirectory;
-+
+
+ bool kdeRunning();
+ bool getKdeRunning();
+ NS_IMETHODIMP kdeFileDialog(PRInt16 *aReturn);
+ NS_IMETHODIMP kdeAppsDialog(PRInt16 *aReturn);
+ nsCString kdeMakeFilter( int index );
++
+ #if (MOZ_WIDGET_GTK == 3)
+ GtkFileChooserWidget *mFileChooserDelegate;
+ #endif
};
#endif
@@ -3628,7 +3678,7 @@
diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
--- a/xpcom/io/nsLocalFileUnix.cpp
+++ b/xpcom/io/nsLocalFileUnix.cpp
-@@ -44,16 +44,17 @@
+@@ -47,16 +47,17 @@
#include "prproces.h"
#include "nsIDirectoryEnumerator.h"
#include "nsISimpleEnumerator.h"
@@ -3646,7 +3696,7 @@
#include "prmem.h"
#include "plbase64.h"
-@@ -1960,42 +1961,52 @@ nsLocalFile::SetPersistentDescriptor(con
+@@ -1963,42 +1964,52 @@ nsLocalFile::SetPersistentDescriptor(con
return InitWithNativePath(aPersistentDescriptor);
#endif
}
@@ -3705,7 +3755,7 @@
return rv;
}
return NS_ERROR_FAILURE;
-@@ -2003,16 +2014,22 @@ nsLocalFile::Reveal()
+@@ -2006,16 +2017,22 @@ nsLocalFile::Reveal()
return NS_ERROR_FAILURE;
#endif
}
++++++ mozilla-no-stdcxx-check.patch ++++++
--- /var/tmp/diff_new_pack.2lLGnJ/_old 2015-10-01 12:21:34.000000000 +0200
+++ /var/tmp/diff_new_pack.2lLGnJ/_new 2015-10-01 12:21:34.000000000 +0200
@@ -1,11 +1,11 @@
# HG changeset patch
# User Wolfgang Rosenauer <wr(a)rosenauer.org>
-# Parent 7b3798afc391847b7eec89b3714b54f1bbbaa0a1
+# Parent af8fd72bd18717e6fc46340f467c7fa4f6d8c2ab
diff --git a/config/config.mk b/config/config.mk
--- a/config/config.mk
+++ b/config/config.mk
-@@ -623,34 +623,33 @@ EXPAND_LD = $(EXPAND_LIBS_EXEC) --uselis
+@@ -626,34 +626,33 @@ EXPAND_LD = $(EXPAND_LIBS_EXEC) --uselis
EXPAND_MKSHLIB_ARGS = --uselist
ifdef SYMBOL_ORDER
EXPAND_MKSHLIB_ARGS += --symbol-order $(SYMBOL_ORDER)
@@ -14,8 +14,8 @@
ifneq (,$(MOZ_LIBSTDCXX_TARGET_VERSION)$(MOZ_LIBSTDCXX_HOST_VERSION))
ifneq ($(OS_ARCH),Darwin)
--CHECK_STDCXX = @$(TOOLCHAIN_PREFIX)objdump -p $(1) | grep -e 'GLIBCXX_3\.4\.\(9\|[1-9][0-9]\)' > /dev/null && echo 'TEST-UNEXPECTED-FAIL | check_stdcxx | We do not want these libstdc++ symbols to be used:' && $(TOOLCHAIN_PREFIX)objdump -T $(1) | grep -e 'GLIBCXX_3\.4\.\(9\|[1-9][0-9]\)' && exit 1 || true
-+#CHECK_STDCXX = @$(TOOLCHAIN_PREFIX)objdump -p $(1) | grep -e 'GLIBCXX_3\.4\.\(9\|[1-9][0-9]\)' > /dev/null && echo 'TEST-UNEXPECTED-FAIL | check_stdcxx | We do not want these libstdc++ symbols to be used:' && $(TOOLCHAIN_PREFIX)objdump -T $(1) | grep -e 'GLIBCXX_3\.4\.\(9\|[1-9][0-9]\)' && exit 1 || true
+-CHECK_STDCXX = @$(TOOLCHAIN_PREFIX)objdump -p $(1) | grep -e 'GLIBCXX_3\.4\.\(1[1-9]\|[2-9][0-9]\)' > /dev/null && echo 'TEST-UNEXPECTED-FAIL | check_stdcxx | We do not want these libstdc++ symbols to be used:' && $(TOOLCHAIN_PREFIX)objdump -T $(1) | grep -e 'GLIBCXX_3\.4\.\(1[1-9]\|[2-9][0-9]\)' && exit 1 || true
++#CHECK_STDCXX = @$(TOOLCHAIN_PREFIX)objdump -p $(1) | grep -e 'GLIBCXX_3\.4\.\(1[1-9]\|[2-9][0-9]\)' > /dev/null && echo 'TEST-UNEXPECTED-FAIL | check_stdcxx | We do not want these libstdc++ symbols to be used:' && $(TOOLCHAIN_PREFIX)objdump -T $(1) | grep -e 'GLIBCXX_3\.4\.\(1[1-9]\|[2-9][0-9]\)' && exit 1 || true
endif
endif
++++++ mozilla-openaes-decl.patch ++++++
--- /var/tmp/diff_new_pack.2lLGnJ/_old 2015-10-01 12:21:34.000000000 +0200
+++ /var/tmp/diff_new_pack.2lLGnJ/_new 2015-10-01 12:21:34.000000000 +0200
@@ -1,7 +1,7 @@
# HG changeset patch
# Parent 33024abb3c58dab7239e32388df58e14f99defd5
# User Wolfgang Rosenauer <wr(a)rosenauer.org>
-# Parent 776cb894347a5ce8f03cd7344dca83b345e93d5f
+# Parent 17196b2f3cd2bcba6a5b54f4496b5762a593c5b3
diff --git a/media/gmp-clearkey/0.1/openaes/oaes_lib.c b/media/gmp-clearkey/0.1/openaes/oaes_lib.c
--- a/media/gmp-clearkey/0.1/openaes/oaes_lib.c
@@ -20,7 +20,7 @@
#include <time.h>
#include <string.h>
+ #include "mozilla/Snprintf.h"
+
#ifdef WIN32
#include <process.h>
- #endif
-
++++++ mozilla-preferences.patch ++++++
--- /var/tmp/diff_new_pack.2lLGnJ/_old 2015-10-01 12:21:34.000000000 +0200
+++ /var/tmp/diff_new_pack.2lLGnJ/_new 2015-10-01 12:21:34.000000000 +0200
@@ -6,12 +6,12 @@
# HG changeset patch
# Parent 8c1bfc96b05ef1836aad6e9f2af323f63ed1b69c
-# Parent 3de9f5c9ca0d23956f2580ad534ac139a63527a5
+# Parent 35b625807600ea4a5a3c49bd1cab22fac5188406
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
-@@ -1770,17 +1770,17 @@ pref("converter.html2txt.always_include_
+@@ -1790,17 +1790,17 @@ pref("converter.html2txt.always_include_
pref("intl.accept_languages", "chrome://global/locale/intl.properties");
pref("intl.menuitems.alwaysappendaccesskeys","chrome://global/locale/intl.properties");
@@ -28,5 +28,5 @@
pref("intl.fallbackCharsetList.ISO-8859-1", "windows-1252");
pref("font.language.group", "chrome://global/locale/intl.properties");
- // these locales have right-to-left UI
- pref("intl.uidirection.ar", "rtl");
+ // Android-specific pref to use key-events-only mode for IME-unaware webapps.
+ #ifdef MOZ_WIDGET_ANDROID
++++++ mozilla-shared-nss-db.patch ++++++
--- /var/tmp/diff_new_pack.2lLGnJ/_old 2015-10-01 12:21:34.000000000 +0200
+++ /var/tmp/diff_new_pack.2lLGnJ/_new 2015-10-01 12:21:34.000000000 +0200
@@ -7,7 +7,7 @@
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
-@@ -8217,16 +8217,31 @@ if test "$MOZ_ENABLE_SKIA"; then
+@@ -8296,16 +8296,31 @@ if test "$MOZ_ENABLE_SKIA"; then
MOZ_ENABLE_SKIA_GPU=1
AC_DEFINE(USE_SKIA_GPU)
AC_SUBST(MOZ_ENABLE_SKIA_GPU)
@@ -39,32 +39,32 @@
if test "$MOZ_XUL"; then
AC_DEFINE(MOZ_XUL)
else
-diff --git a/security/manager/ssl/src/moz.build b/security/manager/ssl/src/moz.build
---- a/security/manager/ssl/src/moz.build
-+++ b/security/manager/ssl/src/moz.build
-@@ -81,16 +81,19 @@ SOURCES += [
- IPDL_SOURCES += [
- 'PPSMContentDownloader.ipdl',
- ]
+diff --git a/security/manager/ssl/moz.build b/security/manager/ssl/moz.build
+--- a/security/manager/ssl/moz.build
++++ b/security/manager/ssl/moz.build
+@@ -156,16 +156,19 @@ FAIL_ON_WARNINGS = True
+ FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
- '/security/manager/boot/src',
+ '/dom/base',
+ '/security/certverifier',
+ '/security/pkix/include',
]
+CXXFLAGS += sorted(CONFIG['NSSHELPER_CFLAGS'])
+OS_LIBS += sorted(CONFIG['NSSHELPER_LIBS'])
+
- if not CONFIG['MOZ_NO_SMART_CARDS']:
- UNIFIED_SOURCES += [
- 'nsSmartCardMonitor.cpp',
- ]
+ GENERATED_INCLUDES += [
+ '/dist/public/nss',
+ ]
- if CONFIG['MOZ_XUL']:
- UNIFIED_SOURCES += [
- 'nsCertTree.cpp',
-diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp
---- a/security/manager/ssl/src/nsNSSComponent.cpp
-+++ b/security/manager/ssl/src/nsNSSComponent.cpp
+ if CONFIG['NSS_DISABLE_DBM']:
+ DEFINES['NSS_DISABLE_DBM'] = '1'
+
+ DEFINES['SSL_DISABLE_DEPRECATED_CIPHER_SUITE_NAMES'] = 'True'
+diff --git a/security/manager/ssl/nsNSSComponent.cpp b/security/manager/ssl/nsNSSComponent.cpp
+--- a/security/manager/ssl/nsNSSComponent.cpp
++++ b/security/manager/ssl/nsNSSComponent.cpp
@@ -1,14 +1,21 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
*
@@ -87,16 +87,15 @@
#include "nsAppDirectoryServiceDefs.h"
#include "nsCertVerificationThread.h"
#include "nsAppDirectoryServiceDefs.h"
-@@ -998,17 +1005,31 @@ nsNSSComponent::InitializeNSS()
- if (NS_FAILED(rv)) {
- nsPSMInitPanic::SetPanic();
+@@ -1015,17 +1022,31 @@ nsNSSComponent::InitializeNSS()
return NS_ERROR_NOT_AVAILABLE;
}
SECStatus init_rv = SECFailure;
- if (!profileStr.IsEmpty()) {
+ bool nocertdb = Preferences::GetBool("security.nocertdb", false);
+
+ if (!nocertdb && !profileStr.IsEmpty()) {
// First try to initialize the NSS DB in read/write mode.
-- SECStatus init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), false);
+#ifdef MOZ_ENABLE_NSSHELPER
+ if (PR_GetEnv("MOZ_XRE_NO_NSSHELPER")) {
+ init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), false);
@@ -105,25 +104,25 @@
+ init_rv = ::nsshelp_open_db ("Firefox", profileStr.get(), flags);
+
+ if (init_rv != SECSuccess) {
-+ PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init NSS using nsshelp_open_db in %s\n", profileStr.get()));
++ MOZ_LOG(gPIPNSSLog, LogLevel::Debug, ("can not init NSS using nsshelp_open_db in %s\n", profileStr.get()));
+ init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), false);
+ }
+ }
+#else
-+ init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), false);
+ init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), false);
+#endif
// If that fails, attempt read-only mode.
if (init_rv != SECSuccess) {
- PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("could not init NSS r/w in %s\n", profileStr.get()));
+ MOZ_LOG(gPIPNSSLog, LogLevel::Debug, ("could not init NSS r/w in %s\n", profileStr.get()));
init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), true);
}
if (init_rv != SECSuccess) {
- PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("could not init in r/o either\n"));
+ MOZ_LOG(gPIPNSSLog, LogLevel::Debug, ("could not init in r/o either\n"));
}
diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
--- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build
-@@ -197,16 +197,18 @@ if CONFIG['MOZ_B2G_CAMERA'] and CONFIG['
+@@ -203,16 +203,18 @@ if CONFIG['MOZ_B2G_CAMERA'] and CONFIG['
'stagefright_omx',
]
++++++ source-stamp.txt ++++++
--- /var/tmp/diff_new_pack.2lLGnJ/_old 2015-10-01 12:21:34.000000000 +0200
+++ /var/tmp/diff_new_pack.2lLGnJ/_new 2015-10-01 12:21:34.000000000 +0200
@@ -1,2 +1,2 @@
-REV=5500ee2a6206
+REV=78c82e5cd777
REPO=http://hg.mozilla.org/releases/mozilla-release
1
0
Hello community,
here is the log from the commit of package bind for openSUSE:Factory checked in at 2015-10-01 12:21:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/bind (Old)
and /work/SRC/openSUSE:Factory/.bind.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bind"
Changes:
--------
--- /work/SRC/openSUSE:Factory/bind/bind.changes 2015-08-10 09:12:28.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.bind.new/bind.changes 2015-10-01 12:21:15.000000000 +0200
@@ -1,0 +2,11 @@
+Tue Sep 22 13:15:51 UTC 2015 - meissner(a)suse.com
+
+- Update to version 9.10.2-P4
+ * An incorrect boundary boundary check in the OPENPGPKEY
+ rdatatype could trigger an assertion failure.
+ (CVE-2015-5986) [RT #40286] (bsc#944107)
+ * A buffer accounting error could trigger an
+ assertion failure when parsing certain malformed
+ DNSSEC keys. (CVE-2015-5722) [RT #40212] (bsc#944066)
+
+-------------------------------------------------------------------
Old:
----
bind-9.10.2-P3.tar.gz
bind-9.10.2-P3.tar.gz.asc
New:
----
bind-9.10.2-P4.tar.gz
bind-9.10.2-P4.tar.gz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bind.spec ++++++
--- /var/tmp/diff_new_pack.W7YMN3/_old 2015-10-01 12:21:17.000000000 +0200
+++ /var/tmp/diff_new_pack.W7YMN3/_new 2015-10-01 12:21:17.000000000 +0200
@@ -18,8 +18,8 @@
Name: bind
%define pkg_name bind
-%define pkg_vers 9.10.2-P3
-%define rpm_vers 9.10.2P3
+%define pkg_vers 9.10.2-P4
+%define rpm_vers 9.10.2P4
%define idn_vers 1.0
Summary: Domain Name System (DNS) Server (named)
License: ISC
@@ -34,7 +34,8 @@
Source1: vendor-files.tar.bz2
Source2: baselibs.conf
Source9: ftp://ftp.internic.net/domain/named.root
-Source40: http://www.venaas.no/ldap/bind-sdb/dnszone-schema.txt
+# url http://www.venaas.no/ldap/bind-sdb/dnszone-schema.txt no longer exists...
+Source40: dnszone-schema.txt
Patch: configure.in.diff
Patch1: Makefile.in.diff
Patch4: perl-path.diff
++++++ bind-9.10.2-P3.tar.gz -> bind-9.10.2-P4.tar.gz ++++++
/work/SRC/openSUSE:Factory/bind/bind-9.10.2-P3.tar.gz /work/SRC/openSUSE:Factory/.bind.new/bind-9.10.2-P4.tar.gz differ: char 5, line 1
++++++ named.root ++++++
--- /var/tmp/diff_new_pack.W7YMN3/_old 2015-10-01 12:21:17.000000000 +0200
+++ /var/tmp/diff_new_pack.W7YMN3/_new 2015-10-01 12:21:17.000000000 +0200
@@ -9,8 +9,8 @@
; on server FTP.INTERNIC.NET
; -OR- RS.INTERNIC.NET
;
-; last update: November 05, 2014
-; related version of root zone: 2014110501
+; last update: May 23, 2015
+; related version of root zone: 2015052300
;
; formerly NS.INTERNIC.NET
;
1
0
Hello community,
here is the log from the commit of package wayland for openSUSE:Factory checked in at 2015-10-01 12:21:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/wayland (Old)
and /work/SRC/openSUSE:Factory/.wayland.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wayland"
Changes:
--------
--- /work/SRC/openSUSE:Factory/wayland/wayland.changes 2015-08-28 08:25:49.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.wayland.new/wayland.changes 2015-10-01 12:21:06.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Sep 22 15:44:02 UTC 2015 - jengelh(a)inai.de
+
+- Update to new upstream release 1.9.0
+* This release brings fixes and modest refactoring.
+- License was changed from MIT X11 to MIT Expat upstream.
+
+-------------------------------------------------------------------
Old:
----
wayland-1.8.1.tar.xz
wayland-1.8.1.tar.xz.sig
New:
----
wayland-1.9.0.tar.xz
wayland-1.9.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ wayland.spec ++++++
--- /var/tmp/diff_new_pack.ncgrMg/_old 2015-10-01 12:21:07.000000000 +0200
+++ /var/tmp/diff_new_pack.ncgrMg/_new 2015-10-01 12:21:07.000000000 +0200
@@ -18,10 +18,10 @@
%define lname libwayland0
Name: wayland
-Version: 1.8.1
+Version: 1.9.0
Release: 0
Summary: Wayland Compositor Infrastructure
-License: HPND
+License: MIT
Group: Development/Libraries/C and C++
Url: http://wayland.freedesktop.org/
++++++ wayland-1.8.1.tar.xz -> wayland-1.9.0.tar.xz ++++++
++++ 8825 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package joe for openSUSE:Factory checked in at 2015-10-01 12:20:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/joe (Old)
and /work/SRC/openSUSE:Factory/.joe.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "joe"
Changes:
--------
--- /work/SRC/openSUSE:Factory/joe/joe.changes 2013-11-30 17:36:05.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.joe.new/joe.changes 2015-10-01 12:21:00.000000000 +0200
@@ -1,0 +2,57 @@
+Sat Sep 19 05:33:29 UTC 2015 - mpluskal(a)suse.com
+
+- Actually fix download url
+
+-------------------------------------------------------------------
+Wed Jul 8 12:15:27 CEST 2015 - pth(a)suse.de
+
+- Fix source URI.
+- Update and fix german messages.
+- Add a rpmlintrc file to stop rpmlint from complaining about
+ files marked as config but not in /etc.
+
+-------------------------------------------------------------------
+Wed Jun 17 08:12:37 UTC 2015 - thehejik(a)suse.com
+
+- Version update to 4.0:
+ - JOE now has pop-up shell windows with full terminal emulation
+ and shell commands that can control the editor. Hit F1 - F4 to bring up a shell window.
+ - See Pop-up shell feature for a full description.
+ - The status command (^K SPACE) can now be customized using the same syntax
+ as the status bar. Look for smsg and zmsg in joerc to see how to do this.
+ parserr (the error parser) will parse only the highlighted block if it's set.
+ Before it always parsed the entire buffer.
+ - Now there is a per-buffer concept of current directory. This was added to
+ make the pop-up shell windows work better, but it's useful in general.
+ - At file prompts you can begin a new anchored path without having to delete
+ the old one. It means that ~jhallen/foo//etc/passwd is translated to /etc/passwd.
+ - Prompt windows are now highighted to indicate which parts of the path are
+ being dropped. There is a syntax file for this: filename.jsf
+ - The error parser now ignores ANSI sequences (some versions of grep
+ color their results, now JOE can still parse it).
+ - Temporary messages are now dismissed by keyboard input only. Before, they
+ could also be dismissed by shell input.
+ - Tags search now supports multiple matches. ^K ; can be configured to
+ either provide a menu of the matches or to cycle through them.
+ - Tags search will now match on the member name part of member functions
+ ('fred' will match 'myclass::fred').
+ - Tags search will prepend the path to the tags file file name in the tags
+ file. This is important when JOE finds the tags file via the TAGS
+ environment variable.
+ - Remove ` as quote character from incremental search.
+ - Clean up documentation, convert much of it to Markdown.
+- Cleanup with spec-cleaner
+- Drop languages as they don't work at all
+- refreshed patches:
+ * joe-3.1-fix_isblanck_argument.patch
+ * joe-3.1-terminate_buffer.patch
+ * joe-3.3-warnings.patch
+ * joe-3.7-additional_key_mappings.patch
+ * joe-3.7-spec_association.patch
+ * joe-codecleanup.patch
+ * joe-sigiot.patch
+- deleted patches:
+ * joe-activate_po.patch.bz2
+ * joe-fr_trans.patch
+
+-------------------------------------------------------------------
Old:
----
joe-3.7.tar.gz
joe-activate_po.patch.bz2
joe-fr_trans.patch
New:
----
joe-4.0.tar.gz
joe-rpmlintrc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ joe.spec ++++++
--- /var/tmp/diff_new_pack.Cmpyse/_old 2015-10-01 12:21:01.000000000 +0200
+++ /var/tmp/diff_new_pack.Cmpyse/_new 2015-10-01 12:21:01.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package joe
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,86 +17,39 @@
Name: joe
-BuildRequires: automake
-BuildRequires: ncurses-devel
-Version: 3.7
+Version: 4.0
Release: 0
Summary: A Text Editor
License: GPL-2.0+
Group: Productivity/Editors/Other
Url: http://sourceforge.net/projects/joe-editor
-
-Source0: http://downloads.sourceforge.net/joe-editor/%{name}-%{version}.tar.gz
+Source0: http://sourceforge.net/projects/joe-editor/files/JOE%%20sources/%{name}-%{v…
Source2: de.po
+Source3: joe-rpmlintrc
Patch0: joe-3.1-terminate_buffer.patch
Patch2: joe-3.1-fix_isblanck_argument.patch
Patch3: joe-3.3-warnings.patch
-Patch5: joe-activate_po.patch.bz2
-Patch6: joe-fr_trans.patch
Patch7: joe-3.7-additional_key_mappings.patch
Patch8: joe-3.7-spec_association.patch
Patch9: joe-codecleanup.patch
Patch10: joe-sigiot.patch
+BuildRequires: automake
+BuildRequires: ncurses-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
-JOE (Joe's Own Editor) is a freeware ASCII editor for UNIX. Joe is
-similar to most IBM PC text editors. The keyboard combinations are
-similar to WordStar[tm] and Turbo C. Some of Joe's features include:
-
--full support of termcap and terminfo (useful for device-independent
-descriptions to control screen output) -optimized screen refresh like
-GNU Emacs (Joe can even be used at 2400 baud) -easy installation with
-all features for UNIX integration with vi: a marked block of text can
-be filtered through a UNIX command and wherever JOE accepts a filename
-parameter, the following can also be substituted:
-
-!command\t\t:to redirect from or to another command
-
->>filename\t\t:to append onto an existing file
-
-filename,start,size\t:to edit a part of a file or device
-
--\t\t\t:to use standard input/output
-
-When JOE has several files opened at the same time, each file is
-displayed in its own window. Additionally, JOE allows for shell windows
-from which the output of the executed commands are saved in a buffer,
-automatic filename completion (via TAB), help windows, undo and redo,
-and search and replace using regular expressions.
-
-
-
-Authors:
---------
- Joseph H. Allen <jhallen(a)world.std.com>
- Marek 'Marx' Grac <xgrac(a)fi.muni.cz>
+Joe is a powerful, easy to use, modeless text editor. It uses the same
+WordStar keybindings used in Borland's development environment.
%prep
%setup -q
-%patch0
-%patch2
-%patch3
-%patch5
-%patch6
-%patch7
-%patch8
-%patch9
-%patch10
-cp %{S:2} po
-# Convert Russian docs and locale from KOI8-R to UTF-8.
-for ru in man/ru/joe.1.in po/ru.po rc/jicerc.ru.in ; do
- iconv -f KOI8-R -t UTF-8 -o "${ru}.tmp" "${ru}" && \
- mv -f "${ru}.tmp" "${ru}"
-done
-sed -i 's/charset=koi8-r/charset=UTF-8/' po/ru.po
-# Convert Ukrainian locale from KOI8-U to UTF-8.
-iconv -f KOI8-U -t UTF-8 po/uk.po | \
-sed 's/charset=koi8-u/charset=UTF-8/' > po/uk.po.tmp && \
-mv -f po/uk.po.tmp po/uk.po
-
-# new automake-1.13.1 removed old macro
-sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac
+%patch0 -p1
+%patch2 -p1
+%patch3 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
%build
autoreconf -fi
@@ -105,36 +58,30 @@
--prefix=%{_prefix} \
--mandir=%{_mandir} \
--sysconfdir=%{_sysconfdir} \
- --docdir=%{_defaultdocdir}/%name
-cd po
-make update-po
+ --docdir=%{_defaultdocdir}/%{name}
+
make %{?_smp_mflags}
%install
-make install DESTDIR="%buildroot"
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
for i in jmacs jpico jstar rjoe; do
ln -s joe.1.gz %{buildroot}%{_mandir}/man1/$i.1.gz
done
+rm -rf %{buildroot}/%{_datadir}/%{name}/lang
%files
%defattr(-,root,root)
%doc %{_defaultdocdir}/%{name}
-%doc %{_mandir}/man1/*
-%doc %{_mandir}/*/man1/*
+%{_mandir}/man1/*
+%{_mandir}/*/man1/*
%config %{_sysconfdir}/joe/*
%dir %{_sysconfdir}/joe
%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/lang
%dir %{_mandir}/ru
%dir %{_mandir}/ru/man1
%{_bindir}/*
%{_datadir}/%{name}/charmaps
%dir %{_datadir}/%{name}/syntax
%config(noreplace) %{_datadir}/%{name}/syntax/*
-%lang(de) %{_datadir}/%{name}/lang/de.mo
-%lang(en) %{_datadir}/%{name}/lang/en(a)*.mo
-%lang(fr) %{_datadir}/%{name}/lang/fr.mo
-%lang(ru) %{_datadir}/%{name}/lang/ru.mo
-%lang(uk) %{_datadir}/%{name}/lang/uk.mo
%changelog
++++++ de.po ++++++
--- /var/tmp/diff_new_pack.Cmpyse/_old 2015-10-01 12:21:01.000000000 +0200
+++ /var/tmp/diff_new_pack.Cmpyse/_new 2015-10-01 12:21:01.000000000 +0200
@@ -5,12 +5,12 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: joe 3.5\n"
+"Project-Id-Version: joe 4.0\n"
"Report-Msgid-Bugs-To: jhallen(a)world.std.com\n"
"POT-Creation-Date: 2009-10-23 15:19+0200\n"
-"PO-Revision-Date: 2009-10-23 13:58+0100\n"
+"PO-Revision-Date: 2015-07-08 13:58+0100\n"
"Last-Translator: Philipp Thomas <pth(a)suse.de>\n"
-"Language-Team: German <de(a)li.org>\n"
+"Language-Team: German <translation-team-de(a)lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -50,7 +50,7 @@
"*** File '%s'\n"
msgstr ""
"\n"
-"*** Datei '%s'\n"
+"*** Datei „%s“\n"
#: b.c:2999
msgid ""
@@ -58,7 +58,7 @@
"*** File '(Unnamed)'\n"
msgstr ""
"\n"
-"*** Datei '(Unbenannt)'\n"
+"*** Datei „(Unbenannt)“\n"
#: bw.c:1279
#, c-format
@@ -182,7 +182,7 @@
#: main.c:222 main.c:239
#, c-format
msgid "There were errors in '%s'. Use it anyway?"
-msgstr "Fehler in '%s'. Trotzdem verwenden?"
+msgstr "Fehler in „%s“. Trotzdem verwenden?"
#: main.c:294
#, c-format
@@ -202,12 +202,12 @@
#: main.c:309 main.c:328 main.c:345
#, c-format
msgid "There were errors in '%s'. Use it anyway (y,n)? "
-msgstr "Fehler in '%s'. Trotzdem verwenden (y,n)? "
+msgstr "Fehler in „%s“. Trotzdem verwenden (y,n)? "
#: main.c:353
#, c-format
msgid "Couldn't open '%s'\n"
-msgstr "Konnte '%s' nicht öffnen\n"
+msgstr "Konnte „%s“ nicht öffnen\n"
#: main.c:359
msgid "rc file has no :main key binding section or no bindings. Bye.\n"
@@ -217,7 +217,7 @@
#: main.c:372
#, c-format
msgid "Unknown option '%s'\n"
-msgstr "Unbekannte Option '%s'\n"
+msgstr "Unbekannte Option „%s“\n"
#: main.c:512
#, c-format
@@ -894,7 +894,7 @@
#: rc.c:365
msgid " ^G ignores '... ' "
-msgstr " ^G ignoriert '... ' "
+msgstr " ^G ignoriert „… “ "
#: rc.c:366
msgid "Double quoting disabled"
@@ -906,7 +906,7 @@
#: rc.c:366
msgid " ^G ignores \"... \" "
-msgstr " ^G ignoriert \"... \" "
+msgstr " ^G ignoriert \"… \" "
#: rc.c:367
msgid "/* comments enabled"
@@ -918,7 +918,7 @@
#: rc.c:367
msgid " ^G ignores /*...*/ "
-msgstr " ^G ignoriert /*...*/ "
+msgstr " ^G ignoriert /*…*/ "
#: rc.c:368
msgid "// comments enabled"
@@ -930,7 +930,7 @@
#: rc.c:368
msgid " ^G ignores //... "
-msgstr " ^G ignoriert //... "
+msgstr " ^G ignoriert //… "
#: rc.c:369
msgid "# comments enabled"
@@ -942,7 +942,7 @@
#: rc.c:369
msgid " ^G ignores #... "
-msgstr " ^G ignoriert #... "
+msgstr " ^G ignoriert #… "
#: rc.c:370
msgid "-- comments enabled"
@@ -954,7 +954,7 @@
#: rc.c:370
msgid " ^G ignores --... "
-msgstr " ^G ignoriert --... "
+msgstr " ^G ignoriert --… "
#: rc.c:371
msgid "; comments enabled"
@@ -966,7 +966,7 @@
#: rc.c:371
msgid " ^G ignores ;... "
-msgstr " ^G ignoriert ;... "
+msgstr " ^G ignoriert ;… "
#: rc.c:372
#, no-c-format
@@ -980,7 +980,7 @@
#: rc.c:372
msgid " ^G ignores %... "
-msgstr " ^G ignoriert %... "
+msgstr " ^G ignoriert %… "
#: rc.c:373
#, c-format
@@ -1073,7 +1073,7 @@
#: rc.c:1256
#, c-format
msgid "Processing '%s'..."
-msgstr "Bearbeite '%s'..."
+msgstr "Bearbeite „%s“…"
#: rc.c:1312
#, c-format
@@ -1190,7 +1190,7 @@
"%s %d: Bad key sequence '%s'"
msgstr ""
"\n"
-"%s %d: Ungültige Tastenfolge »%s«"
+"%s %d: Ungültige Tastenfolge „%s“"
#: rc.c:1492
msgid ""
@@ -1366,16 +1366,16 @@
#: tty.c:743
msgid "You are at the command shell. Type 'exit' to return\n"
-msgstr "Befehlszeilenmodus. 'exit' eingeben um zurückzukehren\n"
+msgstr "Befehlszeilenmodus. „exit“ eingeben um zurückzukehren\n"
#: tty.c:807
msgid "You have suspended the program. Type 'fg' to return\n"
-msgstr "Das Program wurde unterbrochen. 'fg' eingeben um zurückzukehren\n"
+msgstr "Das Program wurde unterbrochen. „fg“ eingeben um zurückzukehren\n"
#: tty.c:1158
#, c-format
msgid "Couldn't execute shell '%s'\n"
-msgstr "Konnte Shell '%s' nicht ausführen\n"
+msgstr "Konnte Shell „%s“ nicht ausführen\n"
#: tw.c:281
msgid "Unnamed"
@@ -1396,7 +1396,7 @@
#: tw.c:401
#, c-format
msgid "(Macro %d recording...)"
-msgstr "(Makro %d wird aufgenommen...)"
+msgstr "(Makro %d wird aufgenommen…)"
#: tw.c:626 tw.c:652 ufile.c:1009 ufile.c:1219
msgid "Lose changes to this file (y,n,^C)? "
@@ -1567,7 +1567,7 @@
#: ufile.c:307
msgid "Couldn't make backup file... file not saved"
-msgstr "Konnte Backupdatei nicht erstellen... Datei nicht gespeichert"
+msgstr "Konnte Backupdatei nicht erstellen… Datei nicht gespeichert"
#: ufile.c:319
msgid "Could not make backup file. Save anyway (y,n,^C)? "
@@ -1794,7 +1794,7 @@
#: ushell.c:197
msgid "Enter build command (for example, 'make'): "
-msgstr "Buildbefehl eingeben (z.B. `make`): "
+msgstr "Buildbefehl eingeben (z.B. „make“): "
#: ushell.c:212
msgid "Grep command: "
@@ -1802,7 +1802,7 @@
#: ushell.c:221
msgid "Enter grep command (for example, 'grep -n foo *.c'): "
-msgstr "grep-Befehl eingeben (z.B. `grep -n foo *.c`): "
+msgstr "grep-Befehl eingeben (z.B. „grep -n foo *.c“): "
#: ushell.c:250
msgid "Kill program (y,n,^C)?"
@@ -1823,27 +1823,8 @@
#: vfile.c:241
#, c-format
msgid "Couldn't open file '%s'\n"
-msgstr "Konnte '%s' nicht öffnen\n"
+msgstr "Konnte „%s“ nicht öffnen\n"
#: w.c:822
msgid "There is no message buffer"
msgstr "Kein Nachrichtenpuffer vorhanden"
-
-#~ msgid ""
-#~ "\n"
-#~ "*** These modified files were found in JOE when it aborted on %s"
-#~ msgstr ""
-#~ "\n"
-#~ "*** Diese geänderten Dateien wurden nach Abbruch von %s in JOE gefunden"
-
-#~ msgid "*** JOE was aborted by UNIX signal %d\n"
-#~ msgstr "*** JOE wurde durch UNIX-Signal %d abgebrochen\n"
-
-#~ msgid "*** JOE was aborted because the terminal closed\n"
-#~ msgstr "*** JOE wurde durch Schließen des Terminals abgebrochen\n"
-
-#~ msgid "Delimiters (%s): "
-#~ msgstr "Begrenzer (%s): "
-
-#~ msgid "Delimiters: "
-#~ msgstr "Begrenzer: "
++++++ joe-3.1-fix_isblanck_argument.patch ++++++
--- /var/tmp/diff_new_pack.Cmpyse/_old 2015-10-01 12:21:01.000000000 +0200
+++ /var/tmp/diff_new_pack.Cmpyse/_new 2015-10-01 12:21:01.000000000 +0200
@@ -1,6 +1,8 @@
---- b.c.orig 2008-11-02 21:59:06.000000000 +0100
-+++ b.c 2009-10-20 12:18:46.443802718 +0200
-@@ -601,9 +601,10 @@ int piseow(P *p)
+Index: joe-4.0/joe/b.c
+===================================================================
+--- joe-4.0.orig/joe/b.c
++++ joe-4.0/joe/b.c
+@@ -626,9 +626,10 @@ int piseow(P *p)
int pisblank(P *p)
{
P *q = pdup(p, USTR "pisblank");
@@ -12,7 +14,7 @@
pgetb(q);
if (piseol(q)) {
prm(q);
-@@ -635,9 +636,10 @@ long pisindent(P *p)
+@@ -660,9 +661,10 @@ long pisindent(P *p)
{
P *q = pdup(p, USTR "pisindent");
long col;
++++++ joe-3.1-terminate_buffer.patch ++++++
--- /var/tmp/diff_new_pack.Cmpyse/_old 2015-10-01 12:21:02.000000000 +0200
+++ /var/tmp/diff_new_pack.Cmpyse/_new 2015-10-01 12:21:02.000000000 +0200
@@ -1,7 +1,7 @@
-Index: path.c
+Index: joe-4.0/joe/path.c
===================================================================
---- path.c.orig 2008-11-02 21:33:23.000000000 +0100
-+++ path.c 2009-10-20 12:04:34.844305049 +0200
+--- joe-4.0.orig/joe/path.c
++++ joe-4.0/joe/path.c
@@ -200,6 +200,8 @@ unsigned char *mktmp(unsigned char *wher
where = (unsigned char *)getenv("TEMP");
if (!where)
++++++ joe-3.3-warnings.patch ++++++
--- /var/tmp/diff_new_pack.Cmpyse/_old 2015-10-01 12:21:02.000000000 +0200
+++ /var/tmp/diff_new_pack.Cmpyse/_new 2015-10-01 12:21:02.000000000 +0200
@@ -1,6 +1,8 @@
---- bw.c
-+++ bw.c
-@@ -206,6 +206,7 @@
+Index: joe-4.0/joe/bw.c
+===================================================================
+--- joe-4.0.orig/joe/bw.c
++++ joe-4.0/joe/bw.c
+@@ -206,6 +206,7 @@ HIGHLIGHT_STATE get_highlight_state(BW *
#ifdef junk
P *tmp = 0;
HIGHLIGHT_STATE state;
++++++ joe-3.7-additional_key_mappings.patch ++++++
--- /var/tmp/diff_new_pack.Cmpyse/_old 2015-10-01 12:21:02.000000000 +0200
+++ /var/tmp/diff_new_pack.Cmpyse/_new 2015-10-01 12:21:02.000000000 +0200
@@ -1,8 +1,8 @@
-Index: rc/jmacsrc.in
+Index: joe-4.0/rc/jmacsrc.in
===================================================================
---- rc/jmacsrc.in.orig 2008-11-02 20:13:54.000000000 +0100
-+++ rc/jmacsrc.in 2009-10-20 12:23:51.005295489 +0200
-@@ -868,6 +868,7 @@ home .kh Goto beginning of line
+--- joe-4.0.orig/rc/jmacsrc.in
++++ joe-4.0/rc/jmacsrc.in
+@@ -938,6 +938,7 @@ home .kh Goto beginning of line
home ^A
home ^[ [ H
home ^[ [ 1 ~
@@ -10,7 +10,7 @@
bop ^[ p (uemacs)
bop ^[ {
bufed ^X b
-@@ -896,6 +897,7 @@ eol .@7
+@@ -966,6 +967,7 @@ eol .@7
eol ^E
eol ^[ [ F
eol ^[ [ 4 ~
@@ -18,11 +18,11 @@
eop ^[ n (uemacs)
eop ^[ }
execmd ^[ x
-Index: rc/joerc.in
+Index: joe-4.0/rc/joerc.in
===================================================================
---- rc/joerc.in.orig 2008-11-02 04:29:43.000000000 +0100
-+++ rc/joerc.in 2009-10-20 12:23:51.039801181 +0200
-@@ -949,6 +949,9 @@ bof ^K u
+--- joe-4.0.orig/rc/joerc.in
++++ joe-4.0/rc/joerc.in
+@@ -1016,6 +1016,9 @@ bof ^K u
bol ^# SP A
home .kh
home ^A
@@ -32,7 +32,7 @@
center ^K A Center line
center ^K ^A
center ^K a
-@@ -973,6 +976,9 @@ eof ^K v
+@@ -1040,6 +1043,9 @@ eof ^K v
eol .kH Go to end of line
eol .@7
eol ^E
@@ -42,11 +42,11 @@
exsave ^K X Save and exit
exsave ^K ^X
exsave ^K x
-Index: rc/jpicorc.in
+Index: joe-4.0/rc/jpicorc.in
===================================================================
---- rc/jpicorc.in.orig 2008-11-02 04:19:48.000000000 +0100
-+++ rc/jpicorc.in 2009-10-20 12:23:51.092404427 +0200
-@@ -766,6 +766,7 @@ home .kh Goto beginning of line
+--- joe-4.0.orig/rc/jpicorc.in
++++ joe-4.0/rc/jpicorc.in
+@@ -837,6 +837,7 @@ home .kh Goto beginning of line
home ^A
home ^[ [ H
home ^[ [ 1 ~
@@ -54,7 +54,7 @@
center ^[ ^C Center line
center ^[ c
delch .kD Delete character
-@@ -794,6 +795,7 @@ eol .@7
+@@ -865,6 +866,7 @@ eol .@7
eol ^E
eol ^[ [ F
eol ^[ [ 4 ~
@@ -62,11 +62,11 @@
execmd ^[ X Prompt for command to execute
execmd ^[ ^X Prompt for command to execute
execmd ^[ x Prompt for command to execute
-Index: rc/jstarrc.in
+Index: joe-4.0/rc/jstarrc.in
===================================================================
---- rc/jstarrc.in.orig 2008-11-02 04:20:19.000000000 +0100
-+++ rc/jstarrc.in 2009-10-20 12:23:51.131880999 +0200
-@@ -805,6 +805,7 @@ bof ^Q .kP
+--- joe-4.0.orig/rc/jstarrc.in
++++ joe-4.0/rc/jstarrc.in
+@@ -875,6 +875,7 @@ bof ^Q .kP
home .kh Goto beginning of line
home ^[ [ H
home ^[ [ 1 ~
@@ -74,7 +74,7 @@
home ^Q S
home ^Q ^S
home ^Q s
-@@ -846,6 +847,7 @@ eol .kH Go to end of line
+@@ -916,6 +917,7 @@ eol .kH Go to end of line
eol .@7
eol ^[ [ F
eol ^[ [ 4 ~
@@ -82,11 +82,11 @@
eol ^Q D
eol ^Q ^D
eol ^Q d
-Index: rc/rjoerc.in
+Index: joe-4.0/rc/rjoerc.in
===================================================================
---- rc/rjoerc.in.orig 2008-11-02 04:20:28.000000000 +0100
-+++ rc/rjoerc.in 2009-10-20 12:23:51.176448836 +0200
-@@ -837,6 +837,7 @@ bol .kh Goto beginning of line
+--- joe-4.0.orig/rc/rjoerc.in
++++ joe-4.0/rc/rjoerc.in
+@@ -880,6 +880,7 @@ bol .kh Goto beginning of line
bol ^A
bol ^[ [ H
bol ^[ [ 1 ~
@@ -94,7 +94,7 @@
bol ^# SP A
center ^K A Center line
center ^K ^A
-@@ -863,6 +864,7 @@ eol .kH Go to end of line
+@@ -906,6 +907,7 @@ eol .kH Go to end of line
eol ^E
eol ^[ [ F
eol ^[ [ 4 ~
++++++ joe-3.7-spec_association.patch ++++++
--- /var/tmp/diff_new_pack.Cmpyse/_old 2015-10-01 12:21:02.000000000 +0200
+++ /var/tmp/diff_new_pack.Cmpyse/_new 2015-10-01 12:21:02.000000000 +0200
@@ -1,6 +1,8 @@
---- rc/ftyperc
-+++ rc/ftyperc
-@@ -753,3 +753,9 @@
+Index: joe-4.0/rc/ftyperc
+===================================================================
+--- joe-4.0.orig/rc/ftyperc
++++ joe-4.0/rc/ftyperc
+@@ -935,6 +935,12 @@
*jpicorc.in
-syntax joerc
@@ -10,3 +12,6 @@
+*.spec.in
+-syntax spec
+
+ Markdown
+ *.md
+ -syntax md
++++++ joe-3.7.tar.gz -> joe-4.0.tar.gz ++++++
++++ 146511 lines of diff (skipped)
++++++ joe-codecleanup.patch ++++++
--- /var/tmp/diff_new_pack.Cmpyse/_old 2015-10-01 12:21:02.000000000 +0200
+++ /var/tmp/diff_new_pack.Cmpyse/_new 2015-10-01 12:21:02.000000000 +0200
@@ -1,40 +1,40 @@
-Index: b.c
+Index: joe-4.0/joe/b.c
===================================================================
---- b.c.orig 2009-10-20 18:31:36.000000000 +0200
-+++ b.c 2009-10-20 18:35:09.643712608 +0200
-@@ -2194,13 +2194,13 @@ unsigned char *parsens(unsigned char *s,
+--- joe-4.0.orig/joe/b.c
++++ joe-4.0/joe/b.c
+@@ -2327,13 +2327,13 @@ unsigned char *parsens(unsigned char *s,
- #if SIZEOF_LONG_LONG && SIZEOF_OFF_T == SIZEOF_LONG_LONG
+ #if HAVE_LONG_LONG
if (n[x + 1] == 'x' || n[x + 1] == 'X')
-- sscanf((char *)(n + x + 2), "%llx", skip);
-+ sscanf((char *)(n + x + 2), "%llx", (long long unsigned int *)skip);
+- sscanf((char *)(n + x + 2), "%llx", &skipr);
++ sscanf((char *)(n + x + 2), "%llx", (long long unsigned int *)skipr);
else if (n[x + 1] == '0' && (n[x + 2] == 'x' || n[x + 2] == 'X'))
-- sscanf((char *)(n + x + 3), "%llx", skip);
-+ sscanf((char *)(n + x + 3), "%llx", (long long unsigned int *)skip);
+- sscanf((char *)(n + x + 3), "%llx", &skipr);
++ sscanf((char *)(n + x + 3), "%llx", (long long unsigned int *)skipr);
else if (n[x + 1] == '0')
-- sscanf((char *)(n + x + 1), "%llo", skip);
-+ sscanf((char *)(n + x + 1), "%llo", (long long unsigned int *)skip);
+- sscanf((char *)(n + x + 1), "%llo", &skipr);
++ sscanf((char *)(n + x + 1), "%llo", (long long unsigned int *)skipr);
else
-- sscanf((char *)(n + x + 1), "%lld", skip);
-+ sscanf((char *)(n + x + 1), "%lld", (long long int *)skip);
+- sscanf((char *)(n + x + 1), "%llu", &skipr);
++ sscanf((char *)(n + x + 1), "%llu", (long long int *)skipr);
#else
if (n[x + 1] == 'x' || n[x + 1] == 'X')
- sscanf((char *)(n + x + 2), "%lx", skip);
-@@ -2219,13 +2219,13 @@ unsigned char *parsens(unsigned char *s,
+ sscanf((char *)(n + x + 2), "%lx", &skipr);
+@@ -2353,13 +2353,13 @@ unsigned char *parsens(unsigned char *s,
*amnt = *skip;
- #if SIZEOF_LONG_LONG && SIZEOF_OFF_T == SIZEOF_LONG_LONG
+ #ifdef HAVE_LONG_LONG
if (n[x + 1] == 'x' || n[x + 1] == 'X')
-- sscanf((char *)(n + x + 2), "%llx", skip);
-+ sscanf((char *)(n + x + 2), "%llx", (long long unsigned int *)skip);
+- sscanf((char *)(n + x + 2), "%llx", &skipr);
++ sscanf((char *)(n + x + 2), "%llx", (long long unsigned int *)&skipr);
else if (n[x + 1] == '0' && (n[x + 2] == 'x' || n[x + 2] == 'X'))
-- sscanf((char *)(n + x + 3), "%llx", skip);
-+ sscanf((char *)(n + x + 3), "%llx", (long long unsigned int *)skip);
+- sscanf((char *)(n + x + 3), "%llx", &skipr);
++ sscanf((char *)(n + x + 3), "%llx", (long long unsigned int *)skipr);
else if (n[x + 1] == '0')
-- sscanf((char *)(n + x + 1), "%llo", skip);
-+ sscanf((char *)(n + x + 1), "%llo", (long long unsigned int *)skip);
+- sscanf((char *)(n + x + 1), "%llo", &skipr);
++ sscanf((char *)(n + x + 1), "%llo", (long long unsigned int *)skipr);
else
-- sscanf((char *)(n + x + 1), "%lld", skip);
-+ sscanf((char *)(n + x + 1), "%lld", (long long int *)skip);
+- sscanf((char *)(n + x + 1), "%llu", &skipr);
++ sscanf((char *)(n + x + 1), "%llu", (long long int *)skipr);
#else
if (n[x + 1] == 'x' || n[x + 1] == 'X')
- sscanf((char *)(n + x + 2), "%lx", skip);
+ sscanf((char *)(n + x + 2), "%lx", &skipr);
++++++ joe-rpmlintrc ++++++
# This line is mandatory to access the configuration functions
from Config import *
# The *are* configuration files, just not in /etc
addFilter("joe.* non-etc-or-var-file-marked-as-conffile")
++++++ joe-sigiot.patch ++++++
--- /var/tmp/diff_new_pack.Cmpyse/_old 2015-10-01 12:21:02.000000000 +0200
+++ /var/tmp/diff_new_pack.Cmpyse/_new 2015-10-01 12:21:02.000000000 +0200
@@ -1,20 +1,8 @@
-Index: uformat.c
+Index: joe-4.0/joe/uformat.c
===================================================================
---- uformat.c.orig 2008-10-28 05:13:56.000000000 +0100
-+++ uformat.c 2009-10-26 18:13:08.726241696 +0100
-@@ -361,9 +361,10 @@ void wrapword(BW *bw, P *p, long int ind
- if (!bw->o.autoindent) {
- /* Don't indent second line of single-line paragraphs if autoindent is off */
- int x = zlen(indents);
-+ int start = x;
- while (x && (indents[x - 1] == ' ' || indents[x - 1] == '\t'))
- indents[--x] = 0;
-- if (x) {
-+ if (x < start) {
- indents[x++] = ' ';
- indents[x] = 0;
- }
-@@ -430,7 +431,7 @@ void wrapword(BW *bw, P *p, long int ind
+--- joe-4.0.orig/joe/uformat.c
++++ joe-4.0/joe/uformat.c
+@@ -444,7 +444,7 @@ void wrapword(BW *bw, P *p, long int ind
if (!pisbol(p) && piscol(p) > indent) {
/* Move q to two (or one if 'french' is set) spaces after end of previous
word */
@@ -23,7 +11,7 @@
while (!pisbol(q))
if (!joe_isblank(p->b->o.charmap, (c = prgetc(q)))) {
pgetc(q);
-@@ -564,10 +565,12 @@ int uformat(BW *bw)
+@@ -578,10 +578,12 @@ int uformat(BW *bw)
if (!bw->o.autoindent) {
/* Don't indent second line of single-line paragraphs if autoindent is off */
int x = zlen(indents);
1
0
Hello community,
here is the log from the commit of package snapper for openSUSE:Factory checked in at 2015-10-01 12:20:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/snapper (Old)
and /work/SRC/openSUSE:Factory/.snapper.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "snapper"
Changes:
--------
--- /work/SRC/openSUSE:Factory/snapper/snapper.changes 2015-09-03 18:06:57.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.snapper.new/snapper.changes 2015-10-01 12:20:53.000000000 +0200
@@ -1,0 +2,19 @@
+Tue Sep 22 16:51:23 CEST 2015 - aschnell(a)suse.com
+
+- updated translations
+
+-------------------------------------------------------------------
+Tue Sep 22 14:55:10 CEST 2015 - shundhammer(a)suse.de
+
+- Call script /usr/lib/snapper/plugins/rollback if present upon
+ rollback (fate#319108)
+- version 0.2.9
+
+-------------------------------------------------------------------
+
+Tue Sep 22 12:20:28 CEST 2015 - aschnell(a)suse.com
+
+- added program to create btrfs subvolume suitable for systems
+ supporting rollback (bsc#944120)
+
+-------------------------------------------------------------------
Old:
----
snapper-0.2.8.tar.bz2
New:
----
snapper-0.2.9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ snapper.spec ++++++
--- /var/tmp/diff_new_pack.mWDxgq/_old 2015-10-01 12:20:54.000000000 +0200
+++ /var/tmp/diff_new_pack.mWDxgq/_new 2015-10-01 12:20:54.000000000 +0200
@@ -17,12 +17,13 @@
Name: snapper
-Version: 0.2.8
+Version: 0.2.9
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: snapper-%{version}.tar.bz2
Prefix: /usr
BuildRequires: boost-devel
+BuildRequires: e2fsprogs-devel
BuildRequires: gcc-c++
BuildRequires: libacl-devel
BuildRequires: libtool
@@ -109,10 +110,12 @@
%defattr(-,root,root)
%{prefix}/bin/snapper
%{prefix}/sbin/snapperd
+%{prefix}/sbin/mksubvolume
%{prefix}/lib/snapper
%doc %{_mandir}/*/snapper.8*
%doc %{_mandir}/*/snapperd.8*
%doc %{_mandir}/*/snapper-configs.5*
+%doc %{_mandir}/*/mksubvolume.8*
%config(noreplace) %{_sysconfdir}/logrotate.d/snapper
/etc/cron.hourly/suse.de-snapper
/etc/cron.daily/suse.de-snapper
++++++ snapper-0.2.8.tar.bz2 -> snapper-0.2.9.tar.bz2 ++++++
++++ 26664 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package python-pbr for openSUSE:Factory checked in at 2015-10-01 12:20:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pbr (Old)
and /work/SRC/openSUSE:Factory/.python-pbr.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pbr"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-pbr/python-pbr-doc.changes 2015-09-16 10:36:15.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.python-pbr.new/python-pbr-doc.changes 2015-10-01 12:20:44.000000000 +0200
@@ -1,0 +2,9 @@
+Sun Sep 20 09:03:29 UTC 2015 - tbechtold(a)suse.com
+
+- update to 1.8.0:
+ * Strip comments present in setup.cfg
+ * Protect WSGI application with a critical section
+- Remove 0001-Remove-sphinx_config.init_values-manual-call.patch
+ Fixed upstream
+
+-------------------------------------------------------------------
python-pbr.changes: same change
Old:
----
0001-Remove-sphinx_config.init_values-manual-call.patch
pbr-1.7.0.tar.gz
New:
----
pbr-1.8.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pbr-doc.spec ++++++
--- /var/tmp/diff_new_pack.e39tmU/_old 2015-10-01 12:20:45.000000000 +0200
+++ /var/tmp/diff_new_pack.e39tmU/_new 2015-10-01 12:20:45.000000000 +0200
@@ -17,7 +17,7 @@
Name: python-pbr-doc
-Version: 1.7.0
+Version: 1.8.0
Release: 0
Summary: Documentation for python-pbr
License: Apache-2.0
@@ -25,9 +25,6 @@
Url: http://pypi.python.org/pypi/pbr
Source: https://pypi.python.org/packages/source/p/pbr/pbr-%{version}.tar.gz
Source1: python-pbr-rpmlintrc
-# NOTE(toabctl): this is currently in review: https://review.openstack.org/#/c/193462/
-# needed to be abe to use pbr with newer Sphinx versions
-Patch0: 0001-Remove-sphinx_config.init_values-manual-call.patch
BuildRequires: fdupes
BuildRequires: python-devel
# Documentation requirements:
@@ -44,7 +41,6 @@
%prep
%setup -q -n pbr-%{version}
-%patch0 -p1
# Get rid of ugly build-time deps that require network:
sed -i "s/, 'sphinx\.ext\.intersphinx'//" doc/source/conf.py
++++++ python-pbr.spec ++++++
--- /var/tmp/diff_new_pack.e39tmU/_old 2015-10-01 12:20:45.000000000 +0200
+++ /var/tmp/diff_new_pack.e39tmU/_new 2015-10-01 12:20:45.000000000 +0200
@@ -21,7 +21,7 @@
%bcond_with test
Name: python-pbr
-Version: 1.7.0
+Version: 1.8.0
Release: 0
Summary: Python Build Reasonableness
License: Apache-2.0
@@ -29,9 +29,6 @@
Url: http://pypi.python.org/pypi/pbr
Source: https://pypi.python.org/packages/source/p/pbr/pbr-%{version}.tar.gz
Source1: python-pbr-rpmlintrc
-# NOTE(toabctl): this is currently in review: https://review.openstack.org/#/c/193462/
-# needed to be abe to use pbr with newer Sphinx versions
-Patch0: 0001-Remove-sphinx_config.init_values-manual-call.patch
BuildRequires: fdupes
BuildRequires: python-devel
BuildRequires: python-pip >= 1.4
@@ -69,7 +66,6 @@
%prep
%setup -q -n pbr-%{version}
-%patch0 -p1
# Get rid of ugly build-time deps that require network:
sed -i "s/, 'sphinx\.ext\.intersphinx'//" doc/source/conf.py
++++++ pbr-1.7.0.tar.gz -> pbr-1.8.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.7.0/AUTHORS new/pbr-1.8.0/AUTHORS
--- old/pbr-1.7.0/AUTHORS 2015-09-08 18:21:17.000000000 +0200
+++ new/pbr-1.8.0/AUTHORS 2015-09-14 22:59:19.000000000 +0200
@@ -1,5 +1,6 @@
Akihiro Motoki <motoki(a)da.jp.nec.com>
Alex Gaynor <alex.gaynor(a)gmail.com>
+Alexander Makarov <amakarov(a)mirantis.com>
Andreas Jaeger <aj(a)suse.de>
Andrew Bogott <abogott(a)wikimedia.org>
Angus Salkeld <asalkeld(a)redhat.com>
@@ -87,6 +88,7 @@
Thomas Grainger <tagrain(a)gmail.com>
Thomas Leaman <thomas.leaman(a)hp.com>
Tim Simpson <tim.simpson(a)rackspace.com>
+Timothy Chavez <timothy.chavez(a)hp.com>
Toilal <toilal.dev(a)gmail.com>
Vasudev Kamath <kamathvasudev(a)gmail.com>
Vincent Untz <vuntz(a)suse.com>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.7.0/ChangeLog new/pbr-1.8.0/ChangeLog
--- old/pbr-1.7.0/ChangeLog 2015-09-08 18:21:16.000000000 +0200
+++ new/pbr-1.8.0/ChangeLog 2015-09-14 22:59:19.000000000 +0200
@@ -1,6 +1,12 @@
CHANGES
=======
+1.8.0
+-----
+
+* Strip comments present in setup.cfg
+* Protect WSGI application with a critical section
+
1.7.0
-----
@@ -10,6 +16,7 @@
-----
* Strip comments in requirements files
+* Support Sphinx >=1.3 new protoype and warnings
1.5.0
-----
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.7.0/PKG-INFO new/pbr-1.8.0/PKG-INFO
--- old/pbr-1.7.0/PKG-INFO 2015-09-08 18:21:17.000000000 +0200
+++ new/pbr-1.8.0/PKG-INFO 2015-09-14 22:59:19.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: pbr
-Version: 1.7.0
+Version: 1.8.0
Summary: Python Build Reasonableness
Home-page: https://launchpad.net/pbr
Author: OpenStack
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.7.0/pbr/builddoc.py new/pbr-1.8.0/pbr/builddoc.py
--- old/pbr-1.7.0/pbr/builddoc.py 2015-09-08 18:20:54.000000000 +0200
+++ new/pbr-1.8.0/pbr/builddoc.py 2015-09-14 22:58:58.000000000 +0200
@@ -17,7 +17,9 @@
from distutils import log
import fnmatch
import os
+import pkg_resources
import sys
+import warnings
try:
import cStringIO
@@ -130,14 +132,19 @@
if self.today:
confoverrides['today'] = self.today
sphinx_config = config.Config(self.config_dir, 'conf.py', {}, [])
- sphinx_config.init_values()
+ sphinx_ver = pkg_resources.get_distribution("sphinx").version
+ if pkg_resources.parse_version(sphinx_ver) >= \
+ pkg_resources.parse_version('1.3.1'):
+ sphinx_config.init_values(warnings.warn)
+ else:
+ sphinx_config.init_values()
if self.builder == 'man' and len(sphinx_config.man_pages) == 0:
return
app = application.Sphinx(
self.source_dir, self.config_dir,
self.builder_target_dir, self.doctree_dir,
self.builder, confoverrides, status_stream,
- freshenv=self.fresh_env, warningiserror=True)
+ freshenv=self.fresh_env, warningiserror=False)
try:
app.build(force_all=self.all_files)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.7.0/pbr/packaging.py new/pbr-1.8.0/pbr/packaging.py
--- old/pbr-1.7.0/pbr/packaging.py 2015-09-08 18:20:54.000000000 +0200
+++ new/pbr-1.8.0/pbr/packaging.py 2015-09-14 22:58:58.000000000 +0200
@@ -250,6 +250,8 @@
_wsgi_text = """#PBR Generated from %(group)r
+import threading
+
from %(module_name)s import %(import_target)s
if __name__ == "__main__":
@@ -275,7 +277,12 @@
server.serve_forever()
else:
- application = %(invoke_target)s()
+ application = None
+ app_lock = threading.Lock()
+
+ with app_lock:
+ if application is None:
+ application = %(invoke_target)s()
"""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.7.0/pbr/tests/test_packaging.py new/pbr-1.8.0/pbr/tests/test_packaging.py
--- old/pbr-1.7.0/pbr/tests/test_packaging.py 2015-09-08 18:20:54.000000000 +0200
+++ new/pbr-1.8.0/pbr/tests/test_packaging.py 2015-09-14 22:58:58.000000000 +0200
@@ -479,7 +479,8 @@
[extras]
test =
foo
- baz>3.2 :python_version=='2.7'
+ baz>3.2 :python_version=='2.7' # MIT
+ bar>3.3 :python_version=='2.7' # MIT # Apache
""")))
# pkg_resources.split_sections uses None as the title of an
# anonymous section instead of the empty string. Weird.
@@ -489,7 +490,7 @@
":(python_version=='2.7')": ['Routes>=1.12.3,!=2.0,!=2.1',
'requests-kerberos>=0.6'],
'test': ['foo'],
- "test:(python_version=='2.7')": ['baz>3.2']
+ "test:(python_version=='2.7')": ['baz>3.2', 'bar>3.3']
}
setup_py = os.path.join(tempdir, 'setup.py')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.7.0/pbr/tests/test_wsgi.py new/pbr-1.8.0/pbr/tests/test_wsgi.py
--- old/pbr-1.7.0/pbr/tests/test_wsgi.py 2015-09-08 18:20:54.000000000 +0200
+++ new/pbr-1.8.0/pbr/tests/test_wsgi.py 2015-09-14 22:58:58.000000000 +0200
@@ -164,7 +164,7 @@
"%s" % app_name)
else_block = """else:
- application = %s()""" % app_name
+ application = None"""
self.assertIn(main_block, script_txt)
self.assertIn(starting_block, script_txt)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.7.0/pbr/util.py new/pbr-1.8.0/pbr/util.py
--- old/pbr-1.7.0/pbr/util.py 2015-09-08 18:20:54.000000000 +0200
+++ new/pbr-1.8.0/pbr/util.py 2015-09-14 22:58:58.000000000 +0200
@@ -334,7 +334,7 @@
# Split install_requires into package,env_marker tuples
# These will be re-assembled later
install_requires = []
- requirement_pattern = '(?P<package>[^;]*);?(?P<env_marker>.*)$'
+ requirement_pattern = '(?P<package>[^;]*);?(?P<env_marker>[^#]*?)(?:\s*#.*)?$'
for requirement in in_cfg_value:
m = re.match(requirement_pattern, requirement)
requirement_package = m.group('package').strip()
@@ -394,7 +394,7 @@
# -> {'fred': ['bar'], 'fred:marker':['foo']}
if 'extras' in config:
- requirement_pattern = '(?P<package>[^:]*):?(?P<env_marker>.*)$'
+ requirement_pattern = '(?P<package>[^:]*):?(?P<env_marker>[^#]*?)(?:\s*#.*)?$'
extras = config['extras']
for extra in extras:
extra_requirements = []
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.7.0/pbr.egg-info/PKG-INFO new/pbr-1.8.0/pbr.egg-info/PKG-INFO
--- old/pbr-1.7.0/pbr.egg-info/PKG-INFO 2015-09-08 18:21:17.000000000 +0200
+++ new/pbr-1.8.0/pbr.egg-info/PKG-INFO 2015-09-14 22:59:19.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: pbr
-Version: 1.7.0
+Version: 1.8.0
Summary: Python Build Reasonableness
Home-page: https://launchpad.net/pbr
Author: OpenStack
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.7.0/setup.cfg new/pbr-1.8.0/setup.cfg
--- old/pbr-1.7.0/setup.cfg 2015-09-08 18:21:17.000000000 +0200
+++ new/pbr-1.8.0/setup.cfg 2015-09-14 22:59:19.000000000 +0200
@@ -53,7 +53,7 @@
universal = 1
[egg_info]
+tag_build =
tag_date = 0
tag_svn_revision = 0
-tag_build =
1
0