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
June 2013
- 1 participants
- 1952 discussions
Hello community,
here is the log from the commit of package gjs for openSUSE:Factory checked in at 2013-06-29 19:39:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gjs (Old)
and /work/SRC/openSUSE:Factory/.gjs.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gjs"
Changes:
--------
--- /work/SRC/openSUSE:Factory/gjs/gjs.changes 2013-04-24 16:05:25.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.gjs.new/gjs.changes 2013-06-29 19:39:42.000000000 +0200
@@ -1,0 +2,13 @@
+Tue May 28 19:51:50 UTC 2013 - dimstar(a)opensuse.org
+
+- Update to version 1.37.1:
+ + Bugs fixed: bgo#670200, bgo#685436, bgo#690982, bgo#690984,
+ bgo#693294, bgo#696933, bgo#697309, bgo#697436, bgo#697592,
+ bgo#697816, bgo#697838, bgo#698182, bgo#698935, bgo#699783,
+ bgo#699784, bgo#699817, bgo#699818, bgo#699878, bgo#700335,
+ bgo#700336, bgo#700337, bgo#700529, bgo#700644, bgo#700668,
+ bgo#700862.
+- Replace pkgconfig(mozjs185) BuildRequires with
+ pkgconfig(mozjs-17.0), following upstreams change.
+
+-------------------------------------------------------------------
Old:
----
gjs-1.36.1.tar.xz
New:
----
gjs-1.37.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gjs.spec ++++++
--- /var/tmp/diff_new_pack.r7tTLz/_old 2013-06-29 19:39:43.000000000 +0200
+++ /var/tmp/diff_new_pack.r7tTLz/_new 2013-06-29 19:39:43.000000000 +0200
@@ -17,14 +17,14 @@
Name: gjs
-Version: 1.36.1
+Version: 1.37.1
Release: 0
# FIXME: find out if tapsets should really be in devel package or in main package
Summary: JavaScript bindings based on gobject-introspection and Mozilla
License: MIT
Group: Development/Libraries/GNOME
Url: http://live.gnome.org/Gjs
-Source: http://download.gnome.org/sources/gjs/1.36/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/gjs/1.37/%{name}-%{version}.tar.xz
BuildRequires: gcc-c++
BuildRequires: python
BuildRequires: readline-devel
@@ -34,7 +34,7 @@
BuildRequires: pkgconfig(glib-2.0) >= 2.36.0
BuildRequires: pkgconfig(gobject-introspection-1.0) >= 1.36.0
BuildRequires: pkgconfig(libffi)
-BuildRequires: pkgconfig(mozjs185)
+BuildRequires: pkgconfig(mozjs-17.0)
Requires: libgjs0 = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ gjs-1.36.1.tar.xz -> gjs-1.37.1.tar.xz ++++++
++++ 51685 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package genius for openSUSE:Factory checked in at 2013-06-29 19:39:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/genius (Old)
and /work/SRC/openSUSE:Factory/.genius.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "genius"
Changes:
--------
--- /work/SRC/openSUSE:Factory/genius/genius.changes 2012-12-19 20:29:35.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.genius.new/genius.changes 2013-06-29 19:39:39.000000000 +0200
@@ -1,0 +2,30 @@
+Thu Jun 27 04:37:32 UTC 2013 - zaitor(a)opensuse.org
+
+- Update to version 1.0.17:
+ + Better precision for graphs especially when zoomed it a lot,
+ and make font smaller if needed.
+ + Line plots and parametric plots now allow "fit dependent axis"
+ automatically when y limits are unspecified. And this is the
+ default in the UI.
+ + Add export of graphs to PDF directly.
+ + Line plot step size is adaptive, also line plots now detect
+ jumps and do not draw a connecting line, try plotting UnitStep
+ for example.
+ + Use arrow keys to move around a line plot.
+ + left-right arrow keys rotate surface plot.
+ + All plots are now antialiased on the screen (due to GtkExtra
+ update and cairo usage).
+ + Update internal GtkExtra to 3.0.5, and forward port all our
+ changes/fixes (this gets us closer to supporting GTK+3 at some
+ point).
+ + Completion for "help on function" in the GUI.
+ + Fix FindRootBisection and FindRootMullersMethod.
+ + Factors is now a lot faster on very large numbers (as fast as
+ Factorize).
+ + Fix placement of labels on surface plots.
+ + A few small fixes and updates to the documentation.
+ + A few minor bugfixes.
+ + Update mersenne primes (new one is known).
+ + Updated translations.
+
+-------------------------------------------------------------------
Old:
----
genius-1.0.16.tar.xz
New:
----
genius-1.0.17.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ genius.spec ++++++
--- /var/tmp/diff_new_pack.JVEW5k/_old 2013-06-29 19:39:40.000000000 +0200
+++ /var/tmp/diff_new_pack.JVEW5k/_new 2013-06-29 19:39:40.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package genius
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: genius
-Version: 1.0.16
+Version: 1.0.17
Release: 0
Summary: General purpose calculator and mathematics tool
License: GPL-3.0+
++++++ genius-1.0.16.tar.xz -> genius-1.0.17.tar.xz ++++++
++++ 144266 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package gedit-plugins for openSUSE:Factory checked in at 2013-06-29 19:39:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gedit-plugins (Old)
and /work/SRC/openSUSE:Factory/.gedit-plugins.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gedit-plugins"
Changes:
--------
--- /work/SRC/openSUSE:Factory/gedit-plugins/gedit-plugins.changes 2013-04-26 15:43:28.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.gedit-plugins.new/gedit-plugins.changes 2013-06-29 19:39:35.000000000 +0200
@@ -1,0 +2,21 @@
+Fri Jun 21 19:50:58 UTC 2013 - dimstar(a)opensuse.org
+
+- Update to version 3.9.1:
+ + Add user help translations.
+ + New git plugin.
+ + terminal: handle drag and drop of files.
+ + Follow gnome-terminal settings on terminal plugin.
+ + Misc bugfixes.
+ + Updated translations.
+- Replace gnome-doc-utils-devel BuildRequires with yelp-tools,
+ following upstreams port to the new documentation infrastructure.
+
+-------------------------------------------------------------------
+Sun May 26 18:42:07 UTC 2013 - dimstar(a)opensuse.org
+
+- Update to version 3.8.2:
+ + Follow gnome-terminal settings on terminal plugin.
+ + Misc bugfixes.
+ + Updated translations.
+
+-------------------------------------------------------------------
Old:
----
gedit-plugins-3.8.1.tar.xz
New:
----
gedit-plugins-3.9.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gedit-plugins.spec ++++++
--- /var/tmp/diff_new_pack.JHMNX9/_old 2013-06-29 19:39:36.000000000 +0200
+++ /var/tmp/diff_new_pack.JHMNX9/_new 2013-06-29 19:39:36.000000000 +0200
@@ -21,15 +21,15 @@
Summary: A collection of plugins for gedit
License: GPL-2.0+
Group: Productivity/Editors/Other
-Version: 3.8.1
+Version: 3.9.1
Release: 0
-Source: http://download.gnome.org/sources/gedit-plugins/3.8/%{name}-%{version}.tar.…
+Source: http://download.gnome.org/sources/gedit-plugins/3.9/%{name}-%{version}.tar.…
Url: http://live.gnome.org/GeditPlugins
BuildRequires: fdupes
-BuildRequires: gnome-doc-utils-devel
BuildRequires: intltool
BuildRequires: pkg-config
BuildRequires: translation-update-upstream
+BuildRequires: yelp-tools
BuildRequires: pkgconfig(dbus-python)
BuildRequires: pkgconfig(gedit) >= 3.7.1
BuildRequires: pkgconfig(gtk+-3.0) >= 3.4.0
@@ -62,12 +62,11 @@
* Show tabbar A very basic plugin which shows or hides the gedit tabbar
* Terminal A simple terminal widget accessible from the bottom panel
+%lang_package
%prep
%setup -q
translation-update-upstream
-%lang_package
-
%build
%configure
%__make %{?jobs:-j%jobs} V=1
@@ -76,6 +75,7 @@
%makeinstall
find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
%find_lang %{name}
+%find_lang gedit %{name}.lang
%fdupes %{buildroot}/%{_datadir}/gedit/plugins
%fdupes %{buildroot}/%{_libdir}/gedit/plugins
++++++ gedit-plugins-3.8.1.tar.xz -> gedit-plugins-3.9.1.tar.xz ++++++
++++ 181478 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package gedit for openSUSE:Factory checked in at 2013-06-29 19:39:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gedit (Old)
and /work/SRC/openSUSE:Factory/.gedit.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gedit"
Changes:
--------
--- /work/SRC/openSUSE:Factory/gedit/gedit.changes 2013-05-16 10:28:54.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.gedit.new/gedit.changes 2013-06-29 19:39:32.000000000 +0200
@@ -1,0 +2,26 @@
+Sat Jun 22 10:46:54 UTC 2013 - zaitor(a)opensuse.org
+
+- Update to version 3.9.2:
+ + Many bugfixes and improvements to the filebrowser, quickopen
+ and external tools plugins.
+ + Misc bugfixes.
+ + Updated translations.
+
+-------------------------------------------------------------------
+Tue Jun 4 19:35:47 UTC 2013 - zaitor(a)opensuse.org
+
+- Update to version 3.9.1:
+ + Add new Highlight Mode dialog.
+ + Allow shell quotes in commands from Run Command tool.
+ + Use widget templates.
+ + external tools:
+ - Look in browser root for files in tool output.
+ - Extend link parser to handle grep output.
+ - Provide environment variable with file browser root.
+ + Improvements in filebrowser.
+ + Improvements in quickopen.
+ + Improvements in docs.
+ + Misc bugfixes.
+ + Updated translations.
+
+-------------------------------------------------------------------
Old:
----
gedit-3.8.2.tar.xz
New:
----
gedit-3.9.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gedit.spec ++++++
--- /var/tmp/diff_new_pack.q3Nhe5/_old 2013-06-29 19:39:33.000000000 +0200
+++ /var/tmp/diff_new_pack.q3Nhe5/_new 2013-06-29 19:39:33.000000000 +0200
@@ -17,13 +17,13 @@
Name: gedit
-Version: 3.8.2
+Version: 3.9.2
Release: 0
Summary: Small and lightweight UTF-8 text editor
License: GPL-2.0+
Group: Productivity/Text/Editors
Url: http://www.gnome.org
-Source: http://download.gnome.org/sources/gedit/3.8/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/gedit/3.9/%{name}-%{version}.tar.xz
# PATCH-FIX-OPENSUSE gedit-desktop.patch -- adds more MIME types and change icon
Patch0: gedit-desktop.patch
BuildRequires: enchant-devel
@@ -36,9 +36,9 @@
BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files
BuildRequires: yelp-tools
-BuildRequires: pkgconfig(gio-2.0) >= 2.35.4
+BuildRequires: pkgconfig(gio-2.0) >= 2.37.0
BuildRequires: pkgconfig(gsettings-desktop-schemas)
-BuildRequires: pkgconfig(gtk+-3.0) >= 3.7.10
+BuildRequires: pkgconfig(gtk+-3.0) >= 3.9.0
BuildRequires: pkgconfig(gtksourceview-3.0) >= 3.2.0
BuildRequires: pkgconfig(ice)
BuildRequires: pkgconfig(libpeas-1.0) >= 1.7.0
++++++ gedit-3.8.2.tar.xz -> gedit-3.9.2.tar.xz ++++++
++++ 127084 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package geary for openSUSE:Factory checked in at 2013-06-29 19:39:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/geary (Old)
and /work/SRC/openSUSE:Factory/.geary.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "geary"
Changes:
--------
--- /work/SRC/openSUSE:Factory/geary/geary.changes 2013-03-23 20:19:02.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.geary.new/geary.changes 2013-06-29 19:39:29.000000000 +0200
@@ -1,0 +2,9 @@
+Wed Jun 26 16:00:45 UTC 2013 - zaitor(a)opensuse.org
+
+- Update to version 0.3.1:
+ + Reduced CPU and memory footprint.
+ + Account dialog bugs fixed.
+ + Stability improvements.
+- Drop geary-0.3-desktop.patch; fixed upstream.
+
+-------------------------------------------------------------------
@@ -4 +13 @@
-- Update to version 3.0.0:
+- Update to version 0.3.0:
Old:
----
geary-0.3-desktop.patch
geary-0.3.0.tar.xz
New:
----
geary-0.3.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ geary.spec ++++++
--- /var/tmp/diff_new_pack.AfHTer/_old 2013-06-29 19:39:29.000000000 +0200
+++ /var/tmp/diff_new_pack.AfHTer/_new 2013-06-29 19:39:29.000000000 +0200
@@ -17,15 +17,13 @@
Name: geary
-Version: 0.3.0
+Version: 0.3.1
Release: 0
Summary: A lightweight email reader for the GNOME desktop
License: LGPL-2.0+
Group: Productivity/Networking/Email/Clients
Url: http://yorba.org/geary
Source: http://yorba.org/download/geary/stable/%{name}-%{version}.tar.xz
-## PATCH-FIX-UPSTREAM geary-0.3-desktop.patch http://redmine.yorba.org/issues/6553 zaitor(a)opensuse.org -- Fix broken desktopfile.
-Patch0: geary-0.3-desktop.patch
BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: intltool
@@ -56,7 +54,6 @@
%lang_package
%prep
%setup -q
-%patch0 -p1
%build
# custom configure script, thus not using the macro.
++++++ geary-0.3.0.tar.xz -> geary-0.3.1.tar.xz ++++++
++++ 3784 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package gdk-pixbuf for openSUSE:Factory checked in at 2013-06-29 19:39:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gdk-pixbuf (Old)
and /work/SRC/openSUSE:Factory/.gdk-pixbuf.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gdk-pixbuf"
Changes:
--------
--- /work/SRC/openSUSE:Factory/gdk-pixbuf/gdk-pixbuf.changes 2013-06-05 11:51:56.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.gdk-pixbuf.new/gdk-pixbuf.changes 2013-06-29 19:39:26.000000000 +0200
@@ -1,0 +2,8 @@
+Sat Jun 22 14:31:04 UTC 2013 - dimstar(a)opensuse.org
+
+- Update to version 2.29.2:
+ + Install some tests.
+ + ANI: Set an error if we fail to produce an animation.
+ + Updated translations.
+
+-------------------------------------------------------------------
Old:
----
gdk-pixbuf-2.29.0.tar.xz
New:
----
gdk-pixbuf-2.29.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gdk-pixbuf.spec ++++++
--- /var/tmp/diff_new_pack.x9VVxq/_old 2013-06-29 19:39:27.000000000 +0200
+++ /var/tmp/diff_new_pack.x9VVxq/_new 2013-06-29 19:39:27.000000000 +0200
@@ -20,7 +20,7 @@
%define gdk_pixbuf_binary_version 2.10.0
Name: gdk-pixbuf
-Version: 2.29.0
+Version: 2.29.2
Release: 0
Summary: An image loading library
License: LGPL-2.1+
@@ -33,7 +33,7 @@
BuildRequires: libjpeg-devel
BuildRequires: libtiff-devel
BuildRequires: translation-update-upstream
-BuildRequires: pkgconfig(glib-2.0) >= 2.37.0
+BuildRequires: pkgconfig(glib-2.0) >= 2.37.2
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(libpng)
BuildRequires: pkgconfig(x11)
++++++ gdk-pixbuf-2.29.0.tar.xz -> gdk-pixbuf-2.29.2.tar.xz ++++++
++++ 8010 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package file-roller for openSUSE:Factory checked in at 2013-06-29 19:39:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/file-roller (Old)
and /work/SRC/openSUSE:Factory/.file-roller.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "file-roller"
Changes:
--------
--- /work/SRC/openSUSE:Factory/file-roller/file-roller.changes 2013-06-05 11:51:00.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.file-roller.new/file-roller.changes 2013-06-29 19:39:20.000000000 +0200
@@ -1,0 +2,21 @@
+Thu Jun 20 14:25:27 UTC 2013 - dimstar(a)opensuse.org
+
+- Update to version 3.9.3:
+ + 'Add files' dialog: use a GtkPlacesSidebar for the sidebar.
+ + Bugs fixed:
+ - Do not allow to create a second 'New Archive' dialog
+ (bgo#701992).
+ - New dialog: use correct method to get the selected directory
+ (bgo#701297).
+ - libarchive: sanitize filenames before extracting.
+ + Updated translations.
+
+-------------------------------------------------------------------
+Tue May 28 06:43:20 UTC 2013 - dimstar(a)opensuse.org
+
+- Update to version 3.9.2:
+ + Do not allow to save as the original name (bgo#700892).
+ + Fixed the build.
+ + Updated translations.
+
+-------------------------------------------------------------------
Old:
----
file-roller-3.9.1.tar.xz
New:
----
file-roller-3.9.3.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ file-roller.spec ++++++
--- /var/tmp/diff_new_pack.x2J2YQ/_old 2013-06-29 19:39:21.000000000 +0200
+++ /var/tmp/diff_new_pack.x2J2YQ/_new 2013-06-29 19:39:21.000000000 +0200
@@ -17,7 +17,7 @@
Name: file-roller
-Version: 3.9.1
+Version: 3.9.3
Release: 0
Summary: An Archive Manager for GNOME
License: GPL-2.0+
@@ -37,7 +37,7 @@
BuildRequires: update-desktop-files
BuildRequires: yelp-tools
BuildRequires: pkgconfig(glib-2.0)
-BuildRequires: pkgconfig(gtk+-3.0) >= 3.4.0
+BuildRequires: pkgconfig(gtk+-3.0) >= 3.9.3
BuildRequires: pkgconfig(ice)
BuildRequires: pkgconfig(json-glib-1.0) >= 0.14.0
BuildRequires: pkgconfig(libarchive) >= 3.0.0
++++++ file-roller-3.9.1.tar.xz -> file-roller-3.9.3.tar.xz ++++++
++++ 9824 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package evolution-ews for openSUSE:Factory checked in at 2013-06-29 19:39:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/evolution-ews (Old)
and /work/SRC/openSUSE:Factory/.evolution-ews.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "evolution-ews"
Changes:
--------
--- /work/SRC/openSUSE:Factory/evolution-ews/evolution-ews.changes 2013-06-05 11:50:33.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.evolution-ews.new/evolution-ews.changes 2013-06-29 19:39:16.000000000 +0200
@@ -1,0 +2,39 @@
+Fri Jun 21 16:04:47 UTC 2013 - dimstar(a)opensuse.org
+
+- Update to version 3.9.3:
+ + e-ews-search-user: Do not print console error when nothing
+ found.
+ + Fetch fresh folder's change-key, when reading folder
+ permissions.
+ + Check for cancellation when refreshing folder content.
+ + Require --with-internal-lzx for libmspack fallback.
+ + Disable incremental GAL updates without libmspack.
+ + Fix various memory leaks.
+ + Make the statements explicit when using ternary if.
+ + Bugs fixed: bgo#701246.
+ + Updated translations.
+
+-------------------------------------------------------------------
+Sun May 26 18:40:06 UTC 2013 - dimstar(a)opensuse.org
+
+- Update to version 3.9.2:
+ + Handle inlined attachments in
+ e_ews_connection_{create,get}_attachments.
+ + Handle absence of ETag.
+ + Update LZX decompressor.
+ + Allow upstream libmspack to be used, if it's new enough.
+ + Allow e_ews_connection_get_oal_detail() to return more than one
+ type of element.
+ + Fix crash on addressbook close.
+ + Don't remove OAB file after processing.
+ + Implement incremental GAL download.
+ + Use "X-EWS-KIND" attribute.
+ + Bugs fixed: bgo#654950, bgo#658892, bgo#673351, bgo#698728,
+ bgo#699231, bgo#699241, bgo#699373, bgo#699481, bgo#699847.
+ + Updated translations.
+- Add pkgconfig(libmspack) BuildRequires: new dependency.
+- Drop liblzx0 subpackage: this was a wrapper around libmspack
+ functionality, where the fixes were merged in this code. As per
+ SLPP, we do not obsolete the library.
+
+-------------------------------------------------------------------
Old:
----
evolution-ews-3.9.1.tar.xz
New:
----
evolution-ews-3.9.3.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ evolution-ews.spec ++++++
--- /var/tmp/diff_new_pack.Cqj2Vo/_old 2013-06-29 19:39:17.000000000 +0200
+++ /var/tmp/diff_new_pack.Cqj2Vo/_new 2013-06-29 19:39:17.000000000 +0200
@@ -19,7 +19,7 @@
Name: evolution-ews
# This should be updated upon major version changes; it should match BASE_VERSION as defined in configure.in.
%define evolution_base_version 3.10
-Version: 3.9.1
+Version: 3.9.3
Release: 0
Summary: Exchange Connector for Evolution, compatible with Exchange 2007 and later
License: LGPL-2.1
@@ -40,6 +40,7 @@
BuildRequires: pkgconfig(libedata-cal-1.2)
BuildRequires: pkgconfig(libedataserver-1.2)
BuildRequires: pkgconfig(libemail-engine) >= 3.2.0
+BuildRequires: pkgconfig(libmspack) >= 0.4
BuildRequires: pkgconfig(libsoup-2.4) >= 2.30
Recommends: %{name}-lang
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -71,19 +72,11 @@
%description -n libewsutils0
This library provides utilities API for EWS Exchange Connector.
-%package -n liblzx0
-Summary: Client library for Accessing Exchange Servers - LZX library
-Group: System/Libraries
-
-%description -n liblzx0
-This library is an implementation of the LZX compression algorithm.
-
%package devel
Summary: Client library for Accessing Exchange Servers -- Development Files
Group: Development/Libraries/C and C++
Requires: libeews-1_2-0 = %{version}
Requires: libewsutils0 = %{version}
-Requires: liblzx0 = %{version}
%description devel
This library is a client library for accessing Exchange servers through
@@ -114,10 +107,6 @@
%postun -n libewsutils0 -p /sbin/ldconfig
-%post -n liblzx0 -p /sbin/ldconfig
-
-%postun -n liblzx0 -p /sbin/ldconfig
-
%files
%defattr(-,root,root)
%doc COPYING README
@@ -139,16 +128,11 @@
%dir %{_libdir}/evolution-data-server/
%{_libdir}/evolution-data-server/libewsutils.so.*
-%files -n liblzx0
-%defattr(-, root, root)
-%{_libdir}/liblzx.so.*
-
%files devel
%defattr(-, root, root)
%dir %{_libdir}/evolution-data-server/
%{_libdir}/evolution-data-server/libeews-1.2.so
%{_libdir}/evolution-data-server/libewsutils.so
-%{_libdir}/liblzx.so
%dir %{_includedir}/evolution-data-server/
%{_includedir}/evolution-data-server/ews/
++++++ evolution-ews-3.9.1.tar.xz -> evolution-ews-3.9.3.tar.xz ++++++
++++ 14224 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package evolution-data-server for openSUSE:Factory checked in at 2013-06-29 19:38:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/evolution-data-server (Old)
and /work/SRC/openSUSE:Factory/.evolution-data-server.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "evolution-data-server"
Changes:
--------
--- /work/SRC/openSUSE:Factory/evolution-data-server/evolution-data-server.changes 2013-06-14 10:05:22.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.evolution-data-server.new/evolution-data-server.changes 2013-06-29 19:38:58.000000000 +0200
@@ -1,0 +2,33 @@
+Sun Jun 16 21:44:53 UTC 2013 - zaitor(a)opensuse.org
+
+- Update to version 3.9.3:
+ + EBookQuery: Added regex query API.
+ + Be able to debug SMTP provider separately.
+ + Make the statements explicit when using ternary if
+ + Bugs fixed: bgo#649420, bgo#672837, bgo#699448, bgo#701797,
+ bgo#701838.
+ + Updated translations.
+
+-------------------------------------------------------------------
+Sun Jun 16 18:41:33 UTC 2013 - dimstar(a)opensuse.org
+
+- Update to version 3.9.2:
+ + Make camel_mime_message_dump() dump message contents.
+ + IMAPX: Recognize RFC 5530 response codes.
+ + EBookClientView/ECalClientView: Make D-Bus signal handlers
+ thread-safe.
+ + ECalBackendWeather: e_weather_source_new() is failable.
+ + google: Remove environment variable check for debugging.
+ + IMAPX: Support IMAP MOVE extension.
+ + IMAPX: Set real Trash/Junk folder type as expected.
+ + Camel MH provider can deadlock on folder creation.
+ + CamelGpgContext: Report decrypt error only if no data was
+ decrypted.
+ + Make CamelPOP3Store a bit more thread-safe.
+ + Make CamelNNTPStore a bit more thread-safe.
+ + Improve error handling in imapx_command_fetch_message_done().
+ + Bugs fixed: bgo#697859, bgo#698725, bgo#699024, bgo#699160,
+ bgo#699223, bgo#699461, bgo#699597, bgo#699811, bgo#699909.
+ + Updated translations.
+
+-------------------------------------------------------------------
Old:
----
evolution-data-server-3.9.1.tar.xz
New:
----
evolution-data-server-3.9.3.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ evolution-data-server.spec ++++++
--- /var/tmp/diff_new_pack.PEEOPs/_old 2013-06-29 19:38:59.000000000 +0200
+++ /var/tmp/diff_new_pack.PEEOPs/_new 2013-06-29 19:38:59.000000000 +0200
@@ -32,7 +32,7 @@
Name: evolution-data-server
%define _evo_version 3.10
-Version: 3.9.1
+Version: 3.9.3
Release: 0
Summary: Evolution Data Server
License: LGPL-2.1+
++++++ evolution-data-server-3.9.1.tar.xz -> evolution-data-server-3.9.3.tar.xz ++++++
++++ 36356 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package evolution for openSUSE:Factory checked in at 2013-06-29 19:38:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/evolution (Old)
and /work/SRC/openSUSE:Factory/.evolution.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "evolution"
Changes:
--------
--- /work/SRC/openSUSE:Factory/evolution/evolution.changes 2013-06-05 11:49:28.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.evolution.new/evolution.changes 2013-06-29 19:38:29.000000000 +0200
@@ -1,0 +2,39 @@
+Fri Jun 21 15:58:53 UTC 2013 - dimstar(a)opensuse.org
+
+- Update to version 3.9.3:
+ + Rename some base libraries to libevolution-$FOO.
+ + Use F9 to toggle sidebar visibility.
+ + Update Quick Reference Card to show F12 shortcut.
+ + Remove Evolution icon from header section.
+ + Make EAlertDialog non-resizable.
+ + Ask for a Smart Card password with a token name too.
+ + GnomeCalendar: Get rid of the async message dispatcher.
+ + Make the "Headers" print dialog tab actually work.
+ + Reimplement the main toolbar's prefer-item feature.
+ + Fix various causes for crashes after closing a 2nd Evolution
+ window.
+ + Heavily refactor MessageList and ETreeModel.
+ + Remove lots of unused legacy APIs.
+ + Bugs fixed: bgo#250046, bgo#555130, bgo#684302, bgo#700277,
+ bgo#700812, bgo#701669.
+ + Updated translations.
+
+-------------------------------------------------------------------
+Sun May 26 18:38:27 UTC 2013 - dimstar(a)opensuse.org
+
+- Update to version 3.9.2:
+ + Make sure EAddressbookModel has a fresh EBookClient.
+ + Merge [mark-all-read] plugin into core code.
+ + contact-photos: Obtain an EClient asynchronously.
+ + Right-align mail header names.
+ + Improve mail header layout in right-to-left locales.
+ + Remove "drag-and-drop-save-name-format" setting.
+ + Convert EMailPart to a GObject.
+ + Use an user-friendlier message when update comp-editor fails.
+ + Make EAttachment a little more thread-safe.
+ + EMailSession: Add helper functions for sending messages.
+ + Bugs fixed: bgo#301323, bgo#696531, bgo#697632, bgo#699334,
+ bgo#699551, bgo#699555, bgo#699980, bgo#700028.
+ + Updated translations.
+
+-------------------------------------------------------------------
Old:
----
evolution-3.9.1.tar.xz
New:
----
evolution-3.9.3.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ evolution.spec ++++++
--- /var/tmp/diff_new_pack.39yvxo/_old 2013-06-29 19:38:30.000000000 +0200
+++ /var/tmp/diff_new_pack.39yvxo/_new 2013-06-29 19:38:30.000000000 +0200
@@ -24,7 +24,7 @@
Name: evolution
# This should be updated upon major version changes; it should match BASE_VERSION as defined in configure.in.
%define evolution_base_version 3.10
-Version: 3.9.1
+Version: 3.9.3
Release: 0
# _version needs to be %{version} stirpped to major.minor.micro only...
%define _version %(echo %{version} | grep -E -o '[0-9]+\.[0-9]+\.[0-9]+')
@@ -256,7 +256,6 @@
%{_libdir}/evolution/*/plugins/*-mail-notification.*
%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.mail-notification.gschema.xml
%{_libdir}/evolution/*/plugins/*-mail-to-task.*
-%{_libdir}/evolution/*/plugins/*-mark-all-read.*
%{_libdir}/evolution/*/plugins/*-prefer-plain.*
%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.prefer-plain.gschema.xml
%{_libdir}/evolution/*/plugins/*-pst-import.*
@@ -282,7 +281,6 @@
%defattr(-,root,root)
%{_includedir}/*
%{_libdir}/pkgconfig/*.pc
-%{_datadir}/gtk-doc/html/libeshell/
-%{_datadir}/gtk-doc/html/libeutil/
+%{_datadir}/gtk-doc/html/evolution-*/
%changelog
++++++ evolution-3.9.1.tar.xz -> evolution-3.9.3.tar.xz ++++++
/work/SRC/openSUSE:Factory/evolution/evolution-3.9.1.tar.xz /work/SRC/openSUSE:Factory/.evolution.new/evolution-3.9.3.tar.xz differ: char 26, line 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package evince for openSUSE:Factory checked in at 2013-06-29 19:37:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/evince (Old)
and /work/SRC/openSUSE:Factory/.evince.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "evince"
Changes:
--------
--- /work/SRC/openSUSE:Factory/evince/evince.changes 2013-04-02 17:52:57.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.evince.new/evince.changes 2013-06-29 19:38:01.000000000 +0200
@@ -1,0 +2,66 @@
+Fri Jun 21 18:59:50 UTC 2013 - dimstar(a)opensuse.org
+
+- Update to version 3.9.3:
+ + Make the history behave more like a web browser
+ + Add a fallback implementation of text selection for backends
+ that implement get_selection_region but not render_selection
+ (bgo#669022).
+ + Initial implementation of caret navigation added to libview
+ (bgo#638905, bgo#702076, bgo#702068).
+ + Add a GSetting to set a custom page cache size (bgo#642683).
+ + Use horzontal/vertical GtkBoxes instead of deprecated
+ GtkHBox/GtkVBox.
+ + Fix runtime critical warning for links with NULL action.
+ + Fix -Wstrict-prototypes warnings.
+ + Remove obsolete g_type_init calls.
+ + Bugs fixed: bgo#697397, bgo#702406, bgo#683172, bgo#701900,
+ bgo#701302.
+ + Updated translations.
+
+-------------------------------------------------------------------
+Wed May 29 09:47:21 UTC 2013 - dimstar(a)opensuse.org
+
+- Update to version 3.9.2:
+ + New features and improvements:
+ - Forward key events received in the toplevel window to the
+ focused widget (bgo#676040).
+ - Use the document filename as output basename when printing to
+ a file (bgo#700466).
+ - Enable GDK_SMOOTH_SCROLL events for EvView (bgo#674098).
+ - Show the document URI in the error message when it fails to
+ open (bgo#697900).
+ - Allow to browse all files from Save Image dialog by adding
+ more filters to the file chooser (bgo#523071).
+ - Added Shift+Enter shortcut to search backwards (bgo#641797).
+ - Make shortcuts for find next/previous work even when the find
+ bar is closed (bgo#625225).
+ - Add support for file identifiers to DJVU backend
+ (bgo#619410).
+ - Add support for page labels to DJVU backend (bgo#619407).
+ - Use ellipsis character in translatable strings (bgo#695597).
+ + bugs fixed: bgo#668446, bgo#699108, bgo#695597, bgo#695524,
+ bgo#694143.
+ + Updated documentation.
+ + Updated translations.
+
+-------------------------------------------------------------------
+Wed May 15 08:18:57 UTC 2013 - dimstar(a)opensuse.org
+
+- Update to version 3.8.2:
+ + Fix zoom and position of FitR link destinations (bgo#695524).
+ + Update the search string when the document is reloaded
+ (bgo#694143).
+ + Fix --find command line option to actually show the find bar
+ (bgo#604327).
+ + Forward EvView key events to the focused form field, so that
+ it's possible to move between words with CTRL+Left/Right in
+ text form fields instead of rotating the view (bgo#699630).
+ + Do not update the history while searching to prevent the find
+ bar from begin closed unexpectedly (bgo#697194).
+ + Fix document to view coordinates transformation to take page
+ borders into account. This makes search results, form fields,
+ annotations and other items to be correctly placed on the view.
+ + Updated documentations.
+ + Updated translations.
+
+-------------------------------------------------------------------
Old:
----
evince-3.8.0.tar.xz
New:
----
evince-3.9.3.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ evince.spec ++++++
--- /var/tmp/diff_new_pack.sld996/_old 2013-06-29 19:38:02.000000000 +0200
+++ /var/tmp/diff_new_pack.sld996/_new 2013-06-29 19:38:02.000000000 +0200
@@ -17,14 +17,14 @@
Name: evince
-Version: 3.8.0
+Version: 3.9.3
Release: 0
%define _major_version 3.0
Summary: GNOME Document Viewer
License: GPL-2.0+
Group: Productivity/Office/Other
Url: http://www.gnome.org/projects/evince/
-Source: http://download.gnome.org/sources/evince/3.8/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/evince/3.9/%{name}-%{version}.tar.xz
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: ghostscript-fonts-std
@@ -36,11 +36,11 @@
BuildRequires: update-desktop-files
BuildRequires: yelp-tools
BuildRequires: pkgconfig(ddjvuapi) >= 3.5.17
-BuildRequires: pkgconfig(gio-2.0) >= 2.33.2
+BuildRequires: pkgconfig(gio-2.0) >= 2.36.0
BuildRequires: pkgconfig(gnome-icon-theme) >= 2.17.1
BuildRequires: pkgconfig(gobject-introspection-1.0) >= 0.6
BuildRequires: pkgconfig(gthread-2.0)
-BuildRequires: pkgconfig(gtk+-3.0) >= 3.7.5
+BuildRequires: pkgconfig(gtk+-3.0) >= 3.8.0
BuildRequires: pkgconfig(ice)
BuildRequires: pkgconfig(libgxps) >= 0.2.1
BuildRequires: pkgconfig(libnautilus-extension) >= 2.91.4
++++++ evince-3.8.0.tar.xz -> evince-3.9.3.tar.xz ++++++
/work/SRC/openSUSE:Factory/evince/evince-3.8.0.tar.xz /work/SRC/openSUSE:Factory/.evince.new/evince-3.9.3.tar.xz differ: char 26, line 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package epiphany for openSUSE:Factory checked in at 2013-06-29 19:37:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/epiphany (Old)
and /work/SRC/openSUSE:Factory/.epiphany.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "epiphany"
Changes:
--------
--- /work/SRC/openSUSE:Factory/epiphany/epiphany.changes 2013-04-26 15:40:47.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.epiphany.new/epiphany.changes 2013-06-29 19:37:48.000000000 +0200
@@ -1,0 +2,19 @@
+Thu May 30 12:06:26 UTC 2013 - dimstar(a)opensuse.org
+
+- Update to version 3.9.2:
+ + Remove WebKit1 support, epiphany is now WebKit2 only.
+ + Fix the encoding dialog, it was broken.
+ + Compile template pages as GResources (bgo#696792).
+ + Allow running a standalone instance with a custom profile
+ (bgo#699602).
+ + Make ephy startup with Wayland.
+ + Lots of minor fixes.
+- Replace pkgconfig(webkitgtk-3.0) with pkgconfig(webkit2gtk-3.0),
+ to be equal to what configure checks for. currently, that does
+ not make a difference, as both .pc files are in the same -devel
+ package and webkit2gtk-3.0 was favored over webkitgtk-3.0 by
+ configure already. The change is in line with removal of WebKit1
+ support.
+- Bump _base_version to 3.9.
+
+-------------------------------------------------------------------
Old:
----
epiphany-3.8.1.tar.xz
New:
----
epiphany-3.9.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ epiphany.spec ++++++
--- /var/tmp/diff_new_pack.z6KKMi/_old 2013-06-29 19:37:49.000000000 +0200
+++ /var/tmp/diff_new_pack.z6KKMi/_new 2013-06-29 19:37:49.000000000 +0200
@@ -17,14 +17,14 @@
Name: epiphany
-Version: 3.8.1
+Version: 3.9.2
Release: 0
-%define _base_version 3.8
+%define _base_version 3.9
Summary: GNOME Web Browser
License: GPL-2.0+
Group: Productivity/Networking/Web/Browsers
Url: http://www.gnome.org/projects/epiphany/
-Source: http://download.gnome.org/sources/epiphany/3.8/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/epiphany/3.9/%{name}-%{version}.tar.xz
# PATCH-FEATURE-OPENSUSE epiphany-safe-one-click-install.patch bnc330070 vuntz(a)novell.com -- Make one-click install work with one-click
Patch6: epiphany-safe-one-click-install.patch
BuildRequires: fdupes
@@ -52,7 +52,7 @@
BuildRequires: pkgconfig(libxslt) >= 1.1.7
BuildRequires: pkgconfig(nss)
BuildRequires: pkgconfig(sqlite3)
-BuildRequires: pkgconfig(webkitgtk-3.0) >= 1.11.92
+BuildRequires: pkgconfig(webkit2gtk-3.0) >= 2.1.1
BuildRequires: pkgconfig(x11)
Requires: %{name}-branding = %{version}
Requires: NetworkManager
++++++ epiphany-3.8.1.tar.xz -> epiphany-3.9.2.tar.xz ++++++
++++ 33777 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package eog for openSUSE:Factory checked in at 2013-06-29 19:37:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/eog (Old)
and /work/SRC/openSUSE:Factory/.eog.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "eog"
Changes:
--------
--- /work/SRC/openSUSE:Factory/eog/eog.changes 2013-05-16 09:52:57.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.eog.new/eog.changes 2013-06-29 19:37:31.000000000 +0200
@@ -1,0 +2,9 @@
+Fri Jun 21 18:31:17 UTC 2013 - dimstar(a)opensuse.org
+
+- Update to version 3.9.1:
+ + Integrate more modern job system from Evince with proper
+ cancellation support in preparation for further refactoring.
+ + Bugs fixed: bgo#563538, bgo#630512, bgo#699043.
+ + Updated translations.
+
+-------------------------------------------------------------------
Old:
----
eog-3.8.2.tar.xz
New:
----
eog-3.9.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ eog.spec ++++++
--- /var/tmp/diff_new_pack.iO4IVE/_old 2013-06-29 19:37:32.000000000 +0200
+++ /var/tmp/diff_new_pack.iO4IVE/_new 2013-06-29 19:37:32.000000000 +0200
@@ -17,13 +17,13 @@
Name: eog
-Version: 3.8.2
+Version: 3.9.1
Release: 0
Summary: Image Viewer for GNOME
License: GPL-2.0+ and LGPL-2.1+
Group: Productivity/Graphics/Viewers
Url: http://www.gnome.org/
-Source: http://download.gnome.org/sources/eog/3.8/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/eog/3.9/%{name}-%{version}.tar.xz
BuildRequires: fdupes
BuildRequires: intltool
BuildRequires: libjpeg-devel
@@ -37,7 +37,7 @@
BuildRequires: pkgconfig(gnome-desktop-3.0)
BuildRequires: pkgconfig(gnome-icon-theme)
BuildRequires: pkgconfig(gobject-introspection-1.0)
-BuildRequires: pkgconfig(gtk+-3.0) >= 3.5.4
+BuildRequires: pkgconfig(gtk+-3.0) >= 3.7.8
BuildRequires: pkgconfig(lcms2)
BuildRequires: pkgconfig(libexif)
BuildRequires: pkgconfig(libpeas-gtk-1.0)
++++++ eog-3.8.2.tar.xz -> eog-3.9.1.tar.xz ++++++
++++ 26862 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package empathy for openSUSE:Factory checked in at 2013-06-29 19:37:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/empathy (Old)
and /work/SRC/openSUSE:Factory/.empathy.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "empathy"
Changes:
--------
--- /work/SRC/openSUSE:Factory/empathy/empathy.changes 2013-06-05 11:48:52.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.empathy.new/empathy.changes 2013-06-29 19:37:05.000000000 +0200
@@ -1,0 +2,21 @@
+Fri Jun 21 21:25:54 UTC 2013 - dimstar(a)opensuse.org
+
+- Update to version 3.9.3:
+ + Bugs fixed: bgo#680778, bgo#698742, bgo#701281, bgo#701891,
+ bgo#701914.
+ + Updated translations.
+
+-------------------------------------------------------------------
+Wed May 29 19:27:47 UTC 2013 - dimstar(a)opensuse.org
+
+- Update to version 3.9.2:
+ + bgo#692746: history uses wrong encoding to show utf8 logs.
+ + bgo#696151: empathy crashed with SIGSEGV in
+ listing_failed_cb().
+ + bgo#699333: online-accounts-preferences crashes when accounts
+ need access granted.
+ + bgo#700084: new *.page added not recognized by git due to
+ commit eb8eb761.
+ + Updated translations.
+
+-------------------------------------------------------------------
Old:
----
empathy-3.9.1.tar.xz
New:
----
empathy-3.9.3.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ empathy.spec ++++++
--- /var/tmp/diff_new_pack.ues1Rc/_old 2013-06-29 19:37:07.000000000 +0200
+++ /var/tmp/diff_new_pack.ues1Rc/_new 2013-06-29 19:37:07.000000000 +0200
@@ -19,7 +19,7 @@
%define with_geocode 0
Name: empathy
-Version: 3.9.1
+Version: 3.9.3
Release: 0
# FIXME: re-enable parallel build
Summary: Instant Messenger Client for GNOME, based on Telepathy
++++++ empathy-3.9.1.tar.xz -> empathy-3.9.3.tar.xz ++++++
++++ 43245 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package chmsee for openSUSE:Factory checked in at 2013-06-29 19:37:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/chmsee (Old)
and /work/SRC/openSUSE:Factory/.chmsee.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "chmsee"
Changes:
--------
--- /work/SRC/openSUSE:Factory/chmsee/chmsee.changes 2013-04-24 16:04:29.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.chmsee.new/chmsee.changes 2013-06-29 19:37:02.000000000 +0200
@@ -1,0 +2,6 @@
+Sat Jun 29 08:55:29 UTC 2013 - zaitor(a)opensuse.org
+
+- Update to version 2.0.2:
+ + Compatibility up to Gecko 22.0.
+
+-------------------------------------------------------------------
Old:
----
chmsee-2.0.1.tar.gz
New:
----
chmsee-2.0.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ chmsee.spec ++++++
--- /var/tmp/diff_new_pack.8CE1at/_old 2013-06-29 19:37:03.000000000 +0200
+++ /var/tmp/diff_new_pack.8CE1at/_new 2013-06-29 19:37:03.000000000 +0200
@@ -20,7 +20,7 @@
Summary: A Gtk+2 CHM document viewer
License: GPL-2.0+
Group: Productivity/Graphics/Viewers
-Version: 2.0.1
+Version: 2.0.2
Release: 0
Url: http://code.google.com/p/chmsee/
Source0: http://chmsee.googlecode.com/files/%{name}-%{version}.tar.gz
++++++ chmsee-2.0.1.tar.gz -> chmsee-2.0.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chmsee-2.0.1/application.ini new/chmsee-2.0.2/application.ini
--- old/chmsee-2.0.1/application.ini 2013-04-17 05:42:54.000000000 +0200
+++ new/chmsee-2.0.2/application.ini 2013-06-28 09:24:24.000000000 +0200
@@ -19,10 +19,10 @@
[App]
Name=ChmSee
-Version=2.0.1
+Version=2.0.2
BuildID=2011040511
ID={f48601d0-39a1-11e0-a013-00241d8cf371}
[Gecko]
-MinVersion=17.0
-MaxVersion=21.*
+MinVersion=22.0
+MaxVersion=23.*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chmsee-2.0.1/chrome/content/main.js new/chmsee-2.0.2/chrome/content/main.js
--- old/chmsee-2.0.1/chrome/content/main.js 2013-04-17 05:42:54.000000000 +0200
+++ new/chmsee-2.0.2/chrome/content/main.js 2013-06-28 09:24:24.000000000 +0200
@@ -690,18 +690,18 @@
};
var adjustTabWidth = function (tabs) {
- var winWidth = window.outerWidth;
- var tabCount = tabs.itemCount;
- var tabWidth = Math.round(winWidth/tabCount);
+ // var winWidth = window.outerWidth;
+ // var tabCount = tabs.itemCount;
+ // var tabWidth = Math.round(winWidth/tabCount);
- var totalWidth = 0;
+ // var totalWidth = 0;
- for (var i = 0; i < tabCount - 1; i++) {
- tabs.getItemAtIndex(i).width = tabWidth;
- totalWidth += tabWidth;
- }
+ // for (var i = 0; i < tabCount - 1; i++) {
+ // tabs.getItemAtIndex(i).width = tabWidth;
+ // totalWidth += tabWidth;
+ // }
- tabs.getItemAtIndex(tabCount-1).width = winWidth - totalWidth + 2*i;
+ // tabs.getItemAtIndex(tabCount-1).width = winWidth - totalWidth + 2*i;
};
// Call DOM inspector for debugging
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chmsee-2.0.1/src/common.mk new/chmsee-2.0.2/src/common.mk
--- old/chmsee-2.0.1/src/common.mk 2013-04-17 05:42:54.000000000 +0200
+++ new/chmsee-2.0.2/src/common.mk 2013-06-28 09:24:24.000000000 +0200
@@ -33,7 +33,7 @@
${INCLUDES} \
${MOZ_DEBUG_DISABLE_DEFS} \
${LIBXUL_SDK}/lib/libxpcomglue_s.a \
- -shared -lxpcom -lmozalloc \
+ -shared -lmozalloc \
${NSPR_LIBS} \
${CHMLIB_LIBS}
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package cheese for openSUSE:Factory checked in at 2013-06-29 19:36:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cheese (Old)
and /work/SRC/openSUSE:Factory/.cheese.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cheese"
Changes:
--------
--- /work/SRC/openSUSE:Factory/cheese/cheese.changes 2013-06-05 11:42:12.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.cheese.new/cheese.changes 2013-06-29 19:36:57.000000000 +0200
@@ -1,0 +2,37 @@
+Fri Jun 21 18:14:00 UTC 2013 - dimstar(a)opensuse.org
+
+- Update to version 3.9.3:
+ + Add documentation for CheeseCamera signals.
+ + Remove unused Cheese.MainWindow.get_data_file_dir.
+ + Make the flash background white.
+ + Fix assertion failures when taking a photo.
+ + Fix updating sensitivity of device selection combo.
+ + Downscale image for effects-preview pipeline.
+ + Do not block the main valve while recording.
+ + Only add videoconvert elements where necessary.
+ + Drop unused preview_caps variable.
+ + Simplify returned GstCaps.
+ + Fix cheese_camera_device_get_best_format memleak.
+ + Fix cheese_camera_device_filter_caps warning.
+ + Remove unused GstCameraBinFlags enum.
+ + Fix video-source memleak when switching cameras.
+ + Improve error handling in CheeseCamera.
+ + Fix no-video-after-switching-resolution problem.
+ + Remove extranous csp_post_balance element.
+ + Add a capsfilter to the video-source bin.
+ + Remove nautilus-sendto sharing support.
+ + Avoid assert when taking avatar photos too quickly.
+ + Updated translations.
+- Remove nautilus-sendto recommends: the functionality has been
+ dropped.
+
+-------------------------------------------------------------------
+Tue May 28 11:23:51 UTC 2013 - dimstar(a)opensuse.org
+
+- Update to version 3.9.2:
+ + Make maintainer.sh compliant with POSIX sh.
+ + Disable the shoot action if the effects are shown (bgo#700317).
+ + Stop the running countdown on destruction (bgo#700315).
+ + Updated translations.
+
+-------------------------------------------------------------------
Old:
----
cheese-3.9.1.tar.xz
New:
----
cheese-3.9.3.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cheese.spec ++++++
--- /var/tmp/diff_new_pack.Hq1DmL/_old 2013-06-29 19:36:58.000000000 +0200
+++ /var/tmp/diff_new_pack.Hq1DmL/_new 2013-06-29 19:36:58.000000000 +0200
@@ -20,7 +20,7 @@
%define lib_gtk_major 23
Name: cheese
-Version: 3.9.1
+Version: 3.9.3
Release: 0
Summary: Webcam Booth for GNOME
License: GPL-2.0+
@@ -55,8 +55,6 @@
BuildRequires: pkgconfig(librsvg-2.0) >= 2.32.0
BuildRequires: pkgconfig(x11)
Requires: gnome-video-effects
-# For sharing pictures/videos
-Recommends: nautilus-sendto
Requires: yelp
Recommends: %{name}-lang
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ cheese-3.9.1.tar.xz -> cheese-3.9.3.tar.xz ++++++
++++ 20115 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package caribou for openSUSE:Factory checked in at 2013-06-29 19:36:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/caribou (Old)
and /work/SRC/openSUSE:Factory/.caribou.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "caribou"
Changes:
--------
--- /work/SRC/openSUSE:Factory/caribou/caribou.changes 2013-04-02 11:39:54.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.caribou.new/caribou.changes 2013-06-29 19:36:53.000000000 +0200
@@ -1,0 +2,9 @@
+Tue Jun 4 17:46:09 UTC 2013 - zaitor(a)opensuse.org
+
+- Update to version 0.4.11:
+ + Press and hold should allow repeating keys like backspace and
+ spacebar (bgo#690435).
+ + Improve layout file generation when building.
+ + Updated translations.
+
+-------------------------------------------------------------------
Old:
----
caribou-0.4.10.tar.xz
New:
----
caribou-0.4.11.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ caribou.spec ++++++
--- /var/tmp/diff_new_pack.4Pd9MO/_old 2013-06-29 19:36:53.000000000 +0200
+++ /var/tmp/diff_new_pack.4Pd9MO/_new 2013-06-29 19:36:53.000000000 +0200
@@ -17,7 +17,7 @@
Name: caribou
-Version: 0.4.10
+Version: 0.4.11
Release: 0
# FIXME: Stop hiding the .desktop file with %%suse_update_desktop_file -u if launching caribou finally works
Summary: On-screen Keyboard for GNOME
++++++ caribou-0.4.10.tar.xz -> caribou-0.4.11.tar.xz ++++++
++++ 3265 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package bijiben for openSUSE:Factory checked in at 2013-06-29 19:36:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/bijiben (Old)
and /work/SRC/openSUSE:Factory/.bijiben.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bijiben"
Changes:
--------
--- /work/SRC/openSUSE:Factory/bijiben/bijiben.changes 2013-06-05 11:40:39.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.bijiben.new/bijiben.changes 2013-06-29 19:36:47.000000000 +0200
@@ -1,0 +2,21 @@
+Fri Jun 21 17:44:26 UTC 2013 - dimstar(a)opensuse.org
+
+- Update to version 3.9.3:
+ + Initial ownCloud support and revisit architecture.
+ + Bug fixed: bgo#701054.
+ + Updated translations.
+- Add pkgconfig(goa-1.0) BuildRequires: new dependency for ownCloud
+ support.
+
+-------------------------------------------------------------------
+Tue May 28 06:43:00 UTC 2013 - dimstar(a)opensuse.org
+
+- Update to version 3.9.2:
+ + Start fixing import dialog, preparing for organize dialog.
+ + A first round of code cleanup.
+ + Search was really awful (bgo#699656).
+ + Updated translations.
+- Add pkgconfig(gobject-introspection-1.0) BuildRequires:
+ dependency of the imported egg-list-box module.
+
+-------------------------------------------------------------------
Old:
----
bijiben-3.9.1.tar.xz
New:
----
bijiben-3.9.3.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bijiben.spec ++++++
--- /var/tmp/diff_new_pack.QYq5bj/_old 2013-06-29 19:36:48.000000000 +0200
+++ /var/tmp/diff_new_pack.QYq5bj/_new 2013-06-29 19:36:48.000000000 +0200
@@ -17,7 +17,7 @@
Name: bijiben
-Version: 3.9.1
+Version: 3.9.3
Release: 0
Summary: Note editor for GNOME
License: GPL-3.0+ and CC-BY-SA-3.0
@@ -30,6 +30,8 @@
BuildRequires: pkgconfig(clutter-gtk-1.0)
BuildRequires: pkgconfig(gio-unix-2.0)
BuildRequires: pkgconfig(glib-2.0) >= 2.28
+BuildRequires: pkgconfig(goa-1.0)
+BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(gtk+-3.0) >= 3.7.7
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(tracker-sparql-0.16)
++++++ bijiben-3.9.1.tar.xz -> bijiben-3.9.3.tar.xz ++++++
++++ 72809 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package audit for openSUSE:Factory checked in at 2013-06-29 19:36:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/audit (Old)
and /work/SRC/openSUSE:Factory/.audit.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "audit"
Changes:
--------
--- /work/SRC/openSUSE:Factory/audit/audit-secondary.changes 2013-03-26 15:28:08.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.audit.new/audit-secondary.changes 2013-06-29 19:36:43.000000000 +0200
@@ -1,0 +2,8 @@
+Thu Jun 27 15:17:16 UTC 2013 - tonyj(a)suse.com
+
+- Eliminate build cycles. audit.spec now builds only libs/devel.
+ Remainder (including daemon) built from audit-secondary.spec
+- Add patch 'audit-fix-implicit-defn.patch' to fix implicit definition
+ warning.
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/audit/audit.changes 2013-05-02 15:29:19.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.audit.new/audit.changes 2013-06-29 19:36:43.000000000 +0200
@@ -1,0 +2,12 @@
+Fri Jun 28 09:30:54 UTC 2013 - coolo(a)suse.com
+
+- remove libcap-ng too from audit.spec as it's only needed for plugins
+ (and libcap-ng itself needs python to build bindings)
+
+-------------------------------------------------------------------
+Thu Jun 27 15:15:07 UTC 2013 - tonyj(a)suse.com
+
+- Eliminate build cycles. audit.spec now builds only libs/devel.
+ Remainder (including daemon) built from audit-secondary.spec
+
+-------------------------------------------------------------------
New:
----
audit-fix-implicit-defn.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ audit-secondary.spec ++++++
--- /var/tmp/diff_new_pack.AyGKGn/_old 2013-06-29 19:36:44.000000000 +0200
+++ /var/tmp/diff_new_pack.AyGKGn/_new 2013-06-29 19:36:44.000000000 +0200
@@ -16,6 +16,9 @@
#
+# This package contains all audit functionality except for audit-libs.
+# The seperation is required to minimize unnecessary build cycles.
+
%define _name audit
Name: audit-secondary
@@ -24,25 +27,42 @@
BuildRequires: pkg-config
BuildRequires: python-devel
BuildRequires: swig
-Summary: Python Bindings for libaudit
+Summary: Secondary packages for audit
License: GPL-2.0+
Group: System/Monitoring
Version: 2.2.3
Release: 0
Url: http://people.redhat.com/sgrubb/audit/
Source0: http://people.redhat.com/sgrubb/audit/%{_name}-%{version}.tar.gz
+Source2: auditd.sysconfig
Patch1: audit-plugins-path.patch
-Requires: audit = %{version}
+Patch2: audit-no-gss.patch
+Patch3: audit-no_m4_dir.patch
+Patch4: audit-fix-implicit-defn.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: %insserv_prereq %fillup_prereq
BuildRequires: audit-devel = %{version}
BuildRequires: autoconf >= 2.12
+BuildRequires: gcc-c++
+BuildRequires: kernel-headers >= 2.6.30
BuildRequires: libtool
+BuildRequires: systemd-rpm-macros
+BuildRequires: tcpd-devel
BuildRequires: pkgconfig(libcap-ng)
%description
-The audit-libs-python package contains the bindings for using libaudit
-by python.
+Secondary packages for system auditing.
+
+%package -n audit
+Summary: User Space Tools for 2.6 Kernel Auditing
+License: LGPL-2.1+
+Group: System/Monitoring
+Requires: %{_name}-libs = %{version}
+
+%description -n audit
+The audit package contains the user space utilities for storing and
+processing the audit records generated by the audit subsystem in the
+Linux 2.6 kernel.
%package -n audit-libs-python
Summary: Python Bindings for libaudit
@@ -71,25 +91,43 @@
rm -rf audisp/plugins/prelude
%setup -q -n %{_name}-%{version}
%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
%build
autoreconf -fi
export CFLAGS="%{optflags} -fno-strict-aliasing"
export CXXFLAGS="$CFLAGS"
-%configure --sbindir=/sbin \
- --libdir=/%{_lib} --libexecdir=%{_prefix}/lib/%{name} \
- --with-apparmor \
+export LDFLAGS="-Wl,-z,relro,-z,now"
+# no krb support (omit --enable-gssapi-krb5=yes), see audit-no-gss.patch
+%configure --sbindir=/sbin --enable-systemd \
+ --libexecdir=%{_prefix}/lib/%{_name} \
+ --with-apparmor --with-libwrap --with-libcap-ng=yes \
--disable-static --with-pic
%{__make} %{?_smp_mflags}
%install
+mkdir -p $RPM_BUILD_ROOT/{sbin,etc/{sysconfig,audispd/plugins.d,init.d}}
mkdir -p $RPM_BUILD_ROOT/usr/sbin
-mkdir -p $RPM_BUILD_ROOT/_tmp
mkdir -p $RPM_BUILD_ROOT/%{_mandir}/{man5,man8}
-make DESTDIR=$RPM_BUILD_ROOT install -C swig
-make DESTDIR=$RPM_BUILD_ROOT install -C bindings
-make DESTDIR=$RPM_BUILD_ROOT install -C audisp/plugins
-make DESTDIR=$RPM_BUILD_ROOT/_tmp install -C docs
+make DESTDIR=$RPM_BUILD_ROOT install
+
+mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
+cp %{SOURCE2} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.auditd
+mkdir -p $RPM_BUILD_ROOT/var/log/audit/
+touch $RPM_BUILD_ROOT/var/log/audit/audit.log
+mkdir -p $RPM_BUILD_ROOT/var/spool/audit/
+# For ghost below, so that old location files will still be there when
+# post copy runs
+touch $RPM_BUILD_ROOT/etc/{auditd.conf,audit.rules}
+# On platforms with 32 & 64 bit libs, we need to coordinate the timestamp
+touch -r ./audit.spec $RPM_BUILD_ROOT/etc/libaudit.conf
+
+# delete redhat scripts, use ours
+rm -rf $RPM_BUILD_ROOT/etc/sysconfig/auditd
+rm -rf $RPM_BUILD_ROOT/etc/init.d/auditd
+rm -rf $RPM_BUILD_ROOT/etc/rc.d/init.d
# Clean up some unneeded library files
rm -f $RPM_BUILD_ROOT/%{_libdir}/python%{py_ver}/site-packages/_audit.a
rm -f $RPM_BUILD_ROOT/%{_libdir}/python%{py_ver}/site-packages/_audit.la
@@ -98,20 +136,97 @@
rm -f $RPM_BUILD_ROOT/%{_libdir}/python%{py_ver}/site-packages/auparse.a
rm -f $RPM_BUILD_ROOT/%{_libdir}/python%{py_ver}/site-packages/auparse.la
rm -f $RPM_BUILD_ROOT/%{_libdir}/python%{py_ver}/site-packages/auparse-1.0-py%{py_ver}.egg-info
+# cleanup files handled by audit.spec
+rm -rf $RPM_BUILD_ROOT/%{_includedir}
+rm -f $RPM_BUILD_ROOT/%{_libdir}/lib{audit,auparse}.*
+rm -f $RPM_BUILD_ROOT/etc/libaudit.conf
+rm -f $RPM_BUILD_ROOT/%{_mandir}/man5/libaudit.conf.5
+rm -rf $RPM_BUILD_ROOT/%{_mandir}/man3
# Cleanup plugins
# audispd-zos-remote uses ldap which is in /usr/lib so move to /usr/sbin
# audisp-remote shouldn't be in /sbin either, it's not 'essential'
mv $RPM_BUILD_ROOT/sbin/{audispd-zos-remote,audisp-remote} $RPM_BUILD_ROOT/usr/sbin
-# af_unix/syslog (builtin) is packaged by main spec file
-rm -f $RPM_BUILD_ROOT/etc/audisp/plugins.d/{af_unix,syslog}.conf
-# Just need selecteed man pages
-mv $RPM_BUILD_ROOT/_tmp/%{_mandir}/man8/audispd-zos-remote.8 $RPM_BUILD_ROOT/%{_mandir}/man8
-mv $RPM_BUILD_ROOT/_tmp/%{_mandir}/man5/zos-remote.conf.5 $RPM_BUILD_ROOT/%{_mandir}/man5
-rm -rf $RPM_BUILD_ROOT/_tmp
+#USR-MERGE
+for prog in auditctl auditd ausearch autrace audispd aureport; do
+ [ \! -f %{buildroot}/sbin/$prog ] || mv %{buildroot}/sbin/$prog %{buildroot}/usr/sbin/$prog
+ ln -s %{_prefix}/sbin/$prog %{buildroot}/sbin/$prog
+done
+#END-USR-MERGE
%check
make check
+%post -n audit
+%{fillup_only -n auditd}
+# Save existing audit files if any (from old location)
+if [ -f /etc/auditd.conf ]; then
+ mv /etc/audit/auditd.conf /etc/audit/auditd.conf.new
+ mv /etc/auditd.conf /etc/audit/auditd.conf
+fi
+if [ -f /etc/audit.rules ]; then
+ mv /etc/audit/audit.rules /etc/audit/audit.rules.new
+ mv /etc/audit.rules /etc/audit/audit.rules
+fi
+%service_add_post auditd.service
+
+%pre -n audit
+%service_add_pre auditd.service
+
+%preun -n audit
+%service_del_preun auditd.service
+
+%postun -n audit
+%service_del_postun auditd.service
+
+%files -n audit
+%defattr(-,root,root,-)
+%doc README COPYING ChangeLog contrib/capp.rules contrib/nispom.rules contrib/lspp.rules contrib/stig.rules init.d/auditd.cron
+%attr(644,root,root) %{_mandir}/man8/audispd.8.gz
+%attr(644,root,root) %{_mandir}/man8/auditctl.8.gz
+%attr(644,root,root) %{_mandir}/man8/auditd.8.gz
+%attr(644,root,root) %{_mandir}/man8/aureport.8.gz
+%attr(644,root,root) %{_mandir}/man8/ausearch.8.gz
+%attr(644,root,root) %{_mandir}/man8/autrace.8.gz
+%attr(644,root,root) %{_mandir}/man8/aulast.8.gz
+%attr(644,root,root) %{_mandir}/man8/aulastlog.8.gz
+%attr(644,root,root) %{_mandir}/man8/ausyscall.8.gz
+%attr(644,root,root) %{_mandir}/man7/audit.rules.7.gz
+%attr(644,root,root) %{_mandir}/man5/auditd.conf.5.gz
+%attr(644,root,root) %{_mandir}/man5/audispd.conf.5.gz
+%attr(644,root,root) %{_mandir}/man5/ausearch-expression.5.gz
+%attr(644,root,root) %{_mandir}/man8/auvirt.8.gz
+%attr(750,root,root) /sbin/auditctl
+%attr(750,root,root) /usr/sbin/auditctl
+%attr(750,root,root) /sbin/auditd
+%attr(750,root,root) /usr/sbin/auditd
+%attr(755,root,root) /sbin/ausearch
+%attr(755,root,root) /usr/sbin/ausearch
+%attr(750,root,root) /sbin/autrace
+%attr(750,root,root) /usr/sbin/autrace
+%attr(750,root,root) /sbin/audispd
+%attr(750,root,root) /usr/sbin/audispd
+%attr(755,root,root) /usr/bin/aulast
+%attr(755,root,root) /usr/bin/aulastlog
+%attr(755,root,root) /usr/bin/ausyscall
+%attr(755,root,root) /sbin/aureport
+%attr(755,root,root) /usr/sbin/aureport
+%attr(755,root,root) /usr/bin/auvirt
+%dir %attr(750,root,root) /etc/audit
+%attr(750,root,root) %dir /etc/audisp
+%attr(750,root,root) %dir /etc/audisp/plugins.d
+%config(noreplace) %attr(640,root,root) /etc/audisp/plugins.d/af_unix.conf
+%config(noreplace) %attr(640,root,root) /etc/audisp/plugins.d/syslog.conf
+%ghost /etc/auditd.conf
+%ghost /etc/audit.rules
+%config(noreplace) %attr(640,root,root) /etc/audit/auditd.conf
+%config(noreplace) %attr(640,root,root) /etc/audit/audit.rules
+%config(noreplace) %attr(640,root,root) /etc/audisp/audispd.conf
+/var/adm/fillup-templates/sysconfig.auditd
+%dir %attr(700,root,root) /var/log/audit
+%ghost %config(noreplace) /var/log/audit/audit.log
+%dir %attr(700,root,root) /var/spool/audit
+%{_unitdir}/auditd.service
+
%files -n audit-libs-python
%defattr(-,root,root,-)
%attr(755,root,root) %{_libdir}/python%{py_ver}/site-packages/_audit.so
@@ -122,15 +237,15 @@
%defattr(-,root,root,-)
%attr(644,root,root) %{_mandir}/man8/audispd-zos-remote.8.gz
%attr(644,root,root) %{_mandir}/man5/zos-remote.conf.5.gz
+%attr(644,root,root) %{_mandir}/man5/audisp-remote.conf.5.gz
+%attr(644,root,root) %{_mandir}/man8/audisp-remote.8.gz
%attr(750,root,root) %dir /etc/audisp
%attr(750,root,root) %dir /etc/audisp/plugins.d
%config(noreplace) %attr(640,root,root) /etc/audisp/plugins.d/audispd-zos-remote.conf
%config(noreplace) %attr(640,root,root) /etc/audisp/zos-remote.conf
+%attr(750,root,root) /usr/sbin/audisp-remote
%attr(750,root,root) /usr/sbin/audispd-zos-remote
%config(noreplace) %attr(640,root,root) /etc/audisp/audisp-remote.conf
%config(noreplace) %attr(640,root,root) /etc/audisp/plugins.d/au-remote.conf
-%attr(750,root,root) /usr/sbin/audisp-remote
-%attr(644,root,root) %{_mandir}/man5/audisp-remote.conf.5.gz
-%attr(644,root,root) %{_mandir}/man8/audisp-remote.8.gz
%changelog
++++++ audit.spec ++++++
--- /var/tmp/diff_new_pack.AyGKGn/_old 2013-06-29 19:36:44.000000000 +0200
+++ /var/tmp/diff_new_pack.AyGKGn/_new 2013-06-29 19:36:44.000000000 +0200
@@ -17,7 +17,7 @@
Name: audit
-Summary: User Space Tools for 2.6 Kernel Auditing
+Summary: First part of auditing package
License: GPL-2.0+
Group: System/Monitoring
Version: 2.2.3
@@ -27,17 +27,13 @@
Source2: auditd.sysconfig
Source3: baselibs.conf
Source4: README-BEFORE-ADDING-PATCHES
-Patch2: audit-no_plugins.patch
-Patch3: audit-no-gss.patch
-Patch4: audit-no_m4_dir.patch
+Patch1: audit-no_m4_dir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf >= 2.12
BuildRequires: gcc-c++
BuildRequires: kernel-headers >= 2.6.30
BuildRequires: libtool
BuildRequires: tcpd-devel
-BuildRequires: pkgconfig(libcap-ng)
-BuildRequires: pkgconfig(systemd)
Requires: %{name}-libs = %{version}
PreReq: %insserv_prereq %fillup_prereq
@@ -66,23 +62,21 @@
The libauparse package contains the dynamic libraries needed to
parse audit records.
-%package devel
+%package -n audit-devel
Summary: Header files and static library for libaudit
License: LGPL-2.1+
Group: Development/Libraries/C and C++
Requires: libaudit1 = %{version}
Requires: libauparse0 = %{version}
-%description devel
+%description -n audit-devel
The audit-devel package contains the static libraries and header files
needed for developing applications that need to use the audit framework
libraries.
%prep
-%setup -q
-%patch2 -p1
-%patch3 -p1
-%patch4
+%setup -q -n %{name}-%{version}
+%patch1 -p1
%build
autoreconf -fi
@@ -91,47 +85,31 @@
export LDFLAGS="-Wl,-z,relro,-z,now"
# no krb support (omit --enable-gssapi-krb5=yes), see audit-no-gss.patch
%configure --enable-systemd --libexecdir=%{_prefix}/lib/%{name} \
- --with-apparmor --with-libwrap --with-libcap-ng=yes \
+ --with-apparmor --with-libwrap --without-libcap-ng \
--disable-static --with-pic --without-python
-%{__make} %{?_smp_mflags}
+(cd lib ; %{__make} %{?_smp_mflags})
+(cd auparse ; %{__make} %{?_smp_mflags})
+(cd docs ; %{__make} %{?_smp_mflags})
%install
-mkdir -p $RPM_BUILD_ROOT/{sbin,etc/{sysconfig,audispd/plugins.d,init.d}}
-mkdir -p $RPM_BUILD_ROOT/usr/sbin
-mkdir -p $RPM_BUILD_ROOT/%{_mandir}/{man5,man8}
-mkdir -p $RPM_BUILD_ROOT/%{_lib}/security
-make DESTDIR=$RPM_BUILD_ROOT install
+(cd lib ; make DESTDIR=$RPM_BUILD_ROOT install)
+(cd auparse ; make DESTDIR=$RPM_BUILD_ROOT install)
+(cd docs ; make DESTDIR=$RPM_BUILD_ROOT install)
+rm -rf $RPM_BUILD_ROOT/%{_mandir}/man[578]
+mkdir -p $RPM_BUILD_ROOT/etc
mkdir -p $RPM_BUILD_ROOT/%{_includedir}
-mkdir -p $RPM_BUILD_ROOT/%{_libdir}
+mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man5
# We manually install this since Makefile doesn't
install -m 0644 lib/libaudit.h $RPM_BUILD_ROOT/%{_includedir}
+# Install libaudit.conf files by hand
+install -m 0644 docs/libaudit.conf.5 $RPM_BUILD_ROOT/%{_mandir}/man5
+install -m 0644 init.d/libaudit.conf $RPM_BUILD_ROOT/etc
-for libname in libaudit libauparse;do
- %{__rm} -v %{buildroot}/%{_libdir}/$libname.la
-done
-
-# USR-MERGE
-for prog in auditctl auditd ausearch autrace audispd aureport; do
- ln -s %{_prefix}/sbin/$prog %{buildroot}/sbin/$prog
-done
-
-mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
-cp %{SOURCE2} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.auditd
-# delete redhat script, use ours
-rm -rf $RPM_BUILD_ROOT/etc/sysconfig/auditd
-rm -rf $RPM_BUILD_ROOT/etc/init.d/auditd
-rm -rf $RPM_BUILD_ROOT/etc/rc.d/init.d
-mkdir -p $RPM_BUILD_ROOT/var/log/audit/
-touch $RPM_BUILD_ROOT/var/log/audit/audit.log
-mkdir -p $RPM_BUILD_ROOT/var/spool/audit/
-# For ghost below, so that old location files will still be there when
-# post copy runs
-touch $RPM_BUILD_ROOT/etc/{auditd.conf,audit.rules}
-# On platforms with 32 & 64 bit libs, we need to coordinate the timestamp
-touch -r ./audit.spec $RPM_BUILD_ROOT/etc/libaudit.conf
+%{__rm} -fv %{buildroot}/%{_libdir}/lib{audit,auparse}.la
%check
-make check
+(cd lib ; make check)
+(cd auparse ; make check)
%post -n libaudit1 -p /sbin/ldconfig
@@ -141,39 +119,17 @@
%postun -n libauparse0 -p /sbin/ldconfig
-%post
-%{fillup_only -n auditd}
-# Save existing audit files if any (from old location)
-if [ -f /etc/auditd.conf ]; then
- mv /etc/audit/auditd.conf /etc/audit/auditd.conf.new
- mv /etc/auditd.conf /etc/audit/auditd.conf
-fi
-if [ -f /etc/audit.rules ]; then
- mv /etc/audit/audit.rules /etc/audit/audit.rules.new
- mv /etc/audit.rules /etc/audit/audit.rules
-fi
-%service_add_post auditd.service
-
-%pre
-%service_add_pre auditd.service
-
-%preun
-%service_del_preun auditd.service
-
-%postun
-%service_del_postun auditd.service
-
%files -n libaudit1
%defattr(-,root,root)
%{_libdir}/libaudit.so.*
%config(noreplace) %attr(640,root,root) /etc/libaudit.conf
-%{_mandir}/man5/libaudit.conf.5*
+%{_mandir}/man5/libaudit.conf.5.gz
%files -n libauparse0
%defattr(-,root,root)
%{_libdir}/libauparse.so.*
-%files devel
+%files -n audit-devel
%defattr(-,root,root)
%doc contrib/skeleton.c contrib/plugin
%{_libdir}/libaudit.so
@@ -183,54 +139,4 @@
%{_includedir}/auparse-defs.h
%{_mandir}/man3/*
-%files
-%defattr(-,root,root,-)
-%doc README COPYING ChangeLog contrib/capp.rules contrib/nispom.rules contrib/lspp.rules contrib/stig.rules init.d/auditd.cron
-%attr(644,root,root) %{_mandir}/man8/audispd.8.gz
-%attr(644,root,root) %{_mandir}/man8/auditctl.8.gz
-%attr(644,root,root) %{_mandir}/man8/auditd.8.gz
-%attr(644,root,root) %{_mandir}/man8/aureport.8.gz
-%attr(644,root,root) %{_mandir}/man8/ausearch.8.gz
-%attr(644,root,root) %{_mandir}/man8/autrace.8.gz
-%attr(644,root,root) %{_mandir}/man8/aulast.8.gz
-%attr(644,root,root) %{_mandir}/man8/aulastlog.8.gz
-%attr(644,root,root) %{_mandir}/man8/ausyscall.8.gz
-%attr(644,root,root) %{_mandir}/man7/audit.rules.7.gz
-%attr(644,root,root) %{_mandir}/man5/auditd.conf.5.gz
-%attr(644,root,root) %{_mandir}/man5/audispd.conf.5.gz
-%attr(644,root,root) %{_mandir}/man5/ausearch-expression.5.gz
-%attr(644,root,root) %{_mandir}/man8/auvirt.8.gz
-%attr(750,root,root) /sbin/auditctl
-%attr(750,root,root) /usr/sbin/auditctl
-%attr(750,root,root) /sbin/auditd
-%attr(750,root,root) /usr/sbin/auditd
-%attr(755,root,root) /sbin/ausearch
-%attr(755,root,root) /usr/sbin/ausearch
-%attr(750,root,root) /sbin/autrace
-%attr(750,root,root) /usr/sbin/autrace
-%attr(750,root,root) /sbin/audispd
-%attr(750,root,root) /usr/sbin/audispd
-%attr(755,root,root) /usr/bin/aulast
-%attr(755,root,root) /usr/bin/aulastlog
-%attr(755,root,root) /usr/bin/ausyscall
-%attr(755,root,root) /sbin/aureport
-%attr(755,root,root) /usr/sbin/aureport
-%attr(755,root,root) /usr/bin/auvirt
-%dir %attr(750,root,root) /etc/audit
-%attr(750,root,root) %dir /etc/audisp
-%attr(750,root,root) %dir /etc/audisp/plugins.d
-%config(noreplace) %attr(640,root,root) /etc/audisp/plugins.d/af_unix.conf
-%config(noreplace) %attr(640,root,root) /etc/audisp/plugins.d/syslog.conf
-%ghost /etc/auditd.conf
-%ghost /etc/audit.rules
-%config(noreplace) %attr(640,root,root) /etc/audit/auditd.conf
-%config(noreplace) %attr(640,root,root) /etc/audit/audit.rules
-%config(noreplace) %attr(640,root,root) /etc/audisp/audispd.conf
-/var/adm/fillup-templates/sysconfig.auditd
-%dir %attr(700,root,root) /var/log/audit
-%ghost %config(noreplace) /var/log/audit/audit.log
-%dir %attr(700,root,root) /var/spool/audit
-%attr(755,root,root) /usr/bin/ausyscall
-%{_unitdir}/auditd.service
-
%changelog
++++++ audit-fix-implicit-defn.patch ++++++
From: Tony Jones <tonyj(a)suse.de>
Subject: fix implicit definition warnings
Upstream: pending
Fixes "W: audit-secondary implicit-pointer-decl auvirt.c:984"
--- a/tools/auvirt/auvirt.c
+++ b/tools/auvirt/auvirt.c
@@ -25,6 +25,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <errno.h>
+#include <ctype.h>
#include <locale.h>
#include <string.h>
#include <regex.h>
++++++ audit-no_m4_dir.patch ++++++
--- /var/tmp/diff_new_pack.AyGKGn/_old 2013-06-29 19:36:44.000000000 +0200
+++ /var/tmp/diff_new_pack.AyGKGn/_new 2013-06-29 19:36:44.000000000 +0200
@@ -3,8 +3,8 @@
audit cannnot build with automake-1.13.1 when looking for a m4 directory
---- configure.ac.orig 2013-04-26 13:09:46.019388414 +0200
-+++ configure.ac 2013-04-26 13:10:54.607385058 +0200
+--- a/configure.ac 2013-04-26 13:09:46.019388414 +0200
++++ b/configure.ac 2013-04-26 13:10:54.607385058 +0200
@@ -35,7 +35,6 @@
echo Configuring auditd $VERSION
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package at-spi2-core for openSUSE:Factory checked in at 2013-06-29 19:36:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/at-spi2-core (Old)
and /work/SRC/openSUSE:Factory/.at-spi2-core.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "at-spi2-core"
Changes:
--------
--- /work/SRC/openSUSE:Factory/at-spi2-core/at-spi2-core.changes 2013-04-03 12:47:10.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.at-spi2-core.new/at-spi2-core.changes 2013-06-29 19:36:40.000000000 +0200
@@ -1,0 +2,18 @@
+Fri Jun 21 19:03:12 UTC 2013 - dimstar(a)opensuse.org
+
+- Update to version 2.9.3:
+ + Add atspi_is_initialized (bgo#681276).
+
+-------------------------------------------------------------------
+Tue May 28 19:51:30 UTC 2013 - dimstar(a)opensuse.org
+
+- Update to version 2.9.2:
+ + Fix D-Bus introspection for GetActions.
+ + Use glib-mkenums to generate enum types, and use these
+ generated types for role and state names, rather than static
+ tables.
+ + nnotate filter in atspi_register_device_event_listener with
+ allow-none (bgo#700237).
+ + Rename various functions to avoid name collisions (bgo#700243).
+
+-------------------------------------------------------------------
Old:
----
at-spi2-core-2.8.0.tar.xz
New:
----
at-spi2-core-2.9.3.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ at-spi2-core.spec ++++++
--- /var/tmp/diff_new_pack.ev6CVA/_old 2013-06-29 19:36:40.000000000 +0200
+++ /var/tmp/diff_new_pack.ev6CVA/_new 2013-06-29 19:36:40.000000000 +0200
@@ -17,13 +17,13 @@
Name: at-spi2-core
-Version: 2.8.0
+Version: 2.9.3
Release: 0
Summary: Assistive Technology Service Provider Interface - D-Bus based implementation
License: GPL-2.0+
Group: System/Libraries
Url: http://www.gnome.org/
-Source0: http://download.gnome.org/sources/at-spi2-core/2.8/%{name}-%{version}.tar.xz
+Source0: http://download.gnome.org/sources/at-spi2-core/2.9/%{name}-%{version}.tar.xz
Source98: baselibs.conf
Source99: %{name}-rpmlintrc
BuildRequires: glib2-devel
++++++ at-spi2-core-2.8.0.tar.xz -> at-spi2-core-2.9.3.tar.xz ++++++
++++ 8821 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package at-spi2-atk for openSUSE:Factory checked in at 2013-06-29 19:36:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/at-spi2-atk (Old)
and /work/SRC/openSUSE:Factory/.at-spi2-atk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "at-spi2-atk"
Changes:
--------
--- /work/SRC/openSUSE:Factory/at-spi2-atk/at-spi2-atk.changes 2013-04-26 15:36:22.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.at-spi2-atk.new/at-spi2-atk.changes 2013-06-29 19:36:34.000000000 +0200
@@ -1,0 +2,14 @@
+Fri Jun 21 19:07:47 UTC 2013 - dimstar(a)opensuse.org
+
+- Update to version 2.9.3:
+ + Fix reentrancy issues with gnome-shell (bgo#681276).
+
+-------------------------------------------------------------------
+Tue May 28 19:51:22 UTC 2013 - dimstar(a)opensuse.org
+
+- Update to version 2.9.2:
+ + Fix various DBusError leaks (bgo#698951).
+ + Suppress a warning if an app returns NULL when referencing a
+ child.
+
+-------------------------------------------------------------------
Old:
----
at-spi2-atk-2.8.1.tar.xz
New:
----
at-spi2-atk-2.9.3.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ at-spi2-atk.spec ++++++
--- /var/tmp/diff_new_pack.hUiSlF/_old 2013-06-29 19:36:35.000000000 +0200
+++ /var/tmp/diff_new_pack.hUiSlF/_new 2013-06-29 19:36:35.000000000 +0200
@@ -17,18 +17,18 @@
Name: at-spi2-atk
-Version: 2.8.1
+Version: 2.9.3
Release: 0
Summary: Assistive Technology Service Provider Interface - GTK+ module
License: LGPL-2.0+
Group: System/Libraries
Url: http://www.gnome.org/
-Source0: http://download.gnome.org/sources/at-spi2-atk/2.8/%{name}-%{version}.tar.xz
+Source0: http://download.gnome.org/sources/at-spi2-atk/2.9/%{name}-%{version}.tar.xz
Source98: baselibs.conf
Source99: %{name}-rpmlintrc
BuildRequires: fdupes
BuildRequires: pkgconfig(atk) >= 2.7.5
-BuildRequires: pkgconfig(atspi-2) >= 2.7.5
+BuildRequires: pkgconfig(atspi-2) >= 2.9.3
BuildRequires: pkgconfig(dbus-1) >= 1.0
BuildRequires: pkgconfig(glib-2.0) >= 2.32.0
BuildRequires: pkgconfig(gmodule-2.0) >= 2.0.0
++++++ at-spi2-atk-2.8.1.tar.xz -> at-spi2-atk-2.9.3.tar.xz ++++++
++++ 1979 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/NEWS new/at-spi2-atk-2.9.3/NEWS
--- old/at-spi2-atk-2.8.1/NEWS 2013-04-17 03:16:32.000000000 +0200
+++ new/at-spi2-atk-2.9.3/NEWS 2013-06-17 23:02:02.000000000 +0200
@@ -1,8 +1,16 @@
-What's new in at-spi2-atk 2.8.1:
+What's new in at-spi2-atk 2.9.3:
-* Fix memory leak in socketadaptor.c (BGO#696733)
+* Fix for BGO#681276 (reentrancy issues with gnome-shell).
-* Fix a crash when handling a D-Bus method reply after deinitialization.
+What's new in at-spi2-atk 2.9.2:
+
+* Fix a memory leak in the socket adaptor (BGO#696733).
+
+* Fix various DBusError leaks (BGO#698951).
+
+* Fix crash when a main loop is shut down repeatedly (BGO#699554).
+
+* Suppress a warning if an app returns NULL when referencing a child.
What's new in at-spi2-atk 2.7.91:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/accessible-adaptor.c new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/accessible-adaptor.c
--- old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/accessible-adaptor.c 2013-04-03 23:16:53.000000000 +0200
+++ new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/accessible-adaptor.c 2013-05-14 19:50:48.000000000 +0200
@@ -144,15 +144,13 @@
{
AtkObject *object = (AtkObject *) user_data;
DBusMessage *reply;
- DBusError error;
dbus_int32_t i;
AtkObject *child;
- dbus_error_init (&error);
g_return_val_if_fail (ATK_IS_OBJECT (user_data),
droute_not_yet_handled_error (message));
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &i, DBUS_TYPE_INVALID))
+ (message, NULL, DBUS_TYPE_INT32, &i, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/action-adaptor.c new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/action-adaptor.c
--- old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/action-adaptor.c 2012-12-17 19:52:09.000000000 +0100
+++ new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/action-adaptor.c 2013-05-14 19:50:48.000000000 +0200
@@ -43,16 +43,14 @@
void *user_data)
{
AtkAction *action = (AtkAction *) user_data;
- DBusError error;
DBusMessage *reply;
dbus_int32_t index;
const char *desc;
- dbus_error_init (&error);
g_return_val_if_fail (ATK_IS_ACTION (user_data),
droute_not_yet_handled_error (message));
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID))
+ (message, NULL, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
}
@@ -72,16 +70,14 @@
impl_get_name (DBusConnection * bus, DBusMessage * message, void *user_data)
{
DBusMessage *reply;
- DBusError error;
dbus_int32_t index;
const char *name;
AtkAction *action = (AtkAction *) user_data;
- dbus_error_init (&error);
g_return_val_if_fail (ATK_IS_ACTION (user_data),
droute_not_yet_handled_error (message));
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID))
+ (message, NULL, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
}
@@ -101,16 +97,14 @@
impl_get_localized_name (DBusConnection * bus, DBusMessage * message, void *user_data)
{
DBusMessage *reply;
- DBusError error;
dbus_int32_t index;
const char *name;
AtkAction *action = (AtkAction *) user_data;
- dbus_error_init (&error);
g_return_val_if_fail (ATK_IS_ACTION (user_data),
droute_not_yet_handled_error (message));
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID))
+ (message, NULL, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
}
@@ -131,16 +125,14 @@
void *user_data)
{
DBusMessage *reply;
- DBusError error;
dbus_int32_t index;
const char *kb;
AtkAction *action = (AtkAction *) user_data;
- dbus_error_init (&error);
g_return_val_if_fail (ATK_IS_ACTION (user_data),
droute_not_yet_handled_error (message));
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID))
+ (message, NULL, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
}
@@ -211,16 +203,14 @@
impl_DoAction (DBusConnection * bus, DBusMessage * message, void *user_data)
{
AtkAction *action = (AtkAction *) user_data;
- DBusError error;
dbus_int32_t index;
dbus_bool_t rv = TRUE;
DBusMessage *reply;
g_return_val_if_fail (ATK_IS_ACTION (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID))
+ (message, NULL, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/application-adaptor.c new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/application-adaptor.c
--- old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/application-adaptor.c 2012-12-17 19:52:09.000000000 +0100
+++ new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/application-adaptor.c 2013-06-15 22:48:01.000000000 +0200
@@ -110,7 +110,7 @@
reply = dbus_message_new_method_return(msg);
if (reply)
{
- const char *retval = (g_getenv ("AT_SPI_CLIENT") ?
+ const char *retval = (atspi_is_initialized () ?
"":
spi_global_app_data->app_bus_addr);
if (!retval)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/cache-adaptor.c new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/cache-adaptor.c
--- old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/cache-adaptor.c 2012-12-17 19:52:09.000000000 +0100
+++ new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/cache-adaptor.c 2013-05-20 23:24:46.000000000 +0200
@@ -154,8 +154,11 @@
AtkObject *child;
child = atk_object_ref_accessible_child (obj, i);
- spi_object_append_reference (&iter_sub_array, child);
- g_object_unref (G_OBJECT (child));
+ if (child)
+ {
+ spi_object_append_reference (&iter_sub_array, child);
+ g_object_unref (G_OBJECT (child));
+ }
}
}
if (ATK_IS_SOCKET (obj) && atk_socket_is_occupied (ATK_SOCKET (obj)))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/component-adaptor.c new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/component-adaptor.c
--- old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/component-adaptor.c 2012-12-17 19:52:09.000000000 +0100
+++ new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/component-adaptor.c 2013-05-14 19:50:48.000000000 +0200
@@ -36,16 +36,14 @@
AtkComponent *component = (AtkComponent *) user_data;
dbus_int32_t x, y;
dbus_uint32_t coord_type;
- DBusError error;
dbus_bool_t retval;
DBusMessage *reply;
g_return_val_if_fail (ATK_IS_COMPONENT (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y,
+ (message, NULL, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y,
DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
@@ -69,15 +67,13 @@
dbus_int32_t x, y;
dbus_uint32_t coord_type;
DBusMessage *reply;
- DBusError error;
AtkObject *child;
g_return_val_if_fail (ATK_IS_COMPONENT (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y,
+ (message, NULL, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y,
DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
@@ -96,16 +92,14 @@
impl_GetExtents (DBusConnection * bus, DBusMessage * message, void *user_data)
{
AtkComponent *component = (AtkComponent *) user_data;
- DBusError error;
dbus_uint32_t coord_type;
gint ix, iy, iwidth, iheight;
g_return_val_if_fail (ATK_IS_COMPONENT (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID))
+ (message, NULL, DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
}
@@ -119,7 +113,6 @@
void *user_data)
{
AtkComponent *component = (AtkComponent *) user_data;
- DBusError error;
dbus_uint32_t coord_type;
gint ix = 0, iy = 0;
dbus_int32_t x, y;
@@ -128,9 +121,8 @@
g_return_val_if_fail (ATK_IS_COMPONENT (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID))
+ (message, NULL, DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/document-adaptor.c new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/document-adaptor.c
--- old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/document-adaptor.c 2012-12-17 19:52:09.000000000 +0100
+++ new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/document-adaptor.c 2013-05-14 19:50:48.000000000 +0200
@@ -55,16 +55,14 @@
void *user_data)
{
AtkDocument *document = (AtkDocument *) user_data;
- DBusError error;
gchar *attributename;
const gchar *atr;
DBusMessage *reply;
g_return_val_if_fail (ATK_IS_DOCUMENT (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_STRING, &attributename, DBUS_TYPE_INVALID))
+ (message, NULL, DBUS_TYPE_STRING, &attributename, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/editabletext-adaptor.c new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/editabletext-adaptor.c
--- old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/editabletext-adaptor.c 2012-12-17 19:52:09.000000000 +0100
+++ new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/editabletext-adaptor.c 2013-05-14 19:50:48.000000000 +0200
@@ -35,14 +35,12 @@
AtkEditableText *editable = (AtkEditableText *) user_data;
const char *newContents;
dbus_bool_t rv;
- DBusError error;
DBusMessage *reply;
g_return_val_if_fail (ATK_IS_EDITABLE_TEXT (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_STRING, &newContents, DBUS_TYPE_INVALID))
+ (message, NULL, DBUS_TYPE_STRING, &newContents, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
}
@@ -65,15 +63,13 @@
dbus_int32_t position, length;
char *text;
dbus_bool_t rv;
- DBusError error;
DBusMessage *reply;
gint ip;
g_return_val_if_fail (ATK_IS_EDITABLE_TEXT (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &position, DBUS_TYPE_STRING, &text,
+ (message, NULL, DBUS_TYPE_INT32, &position, DBUS_TYPE_STRING, &text,
DBUS_TYPE_INT32, &length, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
@@ -96,13 +92,11 @@
{
AtkEditableText *editable = (AtkEditableText *) user_data;
dbus_int32_t startPos, endPos;
- DBusError error;
g_return_val_if_fail (ATK_IS_EDITABLE_TEXT (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &startPos, DBUS_TYPE_INT32, &endPos,
+ (message, NULL, DBUS_TYPE_INT32, &startPos, DBUS_TYPE_INT32, &endPos,
DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
@@ -116,15 +110,13 @@
{
AtkEditableText *editable = (AtkEditableText *) user_data;
dbus_int32_t startPos, endPos;
- DBusError error;
dbus_bool_t rv;
DBusMessage *reply;
g_return_val_if_fail (ATK_IS_EDITABLE_TEXT (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &startPos, DBUS_TYPE_INT32, &endPos,
+ (message, NULL, DBUS_TYPE_INT32, &startPos, DBUS_TYPE_INT32, &endPos,
DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
@@ -146,15 +138,13 @@
{
AtkEditableText *editable = (AtkEditableText *) user_data;
dbus_int32_t startPos, endPos;
- DBusError error;
dbus_bool_t rv;
DBusMessage *reply;
g_return_val_if_fail (ATK_IS_EDITABLE_TEXT (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &startPos, DBUS_TYPE_INT32, &endPos,
+ (message, NULL, DBUS_TYPE_INT32, &startPos, DBUS_TYPE_INT32, &endPos,
DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
@@ -176,15 +166,13 @@
{
AtkEditableText *editable = (AtkEditableText *) user_data;
dbus_int32_t position;
- DBusError error;
dbus_bool_t rv;
DBusMessage *reply;
g_return_val_if_fail (ATK_IS_EDITABLE_TEXT (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &position, DBUS_TYPE_INVALID))
+ (message, NULL, DBUS_TYPE_INT32, &position, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/hyperlink-adaptor.c new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/hyperlink-adaptor.c
--- old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/hyperlink-adaptor.c 2012-12-17 19:52:09.000000000 +0100
+++ new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/hyperlink-adaptor.c 2013-05-14 19:50:48.000000000 +0200
@@ -68,15 +68,13 @@
impl_GetObject (DBusConnection * bus, DBusMessage * message, void *user_data)
{
AtkHyperlink *link = get_hyperlink (user_data);
- DBusError error;
dbus_int32_t i;
AtkObject *atk_object;
g_return_val_if_fail (ATK_IS_HYPERLINK (link),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &i, DBUS_TYPE_INVALID))
+ (message, NULL, DBUS_TYPE_INT32, &i, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
}
@@ -89,15 +87,13 @@
{
AtkHyperlink *link = get_hyperlink (user_data);
dbus_int32_t i;
- DBusError error;
gchar *rv;
DBusMessage *reply;
g_return_val_if_fail (ATK_IS_HYPERLINK (link),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &i, DBUS_TYPE_INVALID))
+ (message, NULL, DBUS_TYPE_INT32, &i, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/hypertext-adaptor.c new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/hypertext-adaptor.c
--- old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/hypertext-adaptor.c 2012-12-17 19:52:09.000000000 +0100
+++ new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/hypertext-adaptor.c 2013-05-14 19:50:48.000000000 +0200
@@ -53,15 +53,13 @@
impl_GetLink (DBusConnection * bus, DBusMessage * message, void *user_data)
{
AtkHypertext *hypertext = (AtkHypertext *) user_data;
- DBusError error;
dbus_int32_t linkIndex;
AtkHyperlink *link;
g_return_val_if_fail (ATK_IS_HYPERTEXT (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &linkIndex, DBUS_TYPE_INVALID))
+ (message, NULL, DBUS_TYPE_INT32, &linkIndex, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
}
@@ -77,16 +75,14 @@
void *user_data)
{
AtkHypertext *hypertext = (AtkHypertext *) user_data;
- DBusError error;
dbus_int32_t characterIndex;
dbus_int32_t rv;
DBusMessage *reply;
g_return_val_if_fail (ATK_IS_HYPERTEXT (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &characterIndex, DBUS_TYPE_INVALID))
+ (message, NULL, DBUS_TYPE_INT32, &characterIndex, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/image-adaptor.c new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/image-adaptor.c
--- old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/image-adaptor.c 2012-12-17 19:52:09.000000000 +0100
+++ new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/image-adaptor.c 2013-05-14 19:50:48.000000000 +0200
@@ -51,15 +51,13 @@
void *user_data)
{
AtkImage *image = (AtkImage *) user_data;
- DBusError error;
dbus_uint32_t coordType;
gint ix, iy, iwidth, iheight;
g_return_val_if_fail (ATK_IS_IMAGE (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_UINT32, &coordType, DBUS_TYPE_INVALID))
+ (message, NULL, DBUS_TYPE_UINT32, &coordType, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
}
@@ -73,7 +71,6 @@
void *user_data)
{
AtkImage *image = (AtkImage *) user_data;
- DBusError error;
dbus_uint32_t coord_type;
gint ix = 0, iy = 0;
dbus_int32_t x, y;
@@ -81,9 +78,8 @@
g_return_val_if_fail (ATK_IS_IMAGE (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID))
+ (message, NULL, DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/selection-adaptor.c new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/selection-adaptor.c
--- old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/selection-adaptor.c 2012-12-17 19:52:09.000000000 +0100
+++ new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/selection-adaptor.c 2013-05-14 19:50:48.000000000 +0200
@@ -54,15 +54,13 @@
{
AtkSelection *selection = (AtkSelection *) user_data;
DBusMessage *reply;
- DBusError error;
dbus_int32_t selectedChildIndex;
AtkObject *atk_object;
g_return_val_if_fail (ATK_IS_SELECTION (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &selectedChildIndex,
+ (message, NULL, DBUS_TYPE_INT32, &selectedChildIndex,
DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
@@ -80,16 +78,14 @@
void *user_data)
{
AtkSelection *selection = (AtkSelection *) user_data;
- DBusError error;
dbus_int32_t childIndex;
dbus_bool_t rv;
DBusMessage *reply;
g_return_val_if_fail (ATK_IS_SELECTION (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &childIndex, DBUS_TYPE_INVALID))
+ (message, NULL, DBUS_TYPE_INT32, &childIndex, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
}
@@ -108,16 +104,14 @@
void *user_data)
{
AtkSelection *selection = (AtkSelection *) user_data;
- DBusError error;
dbus_int32_t selectedChildIndex;
dbus_bool_t rv;
DBusMessage *reply;
g_return_val_if_fail (ATK_IS_SELECTION (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &selectedChildIndex,
+ (message, NULL, DBUS_TYPE_INT32, &selectedChildIndex,
DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
@@ -137,16 +131,14 @@
void *user_data)
{
AtkSelection *selection = (AtkSelection *) user_data;
- DBusError error;
dbus_int32_t childIndex;
dbus_bool_t rv;
DBusMessage *reply;
g_return_val_if_fail (ATK_IS_SELECTION (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &childIndex, DBUS_TYPE_INVALID))
+ (message, NULL, DBUS_TYPE_INT32, &childIndex, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
}
@@ -204,7 +196,6 @@
void *user_data)
{
AtkSelection *selection = (AtkSelection *) user_data;
- DBusError error;
dbus_int32_t selectedChildIndex;
dbus_bool_t rv = FALSE;
gint i, nselected;
@@ -212,9 +203,8 @@
g_return_val_if_fail (ATK_IS_SELECTION (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &selectedChildIndex,
+ (message, NULL, DBUS_TYPE_INT32, &selectedChildIndex,
DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/socket-adaptor.c new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/socket-adaptor.c
--- old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/socket-adaptor.c 2013-04-03 23:16:53.000000000 +0200
+++ new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/socket-adaptor.c 2013-05-14 19:50:48.000000000 +0200
@@ -117,7 +117,7 @@
dbus_message_unref (message);
if (!reply)
return;
- if (!dbus_message_get_args (reply, &error, DBUS_TYPE_INT32, &x_dbus,
+ if (!dbus_message_get_args (reply, NULL, DBUS_TYPE_INT32, &x_dbus,
DBUS_TYPE_INT32, &y_dbus, DBUS_TYPE_INVALID))
{
g_warning ("GetPosition failed: %s", error.message);
@@ -146,7 +146,7 @@
dbus_message_unref (message);
if (!reply)
return;
- if (!dbus_message_get_args (reply, &error, DBUS_TYPE_INT32, &width_dbus,
+ if (!dbus_message_get_args (reply, NULL, DBUS_TYPE_INT32, &width_dbus,
DBUS_TYPE_INT32, &height_dbus, DBUS_TYPE_INVALID))
{
g_warning ("GetSize failed: %s", error.message);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/table-adaptor.c new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/table-adaptor.c
--- old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/table-adaptor.c 2012-12-17 19:52:09.000000000 +0100
+++ new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/table-adaptor.c 2013-05-14 19:50:48.000000000 +0200
@@ -96,14 +96,12 @@
AtkTable *table = (AtkTable *) user_data;
dbus_int32_t row, column;
DBusMessage *reply;
- DBusError error;
AtkObject *obj;
g_return_val_if_fail (ATK_IS_TABLE (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &row, DBUS_TYPE_INT32, &column,
+ (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INT32, &column,
DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
@@ -122,14 +120,12 @@
AtkTable *table = (AtkTable *) user_data;
dbus_int32_t row, column;
dbus_int32_t index;
- DBusError error;
DBusMessage *reply;
g_return_val_if_fail (ATK_IS_TABLE (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &row, DBUS_TYPE_INT32, &column,
+ (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INT32, &column,
DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
@@ -151,14 +147,12 @@
AtkTable *table = (AtkTable *) user_data;
dbus_int32_t index;
dbus_int32_t row;
- DBusError error;
DBusMessage *reply;
g_return_val_if_fail (ATK_IS_TABLE (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID))
+ (message, NULL, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
}
@@ -179,14 +173,12 @@
AtkTable *table = (AtkTable *) user_data;
dbus_int32_t index;
dbus_int32_t column;
- DBusError error;
DBusMessage *reply;
g_return_val_if_fail (ATK_IS_TABLE (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID))
+ (message, NULL, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
}
@@ -220,14 +212,12 @@
dbus_int32_t row;
AtkTable *table = (AtkTable *) user_data;
const gchar *description;
- DBusError error;
DBusMessage *reply;
g_return_val_if_fail (ATK_IS_TABLE (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &row, DBUS_TYPE_INVALID))
+ (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
}
@@ -249,14 +239,12 @@
AtkTable *table = (AtkTable *) user_data;
dbus_int32_t column;
const char *description;
- DBusError error;
DBusMessage *reply;
g_return_val_if_fail (ATK_IS_TABLE (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID))
+ (message, NULL, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
}
@@ -278,14 +266,12 @@
AtkTable *table = (AtkTable *) user_data;
dbus_int32_t row, column;
dbus_int32_t extent;
- DBusError error;
DBusMessage *reply;
g_return_val_if_fail (ATK_IS_TABLE (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &row, DBUS_TYPE_INT32, &column,
+ (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INT32, &column,
DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
@@ -307,14 +293,12 @@
AtkTable *table = (AtkTable *) user_data;
dbus_int32_t row, column;
dbus_int32_t extent;
- DBusError error;
DBusMessage *reply;
g_return_val_if_fail (ATK_IS_TABLE (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &row, DBUS_TYPE_INT32, &column,
+ (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INT32, &column,
DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
@@ -335,14 +319,12 @@
{
AtkTable *table = (AtkTable *) user_data;
dbus_int32_t row;
- DBusError error;
AtkObject *obj = NULL;
g_return_val_if_fail (ATK_IS_TABLE (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &row, DBUS_TYPE_INVALID))
+ (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
}
@@ -356,14 +338,12 @@
{
AtkTable *table = (AtkTable *) user_data;
dbus_int32_t column;
- DBusError error;
AtkObject *obj;
g_return_val_if_fail (ATK_IS_TABLE (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID))
+ (message, NULL, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
}
@@ -429,15 +409,13 @@
{
AtkTable *table = (AtkTable *) user_data;
dbus_int32_t row;
- DBusError error;
DBusMessage *reply;
dbus_bool_t ret;
g_return_val_if_fail (ATK_IS_TABLE (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &row, DBUS_TYPE_INVALID))
+ (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
}
@@ -457,15 +435,13 @@
{
AtkTable *table = (AtkTable *) user_data;
dbus_int32_t column;
- DBusError error;
DBusMessage *reply;
dbus_bool_t ret;
g_return_val_if_fail (ATK_IS_TABLE (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID))
+ (message, NULL, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
}
@@ -484,15 +460,13 @@
{
AtkTable *table = (AtkTable *) user_data;
dbus_int32_t row, column;
- DBusError error;
DBusMessage *reply;
dbus_bool_t ret;
g_return_val_if_fail (ATK_IS_TABLE (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &row, DBUS_TYPE_INT32, &column,
+ (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INT32, &column,
DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
@@ -513,15 +487,13 @@
{
AtkTable *table = (AtkTable *) user_data;
dbus_int32_t row;
- DBusError error;
DBusMessage *reply;
dbus_bool_t ret;
g_return_val_if_fail (ATK_IS_TABLE (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &row, DBUS_TYPE_INVALID))
+ (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
}
@@ -541,15 +513,13 @@
{
AtkTable *table = (AtkTable *) user_data;
dbus_int32_t column;
- DBusError error;
DBusMessage *reply;
dbus_bool_t ret;
g_return_val_if_fail (ATK_IS_TABLE (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID))
+ (message, NULL, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
}
@@ -569,15 +539,13 @@
{
AtkTable *table = (AtkTable *) user_data;
dbus_int32_t row;
- DBusError error;
DBusMessage *reply;
dbus_bool_t ret;
g_return_val_if_fail (ATK_IS_TABLE (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &row, DBUS_TYPE_INVALID))
+ (message, NULL, DBUS_TYPE_INT32, &row, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
}
@@ -597,15 +565,13 @@
{
AtkTable *table = (AtkTable *) user_data;
dbus_int32_t column;
- DBusError error;
DBusMessage *reply;
dbus_bool_t ret;
g_return_val_if_fail (ATK_IS_TABLE (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID))
+ (message, NULL, DBUS_TYPE_INT32, &column, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
}
@@ -625,7 +591,6 @@
{
AtkTable *table = (AtkTable *) user_data;
dbus_int32_t index;
- DBusError error;
dbus_int32_t row, column, row_extents, col_extents;
dbus_bool_t is_selected;
dbus_bool_t ret;
@@ -635,9 +600,8 @@
g_return_val_if_fail (ATK_IS_TABLE (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID))
+ (message, NULL, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/text-adaptor.c new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/text-adaptor.c
--- old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/text-adaptor.c 2012-12-17 19:52:09.000000000 +0100
+++ new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/text-adaptor.c 2013-05-14 19:50:48.000000000 +0200
@@ -67,14 +67,12 @@
AtkText *text = (AtkText *) user_data;
dbus_int32_t startOffset, endOffset;
gchar *txt;
- DBusError error;
DBusMessage *reply;
g_return_val_if_fail (ATK_IS_TEXT (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &startOffset, DBUS_TYPE_INT32,
+ (message, NULL, DBUS_TYPE_INT32, &startOffset, DBUS_TYPE_INT32,
&endOffset, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
@@ -98,14 +96,12 @@
AtkText *text = (AtkText *) user_data;
dbus_int32_t offset;
dbus_bool_t rv;
- DBusError error;
DBusMessage *reply;
g_return_val_if_fail (ATK_IS_TEXT (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &offset, DBUS_TYPE_INVALID))
+ (message, NULL, DBUS_TYPE_INT32, &offset, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
}
@@ -129,14 +125,12 @@
gchar *txt;
dbus_int32_t startOffset, endOffset;
gint intstart_offset = 0, intend_offset = 0;
- DBusError error;
DBusMessage *reply;
g_return_val_if_fail (ATK_IS_TEXT (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &offset, DBUS_TYPE_UINT32, &type,
+ (message, NULL, DBUS_TYPE_INT32, &offset, DBUS_TYPE_UINT32, &type,
DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
@@ -168,14 +162,12 @@
gchar *txt;
dbus_int32_t startOffset, endOffset;
gint intstart_offset = 0, intend_offset = 0;
- DBusError error;
DBusMessage *reply;
g_return_val_if_fail (ATK_IS_TEXT (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &offset, DBUS_TYPE_UINT32, &type,
+ (message, NULL, DBUS_TYPE_INT32, &offset, DBUS_TYPE_UINT32, &type,
DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
@@ -208,14 +200,12 @@
gchar *txt;
dbus_int32_t startOffset, endOffset;
gint intstart_offset = 0, intend_offset = 0;
- DBusError error;
DBusMessage *reply;
g_return_val_if_fail (ATK_IS_TEXT (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &offset, DBUS_TYPE_UINT32, &type,
+ (message, NULL, DBUS_TYPE_INT32, &offset, DBUS_TYPE_UINT32, &type,
DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
@@ -245,14 +235,12 @@
AtkText *text = (AtkText *) user_data;
dbus_int32_t offset;
dbus_int32_t ch;
- DBusError error;
DBusMessage *reply;
g_return_val_if_fail (ATK_IS_TEXT (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &offset, DBUS_TYPE_INVALID))
+ (message, NULL, DBUS_TYPE_INT32, &offset, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
}
@@ -277,7 +265,6 @@
dbus_bool_t defined;
gint intstart_offset = 0, intend_offset = 0;
char *rv = NULL;
- DBusError error;
DBusMessage *reply;
AtkAttributeSet *set;
GSList *cur_attr;
@@ -285,9 +272,8 @@
g_return_val_if_fail (ATK_IS_TEXT (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &offset, DBUS_TYPE_STRING,
+ (message, NULL, DBUS_TYPE_INT32, &offset, DBUS_TYPE_STRING,
&attributeName, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
@@ -332,16 +318,14 @@
dbus_int32_t offset;
dbus_int32_t startOffset, endOffset;
gint intstart_offset, intend_offset;
- DBusError error;
DBusMessage *reply;
AtkAttributeSet *set;
DBusMessageIter iter;
g_return_val_if_fail (ATK_IS_TEXT (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &offset, DBUS_TYPE_INVALID))
+ (message, NULL, DBUS_TYPE_INT32, &offset, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
}
@@ -369,14 +353,12 @@
void *user_data)
{
AtkText *text = (AtkText *) user_data;
- DBusError error;
DBusMessage *reply;
AtkAttributeSet *set;
DBusMessageIter iter;
g_return_val_if_fail (ATK_IS_TEXT (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
set = atk_text_get_default_attributes (text);
reply = dbus_message_new_method_return (message);
@@ -398,14 +380,12 @@
dbus_uint32_t coordType;
dbus_int32_t x, y, width, height;
gint ix = 0, iy = 0, iw = 0, ih = 0;
- DBusError error;
DBusMessage *reply;
g_return_val_if_fail (ATK_IS_TEXT (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &offset, DBUS_TYPE_UINT32,
+ (message, NULL, DBUS_TYPE_INT32, &offset, DBUS_TYPE_UINT32,
&coordType, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
@@ -434,14 +414,12 @@
dbus_int32_t x, y;
dbus_uint32_t coordType;
dbus_int32_t rv;
- DBusError error;
DBusMessage *reply;
g_return_val_if_fail (ATK_IS_TEXT (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y,
+ (message, NULL, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y,
DBUS_TYPE_UINT32, &coordType, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
@@ -484,14 +462,12 @@
dbus_int32_t selectionNum;
dbus_int32_t startOffset, endOffset;
gint intstart_offset = 0, intend_offset = 0;
- DBusError error;
DBusMessage *reply;
g_return_val_if_fail (ATK_IS_TEXT (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &selectionNum, DBUS_TYPE_INVALID))
+ (message, NULL, DBUS_TYPE_INT32, &selectionNum, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
}
@@ -517,14 +493,12 @@
AtkText *text = (AtkText *) user_data;
dbus_int32_t startOffset, endOffset;
dbus_bool_t rv;
- DBusError error;
DBusMessage *reply;
g_return_val_if_fail (ATK_IS_TEXT (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &startOffset, DBUS_TYPE_INT32,
+ (message, NULL, DBUS_TYPE_INT32, &startOffset, DBUS_TYPE_INT32,
&endOffset, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
@@ -546,14 +520,12 @@
AtkText *text = (AtkText *) user_data;
dbus_int32_t selectionNum;
dbus_bool_t rv;
- DBusError error;
DBusMessage *reply;
g_return_val_if_fail (ATK_IS_TEXT (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &selectionNum, DBUS_TYPE_INVALID))
+ (message, NULL, DBUS_TYPE_INT32, &selectionNum, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
}
@@ -574,14 +546,12 @@
AtkText *text = (AtkText *) user_data;
dbus_int32_t selectionNum, startOffset, endOffset;
dbus_bool_t rv;
- DBusError error;
DBusMessage *reply;
g_return_val_if_fail (ATK_IS_TEXT (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &selectionNum, DBUS_TYPE_INT32,
+ (message, NULL, DBUS_TYPE_INT32, &selectionNum, DBUS_TYPE_INT32,
&startOffset, DBUS_TYPE_INT32, &endOffset, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
@@ -605,14 +575,12 @@
dbus_uint32_t coordType;
AtkTextRectangle rect;
dbus_int32_t x, y, width, height;
- DBusError error;
DBusMessage *reply;
g_return_val_if_fail (ATK_IS_TEXT (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &startOffset, DBUS_TYPE_INT32,
+ (message, NULL, DBUS_TYPE_INT32, &startOffset, DBUS_TYPE_INT32,
&endOffset, DBUS_TYPE_UINT32, &coordType, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
@@ -643,7 +611,6 @@
AtkText *text = (AtkText *) user_data;
dbus_int32_t x, y, width, height;
dbus_uint32_t coordType, xClipType, yClipType;
- DBusError error;
AtkTextRange **range_list = NULL;
AtkTextRectangle rect;
DBusMessage *reply;
@@ -651,9 +618,8 @@
g_return_val_if_fail (ATK_IS_TEXT (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y,
+ (message, NULL, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y,
DBUS_TYPE_INT32, &height, DBUS_TYPE_INT32, &width, DBUS_TYPE_UINT32,
&coordType, DBUS_TYPE_UINT32, &xClipType, DBUS_TYPE_UINT32, &yClipType,
DBUS_TYPE_INVALID))
@@ -713,7 +679,6 @@
impl_GetAttributeRun (DBusConnection * bus, DBusMessage * message,
void *user_data)
{
- DBusError error;
AtkText *text = (AtkText *) user_data;
dbus_int32_t offset;
dbus_bool_t includeDefaults;
@@ -725,9 +690,8 @@
g_return_val_if_fail (ATK_IS_TEXT (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &offset, DBUS_TYPE_BOOLEAN,
+ (message, NULL, DBUS_TYPE_INT32, &offset, DBUS_TYPE_BOOLEAN,
&includeDefaults, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/value-adaptor.c new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/value-adaptor.c
--- old/at-spi2-atk-2.8.1/atk-adaptor/adaptors/value-adaptor.c 2012-12-17 19:52:09.000000000 +0100
+++ new/at-spi2-atk-2.9.3/atk-adaptor/adaptors/value-adaptor.c 2013-05-14 19:50:48.000000000 +0200
@@ -156,7 +156,6 @@
{
AtkValue *value = (AtkValue *) user_data;
dbus_bool_t rv;
- DBusError error;
DBusMessage *reply;
gdouble dub = 0;
GValue new_value = { 0 };
@@ -164,9 +163,8 @@
g_return_val_if_fail (ATK_IS_VALUE (value),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_DOUBLE, &dub, DBUS_TYPE_INVALID))
+ (message, NULL, DBUS_TYPE_DOUBLE, &dub, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/bridge.c new/at-spi2-atk-2.9.3/atk-adaptor/bridge.c
--- old/at-spi2-atk-2.8.1/atk-adaptor/bridge.c 2013-04-17 03:16:18.000000000 +0200
+++ new/at-spi2-atk-2.9.3/atk-adaptor/bridge.c 2013-05-14 19:50:48.000000000 +0200
@@ -235,6 +235,14 @@
reply = dbus_pending_call_steal_reply (pending);
dbus_pending_call_unref (pending);
+
+ if (!spi_global_app_data)
+ {
+ if (reply)
+ dbus_message_unref (reply);
+ return;
+ }
+
if (reply)
{
gchar *app_name, *obj_path;
@@ -274,11 +282,8 @@
{
DBusMessage *message;
DBusMessageIter iter;
- DBusError error;
DBusPendingCall *pending;
- dbus_error_init (&error);
-
g_free (app->desktop_name);
g_free (app->desktop_path);
@@ -320,11 +325,8 @@
{
DBusMessage *message;
DBusMessageIter iter;
- DBusError error;
const char *uname;
- dbus_error_init (&error);
-
message = dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY,
ATSPI_DBUS_PATH_REGISTRY,
ATSPI_DBUS_INTERFACE_REGISTRY,
@@ -717,7 +719,7 @@
{
#ifndef DISABLE_P2P
DBusServer *server;
- DBusError err;
+ DBusError error;
if (getuid () != 0)
{
@@ -740,12 +742,12 @@
if (!spi_global_app_data->app_bus_addr)
return -1;
- dbus_error_init(&err);
- server = dbus_server_listen(spi_global_app_data->app_bus_addr, &err);
+ dbus_error_init(&error);
+ server = dbus_server_listen(spi_global_app_data->app_bus_addr, &error);
if (server == NULL)
{
- g_warning ("atk-bridge: Couldn't listen on dbus server: %s", err.message);
- dbus_error_init (&err);
+ g_warning ("atk-bridge: Couldn't listen on dbus server: %s", error.message);
+ dbus_error_free (&error);
spi_global_app_data->app_bus_addr [0] = '\0';
g_main_context_unref (spi_global_app_data->main_context);
spi_global_app_data->main_context = NULL;
@@ -949,6 +951,7 @@
else
get_registered_event_listeners (spi_global_app_data);
+ dbus_error_free (&error);
return 0;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/atk-adaptor/event.c new/at-spi2-atk-2.9.3/atk-adaptor/event.c
--- old/at-spi2-atk-2.8.1/atk-adaptor/event.c 2012-12-17 19:52:09.000000000 +0100
+++ new/at-spi2-atk-2.9.3/atk-adaptor/event.c 2013-06-16 20:58:00.000000000 +0200
@@ -98,15 +98,12 @@
{
DBusPendingCall *pending;
SpiReentrantCallClosure closure;
- GMainContext *main_context;
GSource *source;
- main_context = (g_getenv ("AT_SPI_CLIENT") ? NULL :
- spi_global_app_data->main_context);
closure.bus = bus;
- closure.loop = g_main_loop_new (main_context, FALSE);
+ closure.loop = g_main_loop_new (spi_global_app_data->main_context, FALSE);
closure.reply = NULL;
- switch_main_context (main_context);
+ switch_main_context (spi_global_app_data->main_context);
if (!dbus_connection_send_with_reply (bus, message, &pending, 9000) || !pending)
{
@@ -116,7 +113,7 @@
dbus_pending_call_set_notify (pending, set_reply, (void *) &closure, NULL);
source = g_timeout_source_new (500);
g_source_set_callback (source, timeout_reply, &closure, NULL);
- closure.timeout = g_source_attach (source, main_context);
+ closure.timeout = g_source_attach (source, spi_global_app_data->main_context);
g_source_unref (source);
g_main_loop_run (closure.loop);
if (closure.timeout != -1)
@@ -140,7 +137,6 @@
* key_event)
{
DBusMessage *message;
- DBusError error;
dbus_bool_t consumed = FALSE;
message =
@@ -149,7 +145,6 @@
ATSPI_DBUS_INTERFACE_DEC,
"NotifyListenersSync");
- dbus_error_init (&error);
if (spi_dbus_marshal_deviceEvent (message, key_event))
{
DBusMessage *reply =
@@ -158,8 +153,12 @@
{
DBusError error;
dbus_error_init (&error);
- dbus_message_get_args (reply, &error, DBUS_TYPE_BOOLEAN, &consumed,
- DBUS_TYPE_INVALID);
+ if (!dbus_message_get_args (reply, &error, DBUS_TYPE_BOOLEAN,
+ &consumed, DBUS_TYPE_INVALID))
+ {
+ /* TODO: print a warning */
+ dbus_error_free (&error);
+ }
dbus_message_unref (reply);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/configure.ac new/at-spi2-atk-2.9.3/configure.ac
--- old/at-spi2-atk-2.8.1/configure.ac 2013-04-17 03:16:32.000000000 +0200
+++ new/at-spi2-atk-2.9.3/configure.ac 2013-06-17 23:29:38.000000000 +0200
@@ -1,4 +1,4 @@
-AC_INIT([at-spi2-atk], [2.8.1], [accessibility-atspi(a)lists.linux-foundation.org])
+AC_INIT([at-spi2-atk], [2.9.3], [accessibility-atspi(a)lists.linux-foundation.org])
AC_CONFIG_AUX_DIR(config)
AT_SPI_ATK_MAJOR_VERSION=0
@@ -55,7 +55,7 @@
AC_SUBST(ATK_LIBS)
AC_SUBST(ATK_CFLAGS)
-PKG_CHECK_MODULES(ATSPI, [atspi-2 >= 2.7.5])
+PKG_CHECK_MODULES(ATSPI, [atspi-2 >= 2.9.3])
AC_SUBST(ATSPI_LIBS)
AC_SUBST(ATSPI_CFLAGS)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.8.1/droute/droute.c new/at-spi2-atk-2.9.3/droute/droute.c
--- old/at-spi2-atk-2.8.1/droute/droute.c 2012-12-17 19:52:09.000000000 +0100
+++ new/at-spi2-atk-2.9.3/droute/droute.c 2013-05-14 19:50:48.000000000 +0200
@@ -265,7 +265,12 @@
dbus_error_init (&error);
if (!dbus_message_get_args
(message, &error, DBUS_TYPE_STRING, &iface, DBUS_TYPE_INVALID))
- return dbus_message_new_error (message, DBUS_ERROR_FAILED, error.message);
+ {
+ DBusMessage *ret;
+ ret = dbus_message_new_error (message, DBUS_ERROR_FAILED, error.message);
+ dbus_error_free (&error);
+ return ret;
+ }
reply = dbus_message_new_method_return (message);
if (!reply)
@@ -321,17 +326,26 @@
DBUS_TYPE_STRING,
&(pair.two),
DBUS_TYPE_INVALID))
- return dbus_message_new_error (message, DBUS_ERROR_FAILED, error.message);
+ {
+ DBusMessage *ret;
+ ret = dbus_message_new_error (message, DBUS_ERROR_FAILED, error.message);
+ dbus_error_free (&error);
+ }
_DROUTE_DEBUG ("DRoute (handle prop): %s|%s on %s\n", pair.one, pair.two, pathstr);
prop_funcs = (PropertyPair *) g_hash_table_lookup (path->properties, &pair);
if (!prop_funcs)
+ {
+ DBusMessage *ret;
#ifdef DBUS_ERROR_UNKNOWN_PROPERTY
- return dbus_message_new_error (message, DBUS_ERROR_UNKNOWN_PROPERTY, "Property unavailable");
+ ret = dbus_message_new_error (message, DBUS_ERROR_UNKNOWN_PROPERTY, "Property unavailable");
#else
- return dbus_message_new_error (message, DBUS_ERROR_FAILED, "Property unavailable");
+ ret = dbus_message_new_error (message, DBUS_ERROR_FAILED, "Property unavailable");
#endif
+ dbus_error_free (&error);
+ return ret;
+ }
datum = path_get_datum (path, pathstr);
if (!datum)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package atk for openSUSE:Factory checked in at 2013-06-29 19:36:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/atk (Old)
and /work/SRC/openSUSE:Factory/.atk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "atk"
Changes:
--------
--- /work/SRC/openSUSE:Factory/atk/atk.changes 2013-04-02 11:38:52.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.atk.new/atk.changes 2013-06-29 19:36:23.000000000 +0200
@@ -1,0 +2,15 @@
+Fri Jun 21 18:47:46 UTC 2013 - dimstar(a)opensuse.org
+
+- Update to version 2.9.3:
+ + Removed pads from interfaces.
+ + Bugs fixed: bgo#697968, bgo#701503.
+
+-------------------------------------------------------------------
+Tue May 28 19:51:40 UTC 2013 - dimstar(a)opensuse.org
+
+- Update to version 2.9.2:
+ + Updated documentations.
+ + Bugs fixed: bgo#699262, bgo#699368, bgo#699256, bgo#696466,
+ bgo#696409, bgo#700800.
+
+-------------------------------------------------------------------
Old:
----
atk-2.8.0.tar.xz
New:
----
atk-2.9.3.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ atk.spec ++++++
--- /var/tmp/diff_new_pack.Cn9xC1/_old 2013-06-29 19:36:24.000000000 +0200
+++ /var/tmp/diff_new_pack.Cn9xC1/_new 2013-06-29 19:36:24.000000000 +0200
@@ -20,10 +20,10 @@
Summary: An Accessibility ToolKit
License: LGPL-2.1+
Group: System/Libraries
-Version: 2.8.0
+Version: 2.9.3
Release: 0
Url: http://www.gtk.org/
-Source: http://download.gnome.org/sources/atk/2.8/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/atk/2.9/%{name}-%{version}.tar.xz
Source99: baselibs.conf
BuildRequires: fdupes
BuildRequires: gcc-c++
++++++ atk-2.8.0.tar.xz -> atk-2.9.3.tar.xz ++++++
++++ 9410 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package anjuta for openSUSE:Factory checked in at 2013-06-29 19:35:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/anjuta (Old)
and /work/SRC/openSUSE:Factory/.anjuta.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "anjuta"
Changes:
--------
--- /work/SRC/openSUSE:Factory/anjuta/anjuta.changes 2013-06-05 11:37:12.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.anjuta.new/anjuta.changes 2013-06-29 19:35:56.000000000 +0200
@@ -1,0 +2,49 @@
+Sat Jun 22 11:58:51 UTC 2013 - dimstar(a)opensuse.org
+
+- Update to version 3.9.3:
+ + sourceview:
+ - fix compile warnings.
+ + message-view: don't manually free private structure.
+ + snippets-manager: fix compile warnings.
+ + git:
+ - Add a context menu to the log pane.
+ - Add a context menu to the Branches pane.
+ - Add a popup menu to the Remotes pane.
+ - Check box action fixes in Push and Pull panes.
+ - Add a popup menu to the Stash pane.
+ - Fix a warning.
+ + libanjuta:
+ - Improve symbol-db behavior on cut, paste, undo, redo and
+ when multiple files are modified.
+ - Move scoped and descoped signal on AnjutaProfile object.
+ - Replace AnjutaPluginDescription by AnjutaPluginHandle in API.
+ - Move anjuta_profile_manager_load_profile function in
+ anjuta_profile.
+ - Always keep plugins in the system profile.
+ - Allow to enable only a set of plugins defined in the profile
+ file.
+ - Keep dynamic allocation data in AnjutaPluginDescription.
+ - Allow to change plugin description key from profile.
+ + Allow to select different profile on the command line.
+ + Add a sample custom profile keeping only the editor.
+ + document-manager: Automatically open an empty file if starter
+ plugin is not used.
+ + symbol-db: Update symbol database on editor changes without
+ saving.
+ + language-support-cpp-jave: Fix memory leak.
+ + Bugs fixed: bgo#701443, bgo#701207, bgo#700383
+ + Updated translations.
+
+-------------------------------------------------------------------
+Tue May 28 06:38:58 UTC 2013 - dimstar(a)opensuse.org
+
+- Update to version 3.9.2:
+ + subversion: convert builder file to gtk+-3.0.
+ + starter: guard for NULL document manager or project manager.
+ + Fix deprecation warnings.
+ + Bugs fixed: bgo#699323, bgo#699329, bgo#699327, bgo#699330,
+ bgo#699326, bgo#698705, bgo#699316, bgo#700615, bgo#696991,
+ bgo#698158, bgo#700318, bgo#694644.
+ + Updated translations.
+
+-------------------------------------------------------------------
Old:
----
anjuta-3.9.1.tar.xz
New:
----
anjuta-3.9.3.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ anjuta.spec ++++++
--- /var/tmp/diff_new_pack.GsgGqf/_old 2013-06-29 19:35:57.000000000 +0200
+++ /var/tmp/diff_new_pack.GsgGqf/_new 2013-06-29 19:35:57.000000000 +0200
@@ -17,7 +17,7 @@
Name: anjuta
-Version: 3.9.1
+Version: 3.9.3
Release: 0
Summary: Versatile Integrated Development Environment for GNOME
License: GPL-2.0+
++++++ anjuta-3.9.1.tar.xz -> anjuta-3.9.3.tar.xz ++++++
++++ 101275 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2013-06-29 14:57:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2 (Old)
and /work/SRC/openSUSE:Factory/.yast2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2013-06-05 13:25:24.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2.new/yast2.changes 2013-06-29 14:57:51.000000000 +0200
@@ -1,0 +2,12 @@
+Thu Jun 27 16:10:13 CEST 2013 - jsuchome(a)suse.cz
+
+- show gpg key info in a term that allows copying the text
+ (bnc#611456)
+ -2.24.2
+
+-------------------------------------------------------------------
+Thu Jun 13 06:24:11 UTC 2013 - lslezak(a)suse.cz
+
+- updated the testsuite to make the transition to Ruby easier
+
+-------------------------------------------------------------------
Old:
----
yast2-2.24.1.tar.bz2
New:
----
yast2-2.24.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.pBqJ7s/_old 2013-06-29 14:57:52.000000000 +0200
+++ /var/tmp/diff_new_pack.pBqJ7s/_new 2013-06-29 14:57:52.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2
-Version: 2.24.1
+Version: 2.24.2
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-2.24.1.tar.bz2 -> yast2-2.24.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.24.1/VERSION new/yast2-2.24.2/VERSION
--- old/yast2-2.24.1/VERSION 2013-05-27 14:36:37.000000000 +0200
+++ new/yast2-2.24.2/VERSION 2013-06-27 17:03:12.000000000 +0200
@@ -1 +1 @@
-2.24.1
+2.24.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.24.1/configure new/yast2-2.24.2/configure
--- old/yast2-2.24.1/configure 2013-05-28 14:02:30.000000000 +0200
+++ new/yast2-2.24.2/configure 2013-06-27 17:03:23.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for yast2 2.24.1.
+# Generated by GNU Autoconf 2.69 for yast2 2.24.2.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -579,8 +579,8 @@
# Identity of this package.
PACKAGE_NAME='yast2'
PACKAGE_TARNAME='yast2'
-PACKAGE_VERSION='2.24.1'
-PACKAGE_STRING='yast2 2.24.1'
+PACKAGE_VERSION='2.24.2'
+PACKAGE_STRING='yast2 2.24.2'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -1250,7 +1250,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2 2.24.1 to adapt to many kinds of systems.
+\`configure' configures yast2 2.24.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1321,7 +1321,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2 2.24.1:";;
+ short | recursive ) echo "Configuration of yast2 2.24.2:";;
esac
cat <<\_ACEOF
@@ -1401,7 +1401,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2 configure 2.24.1
+yast2 configure 2.24.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1418,7 +1418,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2 $as_me 2.24.1, which was
+It was created by yast2 $as_me 2.24.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2357,7 +2357,7 @@
# Define the identity of the package.
PACKAGE='yast2'
- VERSION='2.24.1'
+ VERSION='2.24.2'
cat >>confdefs.h <<_ACEOF
@@ -2480,7 +2480,7 @@
-VERSION="2.24.1"
+VERSION="2.24.2"
RPMNAME="yast2"
MAINTAINER="YaST2 Maintainers <yast2-maintainers(a)suse.de>"
@@ -3522,7 +3522,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2 $as_me 2.24.1, which was
+This file was extended by yast2 $as_me 2.24.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3575,7 +3575,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-yast2 config.status 2.24.1
+yast2 config.status 2.24.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.24.1/configure.in new/yast2-2.24.2/configure.in
--- old/yast2-2.24.1/configure.in 2013-05-28 14:02:17.000000000 +0200
+++ new/yast2-2.24.2/configure.in 2013-06-27 17:03:19.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2
dnl
-dnl -- This file is generated by y2autoconf 2.24.0 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.24.1 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2, 2.24.1, http://bugs.opensuse.org/, yast2)
+AC_INIT(yast2, 2.24.2, http://bugs.opensuse.org/, yast2)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.24.1"
+VERSION="2.24.2"
RPMNAME="yast2"
MAINTAINER="YaST2 Maintainers <yast2-maintainers(a)suse.de>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.24.1/library/modules/Version.ycp new/yast2-2.24.2/library/modules/Version.ycp
--- old/yast2-2.24.1/library/modules/Version.ycp 2013-05-28 14:02:38.000000000 +0200
+++ new/yast2-2.24.2/library/modules/Version.ycp 2013-06-27 17:03:30.000000000 +0200
@@ -20,7 +20,7 @@
/**
* Version of the yast2 package
*/
-global string yast2 = "2.24.1";
+global string yast2 = "2.24.2";
/* EOF */
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.24.1/library/packages/src/SignatureCheckDialogs.ycp new/yast2-2.24.2/library/packages/src/SignatureCheckDialogs.ycp
--- old/yast2-2.24.1/library/packages/src/SignatureCheckDialogs.ycp 2013-01-22 12:22:06.000000000 +0100
+++ new/yast2-2.24.2/library/packages/src/SignatureCheckDialogs.ycp 2013-06-27 17:03:12.000000000 +0200
@@ -508,31 +508,28 @@
term GPGKeyAsTerm(map<string,any> key)
{
- boolean no_fingerprint = key["fingerprint"]:"" == nil || key["fingerprint"]:"" == "";
- boolean no_exp_date = key["expires"]:"" == nil || key["expires"]:"" == "";
- boolean no_create_date = key["created"]:"" == nil || key["expires"]:"" == "";
-
- return `HBox(
- `VBox(
- // GPG key property
- `Left(`Label(_("ID: "))),
- // GPG key property
- `Left(`Label(_("Name: "))),
- // GPG key property
- no_fingerprint ? `Empty() : `Left(`Label(_("Fingerprint: "))),
- // GPG key property
- no_create_date ? `Empty() : `Left(`Label(_("Created: "))),
- // GPG key property
- no_exp_date ? `Empty() : `Left(`Label(_("Expires: ")))
- ),
- `VBox(
- `Left(`Label(key["id"]:"")),
- `Left(`Label(key["name"]:"")),
- no_fingerprint ? `Empty() : `Left(`Label(StringSplitter(key["fingerprint"]:"", " ", 4))),
- no_create_date ? `Empty() : `Left(`Label(key["created"]:"")),
- no_exp_date ? `Empty() : `Left(`Label(key["expires"]:""))
- )
- );
+ string rt =
+ // GPG key property
+ sformat ("<b>%1</b>%2", _("ID: "), key["id"]:"") +
+ // GPG key property
+ sformat ("<br><b>%1</b>%2", _("Name: "), key["name"]:"");
+ if (size (key["fingerprint"]:"") > 0)
+ {
+ // GPG key property
+ rt = rt + sformat ("<br><b>%1</b>%2", _("Fingerprint: "),
+ StringSplitter(key["fingerprint"]:"", " ", 4));
+ }
+ if (size (key["created"]:"") > 0)
+ {
+ // GPG key property
+ rt = rt + sformat ("<br><b>%1</b>%2", _("Created: "), key["created"]:"");
+ }
+ if (size (key["expires"]:"") > 0)
+ {
+ // GPG key property
+ rt = rt + sformat ("<br><b>%1</b>%2", _("Expires: "), key["expires"]:"");
+ }
+ return `RichText (rt);
}
/**
@@ -801,10 +798,7 @@
// the important GPG key properties are completely displayed
boolean hide_help = displayinfo["TextMode"]:false && displayinfo["Width"]:80 < 105;
- UI::OpenDialog(
- `opt(`decorated),
- `HBox (
- `VSpacing(19),
+ UI::OpenDialog (`opt(`decorated), `HBox (
// left-side help
hide_help ? `Empty() :
`HWeight(3,
@@ -814,39 +808,27 @@
),
`HSpacing(1.5),
// dialog
- `HWeight(5,
- `VBox(
- `Top (
- `VBox (
- `HBox (
- `VCenter(MessageIcon("question")),
- // popup heading
- `VCenter(`Heading(_("Import Untrusted GnuPG Key"))),
- `HStretch()
- ),
- // dialog message
- `MarginBox(0.5, 0.5, `VBox(
- `Left(`Label(dialog_text)),
- `VSpacing(0.5),
- GPGKeyAsTerm(key),
- `VSpacing(0.5),
- `Left(`Label(dialog_text2))
- )
- )
- )
+ `HWeight(5, `VBox(
+ `HBox (
+ `VCenter(MessageIcon("question")),
+ // popup heading
+ `VCenter(`Heading(_("Import Untrusted GnuPG Key"))),
+ `HStretch()
),
- // dialog buttons
- `Bottom(
+ // dialog message
+ `MarginBox(0.4, 0.4, `VBox(
+ `Left(`Label(dialog_text)),
+ GPGKeyAsTerm(key),
+ `Left(`Label(dialog_text2))
+ )),
+ // dialog buttons
`ButtonBox (
// push button
`PushButton(`id(`trust), `opt (`key_F10, `okButton), _("&Trust")),
`PushButton(`id(`cancel), `opt (`key_F9, `cancelButton), Label::CancelButton())
)
- )
- )
- )
- )
- );
+ ))
+ ));
UI::SetFocus(`cancel);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.24.1/library/sequencer/src/Sequencer.ycp new/yast2-2.24.2/library/sequencer/src/Sequencer.ycp
--- old/yast2-2.24.1/library/sequencer/src/Sequencer.ycp 2013-01-22 12:22:06.000000000 +0100
+++ new/yast2-2.24.2/library/sequencer/src/Sequencer.ycp 2013-06-13 08:30:58.000000000 +0200
@@ -88,7 +88,7 @@
}
else if (is(val, list)) {
if(size((list) val) < 2) {
- y2error(2, "sequencer check: list too small: %1 (%2)", val, key);
+ y2error(2, "sequencer check: list size too small: %1 (key: %2)", size((list) val), key);
return false;
}
/* FIXME: use function pointers
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.24.1/library/sequencer/testsuite/tests/WS_alias.out new/yast2-2.24.2/library/sequencer/testsuite/tests/WS_alias.out
--- old/yast2-2.24.1/library/sequencer/testsuite/tests/WS_alias.out 2013-01-22 12:22:06.000000000 +0100
+++ new/yast2-2.24.2/library/sequencer/testsuite/tests/WS_alias.out 2013-06-13 08:30:58.000000000 +0200
@@ -4,10 +4,10 @@
Return nil
Log sequencer: Alias not found: 1
Return nil
-Return func1 ()
+Return `func1
Log sequencer: Invalid alias: []
Return nil
Log sequencer: Invalid alias: nil
Return nil
-Return func2 ()
-Return func3 ()
+Return `func2
+Return `func3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.24.1/library/sequencer/testsuite/tests/WS_alias.ycp new/yast2-2.24.2/library/sequencer/testsuite/tests/WS_alias.ycp
--- old/yast2-2.24.1/library/sequencer/testsuite/tests/WS_alias.ycp 2013-01-22 12:22:06.000000000 +0100
+++ new/yast2-2.24.2/library/sequencer/testsuite/tests/WS_alias.ycp 2013-06-13 08:30:58.000000000 +0200
@@ -24,9 +24,9 @@
include "testsuite.ycp";
import "Sequencer";
-void func1() { return; }
-void func2() { return; }
-void func3() { return; }
+symbol func1() { return `func1; }
+symbol func2() { return `func2; }
+symbol func3() { return `func3; }
map aliases = $[
"1" : nil,
@@ -40,10 +40,10 @@
TEST(``(Sequencer::WS_alias($[], "blah")), [], nil);
TEST(``(Sequencer::WS_alias(aliases, "blah")), [], nil);
TEST(``(Sequencer::WS_alias(aliases, "1")), [], nil);
-TEST(``(Sequencer::WS_alias(aliases, "2")), [], nil);
+TEST(``(eval(Sequencer::WS_alias(aliases, "2"))), [], nil);
TEST(``(Sequencer::WS_alias(aliases, "3")), [], nil);
TEST(``(Sequencer::WS_alias(aliases, "4")), [], nil);
-TEST(``(Sequencer::WS_alias(aliases, "5")), [], nil);
-TEST(``(Sequencer::WS_alias(aliases, "6")), [], nil);
+TEST(``(eval(Sequencer::WS_alias(aliases, "5"))), [], nil);
+TEST(``(eval(Sequencer::WS_alias(aliases, "6"))), [], nil);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.24.1/library/sequencer/testsuite/tests/WS_check.out new/yast2-2.24.2/library/sequencer/testsuite/tests/WS_check.out
--- old/yast2-2.24.1/library/sequencer/testsuite/tests/WS_check.out 2013-01-22 12:22:06.000000000 +0100
+++ new/yast2-2.24.2/library/sequencer/testsuite/tests/WS_check.out 2013-06-13 08:30:58.000000000 +0200
@@ -1,7 +1,7 @@
Log sequencer check: ws_start needs to be defined
Return false
-Log sequencer check: list too small: [] (2)
-Log sequencer check: list too small: [f1 ()] (3)
+Log sequencer check: list size too small: 0 (key: 2)
+Log sequencer check: list size too small: 1 (key: 3)
Log sequencer check: not a boolean: `x
Log sequencer check: not a boolean: 5
Log sequencer check: not a string: `x
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package wireshark for openSUSE:Factory checked in at 2013-06-29 14:52:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/wireshark (Old)
and /work/SRC/openSUSE:Factory/.wireshark.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wireshark"
Changes:
--------
--- /work/SRC/openSUSE:Factory/wireshark/wireshark.changes 2013-06-06 13:00:23.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.wireshark.new/wireshark.changes 2013-06-29 14:52:54.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Jun 27 20:26:33 UTC 2013 - andreas.stieger(a)gmx.de
+
+- fix factory builds, prevent build failures with pod2man:
+ wireshark-1.10.0-authors-pod2man.patch
+ wireshark-1.10.0-pod-characters.patch
+
+-------------------------------------------------------------------
New:
----
wireshark-1.10.0-authors-pod2man.patch
wireshark-1.10.0-pod-characters.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ wireshark.spec ++++++
--- /var/tmp/diff_new_pack.0REMd5/_old 2013-06-29 14:52:56.000000000 +0200
+++ /var/tmp/diff_new_pack.0REMd5/_new 2013-06-29 14:52:56.000000000 +0200
@@ -28,13 +28,14 @@
Url: https://www.wireshark.org/
Source: https://www.wireshark.org/download/src/%{name}-%{version}.tar.bz2
Source2: https://www.wireshark.org/download/SIGNATURES-%{version}.txt
-# https://www.wireshark.org/download/gerald_at_wireshark_dot_org.gpg
-Source3: wireshark.keyring
+Source3: https://www.wireshark.org/download/gerald_at_wireshark_dot_org.gpg#/wiresha…
# PATCH-FIX-OPENSUSE wireshark-1.6.3-disable-warning-dialog.patch bnc#349782 prusnak(a)suse.cz -- don't show warning when running as root
Patch1: wireshark-1.2.0-disable-warning-dialog.patch
# PATCH-FEATURE-OPENSUSE wireshark-1.2.0-geoip.patch prusnak(a)suse.cz -- search in /var/lib/GeoIP if user hasn't set any GeoIP folders
Patch2: wireshark-1.2.0-geoip.patch
Patch4: wireshark-1.10.0-enable_lua.patch
+Patch5: wireshark-1.10.0-authors-pod2man.patch
+Patch6: wireshark-1.10.0-pod-characters.patch
BuildRequires: bison
BuildRequires: cairo-devel
BuildRequires: flex
@@ -122,6 +123,9 @@
sed -i 's!^Exec=wireshark!Exec=/usr/bin/xdg-su -c /usr/bin/wireshark!' wireshark.desktop
%endif
+%patch5 -p1
+%patch6 -p1
+
%build
# zlib-1.2.5 does not work well with wireshark, so disable it on pre-12.2
++++++ wireshark-1.10.0-authors-pod2man.patch ++++++
From: Andreas Stieger <andreas.stieger(a)gmx.de>
Date: Thu, 27 Jun 2013 21:02:17 +0100
Subject: [patch] change characters in AUTHORS file to be compatible with pod2man
Upstream: never
* remove some characters for which Pod::Man does not have an escape sequence
* replace cyrillic name with transliteration
Wide character in printf at /usr/lib/perl5/5.18.0/Pod/Simple.pm line 539.
wireshark.pod around line 3455: Non-ASCII character seen before =encoding in 'Moń'. Assuming UTF-8
POD document had syntax errors at /usr/bin/pod2man line 71.
make: *** [wireshark.1] Error 255
error: Bad exit status from /var/tmp/rpm-tmp.PtRL60 (%build)
---
AUTHORS | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Index: wireshark-1.10.0/AUTHORS
===================================================================
--- wireshark-1.10.0.orig/AUTHORS 2013-05-29 17:52:27.000000000 +0100
+++ wireshark-1.10.0/AUTHORS 2013-06-27 20:04:34.000000000 +0100
@@ -3509,7 +3509,7 @@ Peter Hatina <phatina[AT]redhat.com> {
Gtk3 Wireshark fixes
}
-Tomasz Moń <desowin[AT]gmail.com> {
+Tomasz Mon <desowin[AT]gmail.com> {
USBPcap support
}
@@ -3612,7 +3612,7 @@ Cvetan Ivanov <zezo[AT]spnet.net>
Vasanth Manickam <vasanth.manickam[AT]bt.com>
Julian Onions <julian.onions[AT]gmail.com>
Samuel Thibault <samuel.thibault[AT]ens-lyon.org>
-Peter Kovář <peter.kovar[AT]gmail.com>
+Peter Kovár <peter.kovar[AT]gmail.com>
Paul Ollis <paul.ollis[AT]roke.co.uk>
Dominik Kuhlen <dkuhlen[AT]gmx.net>
Karl Knoebl <karl.knoebl[AT]siemens.com>
@@ -3703,7 +3703,7 @@ Paul Stath <pstath[AT]axxcelera.com>
DeCount <aatrade[AT]libero.it>
Andras Veres-Szentkiralyi <vsza[AT]vsza.hu>
Jakob Hirsch <jh.wireshark-bugzilla[AT]plonk.de>
-Роман Донченко <DXDragon[AT]yandex.ru>
+Roman Donchenko <DXDragon[AT]yandex.ru>
<billyjeans[AT]gmail.com>
Evan Huus <eapache[AT]gmail.com>
Tom Cook <tcook[AT]ixiacom.com>
++++++ wireshark-1.10.0-pod-characters.patch ++++++
From: Andreas Stieger <andreas.stieger(a)gmx.de>
Date: Thu, 27 Jun 2013 21:02:17 +0100
Subject: [patch] prevent pod2man failures due to non-ASCII characters
References: http://anonsvn.wireshark.org/viewvc?view=revision&revision=49424
Upstream: submitted (different patch upstream but creates other errors)
Prevents the following error sue to weird whitespache characters in the file:
POD2MAN asn2deb.1
asn2deb.pod around line 8: Non-ASCII character seen before =encoding in '[-a?I<ASN.1'. Assuming ISO8859-1
POD document had syntax errors at /usr/bin/pod2man line 71.
make: *** [asn2deb.1] Error 255
POD2MAN idl2deb.1
idl2deb.pod around line 8: Non-ASCII character seen before =encoding in '[B<-d?>I<opts>]'. Assuming ISO8859-1
POD document had syntax errors at /usr/bin/pod2man line 71.
make: *** [idl2deb.1] Error 255
---
doc/asn2deb.pod | 4 ++--
doc/idl2deb.pod | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
Index: wireshark-1.10.0/doc/asn2deb.pod
===================================================================
--- wireshark-1.10.0.orig/doc/asn2deb.pod 2013-06-27 20:33:01.000000000 +0100
+++ wireshark-1.10.0/doc/asn2deb.pod 2013-06-27 20:33:42.000000000 +0100
@@ -5,8 +5,8 @@ asn2deb - Create a Debian package for BE
=head1 SYNOPSIS
-B<asn2deb> [-a�I<ASN.1�file>] [--asn=I<ASN.1�file>] [B<-d�>I<opts>] [B<--dbopts=>I<opts>] [B<-e�>I<address>]
-[B<--email=>I<address>] [B<-h>] [B<--help>] [B<-n�>I<name>] [B<--name=>I<name>] [B<-p>] [B<--preserve>] [B<-v>] [B<--version>]
+B<asn2deb> [-a I<ASN.1 file>] [--asn=I<ASN.1 file>] [B<-d >I<opts>] [B<--dbopts=>I<opts>] [B<-e >I<address>]
+[B<--email=>I<address>] [B<-h>] [B<--help>] [B<-n >I<name>] [B<--name=>I<name>] [B<-p>] [B<--preserve>] [B<-v>] [B<--version>]
=head1 DESCRIPTION
Index: wireshark-1.10.0/doc/idl2deb.pod
===================================================================
--- wireshark-1.10.0.orig/doc/idl2deb.pod 2013-06-27 20:33:01.000000000 +0100
+++ wireshark-1.10.0/doc/idl2deb.pod 2013-06-27 20:33:42.000000000 +0100
@@ -5,8 +5,8 @@ idl2deb - Create a Debian package for CO
=head1 SYNOPSIS
-B<idl2deb> [B<-d�>I<opts>] [B<--dbopts=>I<opts>] [B<-e�>I<address>] [B<--email=>I<address>] [-i�I<idlfile>]
-[--idl=I<idlfile>] [B<-h>] [B<--help>] [B<-n�>I<name>] [B<--name=>I<name>] [B<-p>] [B<--preserve>] [B<-v>] [B<--version>]
+B<idl2deb> [B<-d >I<opts>] [B<--dbopts=>I<opts>] [B<-e >I<address>] [B<--email=>I<address>] [-i I<idlfile>]
+[--idl=I<idlfile>] [B<-h>] [B<--help>] [B<-n >I<name>] [B<--name=>I<name>] [B<-p>] [B<--preserve>] [B<-v>] [B<--version>]
=head1 DESCRIPTION
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package usbview for openSUSE:Factory checked in at 2013-06-29 14:52:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/usbview (Old)
and /work/SRC/openSUSE:Factory/.usbview.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "usbview"
Changes:
--------
--- /work/SRC/openSUSE:Factory/usbview/usbview.changes 2011-09-23 12:49:34.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.usbview.new/usbview.changes 2013-06-29 14:52:13.000000000 +0200
@@ -1,0 +2,7 @@
+Sat Jun 29 09:00:30 UTC 2013 - meissner(a)suse.com
+
+- updated to 2.0
+ + gtk 3.0 port
+ + /proc/bus/usb/devices has moved to /sys/kernel/debug/usb/devices
+
+-------------------------------------------------------------------
Old:
----
usbview-1.1.tar.bz2
New:
----
usbview-2.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ usbview.spec ++++++
--- /var/tmp/diff_new_pack.fXMpff/_old 2013-06-29 14:52:14.000000000 +0200
+++ /var/tmp/diff_new_pack.fXMpff/_new 2013-06-29 14:52:14.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package usbview (Version 1.1)
+# spec file for package usbview
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,19 +15,17 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
Name: usbview
-Version: 1.1
-Release: 1
-License: GPL-2.0+
+Version: 2.0
+Release: 0
Summary: USB Topology and Device Viewer
-Url: http://www.kroah.com/linux-usb/
+License: GPL-2.0+
Group: Hardware/Other
-Source: http://www.kroah.com/linux-usb/%{name}-%{version}.tar.bz2
+Url: http://www.kroah.com/linux-usb/
+Source: http://www.kroah.com/linux-usb/%{name}-%{version}.tar.gz
Source1: %name.desktop
-BuildRequires: gtk2-devel
+BuildRequires: gtk3-devel
BuildRequires: update-desktop-files
BuildRoot: %{_tmppath}/%{name}-%{version}-build
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package sudo for openSUSE:Factory checked in at 2013-06-29 14:51:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sudo (Old)
and /work/SRC/openSUSE:Factory/.sudo.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sudo"
Changes:
--------
--- /work/SRC/openSUSE:Factory/sudo/sudo.changes 2013-03-01 21:03:23.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.sudo.new/sudo.changes 2013-06-29 14:51:56.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Jun 27 18:03:10 UTC 2013 - michael(a)stroeder.com
+
+- Update to upstream release 1.8.7
+ * especially all local patches are obsoleted by upstream fixes
+
+-------------------------------------------------------------------
Old:
----
sudo-1.8.6p3-CVE-2013-1775.patch
sudo-1.8.6p3-CVE-2013-1776.patch
sudo-1.8.6p3.tar.gz
sudo-sudoers.patch
sudoers2ldif-env.patch
New:
----
sudo-1.8.7.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sudo.spec ++++++
--- /var/tmp/diff_new_pack.rEQEW3/_old 2013-06-29 14:51:57.000000000 +0200
+++ /var/tmp/diff_new_pack.rEQEW3/_new 2013-06-29 14:51:57.000000000 +0200
@@ -17,7 +17,7 @@
Name: sudo
-Version: 1.8.6p3
+Version: 1.8.7
Release: 0
Summary: Execute some commands as root
License: ISC
@@ -26,10 +26,6 @@
Source0: http://sudo.ws/sudo/dist/%{name}-%{version}.tar.gz
Source1: sudo.pamd
Source2: README.SUSE
-Patch0: sudoers2ldif-env.patch
-Patch1: sudo-sudoers.patch
-Patch2: sudo-1.8.6p3-CVE-2013-1775.patch
-Patch3: sudo-1.8.6p3-CVE-2013-1776.patch
BuildRequires: audit-devel
BuildRequires: groff
BuildRequires: libselinux-devel
@@ -57,10 +53,6 @@
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
%build
%ifarch s390 s390x %sparc
++++++ sudo-1.8.6p3.tar.gz -> sudo-1.8.7.tar.gz ++++++
++++ 90861 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package rpmlint-mini for openSUSE:Factory checked in at 2013-06-29 14:51:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rpmlint-mini (Old)
and /work/SRC/openSUSE:Factory/.rpmlint-mini.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rpmlint-mini"
Changes:
--------
--- /work/SRC/openSUSE:Factory/rpmlint-mini/rpmlint-mini.changes 2013-06-26 20:27:04.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.rpmlint-mini.new/rpmlint-mini.changes 2013-06-29 14:51:36.000000000 +0200
@@ -1,0 +2,15 @@
+Fri Jun 28 16:16:25 UTC 2013 - dmueller(a)suse.com
+
+- update to desktop-file-validate 0.21:
+ - update to current version of menu specification (Vincent):
+ - only print hint if no main category is present, not an error
+ - make Science a main category
+ - add new registered categories: Adult, Feed, Humanities, Maps,
+ Shooter, Spirituality, XFCE
+ - update related categories
+ - add TDE to list of registered OnlyShowIn
+ - accept and validate GNOME3/GSettings for AutostartCondition (Vincent)
+ - output hint if more than one main category is present (Vincent)
+ - output hint about suggested related categories (Vincent)
+
+-------------------------------------------------------------------
Old:
----
desktop-file-utils-0.20.tar.xz
New:
----
desktop-file-utils-0.21.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rpmlint-mini.spec ++++++
--- /var/tmp/diff_new_pack.m9tATW/_old 2013-06-29 14:51:37.000000000 +0200
+++ /var/tmp/diff_new_pack.m9tATW/_new 2013-06-29 14:51:37.000000000 +0200
@@ -34,11 +34,11 @@
Summary: Rpm correctness checker
License: GPL-2.0+
Group: System/Packages
-Version: 1.4
+Version: 1.5
Release: 0
Url: http://rpmlint.zarb.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source: desktop-file-utils-0.20.tar.xz
+Source: desktop-file-utils-0.21.tar.xz
Source100: rpmlint-deps.txt
Source101: rpmlint.wrapper
Source102: rpmlint-mini.config
@@ -50,7 +50,7 @@
source packages can be checked.
%prep
-%setup -q -n desktop-file-utils-0.20
+%setup -q -n desktop-file-utils-0.21
[[ -r COPYING ]]
%build
++++++ desktop-file-utils-0.20.tar.xz -> desktop-file-utils-0.21.tar.xz ++++++
++++ 4910 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/desktop-file-utils-0.20/ChangeLog new/desktop-file-utils-0.21/ChangeLog
--- old/desktop-file-utils-0.20/ChangeLog 2012-03-05 11:02:10.000000000 +0100
+++ new/desktop-file-utils-0.21/ChangeLog 2012-10-11 16:08:39.000000000 +0200
@@ -1,5 +1,270 @@
# Generated by Makefile. Do not edit.
+commit c0c4c6c1dcfc410984a96193678f40b7a31c9ba1
+Author: Vincent Untz <vuntz(a)gnome.org>
+Date: Thu Oct 11 15:25:25 2012 +0200
+
+ validate: Add Feed category, that can be used with Network
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=20197
+
+ See http://lists.freedesktop.org/archives/xdg/2012-October/012525.html
+
+M src/validate.c
+
+commit 689ec978d17769092e0dde3c79c1ce2db871737e
+Author: Vincent Untz <vuntz(a)gnome.org>
+Date: Thu Oct 11 15:24:56 2012 +0200
+
+ validate: Add Network as related category for Monitor
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=49699
+
+ See http://lists.freedesktop.org/archives/xdg/2012-October/012525.html
+
+M src/validate.c
+
+commit a0e4f097c4d5d0da91dd6112c42111c95b18fff9
+Author: Vincent Untz <vuntz(a)gnome.org>
+Date: Thu Oct 11 15:24:22 2012 +0200
+
+ validate: Add Shooter category for games
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=38553
+
+ See http://lists.freedesktop.org/archives/xdg/2012-October/012525.html
+
+M src/validate.c
+
+commit 0c2cc0855f537c8751af0bd47415193a55a903d2
+Author: Vincent Untz <vuntz(a)gnome.org>
+Date: Thu Oct 11 15:23:41 2012 +0200
+
+ validate: Add Maps category, and document where to put GIS applications
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=20187
+
+ See http://lists.freedesktop.org/archives/xdg/2012-October/012525.html
+
+M src/validate.c
+
+commit 10c0d9e0af220d973c7a6ca80f7bb4ea3074e85f
+Author: Vincent Untz <vuntz(a)gnome.org>
+Date: Thu Oct 11 15:22:59 2012 +0200
+
+ validate: Add Science as related category for more Education categories
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=20186
+
+ See http://lists.freedesktop.org/archives/xdg/2012-October/012525.html
+
+M src/validate.c
+
+commit dc41f7391463ed083edff89e6719949f2755d18a
+Author: Vincent Untz <vuntz(a)gnome.org>
+Date: Thu Oct 11 15:21:50 2012 +0200
+
+ validate: Make Science a main category
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=20186
+
+ See http://lists.freedesktop.org/archives/xdg/2012-October/012525.html
+
+M src/validate.c
+
+commit 7948c96f7cf698f117d32e6e796e9073e77cc610
+Author: Vincent Untz <vuntz(a)gnome.org>
+Date: Thu Oct 11 15:00:32 2012 +0200
+
+ validate: Add Spirituality and Humanities categories
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=20192
+
+ See http://lists.freedesktop.org/archives/xdg/2012-October/012525.html
+
+M src/validate.c
+
+commit 7a647466f4455c289549e399b20f86bd50190df3
+Author: Vincent Untz <vuntz(a)gnome.org>
+Date: Thu Oct 11 14:49:13 2012 +0200
+
+ validate: Change some related categories from "and" to "or"
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=35844
+
+ See http://lists.freedesktop.org/archives/xdg/2012-October/012526.html
+
+M src/validate.c
+
+commit 055c439fade52e30f3c3a866881f6a2890c2a331
+Author: Vincent Untz <vuntz(a)gnome.org>
+Date: Wed Oct 3 15:55:52 2012 +0200
+
+ validate: Code style fixes
+
+M src/validate.c
+
+commit 38b319d92525d1b1f887b1b5f094d416b51bd74c
+Author: Vincent Untz <vuntz(a)gnome.org>
+Date: Wed Oct 3 15:48:35 2012 +0200
+
+ validate: Accept and validate GNOME3/GSettings for AutostartCondition
+
+ We try to validate as much as we can the content of AutostartCondition.
+ This means:
+
+ - for GNOME3, we check that if-session/unless-session is used with an
+ additional argument
+ - for GSettings, we check that two arguments are passed
+
+ Additionally, we now add more validation for the GNOME condition (one
+ argument needs to be passed).
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=55483
+
+M src/validate.c
+
+commit 355b4c6f7e4203a7c8ae184a2db76ae157235003
+Author: Vincent Untz <vuntz(a)gnome.org>
+Date: Wed Oct 3 13:01:11 2012 +0200
+
+ validate: Rework multiple main categories detection
+
+ AudioVideo is required if Audio or Video is present, and that would be
+ two main categories. But in that case, this is okay. So we need to
+ ignore the case of two main categories when one is required by the
+ other.
+
+M src/validate.c
+
+commit b18be61ad4957ea312efcbe65c6cffe2ef52fc6a
+Author: Vincent Untz <vuntz(a)gnome.org>
+Date: Wed Oct 3 11:48:19 2012 +0200
+
+ validate: Clarify message when outputting an item of list
+
+ In some messages, we don't display the key value, but one item of the
+ value (which is a list). Make this clearer.
+
+M src/validate.c
+
+commit 682184ed59154d68c8c333609f4cea777ac67079
+Author: Vincent Untz <vuntz(a)gnome.org>
+Date: Wed Oct 3 08:44:02 2012 +0200
+
+ validate: Add hint about suggested related categories
+
+ Now that related categories are not required (in general, see below for
+ an exception), we don't need to error out when they're missing. Still,
+ it's nice to suggest them with a hint.
+
+ Note that there are still cases where another category is required
+ (AudioVideo for Audio, for instance).
+
+ Part of https://bugs.freedesktop.org/show_bug.cgi?id=35844 (comment 6
+ and later)
+
+M src/validate.c
+
+commit 02cbbd7f90ccb4f1b7e65e32aaabaa3057c61b76
+Author: Vincent Untz <vuntz(a)gnome.org>
+Date: Wed Oct 3 08:21:57 2012 +0200
+
+ validate: Add Adult category
+
+ See http://lists.freedesktop.org/archives/xdg/2011-November/012106.html
+
+M src/validate.c
+
+commit 6a685a92691087eeb0325355e52b42ecf621f797
+Author: Vincent Untz <vuntz(a)gnome.org>
+Date: Wed Oct 3 08:17:39 2012 +0200
+
+ validate: Output hint if more than one main category is present
+
+M src/validate.c
+
+commit c3eeb8c7b4a63233226ef76a56221a167510253e
+Author: Vincent Untz <vuntz(a)gnome.org>
+Date: Wed Oct 3 07:48:59 2012 +0200
+
+ validate: Only print hint if no main category is present, not an error
+
+ The requirement to have at least one main category was removed for the
+ specification a few months ago. It's still useful to tell people with a
+ hint about the risk of not including one, though.
+
+ See http://lists.freedesktop.org/archives/xdg/2011-November/012123.html
+
+ Part of https://bugs.freedesktop.org/show_bug.cgi?id=35844 (comment 6
+ and later)
+
+M src/validate.c
+
+commit a97707811e2669b6a52a861c41cf46838fab8eb5
+Author: Vincent Untz <vuntz(a)gnome.org>
+Date: Wed Oct 3 07:41:14 2012 +0200
+
+ validate: Add function to print hints, and --no-hints option
+
+ This is useful to suggest improvements to the user.
+
+M src/install.c
+M src/validate.c
+M src/validate.h
+M src/validator.c
+
+commit fadbee1bdceffa3c6ffdbaa67563dbcb0ce059f7
+Author: Vincent Untz <vuntz(a)gnome.org>
+Date: Fri May 11 14:06:28 2012 +0200
+
+ validate: Add TDE to to list of registered OnlyShowIn
+
+ See http://lists.freedesktop.org/archives/xdg/2012-April/012374.html
+
+M src/validate.c
+
+commit ff6bf3b5f8e1e2f384939db9d212b4b21c24d5f3
+Author: Vincent Untz <vuntz(a)gnome.org>
+Date: Wed Apr 11 12:48:05 2012 +0200
+
+ validate: Add XFCE to to list of registered categories
+
+ See http://lists.freedesktop.org/archives/xdg/2012-March/012302.html and
+ http://lists.freedesktop.org/archives/xdg/2012-April/012348.html
+
+M src/validate.c
+
+commit 56eddf4ce5008dc95e2b3725684aa2b7cb053c54
+Author: Vincent Untz <vuntz(a)gnome.org>
+Date: Tue Apr 3 14:07:50 2012 +0200
+
+ install: Do not require glib >= 2.28
+
+ We still only check for an older version of glib, and requiring 2.28
+ just for g_slist_free_full() can be silly. So if we don't have 2.28,
+ just use the equivalent trivial code.
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=48133
+
+M src/install.c
+
+commit e82a75619484c8a5362787187871ae1d04cf006c
+Author: Vincent Untz <vuntz(a)gnome.org>
+Date: Mon Mar 5 11:03:49 2012 +0100
+
+ release: post-release bump to 0.21
+
+M configure.ac
+
+commit a00235a091e4d49825c62f6dbb2de43b432e052b
+Author: Vincent Untz <vuntz(a)gnome.org>
+Date: Mon Mar 5 11:02:30 2012 +0100
+
+ release: 0.20
+
+M NEWS
+
commit 191a09f0e1bf2ebd5a4dcbb5b106a91a3b335716
Author: Vincent Untz <vuntz(a)gnome.org>
Date: Fri Mar 2 18:57:24 2012 +0100
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/desktop-file-utils-0.20/NEWS new/desktop-file-utils-0.21/NEWS
--- old/desktop-file-utils-0.20/NEWS 2012-03-05 10:55:56.000000000 +0100
+++ new/desktop-file-utils-0.21/NEWS 2012-10-11 16:08:32.000000000 +0200
@@ -1,4 +1,23 @@
============
+Version 0.21
+============
+
+ desktop-file-validate
+ - update to current version of menu specification (Vincent):
+ - only print hint if no main category is present, not an error
+ - make Science a main category
+ - add new registered categories: Adult, Feed, Humanities, Maps,
+ Shooter, Spirituality, XFCE
+ - update related categories
+ - add TDE to list of registered OnlyShowIn
+ - accept and validate GNOME3/GSettings for AutostartCondition (Vincent)
+ - output hint if more than one main category is present (Vincent)
+ - output hint about suggested related categories (Vincent)
+
+ misc
+ - do not require glib >= 2.28 for build (Vincent)
+
+============
Version 0.20
============
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/desktop-file-utils-0.20/configure.ac new/desktop-file-utils-0.21/configure.ac
--- old/desktop-file-utils-0.20/configure.ac 2011-12-20 16:10:48.000000000 +0100
+++ new/desktop-file-utils-0.21/configure.ac 2012-08-27 16:09:02.000000000 +0200
@@ -1,4 +1,4 @@
-AC_INIT([desktop-file-utils], [0.20],
+AC_INIT([desktop-file-utils], [0.21],
[https://bugs.freedesktop.org/enter_bug.cgi?product=desktop-file-utils])
AC_CONFIG_SRCDIR(src/validate.h)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/desktop-file-utils-0.20/elisp-comp new/desktop-file-utils-0.21/elisp-comp
--- old/desktop-file-utils-0.20/elisp-comp 2011-01-31 12:59:05.000000000 +0100
+++ new/desktop-file-utils-0.21/elisp-comp 2012-07-04 13:54:59.000000000 +0200
@@ -1,8 +1,7 @@
#!/bin/sh
-# Copyright (C) 1995, 2000, 2003, 2004, 2005, 2009 Free Software
-# Foundation, Inc.
+# Copyright (C) 1995-2012 Free Software Foundation, Inc.
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2010-02-06.18; # UTC
# Franc,ois Pinard <pinard(a)iro.umontreal.ca>, 1995.
#
@@ -30,16 +29,16 @@
case $1 in
'')
- echo "$0: No files. Try \`$0 --help' for more information." 1>&2
+ echo "$0: No files. Try '$0 --help' for more information." 1>&2
exit 1;
;;
-h | --h*)
cat <<\EOF
Usage: elisp-comp [--help] [--version] FILES...
-This script byte-compiles all `.el' files listed as FILES using GNU
-Emacs, and put the resulting `.elc' files into the current directory,
-so disregarding the original directories used in `.el' arguments.
+This script byte-compiles all '.el' files listed as FILES using GNU
+Emacs, and put the resulting '.elc' files into the current directory,
+so disregarding the original directories used in '.el' arguments.
This script manages in such a way that all Emacs LISP files to
be compiled are made visible between themselves, in the event
@@ -65,7 +64,11 @@
# Cleanup the temporary directory on exit.
trap 'ret=$?; rm -rf "$tempdir" && exit $ret' 0
-trap '(exit $?); exit' 1 2 13 15
+do_exit='(exit $ret); exit $ret'
+trap "ret=129; $do_exit" 1
+trap "ret=130; $do_exit" 2
+trap "ret=141; $do_exit" 13
+trap "ret=143; $do_exit" 15
mkdir $tempdir
cp "$@" $tempdir
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/desktop-file-utils-0.20/missing new/desktop-file-utils-0.21/missing
--- old/desktop-file-utils-0.20/missing 2011-01-31 12:59:05.000000000 +0100
+++ new/desktop-file-utils-0.21/missing 2012-07-04 13:54:59.000000000 +0200
@@ -1,10 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2012-01-06.18; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
@@ -26,7 +25,7 @@
# the same distribution terms that you use for the rest of that program.
if test $# -eq 0; then
- echo 1>&2 "Try \`$0 --help' for more information"
+ echo 1>&2 "Try '$0 --help' for more information"
exit 1
fi
@@ -34,7 +33,7 @@
sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-# In the cases where this matters, `missing' is being run in the
+# In the cases where this matters, 'missing' is being run in the
# srcdir already.
if test -f configure.ac; then
configure_ac=configure.ac
@@ -65,7 +64,7 @@
echo "\
$0 [OPTION]... PROGRAM [ARGUMENT]...
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
+Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
error status if there is no known handling for PROGRAM.
Options:
@@ -74,21 +73,20 @@
--run try to run the given command, and emulate it if it fails
Supported PROGRAM values:
- aclocal touch file \`aclocal.m4'
- autoconf touch file \`configure'
- autoheader touch file \`config.h.in'
+ aclocal touch file 'aclocal.m4'
+ autoconf touch file 'configure'
+ autoheader touch file 'config.h.in'
autom4te touch the output file, or create a stub one
- automake touch all \`Makefile.in' files
- bison create \`y.tab.[ch]', if possible, from existing .[ch]
- flex create \`lex.yy.c', if possible, from existing .c
+ automake touch all 'Makefile.in' files
+ bison create 'y.tab.[ch]', if possible, from existing .[ch]
+ flex create 'lex.yy.c', if possible, from existing .c
help2man touch the output file
- lex create \`lex.yy.c', if possible, from existing .c
+ lex create 'lex.yy.c', if possible, from existing .c
makeinfo touch the output file
- tar try tar, gnutar, gtar, then tar without non-portable flags
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+ yacc create 'y.tab.[ch]', if possible, from existing .[ch]
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
Send bug reports to <bug-automake(a)gnu.org>."
exit $?
@@ -100,8 +98,8 @@
;;
-*)
- echo 1>&2 "$0: Unknown \`$1' option"
- echo 1>&2 "Try \`$0 --help' for more information"
+ echo 1>&2 "$0: Unknown '$1' option"
+ echo 1>&2 "Try '$0 --help' for more information"
exit 1
;;
@@ -122,22 +120,13 @@
# Not GNU programs, they don't have --version.
;;
- tar*)
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- exit 1
- fi
- ;;
-
*)
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
# We have it, but it failed.
exit 1
elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
# Could not run --version or --help. This is probably someone
- # running `$TOOL --version' or `$TOOL --help' to check whether
+ # running '$TOOL --version' or '$TOOL --help' to check whether
# $TOOL exists and not knowing $TOOL uses missing.
exit 1
fi
@@ -149,27 +138,27 @@
case $program in
aclocal*)
echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`acinclude.m4' or \`${configure_ac}'. You might want
- to install the \`Automake' and \`Perl' packages. Grab them from
+WARNING: '$1' is $msg. You should only need it if
+ you modified 'acinclude.m4' or '${configure_ac}'. You might want
+ to install the Automake and Perl packages. Grab them from
any GNU archive site."
touch aclocal.m4
;;
autoconf*)
echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`${configure_ac}'. You might want to install the
- \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
+WARNING: '$1' is $msg. You should only need it if
+ you modified '${configure_ac}'. You might want to install the
+ Autoconf and GNU m4 packages. Grab them from any GNU
archive site."
touch configure
;;
autoheader*)
echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`acconfig.h' or \`${configure_ac}'. You might want
- to install the \`Autoconf' and \`GNU m4' packages. Grab them
+WARNING: '$1' is $msg. You should only need it if
+ you modified 'acconfig.h' or '${configure_ac}'. You might want
+ to install the Autoconf and GNU m4 packages. Grab them
from any GNU archive site."
files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
test -z "$files" && files="config.h"
@@ -186,9 +175,9 @@
automake*)
echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
- You might want to install the \`Automake' and \`Perl' packages.
+WARNING: '$1' is $msg. You should only need it if
+ you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'.
+ You might want to install the Automake and Perl packages.
Grab them from any GNU archive site."
find . -type f -name Makefile.am -print |
sed 's/\.am$/.in/' |
@@ -197,10 +186,10 @@
autom4te*)
echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
+WARNING: '$1' is needed, but is $msg.
You might have modified some files without having the
proper tools for further handling them.
- You can get \`$1' as part of \`Autoconf' from any GNU
+ You can get '$1' as part of Autoconf from any GNU
archive site."
file=`echo "$*" | sed -n "$sed_output"`
@@ -220,13 +209,13 @@
bison*|yacc*)
echo 1>&2 "\
-WARNING: \`$1' $msg. You should only need it if
- you modified a \`.y' file. You may need the \`Bison' package
+WARNING: '$1' $msg. You should only need it if
+ you modified a '.y' file. You may need the Bison package
in order for those modifications to take effect. You can get
- \`Bison' from any GNU archive site."
+ Bison from any GNU archive site."
rm -f y.tab.c y.tab.h
if test $# -ne 1; then
- eval LASTARG="\${$#}"
+ eval LASTARG=\${$#}
case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
@@ -250,13 +239,13 @@
lex*|flex*)
echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.l' file. You may need the \`Flex' package
+WARNING: '$1' is $msg. You should only need it if
+ you modified a '.l' file. You may need the Flex package
in order for those modifications to take effect. You can get
- \`Flex' from any GNU archive site."
+ Flex from any GNU archive site."
rm -f lex.yy.c
if test $# -ne 1; then
- eval LASTARG="\${$#}"
+ eval LASTARG=\${$#}
case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
@@ -273,10 +262,10 @@
help2man*)
echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
+WARNING: '$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
- \`Help2man' package in order for those modifications to take
- effect. You can get \`Help2man' from any GNU archive site."
+ Help2man package in order for those modifications to take
+ effect. You can get Help2man from any GNU archive site."
file=`echo "$*" | sed -n "$sed_output"`
test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
@@ -291,12 +280,12 @@
makeinfo*)
echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.texi' or \`.texinfo' file, or any other file
+WARNING: '$1' is $msg. You should only need it if
+ you modified a '.texi' or '.texinfo' file, or any other file
indirectly affecting the aspect of the manual. The spurious
- call might also be the consequence of using a buggy \`make' (AIX,
- DU, IRIX). You might want to install the \`Texinfo' package or
- the \`GNU make' package. Grab either from any GNU archive site."
+ call might also be the consequence of using a buggy 'make' (AIX,
+ DU, IRIX). You might want to install the Texinfo package or
+ the GNU make package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
file=`echo "$*" | sed -n "$sed_output"`
test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
@@ -318,49 +307,14 @@
touch $file
;;
- tar*)
- shift
-
- # We have already tried tar in the generic part.
- # Look for gnutar/gtar before invocation to avoid ugly error
- # messages.
- if (gnutar --version > /dev/null 2>&1); then
- gnutar "$@" && exit 0
- fi
- if (gtar --version > /dev/null 2>&1); then
- gtar "$@" && exit 0
- fi
- firstarg="$1"
- if shift; then
- case $firstarg in
- *o*)
- firstarg=`echo "$firstarg" | sed s/o//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
- case $firstarg in
- *h*)
- firstarg=`echo "$firstarg" | sed s/h//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
- fi
-
- echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
- You may want to install GNU tar or Free paxutils, or check the
- command line arguments."
- exit 1
- ;;
-
*)
echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
+WARNING: '$1' is needed, and is $msg.
You might have modified some files without having the
- proper tools for further handling them. Check the \`README' file,
+ proper tools for further handling them. Check the 'README' file,
it often tells you about the needed prerequisites for installing
this package. You may also peek at any GNU archive site, in case
- some other package would contain this missing \`$1' program."
+ some other package would contain this missing '$1' program."
exit 1
;;
esac
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/desktop-file-utils-0.20/src/install.c new/desktop-file-utils-0.21/src/install.c
--- old/desktop-file-utils-0.20/src/install.c 2011-12-14 17:27:30.000000000 +0100
+++ new/desktop-file-utils-0.21/src/install.c 2012-10-03 13:02:22.000000000 +0200
@@ -248,7 +248,7 @@
g_key_file_free (kf);
/* Load and validate the file we just wrote */
- if (!desktop_file_validate (new_filename, FALSE, TRUE))
+ if (!desktop_file_validate (new_filename, FALSE, TRUE, TRUE))
{
g_set_error (err, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_PARSE,
_("Failed to validate the created desktop file"));
@@ -940,7 +940,12 @@
}
}
+#if GLIB_CHECK_VERSION(2,28,0)
g_slist_free_full (edit_actions, (GDestroyNotify) dfu_edit_action_free);
+#else
+ g_slist_foreach (edit_actions, (GFunc) dfu_edit_action_free, NULL);
+ g_slist_free (edit_actions);
+#endif
g_option_context_free (context);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/desktop-file-utils-0.20/src/validate.c new/desktop-file-utils-0.21/src/validate.c
--- old/desktop-file-utils-0.20/src/validate.c 2012-03-02 19:42:06.000000000 +0100
+++ new/desktop-file-utils-0.21/src/validate.c 2012-10-11 15:26:43.000000000 +0200
@@ -112,6 +112,7 @@
gboolean kde_reserved_warnings;
gboolean no_deprecated_warnings;
+ gboolean no_hints;
char *main_group;
DesktopType type;
@@ -360,7 +361,17 @@
};
static const char *show_in_registered[] = {
- "GNOME", "KDE", "LXDE", "MATE", "Razor", "ROX", "Unity", "XFCE", "Old"
+ "GNOME", "KDE", "LXDE", "MATE", "Razor", "ROX", "TDE", "Unity", "XFCE", "Old"
+};
+
+static struct {
+ const char *name;
+ const char *first_arg[3];
+ unsigned int additional_args;
+} registered_autostart_condition[] = {
+ { "GNOME", { NULL }, 1 },
+ { "GNOME3", { "if-session", "unless-session", NULL }, 1},
+ { "GSettings", { NULL }, 2 }
};
static struct {
@@ -368,148 +379,156 @@
gboolean main;
gboolean require_only_show_in;
gboolean deprecated;
- const char *requires[4];
+ const char *requires[2];
+ const char *suggests[4];
} registered_categories[] = {
- { "AudioVideo", TRUE, FALSE, FALSE, { NULL } },
- { "Audio", TRUE, FALSE, FALSE, { "AudioVideo", NULL } },
- { "Video", TRUE, FALSE, FALSE, { "AudioVideo", NULL } },
- { "Development", TRUE, FALSE, FALSE, { NULL } },
- { "Education", TRUE, FALSE, FALSE, { NULL } },
- { "Game", TRUE, FALSE, FALSE, { NULL } },
- { "Graphics", TRUE, FALSE, FALSE, { NULL } },
- { "Network", TRUE, FALSE, FALSE, { NULL } },
- { "Office", TRUE, FALSE, FALSE, { NULL } },
- { "Settings", TRUE, FALSE, FALSE, { NULL } },
- { "System", TRUE, FALSE, FALSE, { NULL } },
- { "Utility", TRUE, FALSE, FALSE, { NULL } },
- { "Audio", FALSE, FALSE, FALSE, { "Development", NULL } },
- { "Video", FALSE, FALSE, FALSE, { "Development", NULL } },
- { "Building", FALSE, FALSE, FALSE, { "Development", NULL } },
- { "Debugger", FALSE, FALSE, FALSE, { "Development", NULL } },
- { "IDE", FALSE, FALSE, FALSE, { "Development", NULL } },
- { "GUIDesigner", FALSE, FALSE, FALSE, { "Development", NULL } },
- { "Profiling", FALSE, FALSE, FALSE, { "Development", NULL } },
- { "RevisionControl", FALSE, FALSE, FALSE, { "Development", NULL } },
- { "Translation", FALSE, FALSE, FALSE, { "Development", NULL } },
- { "Calendar", FALSE, FALSE, FALSE, { "Office", NULL } },
- { "ContactManagement", FALSE, FALSE, FALSE, { "Office", NULL } },
- { "Database", FALSE, FALSE, FALSE, { "Office", "Development", "AudioVideo", NULL } },
- { "Dictionary", FALSE, FALSE, FALSE, { "Office;TextTools", NULL } },
- { "Chart", FALSE, FALSE, FALSE, { "Office", NULL } },
- { "Email", FALSE, FALSE, FALSE, { "Office;Network", NULL } },
- { "Finance", FALSE, FALSE, FALSE, { "Office", NULL } },
- { "FlowChart", FALSE, FALSE, FALSE, { "Office", NULL } },
- { "PDA", FALSE, FALSE, FALSE, { "Office", NULL } },
- { "ProjectManagement", FALSE, FALSE, FALSE, { "Office;Development", NULL } },
- { "Presentation", FALSE, FALSE, FALSE, { "Office", NULL } },
- { "Spreadsheet", FALSE, FALSE, FALSE, { "Office", NULL } },
- { "WordProcessor", FALSE, FALSE, FALSE, { "Office", NULL } },
- { "2DGraphics", FALSE, FALSE, FALSE, { "Graphics", NULL } },
- { "VectorGraphics", FALSE, FALSE, FALSE, { "Graphics;2DGraphics", NULL } },
- { "RasterGraphics", FALSE, FALSE, FALSE, { "Graphics;2DGraphics", NULL } },
- { "3DGraphics", FALSE, FALSE, FALSE, { "Graphics", NULL } },
- { "Scanning", FALSE, FALSE, FALSE, { "Graphics", NULL } },
- { "OCR", FALSE, FALSE, FALSE, { "Graphics;Scanning", NULL } },
- { "Photography", FALSE, FALSE, FALSE, { "Graphics", "Office", NULL } },
- { "Publishing", FALSE, FALSE, FALSE, { "Graphics", "Office", NULL } },
- { "Viewer", FALSE, FALSE, FALSE, { "Graphics", "Office", NULL } },
- { "TextTools", FALSE, FALSE, FALSE, { "Utility", NULL } },
- { "DesktopSettings", FALSE, FALSE, FALSE, { "Settings", NULL } },
- { "HardwareSettings", FALSE, FALSE, FALSE, { "Settings", NULL } },
- { "Printing", FALSE, FALSE, FALSE, { "HardwareSettings;Settings", NULL } },
- { "PackageManager", FALSE, FALSE, FALSE, { "Settings", NULL } },
- { "Dialup", FALSE, FALSE, FALSE, { "Network", NULL } },
- { "InstantMessaging", FALSE, FALSE, FALSE, { "Network", NULL } },
- { "Chat", FALSE, FALSE, FALSE, { "Network", NULL } },
- { "IRCClient", FALSE, FALSE, FALSE, { "Network", NULL } },
- { "FileTransfer", FALSE, FALSE, FALSE, { "Network", NULL } },
- { "HamRadio", FALSE, FALSE, FALSE, { "Network", "Audio", NULL } },
- { "News", FALSE, FALSE, FALSE, { "Network", NULL } },
- { "P2P", FALSE, FALSE, FALSE, { "Network", NULL } },
- { "RemoteAccess", FALSE, FALSE, FALSE, { "Network", NULL } },
- { "Telephony", FALSE, FALSE, FALSE, { "Network", NULL } },
- { "TelephonyTools", FALSE, FALSE, FALSE, { "Utility", NULL } },
- { "VideoConference", FALSE, FALSE, FALSE, { "Network", NULL } },
- { "WebBrowser", FALSE, FALSE, FALSE, { "Network", NULL } },
- { "WebDevelopment", FALSE, FALSE, FALSE, { "Network", "Development", NULL } },
- { "Midi", FALSE, FALSE, FALSE, { "AudioVideo;Audio", NULL } },
- { "Mixer", FALSE, FALSE, FALSE, { "AudioVideo;Audio", NULL } },
- { "Sequencer", FALSE, FALSE, FALSE, { "AudioVideo;Audio", NULL } },
- { "Tuner", FALSE, FALSE, FALSE, { "AudioVideo;Audio", NULL } },
- { "TV", FALSE, FALSE, FALSE, { "AudioVideo;Video", NULL } },
- { "AudioVideoEditing", FALSE, FALSE, FALSE, { "Audio", "Video", "AudioVideo", NULL } },
- { "Player", FALSE, FALSE, FALSE, { "Audio", "Video", "AudioVideo", NULL } },
- { "Recorder", FALSE, FALSE, FALSE, { "Audio", "Video", "AudioVideo", NULL } },
- { "DiscBurning", FALSE, FALSE, FALSE, { "Audio", "Video", "AudioVideo", NULL } },
- { "ActionGame", FALSE, FALSE, FALSE, { "Game", NULL } },
- { "AdventureGame", FALSE, FALSE, FALSE, { "Game", NULL } },
- { "ArcadeGame", FALSE, FALSE, FALSE, { "Game", NULL } },
- { "BoardGame", FALSE, FALSE, FALSE, { "Game", NULL } },
- { "BlocksGame", FALSE, FALSE, FALSE, { "Game", NULL } },
- { "CardGame", FALSE, FALSE, FALSE, { "Game", NULL } },
- { "KidsGame", FALSE, FALSE, FALSE, { "Game", NULL } },
- { "LogicGame", FALSE, FALSE, FALSE, { "Game", NULL } },
- { "RolePlaying", FALSE, FALSE, FALSE, { "Game", NULL } },
- { "Simulation", FALSE, FALSE, FALSE, { "Game", NULL } },
- { "SportsGame", FALSE, FALSE, FALSE, { "Game", NULL } },
- { "StrategyGame", FALSE, FALSE, FALSE, { "Game", NULL } },
- { "Art", FALSE, FALSE, FALSE, { "Education", NULL } },
- { "Construction", FALSE, FALSE, FALSE, { "Education", NULL } },
- { "Music", FALSE, FALSE, FALSE, { "AudioVideo;Education", NULL } },
- { "Languages", FALSE, FALSE, FALSE, { "Education", NULL } },
- { "Science", FALSE, FALSE, FALSE, { "Education", NULL } },
- { "ArtificialIntelligence", FALSE, FALSE, FALSE, { "Education;Science", NULL } },
- { "Astronomy", FALSE, FALSE, FALSE, { "Education;Science", NULL } },
- { "Biology", FALSE, FALSE, FALSE, { "Education;Science", NULL } },
- { "Chemistry", FALSE, FALSE, FALSE, { "Education;Science", NULL } },
- { "ComputerScience", FALSE, FALSE, FALSE, { "Education;Science", NULL } },
- { "DataVisualization", FALSE, FALSE, FALSE, { "Education;Science", NULL } },
- { "Economy", FALSE, FALSE, FALSE, { "Education", NULL } },
- { "Electricity", FALSE, FALSE, FALSE, { "Education;Science", NULL } },
- { "Geography", FALSE, FALSE, FALSE, { "Education", NULL } },
- { "Geology", FALSE, FALSE, FALSE, { "Education;Science", NULL } },
- { "Geoscience", FALSE, FALSE, FALSE, { "Education;Science", NULL } },
- { "History", FALSE, FALSE, FALSE, { "Education", NULL } },
- { "ImageProcessing", FALSE, FALSE, FALSE, { "Education;Science", NULL } },
- { "Literature", FALSE, FALSE, FALSE, { "Education", NULL } },
- { "Math", FALSE, FALSE, FALSE, { "Education;Science", NULL } },
- { "NumericalAnalysis", FALSE, FALSE, FALSE, { "Education;Science;Math", NULL } },
- { "MedicalSoftware", FALSE, FALSE, FALSE, { "Education;Science", NULL } },
- { "Physics", FALSE, FALSE, FALSE, { "Education;Science", NULL } },
- { "Robotics", FALSE, FALSE, FALSE, { "Education;Science", NULL } },
- { "Sports", FALSE, FALSE, FALSE, { "Education", NULL } },
- { "ParallelComputing", FALSE, FALSE, FALSE, { "Education;Science;ComputerScience", NULL } },
- { "Amusement", FALSE, FALSE, FALSE, { NULL } },
- { "Archiving", FALSE, FALSE, FALSE, { "Utility", NULL } },
- { "Compression", FALSE, FALSE, FALSE, { "Utility;Archiving", NULL } },
- { "Electronics", FALSE, FALSE, FALSE, { NULL } },
- { "Emulator", FALSE, FALSE, FALSE, { "System", "Game", NULL } },
- { "Engineering", FALSE, FALSE, FALSE, { NULL } },
- { "FileTools", FALSE, FALSE, FALSE, { "Utility", "System", NULL } },
- { "FileManager", FALSE, FALSE, FALSE, { "System;FileTools", NULL } },
- { "TerminalEmulator", FALSE, FALSE, FALSE, { "System", NULL } },
- { "Filesystem", FALSE, FALSE, FALSE, { "System", NULL } },
- { "Monitor", FALSE, FALSE, FALSE, { "System", NULL } },
- { "Security", FALSE, FALSE, FALSE, { "Settings", "System", NULL } },
- { "Accessibility", FALSE, FALSE, FALSE, { "Settings", "Utility", NULL } },
- { "Calculator", FALSE, FALSE, FALSE, { "Utility", NULL } },
- { "Clock", FALSE, FALSE, FALSE, { "Utility", NULL } },
- { "TextEditor", FALSE, FALSE, FALSE, { "Utility", NULL } },
- { "Documentation", FALSE, FALSE, FALSE, { NULL } },
- { "Core", FALSE, FALSE, FALSE, { NULL } },
- { "KDE", FALSE, FALSE, FALSE, { "Qt", NULL } },
- { "GNOME", FALSE, FALSE, FALSE, { "GTK", NULL } },
- { "GTK", FALSE, FALSE, FALSE, { NULL } },
- { "Qt", FALSE, FALSE, FALSE, { NULL } },
- { "Motif", FALSE, FALSE, FALSE, { NULL } },
- { "Java", FALSE, FALSE, FALSE, { NULL } },
- { "ConsoleOnly", FALSE, FALSE, FALSE, { NULL } },
- { "Screensaver", FALSE, TRUE, FALSE, { NULL } },
- { "TrayIcon", FALSE, TRUE, FALSE, { NULL } },
- { "Applet", FALSE, TRUE, FALSE, { NULL } },
- { "Shell", FALSE, TRUE, FALSE, { NULL } },
- { "Application", FALSE, FALSE, TRUE, { NULL } },
- { "Applications", FALSE, FALSE, TRUE, { NULL } }
+ { "AudioVideo", TRUE, FALSE, FALSE, { NULL }, { NULL } },
+ { "Audio", TRUE, FALSE, FALSE, { "AudioVideo", NULL }, { NULL } },
+ { "Video", TRUE, FALSE, FALSE, { "AudioVideo", NULL }, { NULL } },
+ { "Development", TRUE, FALSE, FALSE, { NULL }, { NULL } },
+ { "Education", TRUE, FALSE, FALSE, { NULL }, { NULL } },
+ { "Game", TRUE, FALSE, FALSE, { NULL }, { NULL } },
+ { "Graphics", TRUE, FALSE, FALSE, { NULL }, { NULL } },
+ { "Network", TRUE, FALSE, FALSE, { NULL }, { NULL } },
+ { "Office", TRUE, FALSE, FALSE, { NULL }, { NULL } },
+ { "Science", TRUE, FALSE, FALSE, { NULL }, { NULL } },
+ { "Settings", TRUE, FALSE, FALSE, { NULL }, { NULL } },
+ { "System", TRUE, FALSE, FALSE, { NULL }, { NULL } },
+ { "Utility", TRUE, FALSE, FALSE, { NULL }, { NULL } },
+ { "Audio", FALSE, FALSE, FALSE, { NULL }, { "Development", NULL } },
+ { "Video", FALSE, FALSE, FALSE, { NULL }, { "Development", NULL } },
+ { "Building", FALSE, FALSE, FALSE, { NULL }, { "Development", NULL } },
+ { "Debugger", FALSE, FALSE, FALSE, { NULL }, { "Development", NULL } },
+ { "IDE", FALSE, FALSE, FALSE, { NULL }, { "Development", NULL } },
+ { "GUIDesigner", FALSE, FALSE, FALSE, { NULL }, { "Development", NULL } },
+ { "Profiling", FALSE, FALSE, FALSE, { NULL }, { "Development", NULL } },
+ { "RevisionControl", FALSE, FALSE, FALSE, { NULL }, { "Development", NULL } },
+ { "Translation", FALSE, FALSE, FALSE, { NULL }, { "Development", NULL } },
+ { "Calendar", FALSE, FALSE, FALSE, { NULL }, { "Office", NULL } },
+ { "ContactManagement", FALSE, FALSE, FALSE, { NULL }, { "Office", NULL } },
+ { "Database", FALSE, FALSE, FALSE, { NULL }, { "Office", "Development", "AudioVideo", NULL } },
+ { "Dictionary", FALSE, FALSE, FALSE, { NULL }, { "Office", "TextTools", NULL } },
+ { "Chart", FALSE, FALSE, FALSE, { NULL }, { "Office", NULL } },
+ { "Email", FALSE, FALSE, FALSE, { NULL }, { "Office", "Network", NULL } },
+ { "Finance", FALSE, FALSE, FALSE, { NULL }, { "Office", NULL } },
+ { "FlowChart", FALSE, FALSE, FALSE, { NULL }, { "Office", NULL } },
+ { "PDA", FALSE, FALSE, FALSE, { NULL }, { "Office", NULL } },
+ { "ProjectManagement", FALSE, FALSE, FALSE, { NULL }, { "Office", "Development", NULL } },
+ { "Presentation", FALSE, FALSE, FALSE, { NULL }, { "Office", NULL } },
+ { "Spreadsheet", FALSE, FALSE, FALSE, { NULL }, { "Office", NULL } },
+ { "WordProcessor", FALSE, FALSE, FALSE, { NULL }, { "Office", NULL } },
+ { "2DGraphics", FALSE, FALSE, FALSE, { NULL }, { "Graphics", NULL } },
+ { "VectorGraphics", FALSE, FALSE, FALSE, { NULL }, { "Graphics;2DGraphics", NULL } },
+ { "RasterGraphics", FALSE, FALSE, FALSE, { NULL }, { "Graphics;2DGraphics", NULL } },
+ { "3DGraphics", FALSE, FALSE, FALSE, { NULL }, { "Graphics", NULL } },
+ { "Scanning", FALSE, FALSE, FALSE, { NULL }, { "Graphics", NULL } },
+ { "OCR", FALSE, FALSE, FALSE, { NULL }, { "Graphics;Scanning", NULL } },
+ { "Photography", FALSE, FALSE, FALSE, { NULL }, { "Graphics", "Office", NULL } },
+ { "Publishing", FALSE, FALSE, FALSE, { NULL }, { "Graphics", "Office", NULL } },
+ { "Viewer", FALSE, FALSE, FALSE, { NULL }, { "Graphics", "Office", NULL } },
+ { "TextTools", FALSE, FALSE, FALSE, { NULL }, { "Utility", NULL } },
+ { "DesktopSettings", FALSE, FALSE, FALSE, { NULL }, { "Settings", NULL } },
+ { "HardwareSettings", FALSE, FALSE, FALSE, { NULL }, { "Settings", NULL } },
+ { "Printing", FALSE, FALSE, FALSE, { NULL }, { "HardwareSettings;Settings", NULL } },
+ { "PackageManager", FALSE, FALSE, FALSE, { NULL }, { "Settings", NULL } },
+ { "Dialup", FALSE, FALSE, FALSE, { NULL }, { "Network", NULL } },
+ { "InstantMessaging", FALSE, FALSE, FALSE, { NULL }, { "Network", NULL } },
+ { "Chat", FALSE, FALSE, FALSE, { NULL }, { "Network", NULL } },
+ { "IRCClient", FALSE, FALSE, FALSE, { NULL }, { "Network", NULL } },
+ { "Feed", FALSE, FALSE, FALSE, { NULL }, { "Network", NULL } },
+ { "FileTransfer", FALSE, FALSE, FALSE, { NULL }, { "Network", NULL } },
+ { "HamRadio", FALSE, FALSE, FALSE, { NULL }, { "Network", "Audio", NULL } },
+ { "News", FALSE, FALSE, FALSE, { NULL }, { "Network", NULL } },
+ { "P2P", FALSE, FALSE, FALSE, { NULL }, { "Network", NULL } },
+ { "RemoteAccess", FALSE, FALSE, FALSE, { NULL }, { "Network", NULL } },
+ { "Telephony", FALSE, FALSE, FALSE, { NULL }, { "Network", NULL } },
+ { "TelephonyTools", FALSE, FALSE, FALSE, { NULL }, { "Utility", NULL } },
+ { "VideoConference", FALSE, FALSE, FALSE, { NULL }, { "Network", NULL } },
+ { "WebBrowser", FALSE, FALSE, FALSE, { NULL }, { "Network", NULL } },
+ { "WebDevelopment", FALSE, FALSE, FALSE, { NULL }, { "Network", "Development", NULL } },
+ { "Midi", FALSE, FALSE, FALSE, { NULL }, { "AudioVideo;Audio", NULL } },
+ { "Mixer", FALSE, FALSE, FALSE, { NULL }, { "AudioVideo;Audio", NULL } },
+ { "Sequencer", FALSE, FALSE, FALSE, { NULL }, { "AudioVideo;Audio", NULL } },
+ { "Tuner", FALSE, FALSE, FALSE, { NULL }, { "AudioVideo;Audio", NULL } },
+ { "TV", FALSE, FALSE, FALSE, { NULL }, { "AudioVideo;Video", NULL } },
+ { "AudioVideoEditing", FALSE, FALSE, FALSE, { NULL }, { "Audio", "Video", "AudioVideo", NULL } },
+ { "Player", FALSE, FALSE, FALSE, { NULL }, { "Audio", "Video", "AudioVideo", NULL } },
+ { "Recorder", FALSE, FALSE, FALSE, { NULL }, { "Audio", "Video", "AudioVideo", NULL } },
+ { "DiscBurning", FALSE, FALSE, FALSE, { NULL }, { "Audio", "Video", "AudioVideo", NULL } },
+ { "ActionGame", FALSE, FALSE, FALSE, { NULL }, { "Game", NULL } },
+ { "AdventureGame", FALSE, FALSE, FALSE, { NULL }, { "Game", NULL } },
+ { "ArcadeGame", FALSE, FALSE, FALSE, { NULL }, { "Game", NULL } },
+ { "BoardGame", FALSE, FALSE, FALSE, { NULL }, { "Game", NULL } },
+ { "BlocksGame", FALSE, FALSE, FALSE, { NULL }, { "Game", NULL } },
+ { "CardGame", FALSE, FALSE, FALSE, { NULL }, { "Game", NULL } },
+ { "KidsGame", FALSE, FALSE, FALSE, { NULL }, { "Game", NULL } },
+ { "LogicGame", FALSE, FALSE, FALSE, { NULL }, { "Game", NULL } },
+ { "RolePlaying", FALSE, FALSE, FALSE, { NULL }, { "Game", NULL } },
+ { "Shooter", FALSE, FALSE, FALSE, { NULL }, { "Game", NULL } },
+ { "Simulation", FALSE, FALSE, FALSE, { NULL }, { "Game", NULL } },
+ { "SportsGame", FALSE, FALSE, FALSE, { NULL }, { "Game", NULL } },
+ { "StrategyGame", FALSE, FALSE, FALSE, { NULL }, { "Game", NULL } },
+ { "Art", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } },
+ { "Construction", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } },
+ { "Music", FALSE, FALSE, FALSE, { NULL }, { "AudioVideo", "Education", NULL } },
+ { "Languages", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } },
+ { "ArtificialIntelligence", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } },
+ { "Astronomy", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } },
+ { "Biology", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } },
+ { "Chemistry", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } },
+ { "ComputerScience", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } },
+ { "DataVisualization", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } },
+ { "Economy", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } },
+ { "Electricity", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } },
+ { "Geography", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } },
+ { "Geology", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } },
+ { "Geoscience", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } },
+ { "History", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } },
+ { "Humanities", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } },
+ { "ImageProcessing", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } },
+ { "Literature", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } },
+ { "Maps", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", "Utility", NULL } },
+ { "Math", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } },
+ { "NumericalAnalysis", FALSE, FALSE, FALSE, { NULL }, { "Education;Math", "Science;Math", NULL } },
+ { "MedicalSoftware", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } },
+ { "Physics", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } },
+ { "Robotics", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } },
+ { "Spirituality", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", "Utility", NULL } },
+ { "Sports", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } },
+ { "ParallelComputing", FALSE, FALSE, FALSE, { NULL }, { "Education;ComputerScience", "Science;ComputerScience", NULL } },
+ { "Amusement", FALSE, FALSE, FALSE, { NULL }, { NULL } },
+ { "Archiving", FALSE, FALSE, FALSE, { NULL }, { "Utility", NULL } },
+ { "Compression", FALSE, FALSE, FALSE, { NULL }, { "Utility;Archiving", NULL } },
+ { "Electronics", FALSE, FALSE, FALSE, { NULL }, { NULL } },
+ { "Emulator", FALSE, FALSE, FALSE, { NULL }, { "System", "Game", NULL } },
+ { "Engineering", FALSE, FALSE, FALSE, { NULL }, { NULL } },
+ { "FileTools", FALSE, FALSE, FALSE, { NULL }, { "Utility", "System", NULL } },
+ { "FileManager", FALSE, FALSE, FALSE, { NULL }, { "System;FileTools", NULL } },
+ { "TerminalEmulator", FALSE, FALSE, FALSE, { NULL }, { "System", NULL } },
+ { "Filesystem", FALSE, FALSE, FALSE, { NULL }, { "System", NULL } },
+ { "Monitor", FALSE, FALSE, FALSE, { NULL }, { "System", "Network", NULL } },
+ { "Security", FALSE, FALSE, FALSE, { NULL }, { "Settings", "System", NULL } },
+ { "Accessibility", FALSE, FALSE, FALSE, { NULL }, { "Settings", "Utility", NULL } },
+ { "Calculator", FALSE, FALSE, FALSE, { NULL }, { "Utility", NULL } },
+ { "Clock", FALSE, FALSE, FALSE, { NULL }, { "Utility", NULL } },
+ { "TextEditor", FALSE, FALSE, FALSE, { NULL }, { "Utility", NULL } },
+ { "Documentation", FALSE, FALSE, FALSE, { NULL }, { NULL } },
+ { "Adult", FALSE, FALSE, FALSE, { NULL }, { NULL } },
+ { "Core", FALSE, FALSE, FALSE, { NULL }, { NULL } },
+ { "KDE", FALSE, FALSE, FALSE, { NULL }, { "Qt", NULL } },
+ { "GNOME", FALSE, FALSE, FALSE, { NULL }, { "GTK", NULL } },
+ { "XFCE", FALSE, FALSE, FALSE, { NULL }, { "GTK", NULL } },
+ { "GTK", FALSE, FALSE, FALSE, { NULL }, { NULL } },
+ { "Qt", FALSE, FALSE, FALSE, { NULL }, { NULL } },
+ { "Motif", FALSE, FALSE, FALSE, { NULL }, { NULL } },
+ { "Java", FALSE, FALSE, FALSE, { NULL }, { NULL } },
+ { "ConsoleOnly", FALSE, FALSE, FALSE, { NULL }, { NULL } },
+ { "Screensaver", FALSE, TRUE, FALSE, { NULL }, { NULL } },
+ { "TrayIcon", FALSE, TRUE, FALSE, { NULL }, { NULL } },
+ { "Applet", FALSE, TRUE, FALSE, { NULL }, { NULL } },
+ { "Shell", FALSE, TRUE, FALSE, { NULL }, { NULL } },
+ { "Application", FALSE, FALSE, TRUE, { NULL }, { NULL } },
+ { "Applications", FALSE, FALSE, TRUE, { NULL }, { NULL } }
};
static void
@@ -565,6 +584,26 @@
g_free (str);
}
+static void
+print_hint (kf_validator *kf, const char *format, ...)
+{
+ va_list args;
+ gchar *str;
+
+ g_return_if_fail (kf != NULL && format != NULL);
+
+ if (kf->no_hints)
+ return;
+
+ va_start (args, format);
+ str = g_strdup_vprintf (format, args);
+ va_end (args);
+
+ g_print ("%s: hint: %s", kf->filename, str);
+
+ g_free (str);
+}
+
/* + Key names must contain only the characters A-Za-z0-9-.
* Checked.
*/
@@ -1021,11 +1060,12 @@
if (g_str_has_suffix (value, ".png") ||
g_str_has_suffix (value, ".xpm") ||
g_str_has_suffix (value, ".svg")) {
- print_future_fatal (kf, "value \"%s\" for key \"%s\" in group \"%s\" is an icon "
- "name with an extension, but there should be no extension "
- "as described in the Icon Theme Specification if the "
- "value is not an absolute path\n",
- value, locale_key, kf->current_group);
+ print_future_fatal (kf, "value \"%s\" for key \"%s\" in group \"%s\" is an "
+ "icon name with an extension, but there should be "
+ "no extension as described in the Icon Theme "
+ "Specification if the value is not an absolute "
+ "path\n",
+ value, locale_key, kf->current_group);
return FALSE;
}
@@ -1428,10 +1468,10 @@
break;
case MU_INVALID:
print_future_fatal (kf, "value \"%s\" for key \"%s\" in group \"%s\" "
- "contains value \"%s\" which is an invalid MIME "
- "type: %s\n",
- value, locale_key, kf->current_group,
- types[i], valid_error);
+ "contains value \"%s\" which is an invalid "
+ "MIME type: %s\n",
+ value, locale_key, kf->current_group,
+ types[i], valid_error);
retval = FALSE;
g_free (valid_error);
@@ -1462,12 +1502,19 @@
* FIXME: it's not really deprecated, so the error message is wrong
* + All categories extending the format should start with "X-".
* Checked.
- * + At least one main category must be included.
+ * + Using multiple main categories may lead to appearing more than once in
+ * application menu.
+ * Checked.
+ * + One main category should be included, otherwise application will appear in
+ * "catch-all" section of application menu.
* Checked.
* FIXME: decide if it's okay to have an empty list of categories.
- * + Some categories, if include, require that another category is included.
- * Eg: if Audio is there, AudioVideo must be there. Same for most additional
- * categories.
+ * + Some categories, if included, require that another category is included.
+ * Eg: if Audio is there, AudioVideo must be there.
+ * Checked.
+ * + Some categories, if included, suggest that another category is included.
+ * Eg: Debugger suggests Development.
+ * This is the case for most additional categories.
* Checked.
*/
static gboolean
@@ -1480,7 +1527,7 @@
GHashTable *hashtable;
int i;
unsigned int j;
- gboolean main_category_present;
+ int main_categories_nb;
handle_key_for_application (kf, locale_key, value);
@@ -1514,7 +1561,7 @@
}
/* second pass */
- main_category_present = FALSE;
+ main_categories_nb = 0;
for (i = 0; categories[i]; i++) {
unsigned int k;
@@ -1541,8 +1588,57 @@
continue;
}
- if (registered_categories[j].main)
- main_category_present = TRUE;
+ if (registered_categories[j].main) {
+ /* only count it as a main category if none of the required categories
+ * for this one is also a main category (and is present) */
+ gboolean required_main_category_present = FALSE;
+
+ for (k = 0; registered_categories[j].requires[k] != NULL; k++) {
+ char **required_categories;
+ int l;
+
+ required_categories = g_strsplit (registered_categories[j].requires[k],
+ ";", 0);
+
+ for (l = 0; required_categories[l]; l++) {
+ unsigned int m;
+
+ if (!g_hash_table_lookup (hashtable, required_categories[l]))
+ continue;
+
+ for (m = 0; m < G_N_ELEMENTS (registered_categories); m++) {
+ if (strcmp (required_categories[l],
+ registered_categories[m].name) != 0)
+ continue;
+
+ if (registered_categories[m].main)
+ required_main_category_present = TRUE;
+
+ break;
+ }
+
+ if (required_main_category_present)
+ break;
+ }
+
+ if (required_main_category_present) {
+ g_strfreev (required_categories);
+ break;
+ }
+
+ g_strfreev (required_categories);
+ }
+
+ if (!required_main_category_present)
+ main_categories_nb++;
+ }
+
+ if (registered_categories[j].main && main_categories_nb > 1)
+ print_hint (kf, "value \"%s\" for key \"%s\" in group \"%s\" "
+ "contains more than one main category; application "
+ "might appear more than once in the application menu\n",
+ value, locale_key, kf->current_group);
+
if (registered_categories[j].deprecated) {
if (!kf->no_deprecated_warnings)
@@ -1554,7 +1650,7 @@
if (registered_categories[j].require_only_show_in) {
if (!g_hash_table_lookup (kf->current_keys, "OnlyShowIn")) {
- print_fatal (kf, "value \"%s\" in key \"%s\" in group \"%s\" "
+ print_fatal (kf, "value item \"%s\" in key \"%s\" in group \"%s\" "
"is a reserved category, so a \"OnlyShowIn\" key "
"must be included\n",
categories[i], locale_key, kf->current_group);
@@ -1562,6 +1658,8 @@
}
}
+ /* required categories */
+
for (k = 0; registered_categories[j].requires[k] != NULL; k++) {
char **required_categories;
int l;
@@ -1584,7 +1682,9 @@
g_strfreev (required_categories);
}
- /* there was a required category and it wasn't found */
+ /* we've reached the end of a non-empty set of required categories; this
+ * means none of the possible required category (or list of required
+ * categories) was found */
if (k != 0 && registered_categories[j].requires[k] == NULL) {
GString *output_required;
@@ -1593,27 +1693,73 @@
g_string_append_printf (output_required, ", or %s",
registered_categories[j].requires[k]);
- print_future_fatal (kf, "value \"%s\" in key \"%s\" in group \"%s\" "
- "requires another category to be present among the "
- "following categories: %s\n",
- categories[i], locale_key, kf->current_group,
- output_required->str);
+ print_future_fatal (kf, "value item \"%s\" in key \"%s\" in group \"%s\" "
+ "requires another category to be present among "
+ "the following categories: %s\n",
+ categories[i], locale_key, kf->current_group,
+ output_required->str);
g_string_free (output_required, TRUE);
retval = FALSE;
}
+ /* suggested categories */
+
+ for (k = 0; registered_categories[j].suggests[k] != NULL; k++) {
+ char **suggested_categories;
+ int l;
+
+ suggested_categories = g_strsplit (registered_categories[j].suggests[k],
+ ";", 0);
+
+ for (l = 0; suggested_categories[l]; l++) {
+ if (!g_hash_table_lookup (hashtable, suggested_categories[l]))
+ break;
+ }
+
+ /* we've reached the end of a list of suggested categories, so
+ * the condition is satisfied */
+ if (suggested_categories[l] == NULL) {
+ g_strfreev (suggested_categories);
+ break;
+ }
+
+ g_strfreev (suggested_categories);
+ }
+
+ /* we've reached the end of a non-empty set of suggested categories; this
+ * means none of the possible suggested category (or list of suggested
+ * categories) was found */
+ if (k != 0 && registered_categories[j].suggests[k] == NULL) {
+ GString *output_suggested;
+
+ output_suggested = g_string_new (registered_categories[j].suggests[0]);
+ for (k = 1; registered_categories[j].suggests[k] != NULL; k++)
+ g_string_append_printf (output_suggested, ", or %s",
+ registered_categories[j].suggests[k]);
+
+ print_hint (kf, "value item \"%s\" in key \"%s\" in group \"%s\" "
+ "can be extended with another category among the "
+ "following categories: %s\n",
+ categories[i], locale_key, kf->current_group,
+ output_suggested->str);
+
+ g_string_free (output_suggested, TRUE);
+ }
+
}
g_strfreev (categories);
g_hash_table_destroy (hashtable);
- if (!main_category_present) {
- print_future_fatal (kf, "value \"%s\" for key \"%s\" in group \"%s\" "
- "does not contain a registered main category\n",
- value, locale_key, kf->current_group, categories[i]);
- retval = FALSE;
- }
+ g_assert (main_categories_nb >= 0);
+
+ if (main_categories_nb == 0)
+ print_hint (kf, "value \"%s\" for key \"%s\" in group \"%s\" "
+ "does not contain a registered main category; application "
+ "might only show up in a \"catch-all\" section of the "
+ "application menu\n",
+ value, locale_key, kf->current_group);
return retval;
}
@@ -1740,6 +1886,7 @@
* - if-exists FILE
* - unless-exists FILE
* - DESKTOP-ENVIRONMENT-NAME [DESKTOP-SPECIFIC-TEST]
+ * - other known conditions (GNOME3, GSettings, etc.)
* Checked.
* + FILE must be a path to a filename, relative to $XDG_CONFIG_HOME.
* Checked.
@@ -1801,9 +1948,124 @@
value, locale_key, kf->current_group, argument);
}
+ } else if (strncmp (condition, "X-", 2) == 0) {
+ if (argument && argument[0] == '\0')
+ print_warning (kf, "value \"%s\" for key \"%s\" in group \"%s\" "
+ "has trailing space(s)\n",
+ value, locale_key, kf->current_group);
} else {
- if (strncmp (condition, "X-", 2)) {
- unsigned int i;
+ unsigned int i;
+ unsigned int j;
+
+ /* Look if it's a registered AutostartCondition */
+
+ for (i = 0; i < G_N_ELEMENTS (registered_autostart_condition); i++) {
+
+ if (strcmp (condition, registered_autostart_condition[i].name) != 0)
+ continue;
+
+ /* check if first argument is one of the expected ones */
+ for (j = 0; registered_autostart_condition[i].first_arg[j] != NULL; j++) {
+ const char *first = registered_autostart_condition[i].first_arg[j];
+ char *after_first = argument;
+
+ if (argument && !strncmp (argument, first, strlen (first))) {
+ after_first += strlen (first);
+ if (after_first[0] == '\0' || after_first[0] == ' ') {
+ /* find next argument */
+ argument = after_first;
+ while (*argument == ' ')
+ argument++;
+ }
+
+ break;
+ }
+ }
+
+ /* we've reached the end of a non-empty set of first arguments; this
+ * means none of the possible first arguments was found */
+ if (j != 0 && registered_autostart_condition[i].first_arg[j] == NULL) {
+ GString *output;
+
+ output = g_string_new (registered_autostart_condition[i].first_arg[0]);
+ for (j = 1; registered_autostart_condition[i].first_arg[j] != NULL; j++)
+ g_string_append_printf (output, ", or %s",
+ registered_autostart_condition[i].first_arg[j]);
+
+ print_fatal (kf, "value \"%s\" for key \"%s\" in group \"%s\" "
+ "does not contain a valid first argument for "
+ "condition \"%s\"; valid first arguments are: %s\n",
+ value, locale_key, kf->current_group,
+ condition, output->str);
+ retval = FALSE;
+
+ g_string_free (output, TRUE);
+
+ } else {
+
+ switch (registered_autostart_condition[i].additional_args) {
+ case 0:
+ if (argument && argument[0] != '\0') {
+ print_fatal (kf, "value \"%s\" for key \"%s\" in group \"%s\" "
+ "has too many arguments for condition \"%s\"\n",
+ value, locale_key, kf->current_group, condition);
+ retval = FALSE;
+ }
+ break;
+
+ case 1:
+ /* we handle the "one argument" case specially, as spaces might be
+ * normal there, and therefore we don't want to split the string
+ * based on spaces */
+ if (!argument || argument[0] == '\0') {
+ print_fatal (kf, "value \"%s\" for key \"%s\" in group \"%s\" "
+ "is missing a last argument for condition "
+ "\"%s\"\n",
+ value, locale_key, kf->current_group, condition);
+ retval = FALSE;
+ }
+ break;
+
+ default:
+ {
+ int argc_diff = -registered_autostart_condition[i].additional_args;
+
+ while (argument && argument[0] != '\0') {
+ argc_diff++;
+ argument = g_utf8_strchr (argument, -1, ' ');
+ while (argument && *argument == ' ')
+ argument++;
+ }
+
+ if (argc_diff > 0) {
+ print_fatal (kf, "value \"%s\" for key \"%s\" in group \"%s\" "
+ "has %d too many arguments for condition "
+ "\"%s\"\n",
+ value, locale_key, kf->current_group,
+ argc_diff, condition);
+ retval = FALSE;
+ } else if (argc_diff < 0) {
+ print_fatal (kf, "value \"%s\" for key \"%s\" in group \"%s\" "
+ "has %d too few arguments for condition "
+ "\"%s\"\n",
+ value, locale_key, kf->current_group,
+ -argc_diff, condition);
+ retval = FALSE;
+ }
+ }
+ break;
+ }
+
+ }
+
+ break;
+
+ }
+
+ /* Now, if we didn't find condition in list of registered
+ * AutostartCondition... */
+ if (i == G_N_ELEMENTS (registered_autostart_condition)) {
+ /* Accept conditions with same name as OnlyShowIn values */
for (i = 0; i < G_N_ELEMENTS (show_in_registered); i++) {
if (!strcmp (condition, show_in_registered[i]))
@@ -1818,12 +2080,11 @@
value, locale_key, kf->current_group, condition);
retval = FALSE;
}
- }
- if (argument && argument[0] == '\0') {
- print_warning (kf, "value \"%s\" for key \"%s\" in group \"%s\" "
- "has trailing space(s)\n",
- value, locale_key, kf->current_group);
+ if (argument && argument[0] == '\0')
+ print_warning (kf, "value \"%s\" for key \"%s\" in group \"%s\" "
+ "has trailing space(s)\n",
+ value, locale_key, kf->current_group);
}
}
@@ -2778,7 +3039,8 @@
gboolean
desktop_file_validate (const char *filename,
gboolean warn_kde,
- gboolean no_warn_deprecated)
+ gboolean no_warn_deprecated,
+ gboolean no_hints)
{
kf_validator kf;
@@ -2795,6 +3057,7 @@
kf.current_keys = NULL;
kf.kde_reserved_warnings = warn_kde;
kf.no_deprecated_warnings = no_warn_deprecated;
+ kf.no_hints = no_hints;
kf.main_group = NULL;
kf.type = INVALID_TYPE;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/desktop-file-utils-0.20/src/validate.h new/desktop-file-utils-0.21/src/validate.h
--- old/desktop-file-utils-0.20/src/validate.h 2010-03-19 11:55:41.000000000 +0100
+++ new/desktop-file-utils-0.21/src/validate.h 2012-10-03 13:02:22.000000000 +0200
@@ -34,7 +34,8 @@
gboolean desktop_file_validate (const char *filename,
gboolean warn_kde,
- gboolean no_warn_deprecated);
+ gboolean no_warn_deprecated,
+ gboolean no_hints);
gboolean desktop_file_fixup (GKeyFile *keyfile,
const char *filename);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/desktop-file-utils-0.20/src/validator.c new/desktop-file-utils-0.21/src/validator.c
--- old/desktop-file-utils-0.20/src/validator.c 2010-09-10 02:31:04.000000000 +0200
+++ new/desktop-file-utils-0.21/src/validator.c 2012-10-03 13:02:22.000000000 +0200
@@ -29,10 +29,12 @@
#include "validate.h"
static gboolean warn_kde = FALSE;
+static gboolean no_hints = FALSE;
static gboolean no_warn_deprecated = FALSE;
static char **filename = NULL;
static GOptionEntry option_entries[] = {
+ { "no-hints", 0, 0, G_OPTION_ARG_NONE, &no_hints, "Do not output hints to improve desktop file", NULL },
{ "no-warn-deprecated", 0, 0, G_OPTION_ARG_NONE, &no_warn_deprecated, "Do not warn about usage of deprecated items", NULL },
{ "warn-kde", 0, 0, G_OPTION_ARG_NONE, &warn_kde, "Warn about usage of KDE extensions to the specification", NULL },
{ G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &filename, NULL, "<desktop-file>" },
@@ -75,7 +77,7 @@
return 1;
}
- if (desktop_file_validate (filename[0], warn_kde, no_warn_deprecated))
+ if (desktop_file_validate (filename[0], warn_kde, no_warn_deprecated, no_hints))
return 0;
else
return 1;
++++++ rpmlint-deps.txt ++++++
--- /var/tmp/diff_new_pack.m9tATW/_old 2013-06-29 14:51:37.000000000 +0200
+++ /var/tmp/diff_new_pack.m9tATW/_new 2013-06-29 14:51:37.000000000 +0200
@@ -13,6 +13,7 @@
commandsmodule.so
commands.pyo
commands.so
+ConfigParser.pyo
copy.pyo
copy_regmodule.so
copy_reg.pyo
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package rpmlint for openSUSE:Factory checked in at 2013-06-29 14:51:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rpmlint (Old)
and /work/SRC/openSUSE:Factory/.rpmlint.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rpmlint"
Changes:
--------
--- /work/SRC/openSUSE:Factory/rpmlint/rpmlint.changes 2013-06-13 22:15:07.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.rpmlint.new/rpmlint.changes 2013-06-29 14:51:25.000000000 +0200
@@ -1,0 +2,11 @@
+Fri Jun 28 16:06:43 UTC 2013 - dmueller(a)suse.com
+
+- drop outdated Update-alternatives check (bnc#826993)
+- add basic new update-alternatives check
+
+-------------------------------------------------------------------
+Fri Jun 21 14:05:53 UTC 2013 - nkrinner(a)suse.com
+
+- Add 'chef' to standard users and groups
+
+-------------------------------------------------------------------
@@ -15,0 +27,8 @@
+-------------------------------------------------------------------
+Tue May 28 12:10:33 UTC 2013 - dmueller(a)suse.com
+
+- update to 1.5:
+ * New Homepage
+ * Plenty of new checks
+- add compressed-backup-regex.diff
+- remove python3_magic_number_fix.diff
Old:
----
python3_magic_number_fix.diff
rpmlint-1.4.tar.xz
New:
----
compressed-backup-regex.diff
rpmlint-1.5.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rpmlint.spec ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:27.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:27.000000000 +0200
@@ -25,9 +25,9 @@
Summary: Rpm correctness checker
License: GPL-2.0+
Group: System/Packages
-Version: 1.4
+Version: 1.5
Release: 0
-Source0: http://rpmlint.zarb.org/download/rpmlint-%{version}.tar.xz
+Source0: https://downloads.sourceforge.net/project/rpmlint/rpmlint-%{version}.tar.xz
Source1: rpmlint-checks-master.tar.gz
Source2: config
Source3: config.in
@@ -35,7 +35,7 @@
Source11: pie.config
Source12: licenses.config
Source100: syntax-validator.py
-Url: http://rpmlint.zarb.org/
+Url: https://sourceforge.net/projects/rpmlint/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: /usr/bin/readelf
Requires: bash
@@ -114,10 +114,10 @@
Patch84: extend-suse-conffiles-check.diff
Patch85: suse-changelog.patch
Patch86: suse-rclink-check.diff
+Patch87: compressed-backup-regex.diff
# accepted upstream
Patch88: suse-speccheck-utf8.diff
Patch89: suse-python-abi-check.diff
-Patch90: python3_magic_number_fix.diff
# PATCH-FIX-OPENSUSE: saschpe(a)suse.de - Don't complain about missing man-pages for rc-scripts
Patch91: suse-manpages-for-rc-scripts.patch
@@ -191,10 +191,9 @@
%patch84
%patch85
%patch86
-#patch87 -p1
+%patch87
%patch88
%patch89
-%patch90
%patch91 -p1
cp -p %{SOURCE2} .
# Only move top-level python files
++++++ add-weak-dependencies.diff ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- Pkg.py.orig
+++ Pkg.py
-@@ -426,6 +426,10 @@ class Pkg:
+@@ -424,6 +424,10 @@ class Pkg:
self._missingok_files = None
self._files = None
self._requires = None
@@ -13,7 +13,7 @@
self._req_names = -1
if header:
-@@ -673,6 +677,22 @@ class Pkg:
+@@ -670,6 +674,22 @@ class Pkg:
self._gatherDepInfo()
return self._requires
@@ -36,7 +36,7 @@
def prereq(self):
"""Get package PreReqs as list of
(name, flags, (epoch, version, release)) tuples."""
-@@ -709,7 +729,7 @@ class Pkg:
+@@ -706,7 +726,7 @@ class Pkg:
# internal function to gather dependency info used by the above ones
def _gather_aux(self, header, list, nametag, flagstag, versiontag,
@@ -45,7 +45,7 @@
names = header[nametag]
flags = header[flagstag]
versions = header[versiontag]
-@@ -720,7 +740,11 @@ class Pkg:
+@@ -717,7 +737,11 @@ class Pkg:
if prereq is not None and flags[loop] & PREREQ_FLAG:
prereq.append((names[loop], flags[loop] & (~PREREQ_FLAG),
evr))
@@ -58,7 +58,7 @@
list.append((names[loop], flags[loop], evr))
def _gatherDepInfo(self):
-@@ -730,6 +754,10 @@ class Pkg:
+@@ -727,6 +751,10 @@ class Pkg:
self._provides = []
self._conflicts = []
self._obsoletes = []
@@ -69,7 +69,7 @@
self._gather_aux(self.header, self._requires,
rpm.RPMTAG_REQUIRENAME,
-@@ -748,6 +776,30 @@ class Pkg:
+@@ -745,6 +773,30 @@ class Pkg:
rpm.RPMTAG_OBSOLETENAME,
rpm.RPMTAG_OBSOLETEFLAGS,
rpm.RPMTAG_OBSOLETEVERSION)
@@ -100,7 +100,7 @@
def scriptprog(self, which):
"""Get the specified script interpreter as a string.
-@@ -761,6 +813,7 @@ class Pkg:
+@@ -758,6 +810,7 @@ class Pkg:
prog = " ".join(prog)
return prog
++++++ avoid-mismatched-libregex.diff ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- FilesCheck.py.orig
+++ FilesCheck.py
-@@ -654,7 +654,7 @@ buildconfig_rpath_regex = re.compile('(?
+@@ -607,7 +607,7 @@ buildconfig_rpath_regex = re.compile('(?
sofile_regex = re.compile('/lib(64)?/(.+/)?lib[^/]+\.so$')
devel_regex = re.compile('(.*)-(debug(info)?|devel|headers|source|static)$')
debuginfo_package_regex = re.compile('-debug(info)?$')
++++++ better-wrong-script.diff ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- FilesCheck.py.orig
+++ FilesCheck.py
-@@ -1697,7 +1697,10 @@ executed.''',
+@@ -1667,7 +1667,10 @@ executed.''',
executed.''',
'wrong-script-interpreter',
++++++ buildroot-doc.diff ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- SpecCheck.py.orig
+++ SpecCheck.py
-@@ -631,7 +631,7 @@ versions you can ignore this warning.'''
+@@ -647,7 +647,7 @@ versions you can ignore this warning.'''
'hardcoded-path-in-buildroot-tag',
'''A path is hardcoded in your Buildroot tag. It should be replaced
++++++ buildroot-in-scripts.diff ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- SpecCheck.py.orig
+++ SpecCheck.py
-@@ -224,7 +224,9 @@ class SpecCheck(AbstractCheck.AbstractCh
+@@ -234,7 +234,9 @@ class SpecCheck(AbstractCheck.AbstractCh
continue
++++++ compressed-backup-regex.diff ++++++
Index: FilesCheck.py
===================================================================
--- FilesCheck.py.orig
+++ FilesCheck.py
@@ -591,7 +591,7 @@ DEFAULT_STANDARD_GROUPS = ('root', 'bin'
tmp_regex = re.compile('^(/var|/usr)?/tmp/')
sub_bin_regex = re.compile('^(/usr)?/s?bin/\S+/')
-backup_regex = re.compile('(~|\#[^/]+\#|\.orig|\.rej)$')
+backup_regex = re.compile('(~|\#[^/]+\#|\.orig|\.orig\.gz|\.rej)$')
compr_regex = re.compile('\.(gz|z|Z|zip|bz2|lzma|xz)$')
absolute_regex = re.compile('^/([^/]+)')
absolute2_regex = re.compile('^/?([^/]+)')
++++++ config ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200
@@ -34,7 +34,7 @@
addCheck("CheckFilelist")
addCheck("CheckKDE4Deps")
addCheck("KMPPolicyCheck")
-addCheck("CheckAlternativesGhostFiles")
+addCheck("CheckUpdateAlternatives")
addCheck("BashismsCheck")
addCheck("CheckBuildDate")
addCheck("CheckLogrotate")
@@ -78,6 +78,7 @@
'bin',
'casaauth',
'cdrom',
+ 'chef',
'citadel',
'colord',
'console',
@@ -218,6 +219,7 @@
'casaatsd',
'casaatvd',
'casaauth',
+ 'chef',
'citadel',
'cntlm',
'colord',
++++++ confusing-invalid-spec-name.patch ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200
@@ -1,10 +1,10 @@
# Confusing message. The problem is not that the file does not end
# with ".spec", but that there is a mismatch of specname and pkg name.
-Index: rpmlint-1.4/SpecCheck.py
+Index: rpmlint-1.5/SpecCheck.py
===================================================================
---- rpmlint-1.4.orig/SpecCheck.py
-+++ rpmlint-1.4/SpecCheck.py
-@@ -605,8 +605,8 @@ addDetails(
+--- rpmlint-1.5.orig/SpecCheck.py
++++ rpmlint-1.5/SpecCheck.py
+@@ -621,8 +621,8 @@ addDetails(
SPEC file to build a valid RPM package.''',
'invalid-spec-name',
++++++ description-check.diff ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- TagsCheck.py.orig
+++ TagsCheck.py
-@@ -704,6 +704,9 @@ class TagsCheck(AbstractCheck.AbstractCh
+@@ -705,6 +705,9 @@ class TagsCheck(AbstractCheck.AbstractCh
if not description:
printError(pkg, 'no-description-tag')
else:
@@ -12,7 +12,7 @@
if not pkg[rpm.RPMTAG_HEADERI18NTABLE]:
self._unexpanded_macros(pkg, '%description', description)
else:
-@@ -987,6 +990,10 @@ Name tag.''',
+@@ -988,6 +991,10 @@ Name tag.''',
'''The major number of the library isn't included in the package's name.
''',
++++++ devel-provide-is-devel-package.diff ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- FilesCheck.py.orig
+++ FilesCheck.py
-@@ -842,6 +842,10 @@ class FilesCheck(AbstractCheck.AbstractC
+@@ -806,6 +806,10 @@ class FilesCheck(AbstractCheck.AbstractC
# Check if the package is a development package
devel_pkg = devel_regex.search(pkg.name)
++++++ docdata-examples.diff ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- FilesCheck.py.orig
+++ FilesCheck.py
-@@ -648,6 +648,7 @@ bin_regex = re.compile('^/(?:usr/(?:s?bi
+@@ -601,6 +601,7 @@ bin_regex = re.compile('^/(?:usr/(?:s?bi
includefile_regex = re.compile('\.(c|h)(pp|xx)?$', re.IGNORECASE)
develfile_regex = re.compile('\.(a|cmxa?|mli?)$')
buildconfigfile_regex = re.compile('(\.pc|/bin/.+-config)$')
@@ -10,7 +10,7 @@
# room for improvement with catching more -R, but also for false positives...
buildconfig_rpath_regex = re.compile('(?:-rpath|Wl,-R)\\b')
sofile_regex = re.compile('/lib(64)?/(.+/)?lib[^/]+\.so$')
-@@ -1199,7 +1200,7 @@ class FilesCheck(AbstractCheck.AbstractC
+@@ -1158,7 +1159,7 @@ class FilesCheck(AbstractCheck.AbstractC
includefile_regex.search(f) or \
develfile_regex.search(f) or \
logrotate_regex.search(f)
@@ -19,7 +19,7 @@
printWarning(pkg, 'spurious-executable-perm', f)
elif f.startswith('/etc/') and f not in config_files and \
f not in ghost_files:
-@@ -1571,7 +1572,10 @@ included in your package.''',
+@@ -1541,7 +1542,10 @@ included in your package.''',
'spurious-executable-perm',
'''The file is installed with executable permissions, but was identified as one
that probably should not be executable. Verify if the executable bits are
++++++ extend-suse-conffiles-check.diff ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- FilesCheck.py.orig
+++ FilesCheck.py
-@@ -1217,7 +1217,7 @@ class FilesCheck(AbstractCheck.AbstractC
+@@ -1176,7 +1176,7 @@ class FilesCheck(AbstractCheck.AbstractC
if nonexec_file and not docdir_examples_regex.search(f):
printWarning(pkg, 'spurious-executable-perm', f)
elif f.startswith('/etc/') and f not in config_files and \
++++++ filename-non-utf8-exception.diff ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200
@@ -1,6 +1,8 @@
---- Filter.py
+Index: Filter.py
+===================================================================
+--- Filter.py.orig
+++ Filter.py
-@@ -24,12 +24,8 @@
+@@ -23,14 +23,8 @@ _diagnostic = list()
_badness_score = 0
printed_messages = { "I": 0, "W": 0, "E": 0 }
@@ -9,7 +11,9 @@
- print(s)
-else:
- def __print(s):
-- print(s.encode(locale.getpreferredencoding(), "replace"))
+- if isinstance(s, unicode):
+- s = s.encode(locale.getpreferredencoding(), "replace")
+- print(s)
+def __print(s):
+ print(s)
++++++ invalid-filerequires.diff ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- TagsCheck.py.orig
+++ TagsCheck.py
-@@ -421,6 +421,7 @@ invalid_version_regex = re.compile('([0-
+@@ -420,6 +420,7 @@ invalid_version_regex = re.compile('([0-
# () are here for grouping purpose in the regexp
forbidden_words_regex = re.compile('(' + Config.getOption('ForbiddenWords') + ')', re.IGNORECASE)
valid_buildhost_regex = re.compile(Config.getOption('ValidBuildHost'))
@@ -10,17 +10,17 @@
use_epoch = Config.getOption('UseEpoch', False)
use_utf8 = Config.getOption('UseUTF8', Config.USEUTF8_DEFAULT)
max_line_len = Config.getOption('MaxLineLength', 79)
-@@ -603,6 +604,9 @@ class TagsCheck(AbstractCheck.AbstractCh
+@@ -602,6 +603,9 @@ class TagsCheck(AbstractCheck.AbstractCh
if d[0].startswith('/usr/local/'):
printError(pkg, 'invalid-dependency', d[0])
+ if d[0].startswith('/') and not valid_filedep_regex.search(d[0]):
+ printWarning(pkg, 'invalid-filepath-dependency', d[0])
+
- if not devel_depend and not is_devel and not is_source and \
- FilesCheck.devel_regex.search(d[0]):
- printError(pkg, 'devel-dependency', d[0])
-@@ -1089,6 +1093,12 @@ explicit Requires: tags.''',
+ if is_source:
+ if lib_devel_number_regex.search(d[0]):
+ printError(pkg, 'invalid-build-requires', d[0])
+@@ -1090,6 +1094,12 @@ explicit Requires: tags.''',
'''This package provides 2 times the same capacity. It should only provide it
once.''',
++++++ libtool-wrapper-check.diff ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200
@@ -2,12 +2,12 @@
===================================================================
--- BinariesCheck.py.orig
+++ BinariesCheck.py
-@@ -253,8 +253,19 @@ class BinariesCheck(AbstractCheck.Abstra
- is_elf = 'ELF' in pkgfile.magic
+@@ -309,8 +309,19 @@ class BinariesCheck(AbstractCheck.Abstra
is_ar = 'current ar archive' in pkgfile.magic
is_ocaml_native = 'Objective caml native' in pkgfile.magic
+ is_lua_bytecode = 'Lua bytecode' in pkgfile.magic
+ is_shell = "shell script" in pkgfile.magic
- is_binary = is_elf or is_ar or is_ocaml_native
+ is_binary = is_elf or is_ar or is_ocaml_native or is_lua_bytecode
+ if is_shell:
+ count= 0
@@ -22,7 +22,7 @@
if not is_binary:
if reference_regex.search(fname):
lines = pkg.grep(invalid_dir_ref_regex, fname)
-@@ -502,6 +513,15 @@ recompiled separately from the static li
+@@ -568,6 +579,15 @@ recompiled separately from the static li
Another common mistake that causes this problem is linking with
``gcc -Wl,-shared'' instead of ``gcc -shared''.''',
++++++ no-badness-return.diff ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- Filter.py.orig
+++ Filter.py
-@@ -112,7 +112,7 @@ def printAllReasons():
+@@ -113,7 +113,7 @@ def printAllReasons():
if len(last_reason):
printDescriptions(last_reason)
last_reason = reason
@@ -15,7 +15,7 @@
===================================================================
--- rpmlint.orig
+++ rpmlint
-@@ -212,7 +212,7 @@ def main():
+@@ -211,7 +211,7 @@ def main():
% (packages_checked, specfiles_checked,
printed_messages["E"], printed_messages["W"])
++++++ no-doc-for-lib.diff ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- FilesCheck.py.orig
+++ FilesCheck.py
-@@ -859,7 +859,7 @@ class FilesCheck(AbstractCheck.AbstractC
+@@ -823,7 +823,7 @@ class FilesCheck(AbstractCheck.AbstractC
debuginfo_srcs = False
debuginfo_debugs = False
++++++ noarch-lib64.diff ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- BinariesCheck.py.orig
+++ BinariesCheck.py
-@@ -234,6 +234,7 @@ class BinariesCheck(AbstractCheck.Abstra
+@@ -289,6 +289,7 @@ class BinariesCheck(AbstractCheck.Abstra
binary = False
binary_in_usr_lib = False
has_usr_lib_file = False
@@ -10,7 +10,7 @@
multi_pkg = False
res = srcname_regex.search(pkg[rpm.RPMTAG_SOURCERPM] or '')
-@@ -250,6 +251,10 @@ class BinariesCheck(AbstractCheck.Abstra
+@@ -305,6 +306,10 @@ class BinariesCheck(AbstractCheck.Abstra
# only-non-binary-in-usr-lib false positives
binary_in_usr_lib = True
@@ -21,7 +21,7 @@
is_elf = 'ELF' in pkgfile.magic
is_ar = 'current ar archive' in pkgfile.magic
is_ocaml_native = 'Objective caml native' in pkgfile.magic
-@@ -464,9 +469,12 @@ class BinariesCheck(AbstractCheck.Abstra
+@@ -530,9 +535,12 @@ class BinariesCheck(AbstractCheck.Abstra
if version and version != -1 and version not in pkg.name:
printError(pkg, 'incoherent-version-in-name', version)
@@ -35,7 +35,7 @@
if has_usr_lib_file and not binary_in_usr_lib:
printWarning(pkg, 'only-non-binary-in-usr-lib')
-@@ -490,6 +498,11 @@ FHS and the FSSTND forbid this.''',
+@@ -556,6 +564,11 @@ FHS and the FSSTND forbid this.''',
# 'non-sparc32-binary',
# '',
++++++ only-reg-files-are-scripts.diff ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- InitScriptCheck.py.orig
+++ InitScriptCheck.py
-@@ -18,7 +18,7 @@ from Filter import addDetails, printErro
+@@ -17,7 +17,7 @@ from Filter import addDetails, printErro
import AbstractCheck
import Config
import Pkg
@@ -11,7 +11,7 @@
chkconfig_content_regex = re.compile('^\s*#\s*chkconfig:\s*([-0-9]+)\s+[-0-9]+\s+[-0-9]+')
subsys_regex = re.compile('/var/lock/subsys/([^/"\'\n\s;&|]+)', re.MULTILINE)
-@@ -64,6 +64,9 @@ class InitScriptCheck(AbstractCheck.Abst
+@@ -63,6 +63,9 @@ class InitScriptCheck(AbstractCheck.Abst
not fname.startswith('/etc/rc.d/init.d/'):
continue
++++++ remove-expand-macros.diff ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200
@@ -8,7 +8,7 @@
===================================================================
--- TagsCheck.py.orig
+++ TagsCheck.py
-@@ -433,15 +433,6 @@ so_dep_regex = re.compile(r'\.so(\.[0-9a
+@@ -432,15 +432,6 @@ so_dep_regex = re.compile(r'\.so(\.[0-9a
# we assume that no rpm packages existed before rpm itself existed...
oldest_changelog_timestamp = calendar.timegm(time.strptime("1995-01-01", "%Y-%m-%d"))
@@ -24,7 +24,7 @@
_enchant_checkers = {}
def spell_check(pkg, str, fmt, lang, ignored):
-@@ -856,30 +847,12 @@ class TagsCheck(AbstractCheck.AbstractCh
+@@ -857,30 +848,12 @@ class TagsCheck(AbstractCheck.AbstractCh
(apply(Pkg.formatRequire, obs),
apply(Pkg.formatRequire, prov)))
++++++ rpmgroup-checks.diff ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- TagsCheck.py.orig
+++ TagsCheck.py
-@@ -714,6 +714,8 @@ class TagsCheck(AbstractCheck.AbstractCh
+@@ -715,6 +715,8 @@ class TagsCheck(AbstractCheck.AbstractCh
self._unexpanded_macros(pkg, 'Group', group)
if not group:
printError(pkg, 'no-group-tag')
@@ -11,7 +11,7 @@
elif VALID_GROUPS and group not in VALID_GROUPS:
printWarning(pkg, 'non-standard-group', group)
-@@ -1026,6 +1028,10 @@ won't fool the specfile parser, and rebu
+@@ -1027,6 +1029,10 @@ won't fool the specfile parser, and rebu
'''There is no Group tag in your package. You have to specify a valid group
in your spec file using the Group tag.''',
++++++ rpmlint-1.4.tar.xz -> rpmlint-1.5.tar.xz ++++++
++++ 19472 lines of diff (skipped)
++++++ rpmlint-checks-master.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-checks-master/CheckAlternativesGhostFiles.py new/rpmlint-checks-master/CheckAlternativesGhostFiles.py
--- old/rpmlint-checks-master/CheckAlternativesGhostFiles.py 2013-01-02 13:40:19.000000000 +0100
+++ new/rpmlint-checks-master/CheckAlternativesGhostFiles.py 1970-01-01 01:00:00.000000000 +0100
@@ -1,85 +0,0 @@
-# vim:sw=4:et
-#############################################################################
-# File : CheckAlternativesGhostFiles.py
-# Package : rpmlint
-# Author : Michal Vyskocil
-# Purpose : Check if files used by update-alternatives are marked as %ghost
-#############################################################################
-
-from Filter import *
-import AbstractCheck
-import rpm
-
-class CheckAlternativesGhostFiles(AbstractCheck.AbstractCheck):
-
- INSTALL="--install"
- SLAVE="--slave"
-
- def __init__(self):
- AbstractCheck.AbstractCheck.__init__(self, "CheckAlternativesGhostFiles")
-
- @classmethod
- def read_ghost_files(cls, script):
- ghost_files = []
-
- if not script or not 'update-alternatives' in script:
- return ghost_files
-
-
- for command in ( \
- c.replace('\\\n', '').strip() \
- for c in script.split('update-alternatives') \
- if cls.INSTALL in c):
-
- #parse install
- command_args = []
- for arg in command.split(None):
- if not arg.startswith("--"):
- command_args.append(arg)
-
- ghost_files.append(command_args[0])
-
- if cls.SLAVE in command:
- for sc in ( \
- c.strip() \
- for c in command[command.index(cls.SLAVE):].split(cls.SLAVE) \
- if c.strip() != ''):
-
- xs = sc.split(None, 2)
- ghost_files.append(xs[0])
-
- return ghost_files
-
- def check(self, pkg):
-
- if pkg.isSource():
- return
-
- alt_files = []
- for script in (pkg.header[tag] for tag in (rpm.RPMTAG_POSTIN, rpm.RPMTAG_PREIN, rpm.RPMTAG_POSTTRANS)):
- alt_files.extend(self.read_ghost_files(script))
-
- files = pkg.files()
- ghost_files = pkg.ghostFiles()
- for af in (af for af in alt_files if not af in ghost_files):
- if af in files:
- printWarning(pkg, 'generic-name-not-marked-as-ghost %s' % (af))
- else:
- printWarning(pkg, 'generic-name-not-in-filelist %s' % af)
-
-
-check=CheckAlternativesGhostFiles()
-
-if Config.info:
- addDetails(
-
-'generic-name-not-marked-as-ghost',
-'''The update-alternatives generic name is not marked as a ghost in the %files section.
-This causes problems during update. Mark it as a %ghost in %files section.''',
-
-'generic-name-not-in-filelist',
-'''The update-alternatives generic name is not in a filelist of package.
-Add it to list marked as %ghost. Note: this error will be raised,
-if you use a hash ($) in file name, use rpm macros in spec file instead.''',
-
-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-checks-master/CheckUpdateAlternatives.py new/rpmlint-checks-master/CheckUpdateAlternatives.py
--- old/rpmlint-checks-master/CheckUpdateAlternatives.py 1970-01-01 01:00:00.000000000 +0100
+++ new/rpmlint-checks-master/CheckUpdateAlternatives.py 2013-06-28 18:05:19.000000000 +0200
@@ -0,0 +1,123 @@
+# vim:sw=4:et
+#############################################################################
+# File : CheckUpdateAlternatives
+# Package : rpmlint
+# Author : SUSE Linux Products GmbH
+# Purpose : Check if update-alternatives is used properly
+#############################################################################
+
+from Filter import printWarning, addDetails, Config
+
+import AbstractCheck
+import os
+import rpm
+import stat
+
+
+class CheckUpdateAlternatives(AbstractCheck.AbstractCheck):
+
+ """Check for compliance with SUSE's update-alternatives guidelines.
+
+ See
+ http://en.opensuse.org/openSUSE:Packaging_Multiple_Version_guidelines
+
+ """
+
+ INSTALL = "--install"
+
+ def __init__(self):
+ AbstractCheck.AbstractCheck.__init__(self, "CheckUpdateAlternatives")
+
+ @classmethod
+ def read_ghost_files(cls, script):
+
+ if not script or not 'update-alternatives' in script:
+ return set()
+
+ ghost_files = set()
+
+ for command in (
+ c.replace('\\\n', '').strip()
+ for c in script.split('update-alternatives')
+ if cls.INSTALL in c):
+
+ #parse install
+ command_args = []
+ for arg in command.split(None):
+ if not arg.startswith("--"):
+ command_args.append(arg)
+
+ ghost_files.add(command_args[0])
+
+ SLAVE = "--slave"
+
+ if SLAVE in command:
+ for sc in (
+ c.strip()
+ for c in command[command.index(SLAVE):].split(SLAVE)
+ if c.strip() != ''):
+
+ xs = sc.split(None, 2)
+ ghost_files.add(xs[0])
+
+ return ghost_files
+
+ def check(self, pkg):
+
+ if pkg.isSource():
+ return
+
+ alt_files = set()
+ for script in (pkg.header[tag]
+ for tag in (rpm.RPMTAG_POSTIN,
+ rpm.RPMTAG_PREIN,
+ rpm.RPMTAG_POSTTRANS)):
+ alt_files.update(self.read_ghost_files(script))
+
+ files = pkg.files()
+ ghost_files = pkg.ghostFiles()
+
+ for af in alt_files:
+ # /etc/alternatives/$(basename) should be a ghost file
+ etc_alt_file = "/etc/alternatives/%s" % os.path.basename(af)
+
+ if etc_alt_file not in files:
+ printWarning(pkg,
+ 'suse-alternative-link-missing', etc_alt_file)
+ elif etc_alt_file not in ghost_files:
+ printWarning(pkg,
+ 'suse-alternative-link-not-ghost', etc_alt_file)
+
+ # generic-name should be a symlink to /etc/alternatives/$(basename)
+ if af not in files:
+ printWarning(pkg,
+ 'suse-alternative-generic-name-missing', af)
+ elif not stat.S_ISLNK(files[af].mode):
+ printWarning(pkg,
+ 'suse-alternative-generic-name-not-symlink', af)
+
+ ### check that %post contains --install call
+ ### check that %preun contains --remove call
+
+
+check = CheckUpdateAlternatives()
+
+if Config.info:
+ addDetails(
+'suse-alternative-generic-name-not-symlink',
+'''The update-alternative generic-name is not a symlink pointing to
+%{_sysconfdir}/alternatives/$(basename generic-name).
+''',
+
+'suse-alternative-link-not-ghost',
+'''The %{_sysconfdir}/alternatives/$(basename generic-name) link exists but is
+not marked as ghost. Mark it as %ghost.''',
+
+'suse-alternative-link-missing',
+'''The file %{_sysconfdir}/alternatives/$(basename generic-name) is missing
+in the file list. Mark it as %ghost and add it to the file list.''',
+
+'suse-alternative-generic-name-missing',
+'''The update-alternatives generic name is not in the filelist. Create it as
+a symlink to %{_sysconfdir}/alternatives/$(basename generic-name) and add it
+to the file list.''')
++++++ rpmlint-pkg-quoting.diff ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- Pkg.py.orig
+++ Pkg.py
-@@ -493,7 +493,7 @@ class Pkg:
+@@ -490,7 +490,7 @@ class Pkg:
dir = self.dirname)
# TODO: better shell escaping or sequence based command invocation
command_str = \
++++++ rpmlint-suse.diff ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200
@@ -15,7 +15,7 @@
===================================================================
--- I18NCheck.py.orig
+++ I18NCheck.py
-@@ -31,7 +31,7 @@ INCORRECT_LOCALES = {
+@@ -30,7 +30,7 @@ INCORRECT_LOCALES = {
'en_UK': 'en_GB'}
package_regex = re.compile('-(' + '|'.join(LANGUAGES) + ')$')
++++++ script-interpreter-only-for-exec-scripts.diff ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- FilesCheck.py.orig
+++ FilesCheck.py
-@@ -1249,7 +1249,7 @@ class FilesCheck(AbstractCheck.AbstractC
+@@ -1219,7 +1219,7 @@ class FilesCheck(AbstractCheck.AbstractC
elif interpreter or mode & 0111 != 0 or \
script_regex.search(f):
if interpreter:
++++++ selfconflicts-provide.diff ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- TagsCheck.py.orig
+++ TagsCheck.py
-@@ -819,6 +819,7 @@ class TagsCheck(AbstractCheck.AbstractCh
+@@ -820,6 +820,7 @@ class TagsCheck(AbstractCheck.AbstractCh
obs_names = [x[0] for x in pkg.obsoletes()]
prov_names = [x[0].split(':/')[0] for x in pkg.provides()]
@@ -10,7 +10,7 @@
for o in (x for x in obs_names if x not in prov_names):
printWarning(pkg, 'obsolete-not-provided', o)
-@@ -830,6 +831,8 @@ class TagsCheck(AbstractCheck.AbstractCh
+@@ -831,6 +832,8 @@ class TagsCheck(AbstractCheck.AbstractCh
# https://bugzilla.redhat.com/460872
useless_provides = []
for p in prov_names:
@@ -19,7 +19,7 @@
if prov_names.count(p) != 1 and p not in useless_provides:
useless_provides.append(p)
for p in useless_provides:
-@@ -970,6 +973,10 @@ the Release tag.''',
+@@ -971,6 +974,10 @@ the Release tag.''',
'''There is no Name tag in your package. You have to specify a name using the
Name tag.''',
++++++ sourced-dirs.diff ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- FilesCheck.py.orig
+++ FilesCheck.py
-@@ -681,7 +681,7 @@ manifest_perl_regex = re.compile('^/usr/
+@@ -634,7 +634,7 @@ manifest_perl_regex = re.compile('^/usr/
shebang_regex = re.compile('^#!\s*(\S+)')
interpreter_regex = re.compile('^/(usr/)?(s?bin|games|libexec(/.+)?|(lib(64)?|share)/.+)/[^/]+$')
script_regex = re.compile('^/((usr/)?s?bin|etc/(rc\.d/init\.d|X11/xinit\.d|cron\.(hourly|daily|monthly|weekly)))/')
++++++ stricter-interpreter-check.diff ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- FilesCheck.py.orig
+++ FilesCheck.py
-@@ -1272,7 +1272,8 @@ class FilesCheck(AbstractCheck.AbstractC
+@@ -1242,7 +1242,8 @@ class FilesCheck(AbstractCheck.AbstractC
f.endswith('.la')):
printError(pkg, 'script-without-shebang', f)
++++++ suse-binarieschecks.diff ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200
@@ -1,6 +1,8 @@
---- BinariesCheck.py
+Index: BinariesCheck.py
+===================================================================
+--- BinariesCheck.py.orig
+++ BinariesCheck.py
-@@ -10,13 +10,15 @@
+@@ -9,13 +9,15 @@
import re
import stat
@@ -17,17 +19,17 @@
DEFAULT_SYSTEM_LIB_PATHS = (
-@@ -37,6 +39,9 @@
+@@ -42,6 +44,9 @@ class BinaryInfo:
unused_regex = re.compile('^\s+(\S+)')
- exit_call_regex = re.compile('\s+FUNC\s+.*?\s+(_?exit(?:@\S+)?)(?:\s|$)')
- fork_call_regex = re.compile('\s+FUNC\s+.*?\s+(fork(?:@\S+)?)(?:\s|$)')
+ exit_call_regex = create_regexp_call('_?exit')
+ fork_call_regex = create_regexp_call('fork')
+ debuginfo_regex=re.compile('^\s+\[\s*\d+\]\s+\.debug_.*\s+')
+ symtab_regex=re.compile('^\s+\[\s*\d+\]\s+\.symtab\s+')
+ gethostbyname_call_regex = re.compile('\s+FUNC\s+.*?\s+(gethostbyname(?:@\S+)?)(?:\s|$)')
-
- def __init__(self, pkg, path, file, is_ar, is_shlib):
- self.readelf_error = False
-@@ -50,7 +55,10 @@
+ # regexp for setgid setegid setresgid set(?:res|e)?gid
+ setgid_call_regex = create_regexp_call(['setresgid','setegid','setgid'])
+ setuid_call_regex = create_regexp_call(['setresuid','seteuid','setuid'])
+@@ -62,7 +67,10 @@ class BinaryInfo:
self.stack = False
self.exec_stack = False
self.exit_calls = []
@@ -37,8 +39,8 @@
+ self.symtab=0
self.tail = ''
- is_debug = path.endswith('.debug')
-@@ -93,6 +101,11 @@
+ self.setgid = False
+@@ -131,6 +139,11 @@ class BinaryInfo:
self.exec_stack = True
continue
@@ -50,7 +52,7 @@
if is_shlib:
r = BinaryInfo.exit_call_regex.search(l)
if r:
-@@ -103,6 +116,14 @@
+@@ -141,6 +154,14 @@ class BinaryInfo:
fork_called = True
continue
@@ -65,7 +67,7 @@
if self.non_pic:
self.non_pic = 'TEXTREL' in res[1]
-@@ -274,13 +295,26 @@
+@@ -330,13 +351,26 @@ class BinariesCheck(AbstractCheck.Abstra
continue
# stripped ?
@@ -93,7 +95,7 @@
if is_shlib:
has_lib = True
-@@ -330,6 +364,10 @@
+@@ -386,6 +420,10 @@ class BinariesCheck(AbstractCheck.Abstra
for ec in bin_info.exit_calls:
printWarning(pkg, 'shared-lib-calls-exit', fname, ec)
@@ -104,7 +106,7 @@
# rpath ?
if bin_info.rpath:
for p in bin_info.rpath:
-@@ -524,6 +562,14 @@
+@@ -590,6 +628,14 @@ with the intended shared libraries only.
'ldd-failed',
'''Executing ldd on this file failed, all checks could not be run.''',
@@ -119,7 +121,7 @@
'executable-stack',
'''The binary declares the stack as executable. Executable stack is usually an
error as it is only needed if the code contains GCC trampolines or similar
-@@ -536,6 +582,10 @@
+@@ -602,6 +648,10 @@ don\'t define a proper .note.GNU-stack s
make the stack executable. Usual suspects include use of a non-GNU linker or
an old GNU linker version.''',
@@ -130,7 +132,7 @@
'shared-lib-calls-exit',
'''This library package calls exit() or _exit(), probably in a non-fork()
context. Doing so from a library is strongly discouraged - when a library
-@@ -554,6 +604,12 @@
+@@ -620,6 +670,12 @@ that use prelink, make sure that prelink
placing a blacklist file in /etc/prelink.conf.d. For more information, see
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=256900#49''',
++++++ suse-changelog.patch ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- TagsCheck.py.orig
+++ TagsCheck.py
-@@ -1024,8 +1024,8 @@ Development/''',
+@@ -1025,8 +1025,8 @@ Development/''',
"%s".''' % '", "'.join(VALID_GROUPS),
'no-changelogname-tag',
++++++ suse-check-optional-dependencies.diff ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- FilesCheck.py.orig
+++ FilesCheck.py
-@@ -948,6 +948,16 @@ class FilesCheck(AbstractCheck.AbstractC
+@@ -907,6 +907,16 @@ class FilesCheck(AbstractCheck.AbstractC
if res.group(1) != pkg.name:
printError(pkg, 'incoherent-logrotate-file', f)
@@ -19,7 +19,7 @@
if link != '':
ext = compr_regex.search(link)
if ext:
-@@ -1757,6 +1767,24 @@ consequences), or other compiler flags w
+@@ -1727,6 +1737,24 @@ consequences), or other compiler flags w
extraction not working as expected. Verify that the binaries are not
unexpectedly stripped and that the intended compiler flags are used.''',
++++++ suse-checks.diff ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- Config.py.orig
+++ Config.py
-@@ -17,14 +17,13 @@ try:
+@@ -16,14 +16,13 @@ try:
except ImportError:
__version__ = 'devel'
++++++ suse-filesystem.diff ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200
@@ -2,147 +2,7 @@
===================================================================
--- FilesCheck.py.orig
+++ FilesCheck.py
-@@ -29,65 +29,112 @@ STANDARD_DIRS = (
- '/',
- '/bin',
- '/boot',
-+ '/dev',
- '/etc',
- '/etc/X11',
-+ '/etc/aliases.d',
-+ '/etc/cron.d',
-+ '/etc/cron.daily',
-+ '/etc/cron.hourly',
-+ '/etc/cron.monthly',
-+ '/etc/cron.weekly',
-+ '/etc/cups',
-+ '/etc/default',
-+ '/etc/init.d',
-+ '/etc/init.d/boot.d',
-+ '/etc/init.d/rc0.d',
-+ '/etc/init.d/rc1.d',
-+ '/etc/init.d/rc2.d',
-+ '/etc/init.d/rc3.d',
-+ '/etc/init.d/rc4.d',
-+ '/etc/init.d/rc5.d',
-+ '/etc/init.d/rc6.d',
-+ '/etc/init.d/rcS.d',
-+ '/etc/java',
-+ '/etc/ld.so.conf.d',
-+ '/etc/logrotate.d',
-+ '/etc/news',
- '/etc/opt',
-+ '/etc/permissions.d',
-+ '/etc/ppp',
-+ '/etc/ppp/ip-down.d',
-+ '/etc/ppp/ip-up.d',
- '/etc/profile.d',
-+ '/etc/rc.d',
- '/etc/skel',
-+ '/etc/susehelp.d',
-+ '/etc/susehelp.d/htdig',
-+ '/etc/sysconfig',
-+ '/etc/sysconfig/SuSEfirewall2.d',
-+ '/etc/sysconfig/SuSEfirewall2.d/services',
-+ '/etc/sysconfig/network',
-+ '/etc/sysconfig/network/if-down.d',
-+ '/etc/sysconfig/network/if-up.d',
-+ '/etc/sysconfig/network/providers',
-+ '/etc/sysconfig/network/scripts',
-+ '/etc/sysconfig/scripts',
-+ '/etc/uucp',
-+ '/etc/xdg',
-+ '/etc/xdg/autostart',
- '/etc/xinetd.d',
- '/home',
- '/lib',
-+ '/lib/YaST',
-+ '/lib/firmware',
-+ '/lib/lsb',
- '/lib/modules',
- '/lib64',
-+ '/lib64/YaST',
-+ '/lib64/firmware',
-+ '/lib64/lsb',
-+ '/lib64/modules',
- '/media',
-+ '/media/cdrom',
-+ '/media/floppy',
- '/mnt',
-- '/mnt/cdrom',
-- '/mnt/disk',
-- '/mnt/floppy',
- '/opt',
- '/proc',
- '/root',
-+ '/root/.gnupg',
-+ '/root/bin',
- '/sbin',
-- '/selinux',
- '/srv',
-+ '/srv/ftp',
-+ '/srv/www',
-+ '/srv/www/cgi-bin',
-+ '/srv/www/htdocs',
- '/sys',
- '/tmp',
-+ '/tmp/.ICE-unix',
-+ '/tmp/.X11-unix',
- '/usr',
- '/usr/X11R6',
- '/usr/X11R6/bin',
-- '/usr/X11R6/doc',
-- '/usr/X11R6/include',
- '/usr/X11R6/lib',
-- '/usr/X11R6/lib64',
-- '/usr/X11R6/man',
-- '/usr/X11R6/man/man1',
-- '/usr/X11R6/man/man2',
-- '/usr/X11R6/man/man3',
-- '/usr/X11R6/man/man4',
-- '/usr/X11R6/man/man5',
-- '/usr/X11R6/man/man6',
-- '/usr/X11R6/man/man7',
-- '/usr/X11R6/man/man8',
-- '/usr/X11R6/man/man9',
-- '/usr/X11R6/man/mann',
- '/usr/bin',
-- '/usr/bin/X11',
-- '/usr/etc',
- '/usr/games',
-+ '/usr/i586-suse-linux',
-+ '/usr/i586-suse-linux/bin',
-+ '/usr/i586-suse-linux/include',
-+ '/usr/i586-suse-linux/lib',
- '/usr/include',
-+ '/usr/include/X11',
- '/usr/lib',
- '/usr/lib/X11',
-- '/usr/lib/games',
-- '/usr/lib/gcc-lib',
-- '/usr/lib/menu',
-+ '/usr/lib/browser-plugins',
-+ '/usr/lib/lsb',
-+ '/usr/lib/news',
-+ '/usr/lib/pkgconfig',
- '/usr/lib64',
-- '/usr/lib64/gcc-lib',
-+ '/usr/lib64/X11',
-+ '/usr/lib64/browser-plugins',
-+ '/usr/lib64/lsb',
-+ '/usr/lib64/news',
-+ '/usr/lib64/pkgconfig',
- '/usr/local',
- '/usr/local/bin',
-- '/usr/local/doc',
-- '/usr/local/etc',
- '/usr/local/games',
-- '/usr/local/info',
-+ '/usr/local/include',
- '/usr/local/lib',
- '/usr/local/lib64',
- '/usr/local/man',
-@@ -103,24 +150,415 @@ STANDARD_DIRS = (
+@@ -103,24 +103,415 @@ STANDARD_DIRS = (
'/usr/local/man/mann',
'/usr/local/sbin',
'/usr/local/share',
@@ -569,7 +429,7 @@
'/usr/share/man',
'/usr/share/man/man1',
'/usr/share/man/man2',
-@@ -132,28 +570,57 @@ STANDARD_DIRS = (
+@@ -132,28 +523,57 @@ STANDARD_DIRS = (
'/usr/share/man/man8',
'/usr/share/man/man9',
'/usr/share/man/mann',
++++++ suse-filter-exception.diff ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- Config.py.orig
+++ Config.py
-@@ -103,11 +103,23 @@ def getOption(name, default = ""):
+@@ -102,11 +102,23 @@ def getOption(name, default = ""):
_filters = []
_filters_re = None
@@ -28,7 +28,7 @@
def removeFilter(s):
global _filters_re
-@@ -122,19 +134,38 @@ def removeFilter(s):
+@@ -121,19 +133,38 @@ def removeFilter(s):
_scoring = {}
def setBadness(s, score):
@@ -71,7 +71,7 @@
_filters_re = '(?:' + _filters[0] + ')'
for idx in range(1, len(_filters)):
-@@ -146,9 +177,27 @@ def isFiltered(s):
+@@ -145,9 +176,27 @@ def isFiltered(s):
_filters_re = _filters_re + '|(?:' + _filters[idx] +')'
_filters_re = re.compile(_filters_re)
++++++ suse-filter-more-verbose.diff ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200
@@ -1,6 +1,8 @@
---- Config.py
+Index: Config.py
+===================================================================
+--- Config.py.orig
+++ Config.py
-@@ -11,6 +11,7 @@
+@@ -10,6 +10,7 @@
import locale
import os.path
import re
@@ -8,7 +10,7 @@
try:
from __version__ import __version__
-@@ -163,7 +164,17 @@
+@@ -162,7 +163,17 @@ def isFiltered(s):
if '(' in _filters_non_except[idx]:
_non_named_group_re.subn('(:?', _filters_non_except[idx])
_filters_non_except_re = _filters_non_except_re + '|(?:' + _filters_non_except[idx] +')'
@@ -27,7 +29,7 @@
if _filters_re == None and len(_filters):
_filters_re = '(?:' + _filters[0] + ')'
-@@ -175,7 +186,17 @@
+@@ -174,7 +185,17 @@ def isFiltered(s):
if '(' in _filters[idx]:
_non_named_group_re.subn('(:?', _filters[idx])
_filters_re = _filters_re + '|(?:' + _filters[idx] +')'
++++++ suse-g-ir-chech.diff ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- FilesCheck.py.orig
+++ FilesCheck.py
-@@ -646,7 +646,7 @@ points_regex = re.compile('^\.\./(.*)')
+@@ -599,7 +599,7 @@ points_regex = re.compile('^\.\./(.*)')
doc_regex = re.compile('^/usr(/share|/X11R6)?/(doc|man|info)/|^/opt/kde3/share/doc|^/usr/share/gnome/help')
bin_regex = re.compile('^/(?:usr/(?:s?bin|games)|s?bin)/(.*)')
includefile_regex = re.compile('\.(c|h)(pp|xx)?$', re.IGNORECASE)
++++++ suse-manpages-for-rc-scripts.patch ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200
@@ -1,8 +1,8 @@
-Index: rpmlint-1.4/FilesCheck.py
+Index: rpmlint-1.5/FilesCheck.py
===================================================================
---- rpmlint-1.4.orig/FilesCheck.py
-+++ rpmlint-1.4/FilesCheck.py
-@@ -1434,7 +1434,7 @@ class FilesCheck(AbstractCheck.AbstractC
+--- rpmlint-1.5.orig/FilesCheck.py
++++ rpmlint-1.5/FilesCheck.py
+@@ -1404,7 +1404,7 @@ class FilesCheck(AbstractCheck.AbstractC
for exe, paths in bindir_exes.items():
if len(paths) > 1:
printWarning(pkg, "duplicate-executable", exe, paths)
++++++ suse-no-run-ldconfig.diff ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- SpecCheck.py.orig
+++ SpecCheck.py
-@@ -414,6 +414,10 @@ class SpecCheck(AbstractCheck.AbstractCh
+@@ -424,6 +424,10 @@ class SpecCheck(AbstractCheck.AbstractCh
printWarning(pkg, 'comparison-operator-in-deptoken',
conf)
@@ -13,7 +13,7 @@
if current_section == 'changelog':
for match in AbstractCheck.macro_regex.findall(line):
res = re.match('%+', match)
-@@ -732,6 +736,14 @@ may break short circuit builds.''',
+@@ -748,6 +752,14 @@ may break short circuit builds.''',
'''Make check or other automated regression test should be run in %check, as
they can be disabled with a rpm macro for short circuiting purposes.''',
++++++ suse-pkg-config-check.diff ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- TagsCheck.py.orig
+++ TagsCheck.py
-@@ -416,6 +416,7 @@ lib_devel_number_regex = re.compile('^li
+@@ -415,6 +415,7 @@ lib_devel_number_regex = re.compile('^li
invalid_url_regex = re.compile(Config.getOption('InvalidURL'), re.IGNORECASE)
lib_package_regex = re.compile('(?:^(?:compat-)?lib.*?(\.so.*)?|libs?[\d-]*)$', re.IGNORECASE)
leading_space_regex = re.compile('^\s+')
@@ -10,7 +10,7 @@
license_regex = re.compile('\(([^)]+)\)|\s(?:and|or)\s')
invalid_version_regex = re.compile('([0-9](?:rc|alpha|beta|pre).*)', re.IGNORECASE)
# () are here for grouping purpose in the regexp
-@@ -629,10 +630,12 @@ class TagsCheck(AbstractCheck.AbstractCh
+@@ -630,10 +631,12 @@ class TagsCheck(AbstractCheck.AbstractCh
base = is_devel.group(1)
dep = None
has_so = False
@@ -24,7 +24,7 @@
if has_so:
base_or_libs = base + '/' + base + '-libs/lib' + base
# try to match *%_isa as well (e.g. "(x86-64)", "(x86-32)")
-@@ -669,6 +672,15 @@ class TagsCheck(AbstractCheck.AbstractCh
+@@ -670,6 +673,15 @@ class TagsCheck(AbstractCheck.AbstractCh
if prov not in (x[0] for x in pkg.provides()):
printWarning(pkg, 'no-provides', prov)
@@ -40,7 +40,7 @@
# List of words to ignore in spell check
ignored_words = set()
for pf in pkg.files():
-@@ -1108,6 +1120,11 @@ instead or require a file in bin or /etc
+@@ -1109,6 +1121,11 @@ instead or require a file in bin or /etc
'no-url-tag',
'''The URL tag is missing. Please add a http or ftp link to the project location.''',
++++++ suse-python-abi-check.diff ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- FilesCheck.py.orig
+++ FilesCheck.py
-@@ -1148,8 +1148,11 @@ class FilesCheck(AbstractCheck.AbstractC
+@@ -1107,8 +1107,11 @@ class FilesCheck(AbstractCheck.AbstractC
if res and not (pkg.check_versioned_dep('python-base',
res.group(1)) or
pkg.check_versioned_dep('python',
++++++ suse-python3-naming-policy.diff ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200
@@ -1,6 +1,8 @@
---- NamingPolicyCheck.py
+Index: NamingPolicyCheck.py
+===================================================================
+--- NamingPolicyCheck.py.orig
+++ NamingPolicyCheck.py
-@@ -91,7 +91,7 @@
+@@ -90,7 +90,7 @@ check = NamingPolicyCheck()
check.add_check('xmms', '^xmms(-|$)', '^/usr/lib(64)?/xmms/')
++++++ suse-rclink-check.diff ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- InitScriptCheck.py.orig
+++ InitScriptCheck.py
-@@ -51,7 +51,7 @@ class InitScriptCheck(AbstractCheck.Abst
+@@ -50,7 +50,7 @@ class InitScriptCheck(AbstractCheck.Abst
return
initscript_list = []
@@ -11,7 +11,7 @@
# check chkconfig call in %post and %preun
postin = pkg[rpm.RPMTAG_POSTIN] or pkg.scriptprog(pkg[rpm.RPMTAG_POSTINPROG])
-@@ -60,6 +60,10 @@ class InitScriptCheck(AbstractCheck.Abst
+@@ -59,6 +59,10 @@ class InitScriptCheck(AbstractCheck.Abst
for fname, pkgfile in pkg.files().items():
@@ -22,7 +22,7 @@
if not fname.startswith('/etc/init.d/') and \
not fname.startswith('/etc/rc.d/init.d/'):
continue
-@@ -199,6 +203,12 @@ class InitScriptCheck(AbstractCheck.Abst
+@@ -198,6 +202,12 @@ class InitScriptCheck(AbstractCheck.Abst
elif subsys_regex_found and not use_subsys:
printError(pkg, 'subsys-unsupported', fname)
@@ -35,7 +35,7 @@
if len(initscript_list) == 1:
pkgname = re.sub("-sysvinit$", "", pkg.name.lower())
goodnames = (pkgname, pkgname + 'd')
-@@ -223,6 +233,10 @@ a call to chkconfig.''',
+@@ -222,6 +232,10 @@ a call to chkconfig.''',
'''The package contains an init script but doesn't contain a %preun with
a call to chkconfig.''',
++++++ suse-shlib-devel-dependency.diff ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- TagsCheck.py.orig
+++ TagsCheck.py
-@@ -637,10 +637,10 @@ class TagsCheck(AbstractCheck.AbstractCh
+@@ -638,10 +638,10 @@ class TagsCheck(AbstractCheck.AbstractCh
if pkg_config_regex.match(fname) and fname.endswith('.pc'):
has_pc = True
if has_so:
++++++ suse-speccheck-utf8.diff ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- SpecCheck.py.orig
+++ SpecCheck.py
-@@ -609,8 +609,8 @@ SPEC file to build a valid RPM package.'
+@@ -625,8 +625,8 @@ SPEC file to build a valid RPM package.'
("Name:" tag). Either rename your package or the specfile.''',
'non-utf8-spec-file',
++++++ suse-url-check.diff ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:28.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:28.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- TagsCheck.py.orig
+++ TagsCheck.py
-@@ -780,7 +780,7 @@ class TagsCheck(AbstractCheck.AbstractCh
+@@ -781,7 +781,7 @@ class TagsCheck(AbstractCheck.AbstractCh
if not valid_license:
self._unexpanded_macros(pkg, 'License', rpm_license)
@@ -11,7 +11,7 @@
if hasattr(rpm, 'RPMTAG_%s' % tag.upper()):
url = pkg[getattr(rpm, 'RPMTAG_%s' % tag.upper())]
self._unexpanded_macros(pkg, tag, url, is_url = True)
-@@ -1096,7 +1096,7 @@ once.''',
+@@ -1097,7 +1097,7 @@ once.''',
'''This rpm requires a specific release of another package.''',
'no-url-tag',
++++++ suse-version.diff ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:29.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:29.000000000 +0200
@@ -1,14 +1,16 @@
---- SpecCheck.py
+Index: SpecCheck.py
+===================================================================
+--- SpecCheck.py.orig
+++ SpecCheck.py
-@@ -57,6 +57,7 @@
+@@ -66,6 +66,7 @@ libdir_regex = re.compile('%{?_lib(?:dir
comment_or_empty_regex = re.compile('^\s*(#|$)')
defattr_regex = re.compile('^\s*%defattr\\b')
attr_regex = re.compile('^\s*%attr\\b')
+suse_version_regex = re.compile('%suse_version\s*[<>=]+\s*(\d+)')
section_regexs = dict(
([x, re.compile('^%' + x + '(?:\s|$)')]
- for x in ('build', 'changelog', 'check', 'clean', 'description', 'files',
-@@ -359,6 +360,12 @@
+ for x in ['build', 'changelog', 'check', 'clean', 'description', 'files',
+@@ -369,6 +370,12 @@ class SpecCheck(AbstractCheck.AbstractCh
if not res.group(1).startswith('%'):
printWarning(pkg, 'hardcoded-prefix-tag', res.group(1))
@@ -21,7 +23,7 @@
res = prereq_regex.search(line)
if res:
printError(pkg, 'prereq-use', res.group(2))
-@@ -774,6 +781,15 @@
+@@ -790,6 +797,15 @@ in the resulting binary package dependin
version (typically < 4.4). Add default attributes using %defattr before it in
the %files section, or use per entry %attr's.''',
++++++ suse-whitelist-opensuse.diff ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:29.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:29.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- TagsCheck.py.orig
+++ TagsCheck.py
-@@ -883,7 +883,7 @@ class TagsCheck(AbstractCheck.AbstractCh
+@@ -884,7 +884,7 @@ class TagsCheck(AbstractCheck.AbstractCh
spell_check(pkg, utf8summary, 'Summary(%s)', lang, ignored_words)
if '\n' in summary:
printError(pkg, 'summary-on-multiple-lines', lang)
++++++ sysv5-init-checks.diff ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:29.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:29.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- InitScriptCheck.py.orig
+++ InitScriptCheck.py
-@@ -30,6 +30,10 @@ lsb_tags_regex = re.compile('^# ([\w-]+)
+@@ -29,6 +29,10 @@ lsb_tags_regex = re.compile('^# ([\w-]+)
lsb_cont_regex = re.compile('^#(?:\t| )(.*?)\s*$')
use_subsys = Config.getOption('UseVarLockSubsys', True)
@@ -13,7 +13,7 @@
LSB_KEYWORDS = ('Provides', 'Required-Start', 'Required-Stop', 'Should-Start',
'Should-Stop', 'Default-Start', 'Default-Stop',
'Short-Description', 'Description')
-@@ -47,6 +51,13 @@ class InitScriptCheck(AbstractCheck.Abst
+@@ -46,6 +50,13 @@ class InitScriptCheck(AbstractCheck.Abst
return
initscript_list = []
@@ -27,7 +27,7 @@
for fname, pkgfile in pkg.files().items():
if not fname.startswith('/etc/init.d/') and \
-@@ -61,20 +72,16 @@ class InitScriptCheck(AbstractCheck.Abst
+@@ -60,20 +71,16 @@ class InitScriptCheck(AbstractCheck.Abst
if "." in basename:
printError(pkg, 'init-script-name-with-dot', fname)
@@ -56,7 +56,7 @@
status_found = False
reload_found = False
-@@ -275,6 +282,17 @@ of chkconfig don't work as expected with
+@@ -274,6 +281,17 @@ of chkconfig don't work as expected with
'init-script-non-executable',
'''The init script should have at least the execution bit set for root
in order for it to run at boot time.''',
++++++ usr-arch.diff ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:29.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:29.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- BinariesCheck.py.orig
+++ BinariesCheck.py
-@@ -208,6 +208,7 @@ usr_lib_exception_regex = re.compile(Con
+@@ -263,6 +263,7 @@ usr_lib_exception_regex = re.compile(Con
srcname_regex = re.compile('(.*?)-[0-9]')
invalid_dir_ref_regex = re.compile('/(home|tmp)(\W|$)')
ocaml_mixed_regex = re.compile('^Caml1999X0\d\d$')
@@ -10,7 +10,7 @@
def dir_base(path):
res = path_regex.search(path)
-@@ -280,7 +281,7 @@ class BinariesCheck(AbstractCheck.Abstra
+@@ -336,7 +337,7 @@ class BinariesCheck(AbstractCheck.Abstra
# arch dependent packages only from here on
# in /usr/share ?
++++++ version-control-internal-file.diff ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:29.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:29.000000000 +0200
@@ -3,7 +3,7 @@
===================================================================
--- FilesCheck.py.orig
+++ FilesCheck.py
-@@ -659,7 +659,7 @@ ldconfig_regex = re.compile('^[^#]*ldcon
+@@ -612,7 +612,7 @@ ldconfig_regex = re.compile('^[^#]*ldcon
depmod_regex = re.compile('^[^#]*depmod', re.MULTILINE)
install_info_regex = re.compile('^[^#]*install-info', re.MULTILINE)
perl_temp_file_regex = re.compile('.*perl.*/(\.packlist|perllocal\.pod)$')
++++++ xdg-paths-update.diff ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:29.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:29.000000000 +0200
@@ -2,12 +2,12 @@
===================================================================
--- MenuXDGCheck.py.orig
+++ MenuXDGCheck.py
-@@ -18,7 +18,7 @@ class MenuXDGCheck(AbstractCheck.Abstrac
- # $ echo $XDG_DATA_DIRS/applications
+@@ -21,7 +21,7 @@ class MenuXDGCheck(AbstractCheck.Abstrac
# /var/lib/menu-xdg:/usr/share
+ self.cfp = RawConfigParser()
AbstractCheck.AbstractFilesCheck.__init__(
- self, "MenuXDGCheck", "/usr/share/applications/.*\.desktop$")
+ self, "MenuXDGCheck", "(?:/usr/share|/etc/opt/.*/share|/opt/.*)/applications/.*\.desktop$")
def check_file(self, pkg, filename):
- f = pkg.dirName() + filename
+ root = pkg.dirName()
++++++ yast-provides.diff ++++++
--- /var/tmp/diff_new_pack.BlhlFb/_old 2013-06-29 14:51:29.000000000 +0200
+++ /var/tmp/diff_new_pack.BlhlFb/_new 2013-06-29 14:51:29.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- TagsCheck.py.orig
+++ TagsCheck.py
-@@ -813,7 +813,7 @@ class TagsCheck(AbstractCheck.AbstractCh
+@@ -814,7 +814,7 @@ class TagsCheck(AbstractCheck.AbstractCh
printWarning(pkg, 'no-url-tag')
obs_names = [x[0] for x in pkg.obsoletes()]
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package python-WebTest for openSUSE:Factory checked in at 2013-06-29 14:48:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-WebTest (Old)
and /work/SRC/openSUSE:Factory/.python-WebTest.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-WebTest"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-WebTest/python-WebTest.changes 2013-05-03 07:40:30.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.python-WebTest.new/python-WebTest.changes 2013-06-29 14:48:27.000000000 +0200
@@ -1,0 +2,9 @@
+Mon Jun 10 13:29:16 UTC 2013 - dmueller(a)suse.com
+
+- update to 2.0.6:
+- fixed #64. cookiejar api has changed in python3.3 [gawel]
+- allow to use a fixed StopableWSGIServer [gawel]
+- Do not alter the BeautifulSoup object when parsing forms. [Georges
+- Remove first newline while parse textarea block, how modern browsers does.
+
+-------------------------------------------------------------------
Old:
----
WebTest-2.0.5.zip
New:
----
WebTest-2.0.6.zip
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-WebTest.spec ++++++
--- /var/tmp/diff_new_pack.tsGjaf/_old 2013-06-29 14:48:28.000000000 +0200
+++ /var/tmp/diff_new_pack.tsGjaf/_new 2013-06-29 14:48:28.000000000 +0200
@@ -17,7 +17,7 @@
Name: python-WebTest
-Version: 2.0.5
+Version: 2.0.6
Release: 0
Url: http://webtest.pythonpaste.org/
Summary: Helper to test WSGI applications
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package python-waitress for openSUSE:Factory checked in at 2013-06-29 14:36:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-waitress (Old)
and /work/SRC/openSUSE:Factory/.python-waitress.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-waitress"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-waitress/python-waitress.changes 2013-05-03 07:40:22.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.python-waitress.new/python-waitress.changes 2013-06-29 14:36:45.000000000 +0200
@@ -1,0 +2,17 @@
+Tue Jun 25 11:28:09 UTC 2013 - dmueller(a)suse.com
+
+- update to 0.8.5:
+ - Fix runner multisegment imports in some Python 2 revisions (see
+ https://github.com/Pylons/waitress/pull/34).
+ - For compatibility, WSGIServer is now an alias of TcpWSGIServer. The
+ signature of BaseWSGIServer is now compatible with WSGIServer pre-0.8.4.
+ - Add a command-line runner called ``waitress-serve`` to allow Waitress
+ to run WSGI applications without any addional machinery. This is
+ essentially a thin wrapper around the ``waitress.serve()`` function.
+ - Allow parallel testing (e.g., under ``detox`` or ``nosetests --processes``)
+ using PID-dependent port / socket for functest servers.
+ - Fix integer overflow errors on large buffers. Thanks to Marcin Kuzminski
+ for the patch. See: https://github.com/Pylons/waitress/issues/22
+ - Add support for listening on Unix domain sockets.
+
+-------------------------------------------------------------------
Old:
----
waitress-0.8.3.tar.gz
New:
----
waitress-0.8.5.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-waitress.spec ++++++
--- /var/tmp/diff_new_pack.6y70m7/_old 2013-06-29 14:36:46.000000000 +0200
+++ /var/tmp/diff_new_pack.6y70m7/_new 2013-06-29 14:36:46.000000000 +0200
@@ -13,15 +13,16 @@
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
Name: python-waitress
-Version: 0.8.3
+Version: 0.8.5
Release: 0
-License: ZPL-2.1
Summary: Waitress WSGI server
-Url: https://github.com/Pylons/waitress
+License: ZPL-2.1
Group: Development/Languages/Python
+Url: https://github.com/Pylons/waitress
Source: http://pypi.python.org/packages/source/w/waitress/waitress-%{version}.tar.gz
BuildRequires: python-devel
BuildRequires: python-distribute
@@ -63,6 +64,7 @@
%files
%defattr(-,root,root,-)
%doc COPYRIGHT.txt LICENSE.txt README.rst
+%{_bindir}/waitress-serve
%{python_sitelib}/*
%changelog
++++++ waitress-0.8.3.tar.gz -> waitress-0.8.5.tar.gz ++++++
++++ 5026 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package python-tox for openSUSE:Factory checked in at 2013-06-29 14:35:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-tox (Old)
and /work/SRC/openSUSE:Factory/.python-tox.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-tox"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-tox/python-tox.changes 2013-04-23 11:39:27.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.python-tox.new/python-tox.changes 2013-06-29 14:35:57.000000000 +0200
@@ -1,0 +2,25 @@
+Tue Jun 25 11:49:47 UTC 2013 - dmueller(a)suse.com
+
+- update to 1.5.0:
+ - fix issue104: use setuptools by default, instead of distribute,
+ now that setuptools has distribute merged.
+ - make sure test commands are searched first in the virtualenv
+ - re-fix issue2 - add whitelist_externals to be used in ``[testenv*]``
+ sections, allowing to avoid warnings for commands such as ``make``,
+ used from the commands value.
+ - fix issue97 - allow substitutions to reference from other sections
+ (thanks Krisztian Fekete)
+ - fix issue92 - fix {envsitepackagesdir} to actually work again
+ - show (test) command that is being executed, thanks
+ Lukasz Balcerzak
+ - re-license tox to MIT license
+ - depend on virtualenv-1.9.1
+ - rename README.txt to README.rst to make bitbucket happier
+
+
+-------------------------------------------------------------------
+Mon Jun 17 12:14:38 UTC 2013 - speilicke(a)suse.com
+
+- Only require argparse on SLE, it's part of Python-2.7
+
+-------------------------------------------------------------------
Old:
----
tox-1.4.3.tar.gz
New:
----
tox-1.5.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-tox.spec ++++++
--- /var/tmp/diff_new_pack.MlI82X/_old 2013-06-29 14:35:57.000000000 +0200
+++ /var/tmp/diff_new_pack.MlI82X/_new 2013-06-29 14:35:57.000000000 +0200
@@ -15,11 +15,12 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
Name: python-tox
-Version: 1.4.3
+Version: 1.5.0
Release: 0
Summary: Virtualenv-based automation of test activities
-License: GPL-2.0+
+License: MIT
Group: Development/Languages/Python
Url: http://codespeak.net/tox
Source: http://pypi.python.org/packages/source/t/tox/tox-%{version}.tar.gz
@@ -29,12 +30,12 @@
BuildRequires: python-pytest
BuildRequires: python-virtualenv
BuildRequires: unzip
-Requires: python-argparse
Requires: python-py
Requires: python-virtualenv
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} && 0%{?suse_version} <= 1110
%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+Requires: python-argparse
%else
BuildArch: noarch
%endif
@@ -68,7 +69,7 @@
%files
%defattr(-,root,root,-)
-%doc LICENSE README.txt doc/_build/html
+%doc LICENSE README.rst doc/_build/html
%{_bindir}/*
%{python_sitelib}/*
++++++ tox-1.4.3.tar.gz -> tox-1.5.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tox-1.4.3/CHANGELOG new/tox-1.5.0/CHANGELOG
--- old/tox-1.4.3/CHANGELOG 2013-03-01 07:39:14.000000000 +0100
+++ new/tox-1.5.0/CHANGELOG 2013-06-22 15:00:49.000000000 +0200
@@ -1,3 +1,30 @@
+1.5.0
+-----------------
+
+- fix issue104: use setuptools by default, instead of distribute,
+ now that setuptools has distribute merged.
+
+- make sure test commands are searched first in the virtualenv
+
+- re-fix issue2 - add whitelist_externals to be used in ``[testenv*]``
+ sections, allowing to avoid warnings for commands such as ``make``,
+ used from the commands value.
+
+- fix issue97 - allow substitutions to reference from other sections
+ (thanks Krisztian Fekete)
+
+- fix issue92 - fix {envsitepackagesdir} to actually work again
+
+- show (test) command that is being executed, thanks
+ Lukasz Balcerzak
+
+- re-license tox to MIT license
+
+- depend on virtualenv-1.9.1
+
+- rename README.txt to README.rst to make bitbucket happier
+
+
1.4.3
-----------------
@@ -44,7 +71,7 @@
- change tests to not rely on os.path.expanduser (closes #60),
also make mock session return args[1:] for more precise checking (closes #61)
- thanks to Barry Warszaw for both.
+ thanks to Barry Warsaw for both.
1.4.2
-----------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tox-1.4.3/CONTRIBUTORS new/tox-1.5.0/CONTRIBUTORS
--- old/tox-1.4.3/CONTRIBUTORS 2013-03-01 07:39:14.000000000 +0100
+++ new/tox-1.5.0/CONTRIBUTORS 2013-06-22 15:00:49.000000000 +0200
@@ -1,8 +1,10 @@
-contributions (under the MIT license):
+contributions:
+Krisztian Fekete
Marc Abramowitz
Sridhar Ratnakumar
+Barry Warsaw
Chris Rose
Jannis Leidl
Ronny Pfannschmidt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tox-1.4.3/LICENSE new/tox-1.5.0/LICENSE
--- old/tox-1.4.3/LICENSE 2013-03-01 07:39:14.000000000 +0100
+++ new/tox-1.5.0/LICENSE 2013-06-22 15:00:49.000000000 +0200
@@ -1,10 +1,20 @@
-The tox package is released under the provisions of the GNU General
-Public License (GPL), version 2 or later.
-See http://www.fsf.org/licensing/licenses/ for more information.
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
-If you have questions and/or want to use parts of
-the code under a different license than the GPL
-please contact me.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-holger krekel, May 2011, holger at merlinux eu
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tox-1.4.3/PKG-INFO new/tox-1.5.0/PKG-INFO
--- old/tox-1.4.3/PKG-INFO 2013-03-01 07:39:20.000000000 +0100
+++ new/tox-1.5.0/PKG-INFO 2013-06-22 15:00:49.000000000 +0200
@@ -1,33 +1,38 @@
Metadata-Version: 1.1
Name: tox
-Version: 1.4.3
+Version: 1.5.0
Summary: virtualenv-based automation of test activities
Home-page: http://tox.testrun.org/
Author: holger krekel
Author-email: holger(a)merlinux.eu
-License: GPLv2 or later
+License: http://opensource.org/licenses/MIT
Description:
What is Tox?
- ==========================
+ --------------------
- Tox as is a generic virtualenv management and test command line tool you can
- use for:
+ Tox as is a generic virtualenv_ management and test command line tool you can use for:
- * checking your package installs correctly with different
- Python versions and interpreters
+ * checking your package installs correctly with different Python versions and
+ interpreters
- * running your tests in each of the
- environments, configuring your test tool of choice
+ * running your tests in each of the environments, configuring your test tool of choice
- * acting as a frontend to Continuous Integration
- servers, greatly reducing boilerplate and merging
- CI and shell-based testing.
+ * acting as a frontend to Continuous Integration servers, greatly
+ reducing boilerplate and merging CI and shell-based testing.
- For more information, docs and many examples please checkout the `home page`_:
+ For more information and the repository please checkout:
- http://tox.testrun.org/
+ - homepage: http://tox.testrun.org
+
+ - repository: https://bitbucket.org/hpk42/tox
+
+ have fun,
+
+
+ have fun,
+
+ holger krekel, May 2013
- .. _`home page`: http://tox.testrun.org/
Platform: unix
Platform: linux
@@ -36,7 +41,7 @@
Platform: win32
Classifier: Development Status :: 5 - Production/Stable
Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: License :: OSI Approved :: MIT License
Classifier: Operating System :: POSIX
Classifier: Operating System :: Microsoft :: Windows
Classifier: Operating System :: MacOS :: MacOS X
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tox-1.4.3/README.rst new/tox-1.5.0/README.rst
--- old/tox-1.4.3/README.rst 1970-01-01 01:00:00.000000000 +0100
+++ new/tox-1.5.0/README.rst 2013-06-22 15:00:49.000000000 +0200
@@ -0,0 +1,27 @@
+
+What is Tox?
+--------------------
+
+Tox as is a generic virtualenv_ management and test command line tool you can use for:
+
+* checking your package installs correctly with different Python versions and
+ interpreters
+
+* running your tests in each of the environments, configuring your test tool of choice
+
+* acting as a frontend to Continuous Integration servers, greatly
+ reducing boilerplate and merging CI and shell-based testing.
+
+For more information and the repository please checkout:
+
+- homepage: http://tox.testrun.org
+
+- repository: https://bitbucket.org/hpk42/tox
+
+have fun,
+
+
+have fun,
+
+holger krekel, May 2013
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tox-1.4.3/README.txt new/tox-1.5.0/README.txt
--- old/tox-1.4.3/README.txt 2013-03-01 07:39:14.000000000 +0100
+++ new/tox-1.5.0/README.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,22 +0,0 @@
-
-What is Tox?
---------------------
-
-Tox as is a generic virtualenv_ management and test command line tool you can use for:
-
-* checking your package installs correctly with different Python versions and
- interpreters
-
-* running your tests in each of the environments, configuring your test tool of choice
-
-* acting as a frontend to Continuous Integration servers, greatly
- reducing boilerplate and merging CI and shell-based testing.
-
-For more information, docs and many examples please checkout:
-
- http://tox.testrun.org
-
-have fun,
-
-holger krekel, May 2012
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tox-1.4.3/doc/conf.py new/tox-1.5.0/doc/conf.py
--- old/tox-1.4.3/doc/conf.py 2013-03-01 07:39:14.000000000 +0100
+++ new/tox-1.5.0/doc/conf.py 2013-06-22 15:00:49.000000000 +0200
@@ -41,14 +41,14 @@
# General information about the project.
project = u'tox'
-copyright = u'2011, holger krekel and others'
+copyright = u'2013, holger krekel and others'
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
-release = version = "1.4.2-1"
+release = version = "1.5.0"
# The full version, including alpha/beta/rc tags.
# The language for content autogenerated by Sphinx. Refer to documentation
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tox-1.4.3/doc/config.txt new/tox-1.5.0/doc/config.txt
--- old/tox-1.4.3/doc/config.txt 2013-03-01 07:39:14.000000000 +0100
+++ new/tox-1.5.0/doc/config.txt 2013-06-22 15:00:49.000000000 +0200
@@ -75,6 +75,16 @@
For eventually performing a call to ``subprocess.Popen(args, ...)``
``args`` are determined by splitting the whole command by whitespace.
+.. confval:: whitelist_externals=MULTI-LINE-LIST
+
+ each line specifies a command name (in glob-style pattern format)
+ which can be used in the ``commands`` section without triggering
+ a "not installed in virtualenv" warning. Example: if you use the
+ unix ``make`` for running tests you can list ``whitelist_externals=make``
+ or ``whitelist_externals=/usr/bin/make`` if you want more precision.
+ If you don't want tox to issue a warning in any case, just use
+ ``whitelist_externals=*`` which will match all commands (not recommended).
+
.. confval:: changedir=path
change to this working directory when executing the test command.
@@ -115,9 +125,12 @@
.. confval:: distribute=True|False
- Set to ``False`` if you want to use setuptools_ instead of the default
- distribute_ in the virtual environment.
- **default:** True.
+ Set to ``True`` if you want to use distribute_ instead of the default
+ setuptools_ in the virtual environment. Prior to tox-1.5 the
+ default was True and now is False, meaning ``setuptools`` is used
+ (note that setuptools-0.7 merged with distribute). In future versions
+ of tox this option might be ignored and setuptools always chosen.
+ **default:** False.
.. confval:: sitepackages=True|False
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tox-1.4.3/doc/example/basic.txt new/tox-1.5.0/doc/example/basic.txt
--- old/tox-1.4.3/doc/example/basic.txt 2013-03-01 07:39:14.000000000 +0100
+++ new/tox-1.5.0/doc/example/basic.txt 2013-06-22 15:00:49.000000000 +0200
@@ -44,6 +44,22 @@
However, you can also create your own test environment names,
see some of the examples in :doc:`examples <../examples>`.
+whitelisting a non-virtualenv commands
+-----------------------------------------------
+
+.. versionadded:: 1.5
+
+Sometimes you may want to use tools not contained in your
+virtualenv such as ``make``, ``bash`` or others. To avoid
+warnings you can use the ``whitelist_externals`` testenv
+configuration::
+
+ # content of tox.ini
+ [testenv]
+ whitelist_externals = make
+ /bin/bash
+
+
.. _virtualenv: http://pypi.python.org/pypi/virtualenv
.. _multiindex:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tox-1.4.3/doc/example/pytest.txt new/tox-1.5.0/doc/example/pytest.txt
--- old/tox-1.4.3/doc/example/pytest.txt 2013-03-01 07:39:14.000000000 +0100
+++ new/tox-1.5.0/doc/example/pytest.txt 2013-06-22 15:00:49.000000000 +0200
@@ -85,16 +85,30 @@
**installed-versus-checkout version**. ``py.test`` collects test
modules on the filesystem and then tries to import them under their
-`fully qualified name`_. This means that if your test directory contains
-an ``__init__.py`` file then your ``py.test`` invocation may end up
+`fully qualified name`_. This means that if your test files are
+importable from somewhere then your ``py.test`` invocation may end up
importing the package from the checkout directory rather than the
-installed package. Therefore it is better to try to avoid
-``__init__.py`` files in test directories and also try to avoid custom
-``PYTHONPATH`` settings. After all, it is the job of your ``setup.py``
-file and the install tools to care for making the package properly
-available for importing.
+installed package.
+
+There are a few ways to prevent this.
+
+With installed tests (the tests packages are known to ``setup.py``), a
+safe and explicit option is to give the explicit path
+``{envsitepackagesdir}/mypkg`` to pytest.
+Alternatively, it is possible to use ``changedir`` so that checked-out
+files are outside the import path, then pass ``--pyargs mypkg`` to
+pytest.
+
+Installed tests are particularly convenient when combined with
+`Distribute's 2to3 support` (``use_2to3``).
+
+With tests that won't be installed, the simplest way is to avoid
+``__init__.py`` files in test directories; pytest will still find them
+but they won't be copied to other places or be found by Python's import
+system.
.. _`fully qualified name`: http://pytest.org/latest/goodpractises.html#package-name
+.. _`Distribute's 2to3 support`: http://packages.python.org/distribute/python3.html
.. include:: ../links.txt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tox-1.4.3/doc/index.txt new/tox-1.5.0/doc/index.txt
--- old/tox-1.4.3/doc/index.txt 2013-03-01 07:39:14.000000000 +0100
+++ new/tox-1.5.0/doc/index.txt 2013-06-22 15:00:49.000000000 +0200
@@ -1,7 +1,7 @@
Welcome to the tox automation project
===============================================
-.. note:: Upcoming: `professional testing with pytest and tox <`http://www.python-academy.com/courses/specialtopics/python_course_testing.html>`_ , 24th-26th June 2013, Leipzig.
+.. note:: Upcoming: `professional testing with pytest and tox <http://www.python-academy.com/courses/specialtopics/python_course_testing.h…>`_ , 24th-26th June 2013, Leipzig.
vision: standardize testing in Python
---------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tox-1.4.3/doc/install.txt new/tox-1.5.0/doc/install.txt
--- old/tox-1.4.3/doc/install.txt 2013-03-01 07:39:14.000000000 +0100
+++ new/tox-1.5.0/doc/install.txt 2013-06-22 15:00:49.000000000 +0200
@@ -4,13 +4,13 @@
Install info in a nutshell
----------------------------------
-**Pythons**: CPython 2.4-3.2, Jython-2.5.1, pypy-1.5
+**Pythons**: CPython 2.4-3.3, Jython-2.5.1, pypy-1.9ff
**Operating systems**: Linux, Windows, OSX, Unix
**Installer Requirements**: setuptools_ or Distribute_
-**License**: GPLv2 or later
+**License**: MIT license
**hg repository**: http://bitbucket.org/hpk42/tox
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tox-1.4.3/setup.py new/tox-1.5.0/setup.py
--- old/tox-1.4.3/setup.py 2013-03-01 07:39:14.000000000 +0100
+++ new/tox-1.5.0/setup.py 2013-06-22 15:00:49.000000000 +0200
@@ -2,29 +2,6 @@
from setuptools import setup
from setuptools.command.test import test as TestCommand
-long_description = """
-What is Tox?
-==========================
-
-Tox as is a generic virtualenv management and test command line tool you can
-use for:
-
-* checking your package installs correctly with different
- Python versions and interpreters
-
-* running your tests in each of the
- environments, configuring your test tool of choice
-
-* acting as a frontend to Continuous Integration
- servers, greatly reducing boilerplate and merging
- CI and shell-based testing.
-
-For more information, docs and many examples please checkout the `home page`_:
-
- http://tox.testrun.org/
-
-.. _`home page`: http://tox.testrun.org/
-"""
class Tox(TestCommand):
@@ -41,16 +18,16 @@
def main():
version = sys.version_info[:2]
- install_requires = ['virtualenv>=1.8.4', 'py>=1.4.12', ]
+ install_requires = ['virtualenv>=1.9.1', 'py>=1.4.15', ]
if version < (2, 7) or (3, 0) <= version <= (3, 1):
install_requires += ['argparse']
setup(
name='tox',
description='virtualenv-based automation of test activities',
- long_description=long_description,
+ long_description=open("README.rst").read(),
url='http://tox.testrun.org/',
- version='1.4.3',
- license='GPLv2 or later',
+ version='1.5.0',
+ license='http://opensource.org/licenses/MIT',
platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
author='holger krekel',
author_email='holger(a)merlinux.eu',
@@ -65,15 +42,15 @@
classifiers=[
'Development Status :: 5 - Production/Stable',
'Intended Audience :: Developers',
- 'License :: OSI Approved :: GNU General Public License (GPL)',
- 'Operating System :: POSIX',
- 'Operating System :: Microsoft :: Windows',
- 'Operating System :: MacOS :: MacOS X',
- 'Topic :: Software Development :: Testing',
- 'Topic :: Software Development :: Libraries',
- 'Topic :: Utilities',
- 'Programming Language :: Python',
- 'Programming Language :: Python :: 3'],
+ 'License :: OSI Approved :: MIT License',
+ 'Operating System :: POSIX',
+ 'Operating System :: Microsoft :: Windows',
+ 'Operating System :: MacOS :: MacOS X',
+ 'Topic :: Software Development :: Testing',
+ 'Topic :: Software Development :: Libraries',
+ 'Topic :: Utilities',
+ 'Programming Language :: Python',
+ 'Programming Language :: Python :: 3'],
)
if __name__ == '__main__':
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tox-1.4.3/tests/test_config.py new/tox-1.5.0/tests/test_config.py
--- old/tox-1.4.3/tests/test_config.py 2013-03-01 07:39:14.000000000 +0100
+++ new/tox-1.5.0/tests/test_config.py 2013-06-22 15:00:49.000000000 +0200
@@ -1,6 +1,7 @@
import tox
import pytest
import os, sys
+import subprocess
from textwrap import dedent
import py
@@ -175,6 +176,29 @@
py.test.raises(tox.exception.ConfigError,
'reader.getdefault("section", "key2")')
+ def test_getdefault_other_section_substitution(self, newconfig):
+ config = newconfig("""
+ [section]
+ key = rue
+ [testenv]
+ key = t{[section]key}
+ """)
+ reader = IniReader(config._cfg)
+ x = reader.getdefault("testenv", "key")
+ assert x == "true"
+
+ def test_command_substitution_from_other_section(self, newconfig):
+ config = newconfig("""
+ [section]
+ key = whatever
+ [testenv]
+ commands =
+ echo {[section]key}
+ """)
+ reader = IniReader(config._cfg)
+ x = reader.getargvlist("testenv", "commands")
+ assert x == [["echo", "whatever"]]
+
def test_argvlist(self, tmpdir, newconfig):
config = newconfig("""
[section]
@@ -328,7 +352,7 @@
envconfig = config.envconfigs['python']
assert envconfig.commands == [["xyz", "--abc"]]
assert envconfig.changedir == config.setupdir
- assert envconfig.distribute == True
+ assert envconfig.distribute == False
assert envconfig.sitepackages == False
assert envconfig.envlogdir == envconfig.envdir.join("log")
assert envconfig.setenv is None
@@ -344,6 +368,24 @@
envconfig = config.envconfigs['py']
assert envconfig.commands == [["abc"]]
+ def test_whitelist_externals(self, tmpdir, newconfig):
+ config = newconfig("""
+ [testenv]
+ whitelist_externals = xyz
+ commands=xyz
+ [testenv:x]
+
+ [testenv:py]
+ whitelist_externals = xyz2
+ commands=abc
+ """)
+ assert len(config.envconfigs) == 2
+ envconfig = config.envconfigs['py']
+ assert envconfig.commands == [["abc"]]
+ assert envconfig.whitelist_externals == ["xyz2"]
+ envconfig = config.envconfigs['x']
+ assert envconfig.whitelist_externals == ["xyz"]
+
def test_changedir(self, tmpdir, newconfig):
config = newconfig("""
[testenv]
@@ -590,6 +632,35 @@
assert conf.changedir.basename == 'testing'
assert conf.changedir.dirpath().realpath() == tmpdir.realpath()
+ @pytest.mark.xfailif("sys.platform == 'win32'")
+ def test_substitution_envsitepackagesdir(self, tmpdir, monkeypatch,
+ newconfig):
+ """
+ The envsitepackagesdir property is mostly doing system work,
+ so this test doesn't excercise it very well.
+
+ Usage of envsitepackagesdir on win32/jython will explicitly
+ throw an exception,
+ """
+ class MockPopen(object):
+ returncode = 0
+
+ def __init__(self, *args, **kwargs):
+ pass
+
+ def communicate(self, *args, **kwargs):
+ return 'onevalue', 'othervalue'
+
+ monkeypatch.setattr(subprocess, 'Popen', MockPopen)
+ env = 'py%s' % (''.join(sys.version.split('.')[0:2]))
+ config = newconfig("""
+ [testenv:%s]
+ commands = {envsitepackagesdir}
+ """ % (env))
+ conf = config.envconfigs[env]
+ argv = conf.commands
+ assert argv[0][0] == 'onevalue'
+
class TestGlobalOptions:
def test_notest(self, newconfig):
@@ -753,6 +824,22 @@
assert config.indexserver["default"].url == "xzy"
assert config.indexserver["name1"].url == "xzy"
+ def test_multiple_homedir_relative_local_indexservers(self, newconfig):
+ inisource = """
+ [tox]
+ indexserver =
+ default = file://{homedir}/.pip/downloads/simple
+ local1 = file://{homedir}/.pip/downloads/simple
+ local2 = file://{toxinidir}/downloads/simple
+ pypi = http://pypi.python.org/simple
+ """
+ config = newconfig([], inisource)
+ homedir = str(py.path.local._gethomedir())
+ expected = "file://%s/.pip/downloads/simple" % homedir
+ assert config.indexserver['default'].url == expected
+ assert config.indexserver['local1'].url == \
+ config.indexserver['default'].url
+
class TestParseEnv:
def test_parse_recreate(self, newconfig):
@@ -807,8 +894,6 @@
*docs*
""")
- @py.test.mark.xfail("sys.version_info < (2,6)",
- reason="virtualenv3 cannot be imported")
def test_config_specific_ini(self, tmpdir, cmd):
ini = tmpdir.ensure("hello.ini")
result = cmd.run("tox", "-c", ini, "--showconfig")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tox-1.4.3/tests/test_venv.py new/tox-1.5.0/tests/test_venv.py
--- old/tox-1.4.3/tests/test_venv.py 2013-03-01 07:39:14.000000000 +0100
+++ new/tox-1.5.0/tests/test_venv.py 2013-06-22 15:00:49.000000000 +0200
@@ -102,6 +102,20 @@
assert interp == venv.getconfigexecutable()
assert venv.path_config.check(exists=False)
+(a)pytest.mark.skipif("sys.platform == 'win32'")
+def test_commandpath_venv_precendence(tmpdir, monkeypatch,
+ mocksession, newconfig):
+ config = newconfig([], """
+ [testenv:py123]
+ """)
+ envconfig = config.envconfigs['py123']
+ venv = VirtualEnv(envconfig, session=mocksession)
+ tmpdir.ensure("easy_install")
+ monkeypatch.setenv("PATH", str(tmpdir), prepend=os.pathsep)
+ envconfig.envbindir.ensure("easy_install")
+ p = venv.getcommandpath("easy_install")
+ assert py.path.local(p).relto(envconfig.envbindir), p
+
def test_create_distribute(monkeypatch, mocksession, newconfig):
config = newconfig([], """
[testenv:py123]
@@ -116,6 +130,7 @@
assert len(l) >= 1
args = l[0].args
assert "--distribute" not in map(str, args)
+ assert "--setuptools" in map(str, args)
def test_create_sitepackages(monkeypatch, mocksession, newconfig):
config = newconfig([], """
@@ -261,6 +276,16 @@
venv.update()
mocksession.report.expect("verbosity0", "*recreate*")
+def test_test_runtests_action_command_is_in_output(newmocksession):
+ mocksession = newmocksession([], '''
+ [testenv]
+ commands = echo foo bar
+ ''')
+ venv = mocksession.getenv('python')
+ venv.update()
+ venv.test()
+ mocksession.report.expect("verbosity0", "*runtests*commands?0? | echo foo bar")
+
def test_install_error(newmocksession, monkeypatch):
mocksession = newmocksession(['--recreate'], """
[testenv]
@@ -284,6 +309,21 @@
mocksession.report.expect("warning", "*test command found but not*")
assert venv.status == "commands failed"
+def test_install_command_whitelisted(newmocksession, monkeypatch):
+ mocksession = newmocksession(['--recreate'], """
+ [testenv]
+ whitelist_externals = py.test
+ xy*
+ commands=
+ py.test
+ xyz
+ """)
+ venv = mocksession.getenv('python')
+ venv.test()
+ mocksession.report.expect("warning", "*test command found but not*",
+ invert=True)
+ assert venv.status == "commands failed"
+
@pytest.mark.skipif("not sys.platform.startswith('linux')")
def test_install_command_not_installed(newmocksession):
mocksession = newmocksession(['--recreate'], """
@@ -427,7 +467,7 @@
venv = VirtualEnv(envconfig, session=mocksession)
venv.update()
cconfig = venv._getliveconfig()
- cconfig.distribute = False
+ cconfig.distribute = True
cconfig.writeconfig(venv.path_config)
mocksession._clearmocks()
venv.update()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tox-1.4.3/tests/test_z_cmdline.py new/tox-1.5.0/tests/test_z_cmdline.py
--- old/tox-1.4.3/tests/test_z_cmdline.py 2013-03-01 07:39:14.000000000 +0100
+++ new/tox-1.5.0/tests/test_z_cmdline.py 2013-06-22 15:00:49.000000000 +0200
@@ -2,7 +2,7 @@
import py
import pytest
import sys
-from conftest import ReportExpectMock
+from tox._pytestplugin import ReportExpectMock
pytest_plugins = "pytester"
@@ -276,7 +276,7 @@
name='pkg123',
description='pkg123 project',
version='0.7',
- license='GPLv2 or later',
+ license='MIT',
platforms=['unix', 'win32'],
packages=['pkg123',],
install_requires=['qweqwe123'],
@@ -448,12 +448,16 @@
sdist_path = session.sdist()
assert sdist_path == p
-(a)pytest.mark.xfailif("sys.platform == 'win32'")
+(a)pytest.mark.xfail("sys.platform == 'win32'", reason="test needs better impl")
def test_envsitepackagesdir(cmd, initproj):
initproj("pkg512-0.0.5", filedefs={
'tox.ini': """
+ [testenv]
commands=
- grep '__version__.*=.*0\.0\.5' {envsitepackagesdir}/pkg512/__init__.py
+ echo X:{envsitepackagesdir}
"""})
result = cmd.run("tox")
-
+ assert result.ret == 0
+ result.stdout.fnmatch_lines("""
+ X:*site-packages*
+ """)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tox-1.4.3/tox/__init__.py new/tox-1.5.0/tox/__init__.py
--- old/tox-1.4.3/tox/__init__.py 2013-03-01 07:39:14.000000000 +0100
+++ new/tox-1.5.0/tox/__init__.py 2013-06-22 15:00:49.000000000 +0200
@@ -1,5 +1,5 @@
#
-__version__ = '1.4.3'
+__version__ = '1.5.0'
class exception:
class Error(Exception):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tox-1.4.3/tox/_config.py new/tox-1.5.0/tox/_config.py
--- old/tox-1.4.3/tox/_config.py 2013-03-01 07:39:14.000000000 +0100
+++ new/tox-1.5.0/tox/_config.py 2013-06-22 15:00:49.000000000 +0200
@@ -128,6 +128,7 @@
name = "python"
return self.envbindir.join(name)
+ # no @property to avoid early calling (see callable(subst[key]) checks)
def envsitepackagesdir(self):
print_envsitepackagesdir = textwrap.dedent("""
import sys
@@ -290,6 +291,8 @@
vc.setenv = None
vc.commands = reader.getargvlist(section, "commands")
+ vc.whitelist_externals = reader.getlist(section,
+ "whitelist_externals")
vc.deps = []
for depline in reader.getlist(section, "deps"):
m = re.match(r":(\w+):\s*(\S+)", depline)
@@ -300,7 +303,7 @@
name = depline.strip()
ixserver = None
vc.deps.append(DepConfig(name, ixserver))
- vc.distribute = reader.getbool(section, "distribute", True)
+ vc.distribute = reader.getbool(section, "distribute", False)
vc.sitepackages = reader.getbool(section, "sitepackages", False)
vc.downloadcache = None
downloadcache = os.environ.get("PIP_DOWNLOAD_CACHE", None)
@@ -344,6 +347,16 @@
self.name = name
self.url = url
+RE_ITEM_REF = re.compile(
+ '''
+ [{]
+ (?:(?P<sub_type>[^[:{}]+):)? # optional sub_type for special rules
+ (?P<substitution_value>[^{}]*) # substitution key
+ [}]
+ ''',
+ re.VERBOSE)
+
+
class IniReader:
def __init__(self, cfgparser, fallbacksections=None):
self._cfg = cfgparser
@@ -410,7 +423,6 @@
def _processcommand(self, command):
posargs = self._subs.get('_posargs', None)
- pat = r'\{(?:(?P<sub_type>[^:]+):)?(?P<substitution_value>.*)\}'
words = list(CommandParser(command).words())
new_command = ''
for word in words:
@@ -419,9 +431,9 @@
new_command += ' '.join(posargs)
continue
- new_word = re.sub(pat, self._replace_match, word)
+ new_word = self._replace(word, quote=True)
# two passes; we might have substitutions in the result
- new_word = re.sub(pat, self._replace_match, new_word)
+ new_word = self._replace(new_word, quote=True)
new_command += new_word
return shlex.split(new_command.strip())
@@ -463,38 +475,7 @@
#print "getdefault", section, name, "returned", repr(x)
return x
- def _sub(self, match):
- key = match.group(0)[1:-1]
- if key.startswith("env:"):
- envkey = key[4:]
- if envkey not in os.environ:
- raise tox.exception.ConfigError(
- "substitution %r: %r not found in environment" %
- (key, envkey))
- return os.environ[envkey]
- val = self._subs.get(key, None)
- if val is None:
- if key.startswith("[") and "]" in key:
- i = key.find("]")
- section, item = key[1:i], key[i+1:]
- if section in self._cfg and item in self._cfg[section]:
- if (section, item) in self._subststack:
- raise ValueError('%s already in %s' %(
- (section, item), self._subststack))
- x = str(self._cfg[section][item])
- self._subststack.append((section, item))
- try:
- return self._replace(x)
- finally:
- self._subststack.pop()
-
- raise tox.exception.ConfigError(
- "substitution key %r not found" % key)
- if py.builtin.callable(val):
- val = val()
- return str(val)
-
- def _replace_posargs(self, match):
+ def _replace_posargs(self, match, quote):
return self._do_replace_posargs(lambda: match.group('substitution_value'))
def _do_replace_posargs(self, value_func):
@@ -509,7 +490,7 @@
return ''
- def _replace_env(self, match):
+ def _replace_env(self, match, quote):
envkey = match.group('substitution_value')
if not envkey:
raise tox.exception.ConfigError(
@@ -522,18 +503,41 @@
return os.environ[envkey]
- def _replace_substitution(self, match):
+ def _substitute_from_other_section(self, key, quote):
+ if key.startswith("[") and "]" in key:
+ i = key.find("]")
+ section, item = key[1:i], key[i+1:]
+ if section in self._cfg and item in self._cfg[section]:
+ if (section, item) in self._subststack:
+ raise ValueError('%s already in %s' %(
+ (section, item), self._subststack))
+ x = str(self._cfg[section][item])
+ self._subststack.append((section, item))
+ try:
+ return self._replace(x, quote=quote)
+ finally:
+ self._subststack.pop()
+
+ raise tox.exception.ConfigError(
+ "substitution key %r not found" % key)
+
+ def _replace_substitution(self, match, quote):
sub_key = match.group('substitution_value')
- if sub_key not in self._subs:
- raise tox.exception.ConfigError(
- "substitution key %r not found" % sub_key)
- return '"%s"' % str(self._subs[sub_key]).replace('"', r'\"')
+ val = self._subs.get(sub_key, None)
+ if val is None:
+ val = self._substitute_from_other_section(sub_key, quote)
+ if py.builtin.callable(val):
+ val = val()
+ if quote:
+ return '"%s"' % str(val).replace('"', r'\"')
+ else:
+ return str(val)
def _is_bare_posargs(self, groupdict):
return groupdict.get('substitution_value', None) == 'posargs' \
and not groupdict.get('sub_type')
- def _replace_match(self, match):
+ def _replace_match(self, match, quote):
g = match.groupdict()
# special case: posargs. If there is a 'posargs' substitution value
@@ -556,11 +560,23 @@
except KeyError:
raise tox.exception.ConfigError("No support for the %s substitution type" % sub_type)
- return handler(match)
+ # quoting is done in handlers, as at least posargs handling is special:
+ # all of its arguments are inserted as separate parameters
+ return handler(match, quote)
+
+ def _replace_match_quote(self, match):
+ return self._replace_match(match, quote=True)
+ def _replace_match_no_quote(self, match):
+ return self._replace_match(match, quote=False)
- def _replace(self, x, rexpattern = re.compile("\{.+?\}")):
+ def _replace(self, x, rexpattern=RE_ITEM_REF, quote=False):
+ # XXX is rexpattern used by callers? can it be removed?
if '{' in x:
- return rexpattern.sub(self._sub, x)
+ if quote:
+ replace_func = self._replace_match_quote
+ else:
+ replace_func = self._replace_match_no_quote
+ return rexpattern.sub(replace_func, x)
return x
def _parse_command(self, command):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tox-1.4.3/tox/_pytestplugin.py new/tox-1.5.0/tox/_pytestplugin.py
--- old/tox-1.4.3/tox/_pytestplugin.py 2013-03-01 07:39:14.000000000 +0100
+++ new/tox-1.5.0/tox/_pytestplugin.py 2013-06-22 15:00:49.000000000 +0200
@@ -262,7 +262,7 @@
name='%(name)s',
description='%(name)s project',
version='%(version)s',
- license='GPLv2 or later',
+ license='MIT',
platforms=['unix', 'win32'],
packages=['%(name)s', ],
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tox-1.4.3/tox/_venv.py new/tox-1.5.0/tox/_venv.py
--- old/tox-1.4.3/tox/_venv.py 2013-03-01 07:39:14.000000000 +0100
+++ new/tox-1.5.0/tox/_venv.py 2013-06-22 15:00:49.000000000 +0200
@@ -74,21 +74,38 @@
p = cwd.join(name)
if p.check():
return str(p)
+ p = None
+ if venv:
+ p = py.path.local.sysfind(name, paths=[self.envconfig.envbindir])
+ if p is not None:
+ return p
p = py.path.local.sysfind(name)
if p is None:
- raise tox.exception.InvocationError("could not find executable %r"
- % (name,))
- if p.relto(self.envconfig.envdir):
- return p
+ raise tox.exception.InvocationError(
+ "could not find executable %r" % (name,))
+ # p is not found in virtualenv script/bin dir
if venv:
- self.session.report.warning(
- "test command found but not installed in testenv\n"
- " cmd: %s\n"
- " env: %s\n"
- "Maybe forgot to specify a dependency?" % (p,
- self.envconfig.envdir))
+ if not self.is_allowed_external(p):
+ self.session.report.warning(
+ "test command found but not installed in testenv\n"
+ " cmd: %s\n"
+ " env: %s\n"
+ "Maybe forgot to specify a dependency?" % (p,
+ self.envconfig.envdir))
return str(p) # will not be rewritten for reporting
+ def is_allowed_external(self, p):
+ tryadd = [""]
+ if sys.platform == "win32":
+ tryadd += [os.path.normcase(x)
+ for x in os.environ['PATHEXT'].split(os.pathsep)]
+ p = py.path.local(os.path.normcase(str(p)))
+ for x in self.envconfig.whitelist_externals:
+ for add in tryadd:
+ if p.fnmatch(x + add):
+ return True
+ return False
+
def _ispython3(self):
return "python3" in str(self.envconfig.basepython)
@@ -162,8 +179,10 @@
venvscript = path.rstrip("co")
#venvscript = py.path.local(tox.__file__).dirpath("virtualenv.py")
args = [config_interpreter, venvscript]
- if not self._ispython3() and self.envconfig.distribute:
- args.append('--distribute')
+ if self.envconfig.distribute:
+ args.append("--distribute")
+ else:
+ args.append("--setuptools")
if self.envconfig.sitepackages:
args.append('--system-site-packages')
#if sys.platform == "win32":
@@ -267,7 +286,8 @@
self.session.make_emptydir(self.envconfig.envtmpdir)
cwd = self.envconfig.changedir
for i, argv in enumerate(self.envconfig.commands):
- action.setactivity("runtests", "commands[%s]" % i)
+ message = "commands[%s] | %s" % (i, ' '.join(argv))
+ action.setactivity("runtests", message)
try:
self._pcall(argv, cwd=cwd, action=action, redirect=redirect)
except tox.exception.InvocationError:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tox-1.4.3/tox.egg-info/PKG-INFO new/tox-1.5.0/tox.egg-info/PKG-INFO
--- old/tox-1.4.3/tox.egg-info/PKG-INFO 2013-03-01 07:39:20.000000000 +0100
+++ new/tox-1.5.0/tox.egg-info/PKG-INFO 2013-06-22 15:00:49.000000000 +0200
@@ -1,33 +1,38 @@
Metadata-Version: 1.1
Name: tox
-Version: 1.4.3
+Version: 1.5.0
Summary: virtualenv-based automation of test activities
Home-page: http://tox.testrun.org/
Author: holger krekel
Author-email: holger(a)merlinux.eu
-License: GPLv2 or later
+License: http://opensource.org/licenses/MIT
Description:
What is Tox?
- ==========================
+ --------------------
- Tox as is a generic virtualenv management and test command line tool you can
- use for:
+ Tox as is a generic virtualenv_ management and test command line tool you can use for:
- * checking your package installs correctly with different
- Python versions and interpreters
+ * checking your package installs correctly with different Python versions and
+ interpreters
- * running your tests in each of the
- environments, configuring your test tool of choice
+ * running your tests in each of the environments, configuring your test tool of choice
- * acting as a frontend to Continuous Integration
- servers, greatly reducing boilerplate and merging
- CI and shell-based testing.
+ * acting as a frontend to Continuous Integration servers, greatly
+ reducing boilerplate and merging CI and shell-based testing.
- For more information, docs and many examples please checkout the `home page`_:
+ For more information and the repository please checkout:
- http://tox.testrun.org/
+ - homepage: http://tox.testrun.org
+
+ - repository: https://bitbucket.org/hpk42/tox
+
+ have fun,
+
+
+ have fun,
+
+ holger krekel, May 2013
- .. _`home page`: http://tox.testrun.org/
Platform: unix
Platform: linux
@@ -36,7 +41,7 @@
Platform: win32
Classifier: Development Status :: 5 - Production/Stable
Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: License :: OSI Approved :: MIT License
Classifier: Operating System :: POSIX
Classifier: Operating System :: Microsoft :: Windows
Classifier: Operating System :: MacOS :: MacOS X
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tox-1.4.3/tox.egg-info/SOURCES.txt new/tox-1.5.0/tox.egg-info/SOURCES.txt
--- old/tox-1.4.3/tox.egg-info/SOURCES.txt 2013-03-01 07:39:20.000000000 +0100
+++ new/tox-1.5.0/tox.egg-info/SOURCES.txt 2013-06-22 15:00:49.000000000 +0200
@@ -3,7 +3,7 @@
ISSUES.txt
LICENSE
MANIFEST.in
-README.txt
+README.rst
setup.py
tox.ini
toxbootstrap.py
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tox-1.4.3/tox.egg-info/requires.txt new/tox-1.5.0/tox.egg-info/requires.txt
--- old/tox-1.4.3/tox.egg-info/requires.txt 2013-03-01 07:39:20.000000000 +0100
+++ new/tox-1.5.0/tox.egg-info/requires.txt 2013-06-22 15:00:49.000000000 +0200
@@ -1,2 +1,2 @@
-virtualenv>=1.8.4
-py>=1.4.12
\ No newline at end of file
+virtualenv>=1.9.1
+py>=1.4.15
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tox-1.4.3/tox.ini new/tox-1.5.0/tox.ini
--- old/tox-1.4.3/tox.ini 2013-03-01 07:39:14.000000000 +0100
+++ new/tox-1.5.0/tox.ini 2013-06-22 15:00:49.000000000 +0200
@@ -1,20 +1,22 @@
[tox]
envlist=py27,py26,py25,py32,py33,docs,pypy
-indexserver =
- testrun = http://pypi.testrun.org
- pypi = https://pypi.python.org/simple
[testenv:X]
commands=echo {posargs}
[testenv]
-commands=py.test --junitxml={envlogdir}/junit-{envname}.xml {posargs}
+commands=py.test --instafail --junitxml={envlogdir}/junit-{envname}.xml {posargs}
deps=pytest==2.3.4
+ pytest-instafail
+
+[testenv:py25]
+setenvs =
+ PIP_INSECURE=True
[testenv:docs]
basepython=python
changedir=doc
-deps=:pypi:sphinx
+deps=sphinx
{[testenv]deps}
commands=
py.test -v \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tox-1.4.3/toxbootstrap.py new/tox-1.5.0/toxbootstrap.py
--- old/tox-1.4.3/toxbootstrap.py 2013-03-01 07:39:14.000000000 +0100
+++ new/tox-1.5.0/toxbootstrap.py 2013-06-22 15:00:49.000000000 +0200
@@ -58,7 +58,7 @@
"""
-__version__ = '1.4.3.dev6'
+__version__ = '1.5.0'
import sys
import os
@@ -192,7 +192,7 @@
# XXX: we use --no-site-packages because: if tox is installed in global
# site-packages, then pip will not install it locally. ideal fix for
# this should be to first look for tox in the global scripts/ directory
- run('%s virtualenv.py --no-site-packages --distribute %s' %
+ run('%s virtualenv.py --no-site-packages --setuptools %s' %
(sys.executable, TENV))
logging.info("removing virtualenv.py script after bootstrap venv creation")
for x in ('', 'o', 'c'):
@@ -209,11 +209,6 @@
# install/upgrade tox itself
if USETOXDEV:
- if 'PIP_DOWNLOAD_CACHE' in os.environ:
- cache = ""
- else:
- cache = "--download-cache=_download"
- ensuredir('_download')
run('%s install -q -i http://pypi.testrun.org '
'--upgrade %s tox' % (pip, cache))
elif any([
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
29 Jun '13
Hello community,
here is the log from the commit of package python-sphinxcontrib-issuetracker for openSUSE:Factory checked in at 2013-06-29 14:34:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-sphinxcontrib-issuetracker (Old)
and /work/SRC/openSUSE:Factory/.python-sphinxcontrib-issuetracker.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-sphinxcontrib-issuetracker"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-sphinxcontrib-issuetracker/python-sphinxcontrib-issuetracker.changes 2013-01-20 08:18:21.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.python-sphinxcontrib-issuetracker.new/python-sphinxcontrib-issuetracker.changes 2013-06-29 14:34:56.000000000 +0200
@@ -1,0 +2,8 @@
+Tue Jun 25 11:47:11 UTC 2013 - dmueller(a)suse.com
+
+- update to 0.11:
+ - Send proper user agent in API requests
+ - #4: Respect Github rate limits
+ - #5: Fix compatibility with requests 1.0
+
+-------------------------------------------------------------------
New:
----
sphinxcontrib-issuetracker-0.11.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-sphinxcontrib-issuetracker.spec ++++++
--- /var/tmp/diff_new_pack.gdkdOs/_old 2013-06-29 14:34:57.000000000 +0200
+++ /var/tmp/diff_new_pack.gdkdOs/_new 2013-06-29 14:34:57.000000000 +0200
@@ -17,7 +17,7 @@
Name: python-sphinxcontrib-issuetracker
-Version: 0.10.1
+Version: 0.11
Release: 0
Url: http://packages.python.org/sphinxcontrib-issuetracker
Summary: Sphinx integration with different issuetrackers
@@ -29,8 +29,8 @@
BuildRequires: python-devel
BuildRequires: python-distribute
BuildRequires: python-requests
-Requires: python-Sphinx
-Requires: python-requests
+Requires: python-Sphinx >= 1.1
+Requires: python-requests >= 1.1
%if 0%{?suse_version} && 0%{?suse_version} <= 1110
%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%else
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package python-py for openSUSE:Factory checked in at 2013-06-29 14:33:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-py (Old)
and /work/SRC/openSUSE:Factory/.python-py.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-py"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-py/python-py.changes 2013-06-05 13:35:55.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.python-py.new/python-py.changes 2013-06-29 14:33:51.000000000 +0200
@@ -1,0 +2,9 @@
+Tue Jun 25 11:45:11 UTC 2013 - dmueller(a)suse.com
+
+- update to 1.4.15:
+ - majorly speed up some common calling patterns with
+ LocalPath.listdir()/join/check/stat functions considerably.
+ - fix an edge case with fnmatch where a glob style pattern appeared
+ in an absolute path.
+
+-------------------------------------------------------------------
Old:
----
py-1.4.14.tar.gz
New:
----
py-1.4.15.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-py.spec ++++++
--- /var/tmp/diff_new_pack.kzwpX8/_old 2013-06-29 14:33:51.000000000 +0200
+++ /var/tmp/diff_new_pack.kzwpX8/_new 2013-06-29 14:33:51.000000000 +0200
@@ -17,7 +17,7 @@
Name: python-py
-Version: 1.4.14
+Version: 1.4.15
Release: 0
Summary: Library with cross-python path, ini-parsing, io, code, log facilities
License: MIT
++++++ py-1.4.14.tar.gz -> py-1.4.15.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/py-1.4.14/CHANGELOG new/py-1.4.15/CHANGELOG
--- old/py-1.4.14/CHANGELOG 2013-05-07 10:40:23.000000000 +0200
+++ new/py-1.4.15/CHANGELOG 2013-06-21 16:36:31.000000000 +0200
@@ -1,3 +1,12 @@
+Changes between 1.4.14 and 1.4.15
+==================================================
+
+- majorly speed up some common calling patterns with
+ LocalPath.listdir()/join/check/stat functions considerably.
+
+- fix an edge case with fnmatch where a glob style pattern appeared
+ in an absolute path.
+
Changes between 1.4.13 and 1.4.14
==================================================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/py-1.4.14/PKG-INFO new/py-1.4.15/PKG-INFO
--- old/py-1.4.14/PKG-INFO 2013-05-07 10:40:24.000000000 +0200
+++ new/py-1.4.15/PKG-INFO 2013-06-21 16:36:31.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: py
-Version: 1.4.14
+Version: 1.4.15
Summary: library with cross-python path, ini-parsing, io, code, log facilities
Home-page: http://pylib.readthedocs.org/
Author: holger krekel, Ronny Pfannschmidt, Benjamin Peterson and others
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/py-1.4.14/doc/install.txt new/py-1.4.15/doc/install.txt
--- old/py-1.4.14/doc/install.txt 2013-05-07 10:40:23.000000000 +0200
+++ new/py-1.4.15/doc/install.txt 2013-06-21 16:36:31.000000000 +0200
@@ -7,7 +7,7 @@
**PyPI name**: py_
-**Pythons**: 2.5, 2.6, 2.7, 3.0, 3.1.x, Jython-2.5.1, PyPy-1.3
+**Pythons**: 2.5, 2.6, 2.7, 3.2, 3.3, Jython-2.5.1, PyPy-2.0
**Operating systems**: Linux, Windows, OSX, Unix
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/py-1.4.14/doc/log.txt new/py-1.4.15/doc/log.txt
--- old/py-1.4.14/doc/log.txt 2013-05-07 10:40:23.000000000 +0200
+++ new/py-1.4.15/doc/log.txt 2013-06-21 16:36:31.000000000 +0200
@@ -163,7 +163,7 @@
Each log producer may have at most one log consumer associated with
it. A log producer gets associated with a log consumer through a
-``py.log.set_consumer()`` call. That function accepts two arguments,
+``py.log.setconsumer()`` call. That function accepts two arguments,
the first identifying a producer (a tuple of keyword strings or a single
space-separated string of keywords), the second specifying the precise
consumer to use for that producer. Until this function is called for a
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/py-1.4.14/py/__init__.py new/py-1.4.15/py/__init__.py
--- old/py-1.4.14/py/__init__.py 2013-05-07 10:40:23.000000000 +0200
+++ new/py-1.4.15/py/__init__.py 2013-06-21 16:36:31.000000000 +0200
@@ -8,7 +8,7 @@
(c) Holger Krekel and others, 2004-2013
"""
-__version__ = '1.4.14'
+__version__ = '1.4.15'
from py import _apipkg
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/py-1.4.14/py/_path/common.py new/py-1.4.15/py/_path/common.py
--- old/py-1.4.14/py/_path/common.py 2013-05-07 10:40:23.000000000 +0200
+++ new/py-1.4.15/py/_path/common.py 2013-06-21 16:36:31.000000000 +0200
@@ -364,12 +364,14 @@
class FNMatcher:
def __init__(self, pattern):
self.pattern = pattern
+
def __call__(self, path):
pattern = self.pattern
if pattern.find(path.sep) == -1:
name = path.basename
else:
name = str(path) # path.strpath # XXX svn?
- pattern = '*' + path.sep + pattern
+ if not os.path.isabs(pattern):
+ pattern = '*' + path.sep + pattern
return py.std.fnmatch.fnmatch(name, pattern)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/py-1.4.14/py/_path/local.py new/py-1.4.15/py/_path/local.py
--- old/py-1.4.14/py/_path/local.py 2013-05-07 10:40:23.000000000 +0200
+++ new/py-1.4.15/py/_path/local.py 2013-06-21 16:36:31.000000000 +0200
@@ -4,9 +4,18 @@
import sys, os, stat, re, atexit
import py
from py._path import common
+from stat import S_ISLNK, S_ISDIR, S_ISREG
+
+from os.path import normpath, isabs, exists, isdir, isfile
iswin32 = sys.platform == "win32" or (getattr(os, '_name', False) == 'nt')
+if sys.version_info > (3,0):
+ def map_as_list(func, iter):
+ return list(map(func, iter))
+else:
+ map_as_list = map
+
class Stat(object):
def __getattr__(self, name):
return getattr(self._osstatresult, "st_" + name)
@@ -33,14 +42,14 @@
return entry[0]
def isdir(self):
- return stat.S_ISDIR(self.mode)
+ return S_ISDIR(self._osstatresult.st_mode)
def isfile(self):
- return stat.S_ISREG(self.mode)
+ return S_ISREG(self._osstatresult.st_mode)
def islink(self):
st = self.path.lstat()
- return stat.S_ISLNK(st.mode)
+ return S_ISLNK(self._osstatresult.st_mode)
class PosixPath(common.PathBase):
def chown(self, user, group, rec=0):
@@ -112,17 +121,17 @@
return self._statcache
def dir(self):
- return stat.S_ISDIR(self._stat().mode)
+ return S_ISDIR(self._stat().mode)
def file(self):
- return stat.S_ISREG(self._stat().mode)
+ return S_ISREG(self._stat().mode)
def exists(self):
return self._stat()
def link(self):
st = self.path.lstat()
- return stat.S_ISLNK(st.mode)
+ return S_ISLNK(st.mode)
def __init__(self, path=None):
""" Initialize and return a local Path instance.
@@ -138,7 +147,7 @@
elif isinstance(path, common.PathBase):
self.strpath = path.strpath
elif isinstance(path, py.builtin._basestring):
- self.strpath = os.path.abspath(os.path.normpath(str(path)))
+ self.strpath = os.path.abspath(normpath(str(path)))
else:
raise ValueError("can only pass None, Path instances "
"or non-empty strings to LocalPath")
@@ -226,6 +235,9 @@
xxx ext
"""
obj = object.__new__(self.__class__)
+ if not kw:
+ obj.strpath = self.strpath
+ return obj
drive, dirname, basename, purebasename,ext = self._getbyspec(
"drive,dirname,basename,purebasename,ext")
if 'basename' in kw:
@@ -247,7 +259,7 @@
else:
kw.setdefault('dirname', dirname)
kw.setdefault('sep', self.sep)
- obj.strpath = os.path.normpath(
+ obj.strpath = normpath(
"%(dirname)s%(sep)s%(basename)s" % kw)
return obj
@@ -286,46 +298,69 @@
components. if abs=1 is used restart from root if any
of the args is an absolute path.
"""
- if not args:
- return self
- strpath = self.strpath
sep = self.sep
- strargs = [str(x) for x in args]
- if kwargs.get('abs', 0):
- for i in range(len(strargs)-1, -1, -1):
- if os.path.isabs(strargs[i]):
- strpath = strargs[i]
- strargs = strargs[i+1:]
+ strargs = map_as_list(str, args)
+ strpath = self.strpath
+ if kwargs.get('abs'):
+ newargs = []
+ for arg in reversed(strargs):
+ if isabs(arg):
+ strpath = arg
+ strargs = newargs
break
+ newargs.insert(0, arg)
for arg in strargs:
arg = arg.strip(sep)
if iswin32:
# allow unix style paths even on windows.
arg = arg.strip('/')
arg = arg.replace('/', sep)
- if arg:
- if not strpath.endswith(sep):
- strpath += sep
- strpath += arg
- obj = self.new()
- obj.strpath = os.path.normpath(strpath)
+ strpath = strpath + sep + arg
+ obj = object.__new__(self.__class__)
+ obj.strpath = normpath(strpath)
return obj
def open(self, mode='r'):
""" return an opened file with the given mode. """
return py.error.checked_call(open, self.strpath, mode)
+ def _fastjoin(self, name):
+ child = object.__new__(self.__class__)
+ child.strpath = self.strpath + self.sep + name
+ return child
+
+ _fastcheck = set("file dir link")
+ def check(self, **kw):
+ if not kw:
+ return exists(self.strpath)
+ if len(kw) == 1:
+ if "dir" in kw:
+ return not kw["dir"] ^ isdir(self.strpath)
+ if "file" in kw:
+ return not kw["file"] ^ isfile(self.strpath)
+ return super(LocalPath, self).check(**kw)
+
+ _patternchars = set("*?[" + os.path.sep)
def listdir(self, fil=None, sort=None):
""" list directory contents, possibly filter by the given fil func
and possibly sorted.
"""
+ if fil is None and sort is None:
+ names = py.error.checked_call(os.listdir, self.strpath)
+ return map_as_list(self._fastjoin, names)
if isinstance(fil, str):
+ if not self._patternchars.intersection(fil):
+ child = self._fastjoin(fil)
+ if os.path.exists(child.strpath):
+ return [child]
+ return []
fil = common.FNMatcher(fil)
+ names = py.error.checked_call(os.listdir, self.strpath)
res = []
- for name in py.error.checked_call(os.listdir, self.strpath):
- childurl = self.join(name)
- if fil is None or fil(childurl):
- res.append(childurl)
+ for name in names:
+ child = self._fastjoin(name)
+ if fil is None or fil(child):
+ res.append(child)
self._sortlist(res, sort)
return res
@@ -587,9 +622,9 @@
The process is directly invoked and not through a system shell.
"""
from subprocess import Popen, PIPE
- argv = map(str, argv)
+ argv = map_as_list(str, argv)
popen_opts['stdout'] = popen_opts['stderr'] = PIPE
- proc = Popen([str(self)] + list(argv), **popen_opts)
+ proc = Popen([str(self)] + argv, **popen_opts)
stdout, stderr = proc.communicate()
ret = proc.wait()
if py.builtin._isbytes(stdout):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/py-1.4.14/py.egg-info/PKG-INFO new/py-1.4.15/py.egg-info/PKG-INFO
--- old/py-1.4.14/py.egg-info/PKG-INFO 2013-05-07 10:40:23.000000000 +0200
+++ new/py-1.4.15/py.egg-info/PKG-INFO 2013-06-21 16:36:31.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: py
-Version: 1.4.14
+Version: 1.4.15
Summary: library with cross-python path, ini-parsing, io, code, log facilities
Home-page: http://pylib.readthedocs.org/
Author: holger krekel, Ronny Pfannschmidt, Benjamin Peterson and others
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/py-1.4.14/setup.py new/py-1.4.15/setup.py
--- old/py-1.4.14/setup.py 2013-05-07 10:40:23.000000000 +0200
+++ new/py-1.4.15/setup.py 2013-06-21 16:36:31.000000000 +0200
@@ -12,7 +12,7 @@
name='py',
description='library with cross-python path, ini-parsing, io, code, log facilities',
long_description = open('README.txt').read(),
- version='1.4.14',
+ version='1.4.15',
url='http://pylib.readthedocs.org/',
license='MIT license',
platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/py-1.4.14/testing/path/test_local.py new/py-1.4.15/testing/path/test_local.py
--- old/py-1.4.14/testing/path/test_local.py 2013-05-07 10:40:23.000000000 +0200
+++ new/py-1.4.15/testing/path/test_local.py 2013-06-21 16:36:31.000000000 +0200
@@ -221,6 +221,12 @@
# check that breadth comes last
assert l[0] == p1
+ def test_fnmatch_file_abspath(self, tmpdir):
+ b = tmpdir.join("a", "b")
+ assert b.fnmatch(os.sep.join("ab"))
+ pattern = os.sep.join([str(tmpdir), "*", "b"])
+ assert b.fnmatch(pattern)
+
def test_sysfind(self):
name = sys.platform == "win32" and "cmd" or "test"
x = py.path.local.sysfind(name)
@@ -454,6 +460,10 @@
p2 = p.__class__(str(p).upper())
assert p1.samefile(p2)
+def test_listdir_single_arg(tmpdir):
+ tmpdir.ensure("hello")
+ assert tmpdir.listdir("hello")[0].basename == "hello"
+
def test_mkdtemp_rootdir(tmpdir):
dtmp = local.mkdtemp(rootdir=tmpdir)
assert tmpdir.listdir() == [dtmp]
@@ -640,7 +650,7 @@
def test_join_to_root(self, path1):
root = path1.parts()[0]
assert len(str(root)) == 1
- assert str(root.join('a')) == '/a'
+ assert str(root.join('a')) == '//a' # posix allows two slashes
def test_join_root_to_root_with_no_abs(self, path1):
nroot = path1.join('/')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/py-1.4.14/tox.ini new/py-1.4.15/tox.ini
--- old/py-1.4.14/tox.ini 2013-05-07 10:40:23.000000000 +0200
+++ new/py-1.4.15/tox.ini 2013-06-21 16:36:31.000000000 +0200
@@ -1,5 +1,5 @@
[tox]
-envlist=py26,py27,py31,py32,py33,py27-xdist,py25
+envlist=py26,py27,py32,py33,py27-xdist,py25
#indexserver=
# default=http://pypi.testrun.org
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package python-psycopg2 for openSUSE:Factory checked in at 2013-06-29 14:33:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-psycopg2 (Old)
and /work/SRC/openSUSE:Factory/.python-psycopg2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-psycopg2"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-psycopg2/python-psycopg2.changes 2013-04-24 16:11:47.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.python-psycopg2.new/python-psycopg2.changes 2013-06-29 14:33:46.000000000 +0200
@@ -1,0 +2,11 @@
+Tue Jun 25 11:41:28 UTC 2013 - dmueller(a)suse.com
+
+- update to 2.5.1:
+ - Fixed build on Solaris 10 and 11 where the round() function is already
+ declared (:ticket:`#146`).
+ - Fixed comparison of `Range` with non-range objects (:ticket:`#164`).
+ Thanks to Chris Withers for the patch.
+ - Fixed double-free on connection dealloc (:ticket:`#166`). Thanks to
+ Gangadharan S.A. for the report and fix suggestion.
+
+-------------------------------------------------------------------
Old:
----
psycopg2-2.5.tar.gz
New:
----
psycopg2-2.5.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-psycopg2.spec ++++++
--- /var/tmp/diff_new_pack.WDep8s/_old 2013-06-29 14:33:47.000000000 +0200
+++ /var/tmp/diff_new_pack.WDep8s/_new 2013-06-29 14:33:47.000000000 +0200
@@ -17,7 +17,7 @@
Name: python-psycopg2
-Version: 2.5
+Version: 2.5.1
Release: 0
License: LGPL-3.0+ and (LGPL-3.0+ or ZPL-2.0) and SUSE-GPL-2.0-with-openssl-exception
Summary: Python-PostgreSQL Database Adapter
++++++ psycopg2-2.5.tar.gz -> psycopg2-2.5.1.tar.gz ++++++
++++ 4801 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package python-pecan for openSUSE:Factory checked in at 2013-06-29 14:33:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pecan (Old)
and /work/SRC/openSUSE:Factory/.python-pecan.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pecan"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-pecan/python-pecan.changes 2013-03-08 09:47:05.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.python-pecan.new/python-pecan.changes 2013-06-29 14:33:23.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Jun 25 11:40:11 UTC 2013 - dmueller(a)suse.com
+
+- Update to version 0.3.0:
+ + New upstream release
+
+-------------------------------------------------------------------
Old:
----
pecan-0.2.1.tar.gz
New:
----
pecan-0.3.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pecan.spec ++++++
--- /var/tmp/diff_new_pack.Ze3imR/_old 2013-06-29 14:33:23.000000000 +0200
+++ /var/tmp/diff_new_pack.Ze3imR/_new 2013-06-29 14:33:23.000000000 +0200
@@ -17,7 +17,7 @@
Name: python-pecan
-Version: 0.2.1
+Version: 0.3.0
Release: 0
Summary: A WSGI object-dispatching web framework, designed to be lean and fast
License: BSD-3-Clause
@@ -35,10 +35,12 @@
#BuildRequires: python-gunicorn
#BuildRequires: python-simplegeneric >= 0.8
#BuildRequires: python-virtualenv
-Requires: python-Mako >= 0.4.0
-Requires: python-WebOb >= 1.2dev
-Requires: python-WebTest >= 1.3.1
-Requires: python-simplegeneric >= 0.8
+BuildRequires: python-six
+Requires: python-Mako >= 0.6.2
+Requires: python-MarkupSafe >= 0.15
+Requires: python-WebOb >= 1.2b3
+Requires: python-WebTest >= 1.3.3
+Requires: python-simplegeneric >= 0.8.1
Suggests: python-Jinja2
Suggests: python-Genshi
Suggests: python-gunicorn
++++++ pecan-0.2.1.tar.gz -> pecan-0.3.0.tar.gz ++++++
++++ 9019 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package python-Mako for openSUSE:Factory checked in at 2013-06-29 14:33:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-Mako (Old)
and /work/SRC/openSUSE:Factory/.python-Mako.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-Mako"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-Mako/python-Mako.changes 2012-11-30 12:30:01.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.python-Mako.new/python-Mako.changes 2013-06-29 14:33:14.000000000 +0200
@@ -1,0 +2,48 @@
+Tue Jun 25 11:58:53 UTC 2013 - dmueller(a)suse.com
+
+- update to 0.8.1:
+ - [bug] Changed setup.py to skip installing markupsafe
+ if Python version is < 2.6 or is between 3.0 and
+ less than 3.3, as Markupsafe now only supports 2.6->2.X,
+ 3.3->3.X. [ticket:216]
+
+ - [bug] Fixed regression where "entity" filter wasn't
+ converted for py3k properly (added tests.)
+ [ticket:214]
+
+ - [bug] Fixed bug where mako-render script wasn't
+ compatible with Py3k. [ticket:212]
+
+ - [bug] Cleaned up all the various deprecation/
+ file warnings when running the tests under
+ various Pythons with warnings turned on.
+ [ticket:213]
+
+ - [feature] Performance improvement to the
+ "legacy" HTML escape feature, used for XML
+ escaping and when markupsafe isn't present,
+ courtesy George Xie.
+
+ - [bug] Fixed bug whereby an exception in Python 3
+ against a module compiled to the filesystem would
+ fail trying to produce a RichTraceback due to the
+ content being in bytes. [ticket:209]
+
+ - [bug] Change default for compile()->reserved_names
+ from tuple to frozenset, as this is expected to be
+ a set by default. [ticket:208]
+
+ - [feature] Code has been reworked to support Python 2.4->
+ Python 3.xx in place. 2to3 no longer needed.
+
+ - [feature] Added lexer_cls argument to Template,
+ TemplateLookup, allows alternate Lexer classes
+ to be used.
+
+ - [feature] Added future_imports parameter to Template
+ and TemplateLookup, renders the __future__ header
+ with desired capabilities at the top of the generated
+ template module. Courtesy Ben Trofatter.
+
+
+-------------------------------------------------------------------
Old:
----
Mako-0.7.3.tar.gz
New:
----
Mako-0.8.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-Mako.spec ++++++
--- /var/tmp/diff_new_pack.RoCm0D/_old 2013-06-29 14:33:15.000000000 +0200
+++ /var/tmp/diff_new_pack.RoCm0D/_new 2013-06-29 14:33:15.000000000 +0200
@@ -17,7 +17,7 @@
Name: python-Mako
-Version: 0.7.3
+Version: 0.8.1
Release: 0
Url: http://www.makotemplates.org/
Summary: A super-fast Python templating language
++++++ Mako-0.7.3.tar.gz -> Mako-0.8.1.tar.gz ++++++
++++ 6711 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package python-distribute for openSUSE:Factory checked in at 2013-06-29 14:33:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-distribute (Old)
and /work/SRC/openSUSE:Factory/.python-distribute.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-distribute"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-distribute/python-distribute.changes 2013-06-19 17:01:34.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.python-distribute.new/python-distribute.changes 2013-06-29 14:33:02.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Jun 25 08:51:21 UTC 2013 - speilicke(a)suse.com
+
+- Only provide/obsolete setuptools up to version 0.6.45. Distribute merged
+ into setuptools-0.7.x. Thus, setuptools will raised from the grave and
+ obsolete this package instead
+
+-------------------------------------------------------------------
@@ -5 +12 @@
- * Issue #379: ``distribute_setup.py`` now traps VersionConflict as well,
+ * Issue #379: distribute_setup.py now traps VersionConflict as well,
@@ -7 +14 @@
- * ``distribute_setup.py`` has been updated to allow Setuptools 0.7 to
+ * distribute_setup.py has been updated to allow Setuptools 0.7 to
@@ -14,2 +21,2 @@
- the private method `_zip_directory_cache`.
- * Added a new function ``easy_install.get_win_launcher`` which may be used by
+ the private method _zip_directory_cache.
+ * Added a new function easy_install.get_win_launcher which may be used by
@@ -30,2 +37,2 @@
- in `this Microsoft article
- <http://technet.microsoft.com/en-us/library/cc709628%28WS.10%29.aspx>`_.
+ in this Microsoft article
+ <http://technet.microsoft.com/en-us/library/cc709628%28WS.10%29.aspx>_.
@@ -63 +70 @@
- * Issue #336: `setup.py` no longer masks failure exit code when tests fail.
+ * Issue #336: setup.py no longer masks failure exit code when tests fail.
@@ -71 +78 @@
- * Issue #335: Backed out `setup_requires` superceding installed requirements
+ * Issue #335: Backed out setup_requires superceding installed requirements
@@ -90 +97 @@
- * Issue #323: Allow `setup_requires` requirements to supercede installed
+ * Issue #323: Allow setup_requires requirements to supercede installed
@@ -112 +119 @@
- * If Sphinx is installed, the `upload_docs` command now runs `build_sphinx`
+ * If Sphinx is installed, the upload_docs command now runs build_sphinx
@@ -114 +121 @@
- * Issue #326: `upload_docs` provided mangled auth credentials under Python 3.
+ * Issue #326: upload_docs provided mangled auth credentials under Python 3.
@@ -131,2 +138,2 @@
- * Issue #218: Improved documentation on behavior of `package_data` and
- `include_package_data`. Files indicated by `package_data` are now included
+ * Issue #218: Improved documentation on behavior of package_data and
+ include_package_data. Files indicated by package_data are now included
@@ -134 +141 @@
- * `distribute_setup.py` now allows a `--download-base` argument for retrieving
+ * distribute_setup.py now allows a --download-base argument for retrieving
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-distribute.spec ++++++
--- /var/tmp/diff_new_pack.CzDQko/_old 2013-06-29 14:33:02.000000000 +0200
+++ /var/tmp/diff_new_pack.CzDQko/_new 2013-06-29 14:33:02.000000000 +0200
@@ -16,25 +16,22 @@
#
-%define modname distribute
-%define mod2nam setuptools
-Name: python-%{modname}
+Name: python-distribute
Version: 0.6.45
Release: 0
Url: http://packages.python.org/distribute
Summary: Easily download, build, install, upgrade, and uninstall Python packages
License: Python-2.0 or ZPL-2.0
Group: Development/Languages/Python
-Source: http://pypi.python.org/packages/source/d/%{modname}/%{modname}-%{version}.t…
+Source: http://pypi.python.org/packages/source/d/distribute/distribute-%{version}.t…
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: python-devel
-Provides: python-setuptools = %{version}
-Obsoletes: python-setuptools < %{version}
+Provides: python-setuptools = 0.6.45
+Obsoletes: python-setuptools < 0.6.45
%if 0%{?suse_version} && 0%{?suse_version} <= 1110
%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
%else
BuildArch: noarch
-%py_requires
%endif
%description
@@ -44,17 +41,17 @@
with Python module distributions.
%prep
-%setup -q -n %{modname}-%{version}
-rm -f %{modname}.egg-info/*.orig
-chmod -x {.,docs}/*.txt # Fix executable bits for documentation
+%setup -q -n distribute-%{version}
+#rm -f distribute.egg-info/*.orig
+#chmod -x {.,docs}/*.txt # Fix executable bits for documentation
%build
python setup.py build
%install
python setup.py install --prefix=%{_prefix} --root=%{buildroot}
-rm -rf %{buildroot}%{python_sitelib}/%{mod2nam}/tests # Don't install tests
-rm -rf %{buildroot}%{python_sitelib}/%{mod2nam}/*.exe # Remove unneeded files
+#rm -rf %{buildroot}%{python_sitelib}/setuptools/tests # Don't install tests
+#rm -rf %{buildroot}%{python_sitelib}/setuptools/*.exe # Remove unneeded files
## tests don't work without network access
##%if 0%{?suse_version} <= 1201
@@ -70,9 +67,9 @@
%{python_sitelib}/easy_install.py*
%{python_sitelib}/pkg_resources.py*
%{python_sitelib}/_markerlib/
-%{python_sitelib}/%{mod2nam}.pth
-%{python_sitelib}/%{mod2nam}/
-%{python_sitelib}/%{modname}-%{version}-py%{py_ver}.egg-info/
-%{python_sitelib}/%{mod2nam}-*-py%{py_ver}.egg-info
+%{python_sitelib}/setuptools.pth
+%{python_sitelib}/setuptools/
+%{python_sitelib}/distribute-%{version}-py%{py_ver}.egg-info/
+%{python_sitelib}/setuptools-*-py%{py_ver}.egg-info
%changelog
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package python-cliff for openSUSE:Factory checked in at 2013-06-29 14:32:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-cliff (Old)
and /work/SRC/openSUSE:Factory/.python-cliff.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-cliff"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-cliff/python-cliff.changes 2013-05-13 15:25:24.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.python-cliff.new/python-cliff.changes 2013-06-29 14:32:37.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Jun 27 10:02:03 UTC 2013 - speilicke(a)suse.com
+
+- Update to version 1.4:
+ + Upstream provides no changelog
+
+-------------------------------------------------------------------
Old:
----
cliff-1.3.3.tar.gz
New:
----
cliff-1.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-cliff.spec ++++++
--- /var/tmp/diff_new_pack.TpFUoL/_old 2013-06-29 14:32:37.000000000 +0200
+++ /var/tmp/diff_new_pack.TpFUoL/_new 2013-06-29 14:32:37.000000000 +0200
@@ -17,7 +17,7 @@
Name: python-cliff
-Version: 1.3.3
+Version: 1.4
Release: 0
Url: https://github.com/dreamhost/cliff
Summary: Command Line Interface Formulation Framework
++++++ cliff-1.3.3.tar.gz -> cliff-1.4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.3.3/MANIFEST.in new/cliff-1.4/MANIFEST.in
--- old/cliff-1.3.3/MANIFEST.in 2012-06-20 22:53:43.000000000 +0200
+++ new/cliff-1.4/MANIFEST.in 2013-06-11 19:53:50.000000000 +0200
@@ -1,5 +1,4 @@
include setup.py
-include distribute_setup.py
recursive-include docs *.rst *.py *.html *.css *.js *.png *.txt
recursive-include demoapp *.py
recursive-include tests *.py
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.3.3/PKG-INFO new/cliff-1.4/PKG-INFO
--- old/cliff-1.3.3/PKG-INFO 2013-05-02 20:23:39.000000000 +0200
+++ new/cliff-1.4/PKG-INFO 2013-06-11 20:05:50.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: cliff
-Version: 1.3.3
+Version: 1.4
Summary: Command Line Interface Formulation Framework
Home-page: https://github.com/dreamhost/cliff
Author: Doug Hellmann
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.3.3/announce.rst new/cliff-1.4/announce.rst
--- old/cliff-1.3.3/announce.rst 2013-04-02 21:55:37.000000000 +0200
+++ new/cliff-1.4/announce.rst 2013-06-11 20:04:38.000000000 +0200
@@ -1,6 +1,6 @@
-========================================================================
- cliff -- Command Line Interface Formulation Framework -- version 1.3.2
-========================================================================
+======================================================================
+ cliff -- Command Line Interface Formulation Framework -- version 1.4
+======================================================================
.. tags:: python cliff release DreamHost
@@ -11,15 +11,12 @@
What's New In This Release?
===========================
-- Add ``convert_underscores`` parameter to ``CommandManager``
- ``__init__`` method to allow underscores to be used in command
- names. This optional argument is defaulted to True to maintain
- current behavior. (contributed by Joe Server)
-- Use flake8_ for style checking.
-- Relax version requirement for PrettyTable dependency to allow point
- releases of 0.7.
-
-.. _flake8: https://pypi.python.org/pypi/flake8
+- Store a reference to the InteractiveApp on the App while in
+ interactive mode to allow commands to update the interactive
+ state. (Contributed by Tomaz Muraus)
+- Remove reliance on distribute, now that it has merged with
+ setuptools 0.7. Providing an explicit dependency on setuptools
+ breaks updates in some cases, so just fail if it isn't there.
Documentation
=============
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.3.3/cliff/app.py new/cliff-1.4/cliff/app.py
--- old/cliff-1.3.3/cliff/app.py 2013-03-16 18:57:02.000000000 +0100
+++ new/cliff-1.4/cliff/app.py 2013-05-31 21:19:25.000000000 +0200
@@ -73,6 +73,7 @@
self.interactive_app_factory = interactive_app_factory
self.parser = self.build_option_parser(description, version)
self.interactive_mode = False
+ self.interpreter = None
def build_option_parser(self, description, version,
argparse_kwargs=None):
@@ -224,12 +225,12 @@
return
def interact(self):
- interpreter = self.interactive_app_factory(self,
- self.command_manager,
- self.stdin,
- self.stdout,
- )
- interpreter.cmdloop()
+ self.interpreter = self.interactive_app_factory(self,
+ self.command_manager,
+ self.stdin,
+ self.stdout,
+ )
+ self.interpreter.cmdloop()
return 0
def run_subcommand(self, argv):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.3.3/cliff.egg-info/PKG-INFO new/cliff-1.4/cliff.egg-info/PKG-INFO
--- old/cliff-1.3.3/cliff.egg-info/PKG-INFO 2013-05-02 20:23:38.000000000 +0200
+++ new/cliff-1.4/cliff.egg-info/PKG-INFO 2013-06-11 20:05:49.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: cliff
-Version: 1.3.3
+Version: 1.4
Summary: Command Line Interface Formulation Framework
Home-page: https://github.com/dreamhost/cliff
Author: Doug Hellmann
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.3.3/cliff.egg-info/SOURCES.txt new/cliff-1.4/cliff.egg-info/SOURCES.txt
--- old/cliff-1.3.3/cliff.egg-info/SOURCES.txt 2013-05-02 20:23:38.000000000 +0200
+++ new/cliff-1.4/cliff.egg-info/SOURCES.txt 2013-06-11 20:05:49.000000000 +0200
@@ -5,7 +5,6 @@
Makefile
README.rst
announce.rst
-distribute_setup.py
setup.py
test-requirements.txt
tox.ini
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.3.3/cliff.egg-info/requires.txt new/cliff-1.4/cliff.egg-info/requires.txt
--- old/cliff-1.3.3/cliff.egg-info/requires.txt 2013-05-02 20:23:38.000000000 +0200
+++ new/cliff-1.4/cliff.egg-info/requires.txt 2013-06-11 20:05:49.000000000 +0200
@@ -1,4 +1,3 @@
-distribute
PrettyTable>=0.6,<0.8
cmd2>=0.6.4
pyparsing==1.5.7
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.3.3/distribute_setup.py new/cliff-1.4/distribute_setup.py
--- old/cliff-1.3.3/distribute_setup.py 2012-04-20 18:53:30.000000000 +0200
+++ new/cliff-1.4/distribute_setup.py 1970-01-01 01:00:00.000000000 +0100
@@ -1,477 +0,0 @@
-#!python
-"""Bootstrap distribute installation
-
-If you want to use setuptools in your package's setup.py, just include this
-file in the same directory with it, and add this to the top of your setup.py::
-
- from distribute_setup import use_setuptools
- use_setuptools()
-
-If you want to require a specific version of setuptools, set a download
-mirror, or use an alternate download directory, you can do so by supplying
-the appropriate options to ``use_setuptools()``.
-
-This file can also be run as a script to install or upgrade setuptools.
-"""
-import os
-import sys
-import time
-import fnmatch
-import tempfile
-import tarfile
-from distutils import log
-
-try:
- from site import USER_SITE
-except ImportError:
- USER_SITE = None
-
-try:
- import subprocess
-
- def _python_cmd(*args):
- args = (sys.executable,) + args
- return subprocess.call(args) == 0
-
-except ImportError:
- # will be used for python 2.3
- def _python_cmd(*args):
- args = (sys.executable,) + args
- # quoting arguments if windows
- if sys.platform == 'win32':
- def quote(arg):
- if ' ' in arg:
- return '"%s"' % arg
- return arg
- args = [quote(arg) for arg in args]
- return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
-
-DEFAULT_VERSION = "0.6.10"
-DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
-SETUPTOOLS_FAKED_VERSION = "0.6c11"
-
-SETUPTOOLS_PKG_INFO = """\
-Metadata-Version: 1.0
-Name: setuptools
-Version: %s
-Summary: xxxx
-Home-page: xxx
-Author: xxx
-Author-email: xxx
-License: xxx
-Description: xxx
-""" % SETUPTOOLS_FAKED_VERSION
-
-
-def _install(tarball):
- # extracting the tarball
- tmpdir = tempfile.mkdtemp()
- log.warn('Extracting in %s', tmpdir)
- old_wd = os.getcwd()
- try:
- os.chdir(tmpdir)
- tar = tarfile.open(tarball)
- _extractall(tar)
- tar.close()
-
- # going in the directory
- subdir = os.path.join(tmpdir, os.listdir(tmpdir)[0])
- os.chdir(subdir)
- log.warn('Now working in %s', subdir)
-
- # installing
- log.warn('Installing Distribute')
- if not _python_cmd('setup.py', 'install'):
- log.warn('Something went wrong during the installation.')
- log.warn('See the error message above.')
- finally:
- os.chdir(old_wd)
-
-
-def _build_egg(egg, tarball, to_dir):
- # extracting the tarball
- tmpdir = tempfile.mkdtemp()
- log.warn('Extracting in %s', tmpdir)
- old_wd = os.getcwd()
- try:
- os.chdir(tmpdir)
- tar = tarfile.open(tarball)
- _extractall(tar)
- tar.close()
-
- # going in the directory
- subdir = os.path.join(tmpdir, os.listdir(tmpdir)[0])
- os.chdir(subdir)
- log.warn('Now working in %s', subdir)
-
- # building an egg
- log.warn('Building a Distribute egg in %s', to_dir)
- _python_cmd('setup.py', '-q', 'bdist_egg', '--dist-dir', to_dir)
-
- finally:
- os.chdir(old_wd)
- # returning the result
- log.warn(egg)
- if not os.path.exists(egg):
- raise IOError('Could not build the egg.')
-
-
-def _do_download(version, download_base, to_dir, download_delay):
- egg = os.path.join(to_dir, 'distribute-%s-py%d.%d.egg'
- % (version, sys.version_info[0], sys.version_info[1]))
- if not os.path.exists(egg):
- tarball = download_setuptools(version, download_base,
- to_dir, download_delay)
- _build_egg(egg, tarball, to_dir)
- sys.path.insert(0, egg)
- import setuptools
- setuptools.bootstrap_install_from = egg
-
-
-def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
- to_dir=os.curdir, download_delay=15, no_fake=True):
- # making sure we use the absolute path
- to_dir = os.path.abspath(to_dir)
- was_imported = 'pkg_resources' in sys.modules or \
- 'setuptools' in sys.modules
- try:
- try:
- import pkg_resources
- if not hasattr(pkg_resources, '_distribute'):
- if not no_fake:
- _fake_setuptools()
- raise ImportError
- except ImportError:
- return _do_download(version, download_base, to_dir, download_delay)
- try:
- pkg_resources.require("distribute>="+version)
- return
- except pkg_resources.VersionConflict:
- e = sys.exc_info()[1]
- if was_imported:
- sys.stderr.write(
- "The required version of distribute (>=%s) is not available,\n"
- "and can't be installed while this script is running. Please\n"
- "install a more recent version first, using\n"
- "'easy_install -U distribute'."
- "\n\n(Currently using %r)\n" % (version, e.args[0]))
- sys.exit(2)
- else:
- del pkg_resources, sys.modules['pkg_resources'] # reload ok
- return _do_download(version, download_base, to_dir,
- download_delay)
- except pkg_resources.DistributionNotFound:
- return _do_download(version, download_base, to_dir,
- download_delay)
- finally:
- if not no_fake:
- _create_fake_setuptools_pkg_info(to_dir)
-
-def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
- to_dir=os.curdir, delay=15):
- """Download distribute from a specified location and return its filename
-
- `version` should be a valid distribute version number that is available
- as an egg for download under the `download_base` URL (which should end
- with a '/'). `to_dir` is the directory where the egg will be downloaded.
- `delay` is the number of seconds to pause before an actual download
- attempt.
- """
- # making sure we use the absolute path
- to_dir = os.path.abspath(to_dir)
- try:
- from urllib.request import urlopen
- except ImportError:
- from urllib2 import urlopen
- tgz_name = "distribute-%s.tar.gz" % version
- url = download_base + tgz_name
- saveto = os.path.join(to_dir, tgz_name)
- src = dst = None
- if not os.path.exists(saveto): # Avoid repeated downloads
- try:
- log.warn("Downloading %s", url)
- src = urlopen(url)
- # Read/write all in one block, so we don't create a corrupt file
- # if the download is interrupted.
- data = src.read()
- dst = open(saveto, "wb")
- dst.write(data)
- finally:
- if src:
- src.close()
- if dst:
- dst.close()
- return os.path.realpath(saveto)
-
-
-def _patch_file(path, content):
- """Will backup the file then patch it"""
- existing_content = open(path).read()
- if existing_content == content:
- # already patched
- log.warn('Already patched.')
- return False
- log.warn('Patching...')
- _rename_path(path)
- f = open(path, 'w')
- try:
- f.write(content)
- finally:
- f.close()
- return True
-
-
-def _same_content(path, content):
- return open(path).read() == content
-
-def _no_sandbox(function):
- def __no_sandbox(*args, **kw):
- try:
- from setuptools.sandbox import DirectorySandbox
- def violation(*args):
- pass
- DirectorySandbox._old = DirectorySandbox._violation
- DirectorySandbox._violation = violation
- patched = True
- except ImportError:
- patched = False
-
- try:
- return function(*args, **kw)
- finally:
- if patched:
- DirectorySandbox._violation = DirectorySandbox._old
- del DirectorySandbox._old
-
- return __no_sandbox
-
-@_no_sandbox
-def _rename_path(path):
- new_name = path + '.OLD.%s' % time.time()
- log.warn('Renaming %s into %s', path, new_name)
- os.rename(path, new_name)
- return new_name
-
-def _remove_flat_installation(placeholder):
- if not os.path.isdir(placeholder):
- log.warn('Unkown installation at %s', placeholder)
- return False
- found = False
- for file in os.listdir(placeholder):
- if fnmatch.fnmatch(file, 'setuptools*.egg-info'):
- found = True
- break
- if not found:
- log.warn('Could not locate setuptools*.egg-info')
- return
-
- log.warn('Removing elements out of the way...')
- pkg_info = os.path.join(placeholder, file)
- if os.path.isdir(pkg_info):
- patched = _patch_egg_dir(pkg_info)
- else:
- patched = _patch_file(pkg_info, SETUPTOOLS_PKG_INFO)
-
- if not patched:
- log.warn('%s already patched.', pkg_info)
- return False
- # now let's move the files out of the way
- for element in ('setuptools', 'pkg_resources.py', 'site.py'):
- element = os.path.join(placeholder, element)
- if os.path.exists(element):
- _rename_path(element)
- else:
- log.warn('Could not find the %s element of the '
- 'Setuptools distribution', element)
- return True
-
-
-def _after_install(dist):
- log.warn('After install bootstrap.')
- placeholder = dist.get_command_obj('install').install_purelib
- _create_fake_setuptools_pkg_info(placeholder)
-
-@_no_sandbox
-def _create_fake_setuptools_pkg_info(placeholder):
- if not placeholder or not os.path.exists(placeholder):
- log.warn('Could not find the install location')
- return
- pyver = '%s.%s' % (sys.version_info[0], sys.version_info[1])
- setuptools_file = 'setuptools-%s-py%s.egg-info' % \
- (SETUPTOOLS_FAKED_VERSION, pyver)
- pkg_info = os.path.join(placeholder, setuptools_file)
- if os.path.exists(pkg_info):
- log.warn('%s already exists', pkg_info)
- return
-
- log.warn('Creating %s', pkg_info)
- f = open(pkg_info, 'w')
- try:
- f.write(SETUPTOOLS_PKG_INFO)
- finally:
- f.close()
-
- pth_file = os.path.join(placeholder, 'setuptools.pth')
- log.warn('Creating %s', pth_file)
- f = open(pth_file, 'w')
- try:
- f.write(os.path.join(os.curdir, setuptools_file))
- finally:
- f.close()
-
-def _patch_egg_dir(path):
- # let's check if it's already patched
- pkg_info = os.path.join(path, 'EGG-INFO', 'PKG-INFO')
- if os.path.exists(pkg_info):
- if _same_content(pkg_info, SETUPTOOLS_PKG_INFO):
- log.warn('%s already patched.', pkg_info)
- return False
- _rename_path(path)
- os.mkdir(path)
- os.mkdir(os.path.join(path, 'EGG-INFO'))
- pkg_info = os.path.join(path, 'EGG-INFO', 'PKG-INFO')
- f = open(pkg_info, 'w')
- try:
- f.write(SETUPTOOLS_PKG_INFO)
- finally:
- f.close()
- return True
-
-
-def _before_install():
- log.warn('Before install bootstrap.')
- _fake_setuptools()
-
-
-def _under_prefix(location):
- if 'install' not in sys.argv:
- return True
- args = sys.argv[sys.argv.index('install')+1:]
- for index, arg in enumerate(args):
- for option in ('--root', '--prefix'):
- if arg.startswith('%s=' % option):
- top_dir = arg.split('root=')[-1]
- return location.startswith(top_dir)
- elif arg == option:
- if len(args) > index:
- top_dir = args[index+1]
- return location.startswith(top_dir)
- elif option == '--user' and USER_SITE is not None:
- return location.startswith(USER_SITE)
- return True
-
-
-def _fake_setuptools():
- log.warn('Scanning installed packages')
- try:
- import pkg_resources
- except ImportError:
- # we're cool
- log.warn('Setuptools or Distribute does not seem to be installed.')
- return
- ws = pkg_resources.working_set
- try:
- setuptools_dist = ws.find(pkg_resources.Requirement.parse('setuptools',
- replacement=False))
- except TypeError:
- # old distribute API
- setuptools_dist = ws.find(pkg_resources.Requirement.parse('setuptools'))
-
- if setuptools_dist is None:
- log.warn('No setuptools distribution found')
- return
- # detecting if it was already faked
- setuptools_location = setuptools_dist.location
- log.warn('Setuptools installation detected at %s', setuptools_location)
-
- # if --root or --preix was provided, and if
- # setuptools is not located in them, we don't patch it
- if not _under_prefix(setuptools_location):
- log.warn('Not patching, --root or --prefix is installing Distribute'
- ' in another location')
- return
-
- # let's see if its an egg
- if not setuptools_location.endswith('.egg'):
- log.warn('Non-egg installation')
- res = _remove_flat_installation(setuptools_location)
- if not res:
- return
- else:
- log.warn('Egg installation')
- pkg_info = os.path.join(setuptools_location, 'EGG-INFO', 'PKG-INFO')
- if (os.path.exists(pkg_info) and
- _same_content(pkg_info, SETUPTOOLS_PKG_INFO)):
- log.warn('Already patched.')
- return
- log.warn('Patching...')
- # let's create a fake egg replacing setuptools one
- res = _patch_egg_dir(setuptools_location)
- if not res:
- return
- log.warn('Patched done.')
- _relaunch()
-
-
-def _relaunch():
- log.warn('Relaunching...')
- # we have to relaunch the process
- args = [sys.executable] + sys.argv
- sys.exit(subprocess.call(args))
-
-
-def _extractall(self, path=".", members=None):
- """Extract all members from the archive to the current working
- directory and set owner, modification time and permissions on
- directories afterwards. `path' specifies a different directory
- to extract to. `members' is optional and must be a subset of the
- list returned by getmembers().
- """
- import copy
- import operator
- from tarfile import ExtractError
- directories = []
-
- if members is None:
- members = self
-
- for tarinfo in members:
- if tarinfo.isdir():
- # Extract directories with a safe mode.
- directories.append(tarinfo)
- tarinfo = copy.copy(tarinfo)
- tarinfo.mode = 448 # decimal for oct 0700
- self.extract(tarinfo, path)
-
- # Reverse sort directories.
- if sys.version_info < (2, 4):
- def sorter(dir1, dir2):
- return cmp(dir1.name, dir2.name)
- directories.sort(sorter)
- directories.reverse()
- else:
- directories.sort(key=operator.attrgetter('name'), reverse=True)
-
- # Set correct owner, mtime and filemode on directories.
- for tarinfo in directories:
- dirpath = os.path.join(path, tarinfo.name)
- try:
- self.chown(tarinfo, dirpath)
- self.utime(tarinfo, dirpath)
- self.chmod(tarinfo, dirpath)
- except ExtractError:
- e = sys.exc_info()[1]
- if self.errorlevel > 1:
- raise
- else:
- self._dbg(1, "tarfile: %s" % e)
-
-
-def main(argv, version=DEFAULT_VERSION):
- """Install or upgrade setuptools and EasyInstall"""
- tarball = download_setuptools()
- _install(tarball)
-
-
-if __name__ == '__main__':
- main(sys.argv[1:])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.3.3/docs/source/history.rst new/cliff-1.4/docs/source/history.rst
--- old/cliff-1.3.3/docs/source/history.rst 2013-05-02 20:21:26.000000000 +0200
+++ new/cliff-1.4/docs/source/history.rst 2013-06-11 20:02:29.000000000 +0200
@@ -2,6 +2,15 @@
Release History
=================
+1.4
+
+- Store a reference to the InteractiveApp on the App while in
+ interactive mode to allow commands to update the interactive
+ state. (Contributed by Tomaz Muraus)
+- Remove reliance on distribute, now that it has merged with
+ setuptools 0.7. Providing an explicit dependency on setuptools
+ breaks updates in some cases, so just fail if it isn't there.
+
1.3.3
- Restore compatibility with prettytable < 0.7.2 by forcing no
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.3.3/setup.py new/cliff-1.4/setup.py
--- old/cliff-1.3.3/setup.py 2013-05-02 20:22:02.000000000 +0200
+++ new/cliff-1.4/setup.py 2013-06-11 20:02:32.000000000 +0200
@@ -3,11 +3,7 @@
PROJECT = 'cliff'
# Change docs/source/conf.py too!
-VERSION = '1.3.3'
-
-# Bootstrap installation of Distribute
-import distribute_setup
-distribute_setup.use_setuptools()
+VERSION = '1.4'
from setuptools import setup, find_packages
@@ -22,7 +18,6 @@
long_description = ''
install_requires = [
- 'distribute',
'PrettyTable>=0.6,<0.8',
'cmd2>=0.6.4',
]
@@ -37,7 +32,7 @@
install_requires.append('pyparsing>=2.0.0')
try:
- import argparse
+ import argparse # noqa
except ImportError:
install_requires.append('argparse')
@@ -52,13 +47,11 @@
'./dist', 'EGG-INFO', '*.egg-info')
-def find_package_data(
- where='.', package='',
- exclude=standard_exclude,
- exclude_directories=standard_exclude_directories,
- only_in_packages=True,
- show_ignored=False,
- ):
+def find_package_data(where='.', package='',
+ exclude=standard_exclude,
+ exclude_directories=standard_exclude_directories,
+ only_in_packages=True,
+ show_ignored=False):
"""
Return a dictionary suitable for use in ``package_data``
in a distutils ``setup.py`` file.
@@ -98,7 +91,7 @@
bad_name = False
for pattern in exclude_directories:
if (fnmatchcase(name, pattern)
- or fn.lower() == pattern.lower()):
+ or fn.lower() == pattern.lower()):
bad_name = True
if show_ignored:
print >> sys.stderr, (
@@ -123,7 +116,7 @@
bad_name = False
for pattern in exclude:
if (fnmatchcase(name, pattern)
- or fn.lower() == pattern.lower()):
+ or fn.lower() == pattern.lower()):
bad_name = True
if show_ignored:
print >> sys.stderr, (
@@ -185,12 +178,12 @@
'cliff.formatter.list': [
'table = cliff.formatters.table:TableFormatter',
'csv = cliff.formatters.commaseparated:CSVLister',
- ],
+ ],
'cliff.formatter.show': [
'table = cliff.formatters.table:TableFormatter',
'shell = cliff.formatters.shell:ShellFormatter',
- ],
- },
+ ],
+ },
zip_safe=False,
- )
+)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.3.3/tests/test_app.py new/cliff-1.4/tests/test_app.py
--- old/cliff-1.3.3/tests/test_app.py 2013-03-16 21:35:54.000000000 +0100
+++ new/cliff-1.4/tests/test_app.py 2013-05-31 21:19:25.000000000 +0200
@@ -46,7 +46,9 @@
app.interactive_app_factory = mock.MagicMock(
name='interactive_app_factory'
)
+ assert app.interpreter is None
app.run([])
+ assert app.interpreter is not None
app.interactive_app_factory.return_value.cmdloop.assert_called_once_with()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.3.3/tox.ini new/cliff-1.4/tox.ini
--- old/cliff-1.3.3/tox.ini 2013-03-26 21:49:03.000000000 +0100
+++ new/cliff-1.4/tox.ini 2013-06-11 19:55:58.000000000 +0200
@@ -10,4 +10,4 @@
[testenv:style]
deps = flake8
-commands = flake8 cliff docs/source/conf.py tests
+commands = flake8 cliff docs/source/conf.py tests setup.py
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package python-bugzilla for openSUSE:Factory checked in at 2013-06-29 14:30:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-bugzilla (Old)
and /work/SRC/openSUSE:Factory/.python-bugzilla.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-bugzilla"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-bugzilla/python-bugzilla.changes 2013-06-05 13:35:17.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.python-bugzilla.new/python-bugzilla.changes 2013-06-29 14:30:30.000000000 +0200
@@ -1,0 +2,13 @@
+Thu Jun 27 16:29:47 UTC 2013 - jmatejek(a)suse.com
+
+- update to 0.9.0
+ * CVE-2013-2191: Switch to pycurl to get SSL host and cert validation
+ (fixes bnc#825876)
+ * bugzilla: modify: add --dependson (Don Zickus)
+ * bugzilla: new: add --groups option (Paul Frields)
+ * bugzilla: modify: Allow setting nearly every bug parameter
+- update to suse3 from gitorious
+ * remerged NovellBugzilla functionality
+ (upstream inclusion pending bnc#822053)
+
+-------------------------------------------------------------------
Old:
----
python-bugzilla-0.8.0suse2.tar.bz2
New:
----
python-bugzilla-0.9.0suse3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-bugzilla.spec ++++++
--- /var/tmp/diff_new_pack.HCWujL/_old 2013-06-29 14:30:31.000000000 +0200
+++ /var/tmp/diff_new_pack.HCWujL/_new 2013-06-29 14:30:31.000000000 +0200
@@ -17,7 +17,7 @@
Name: python-bugzilla
-Version: 0.8.0suse2
+Version: 0.9.0suse3
Release: 0
Summary: Python library for bugzilla
License: GPL-2.0+
@@ -32,6 +32,7 @@
%else
BuildArch: noarch
%endif
+Requires: python-pycurl
Suggests: osc
%description
++++++ python-bugzilla-0.8.0suse2.tar.bz2 -> python-bugzilla-0.9.0suse3.tar.bz2 ++++++
++++ 2518 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package pulseaudio for openSUSE:Factory checked in at 2013-06-29 14:30:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pulseaudio (Old)
and /work/SRC/openSUSE:Factory/.pulseaudio.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pulseaudio"
Changes:
--------
--- /work/SRC/openSUSE:Factory/pulseaudio/pulseaudio.changes 2013-06-18 15:32:50.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.pulseaudio.new/pulseaudio.changes 2013-06-29 14:30:26.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Jun 24 15:10:41 UTC 2013 - oholecek(a)suse.com
+
+- add SUSEfirewall service definition (bnc#607614)
+
+-------------------------------------------------------------------
New:
----
pulseaudio-server.fw
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pulseaudio.spec ++++++
--- /var/tmp/diff_new_pack.kVsSfK/_old 2013-06-29 14:30:27.000000000 +0200
+++ /var/tmp/diff_new_pack.kVsSfK/_new 2013-06-29 14:30:27.000000000 +0200
@@ -22,6 +22,7 @@
%define drvver 4.0
%define soname 0
%define _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d
+%define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services
Summary: A Networked Sound Server
License: GPL-2.0+ and LGPL-2.1+
Group: System/Sound Daemons
@@ -30,6 +31,7 @@
Source1: default.pa-for-gdm
Source2: setup-pulseaudio
Source3: sysconfig.sound-pulseaudio
+Source4: pulseaudio-server.fw
Source99: baselibs.conf
Patch0: disabled-start.diff
Patch1: suppress-socket-error-msg.diff
@@ -308,6 +310,11 @@
mkdir -p %{buildroot}%{_localstatedir}/lib/gdm/.pulse
cp $RPM_SOURCE_DIR/default.pa-for-gdm %{buildroot}%{_localstatedir}/lib/gdm/.pulse/default.pa
ln -s esdcompat %{buildroot}%{_bindir}/esd
+# install firewall rule on SUSE
+%if %{defined suse_version}
+mkdir -p %{buildroot}/%{_fwdefdir}
+install -m 0644 %{S:4} %{buildroot}/%{_fwdefdir}/pulseaudio-server
+%endif
%fdupes -s doxygen/html
%clean
@@ -439,6 +446,9 @@
%config(noreplace) %{_sysconfdir}/pulse/system.pa
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/pulseaudio-system.conf
%config(noreplace) %{_sysconfdir}/bash_completion.d/pulseaudio-bash-completion.sh
+%if %{defined suse_version}
+%config(noreplace) %{_fwdefdir}/pulseaudio-server
+%endif
# created by setup-pulseaudio script
%ghost %{_sysconfdir}/profile.d/pulseaudio.sh
%ghost %{_sysconfdir}/profile.d/pulseaudio.csh
++++++ pulseaudio-server.fw ++++++
## Name: PulseAudio server (TCP)
## Description: Ports for PulseAudio network access (for module-native-protocol-tcp)
TCP="4713"
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package polkit-default-privs for openSUSE:Factory checked in at 2013-06-29 14:30:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/polkit-default-privs (Old)
and /work/SRC/openSUSE:Factory/.polkit-default-privs.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "polkit-default-privs"
Changes:
--------
--- /work/SRC/openSUSE:Factory/polkit-default-privs/polkit-default-privs.changes 2013-06-18 10:35:11.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.polkit-default-privs.new/polkit-default-privs.changes 2013-06-29 14:30:21.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Jun 28 12:15:02 UTC 2013 - meissner(a)suse.com
+
+- Added gnome-settings-daemon new policy
+ org.gnome.settings-daemon.plugins.wacom.wacom-oled-helper (bnc#822405)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ polkit-default-privs-13.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-default-privs-13.1/polkit-default-privs.restrictive new/polkit-default-privs-13.1/polkit-default-privs.restrictive
--- old/polkit-default-privs-13.1/polkit-default-privs.restrictive 2013-06-17 15:50:15.000000000 +0200
+++ new/polkit-default-privs-13.1/polkit-default-privs.restrictive 2013-06-28 14:14:03.000000000 +0200
@@ -37,6 +37,8 @@
org.gnome.settingsdaemon.datetimemechanism.configure auth_admin_keep
# bnc#750795
org.gnome.settings-daemon.plugins.wacom.wacom-led-helper auth_admin
+# bnc#822405
+org.gnome.settings-daemon.plugins.wacom.wacom-oled-helper auth_admin
#
# colord (bnc#698250)
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-default-privs-13.1/polkit-default-privs.standard new/polkit-default-privs-13.1/polkit-default-privs.standard
--- old/polkit-default-privs-13.1/polkit-default-privs.standard 2013-06-17 15:50:15.000000000 +0200
+++ new/polkit-default-privs-13.1/polkit-default-privs.standard 2013-06-28 14:14:03.000000000 +0200
@@ -38,6 +38,8 @@
org.gnome.settingsdaemon.datetimemechanism.configure auth_admin_keep
# bnc#750795
org.gnome.settings-daemon.plugins.wacom.wacom-led-helper no:no:yes
+# bnc#822405
+org.gnome.settings-daemon.plugins.wacom.wacom-oled-helper no:no:yes
#
# colord (bnc#698250)
#
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package nfc-eventd for openSUSE:Factory checked in at 2013-06-29 14:29:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nfc-eventd (Old)
and /work/SRC/openSUSE:Factory/.nfc-eventd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nfc-eventd"
Changes:
--------
--- /work/SRC/openSUSE:Factory/nfc-eventd/nfc-eventd.changes 2013-06-06 12:12:31.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.nfc-eventd.new/nfc-eventd.changes 2013-06-29 14:29:24.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Jun 28 23:05:08 UTC 2013 - jengelh(a)inai.de
+
+- Update to new upstream release 0.1.7
+* Support the libnfc-1.7.0 API
+
+-------------------------------------------------------------------
Old:
----
nfc-eventd-0.1.5+svn1129.tar.xz
New:
----
nfc-eventd-0.1.7.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nfc-eventd.spec ++++++
--- /var/tmp/diff_new_pack.ZltyU4/_old 2013-06-29 14:29:25.000000000 +0200
+++ /var/tmp/diff_new_pack.ZltyU4/_new 2013-06-29 14:29:25.000000000 +0200
@@ -20,22 +20,20 @@
Summary: NFC event daemon
License: GPL-3.0+
Group: Hardware/Other
-Version: 0.1.5+svn1129
+Version: 0.1.7
Release: 0
Url: http://code.google.com/p/nfc-tools/
#SVN-DL: http://nfc-tools.googlecode.com/svn/trunk/nfc-eventd/
+#DL-URL: http://nfc-tools.googlecode.com/files/nfc-eventd-0.1.7.tar.gz
Source: %name-%version.tar.xz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: xz
%if 0%{?suse_version} >= 1140 || 0%{?fedora_version}
-BuildRequires: pkgconfig(libnfc) >= 1.5.1
+BuildRequires: pkgconfig(libnfc) > 1.6.99
%else
-BuildRequires: libnfc-devel >= 1.5.1
+BuildRequires: libnfc-devel > 1.6.99
%endif
%description
@@ -44,12 +42,9 @@
allow many kind of usage of theses events.
%prep
-%setup -qn %name
+%setup -q
%build
-if [ ! -e configure ]; then
- autoreconf -fi;
-fi;
%configure --disable-static
make %{?_smp_mflags};
++++++ nfc-eventd-0.1.5+svn1129.tar.xz -> nfc-eventd-0.1.7.tar.xz ++++++
++++ 45309 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package gettext-runtime for openSUSE:Factory checked in at 2013-06-29 14:25:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gettext-runtime (Old)
and /work/SRC/openSUSE:Factory/.gettext-runtime.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gettext-runtime"
Changes:
--------
gettext-java.changes: same change
--- /work/SRC/openSUSE:Factory/gettext-runtime/gettext-runtime-mini.changes 2013-06-20 11:55:56.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.gettext-runtime.new/gettext-runtime-mini.changes 2013-06-29 14:25:11.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Jun 25 09:09:00 UTC 2013 - gber(a)opensuse.org
+
+- add gettext-fix-tcl-u-escape-sequences.patch in order to fix
+ the handling of Tcl \u escape sequences (bnc#826422)
+
+-------------------------------------------------------------------
gettext-runtime.changes: same change
New:
----
gettext-fix-tcl-u-escape-sequences.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
gettext-java.spec: same change
++++++ gettext-runtime-mini.spec ++++++
--- /var/tmp/diff_new_pack.0JYHTG/_old 2013-06-29 14:25:12.000000000 +0200
+++ /var/tmp/diff_new_pack.0JYHTG/_new 2013-06-29 14:25:12.000000000 +0200
@@ -63,6 +63,7 @@
Patch5: gettext-initialize_vars.patch
Patch9: gettext-needlessly_init_vars.patch
Patch10: gettext-configure.patch
+Patch11: gettext-fix-tcl-u-escape-sequences.patch
%description
This package contains the intl library as well as tools that ease the
@@ -109,6 +110,7 @@
%patch5
%patch9
%patch10 -p1
+%patch11 -p1
%build
# expect a couple "You should update your `aclocal.m4' by running aclocal."
gettext-runtime.spec: same change
++++++ gettext-fix-tcl-u-escape-sequences.patch ++++++
Index: gettext-0.18.2.1/gettext-tools/src/x-tcl.c
===================================================================
--- gettext-0.18.2.1.orig/gettext-tools/src/x-tcl.c
+++ gettext-0.18.2.1/gettext-tools/src/x-tcl.c
@@ -517,7 +517,10 @@ do_getc_escaped ()
{
c = phase1_getc ();
if (c == EOF || !c_isxdigit ((unsigned char) c))
- break;
+ {
+ phase1_ungetc (c);
+ break;
+ }
if (c >= '0' && c <= '9')
n = (n << 4) + (c - '0');
@@ -526,7 +529,6 @@ do_getc_escaped ()
else if (c >= 'a' && c <= 'f')
n = (n << 4) + (c - 'a' + 10);
}
- phase1_ungetc (c);
return (i > 0 ? n : 'u');
}
case '0': case '1': case '2': case '3': case '4':
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package dovecot21 for openSUSE:Factory checked in at 2013-06-29 14:24:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dovecot21 (Old)
and /work/SRC/openSUSE:Factory/.dovecot21.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dovecot21"
Changes:
--------
--- /work/SRC/openSUSE:Factory/dovecot21/dovecot21.changes 2013-05-17 08:25:43.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.dovecot21.new/dovecot21.changes 2013-06-29 14:25:00.000000000 +0200
@@ -1,0 +2,15 @@
+Thu Jun 27 02:30:31 UTC 2013 - alexandre(a)exatati.com.br
+
+- Update to 2.1.17:
+ + zlib: Keep the last read mail uncompressed in a temporary file.
+ This significantly improves performance when IMAP client does
+ small partial fetches for a large mail.
+ + acl: Optionally get default ACL's for private/shared namespaces
+ from user's INBOX (plugin { acl_defaults_from_inbox = yes }
+ - Case-insensitive unicode character comparisons weren't all working
+ as they should.
+ - maildir: Fixed handling over 26 keywords in a mailbox.
+ - auth: Don't crash in non-PLAIN/LOGIN auth mechanism if master user
+ login is attempted without any master passdbs configured.
+
+-------------------------------------------------------------------
Old:
----
dovecot-2.1.16.tar.bz2
New:
----
dovecot-2.1.17.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dovecot21.spec ++++++
--- /var/tmp/diff_new_pack.ADhNRx/_old 2013-06-29 14:25:01.000000000 +0200
+++ /var/tmp/diff_new_pack.ADhNRx/_new 2013-06-29 14:25:01.000000000 +0200
@@ -17,11 +17,11 @@
Name: dovecot21
-Version: 2.1.16
+Version: 2.1.17
Release: 0
%define pkg_name dovecot
%define sieve_version 2.1
-%define dovecot_version 2.1.16
+%define dovecot_version 2.1.17
%define dovecot_pigeonhole_docdir %{_docdir}/%{pkg_name}/dovecot-pigeonhole
%define with_solr 1
%define with_clucene 1
++++++ dovecot-2.1.16.tar.bz2 -> dovecot-2.1.17.tar.bz2 ++++++
++++ 12537 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package dbus-1 for openSUSE:Factory checked in at 2013-06-29 14:23:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dbus-1 (Old)
and /work/SRC/openSUSE:Factory/.dbus-1.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dbus-1"
Changes:
--------
--- /work/SRC/openSUSE:Factory/dbus-1/dbus-1-x11.changes 2013-06-25 14:39:27.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.dbus-1.new/dbus-1-x11.changes 2013-06-29 14:24:11.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Jun 25 14:09:30 UTC 2013 - coolo(a)suse.com
+
+- to avoid a cycle with systemd, build the daemon in dbus-x11.spec.
+ It would be wise to rename dbus-1.spec to dbus-1-libs.spec and
+ dbus-1-x11.spec to dbus-1.spec, but I first wanted to hear feedback
+
+-------------------------------------------------------------------
dbus-1.changes: same change
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dbus-1-x11.spec ++++++
--- /var/tmp/diff_new_pack.TxkhAI/_old 2013-06-29 14:24:12.000000000 +0200
+++ /var/tmp/diff_new_pack.TxkhAI/_new 2013-06-29 14:24:12.000000000 +0200
@@ -16,6 +16,9 @@
#
+%define with_systemd 1
+%bcond_without docs
+
Name: dbus-1-x11
%define _name dbus
BuildRequires: pkgconfig(x11)
@@ -23,11 +26,14 @@
Summary: D-Bus Message Bus System
License: GPL-2.0+ or AFL-2.1
Group: System/Daemons
+BuildRequires: audit-devel
+BuildRequires: doxygen
+BuildRequires: update-desktop-files
+BuildRequires: xmlto
+
# COMMON1-BEGIN
# COMMON1-BEGIN
-%define with_systemd 1
-
%if ! %{with_systemd}
%if 0%{?suse_version} < 1230
%define _unitdir /lib/systemd/system
@@ -36,23 +42,15 @@
%endif
%endif
-BuildRequires: audit-devel
-BuildRequires: doxygen
-BuildRequires: libexpat-devel
-BuildRequires: libtool
-BuildRequires: pkg-config
-BuildRequires: update-desktop-files
-BuildRequires: xmlto
%if %{with_systemd}
BuildRequires: pkgconfig(libsystemd-daemon)
BuildRequires: pkgconfig(libsystemd-login)
%endif
+BuildRequires: libexpat-devel
+BuildRequires: libtool
+BuildRequires: pkg-config
Version: 1.7.4
Release: 0
-# bug437293
-%ifarch ppc64
-Obsoletes: dbus-1-64bit
-%endif
#
Source0: http://dbus.freedesktop.org/releases/dbus/%{_name}-%{version}.tar.gz
Source1: rc.boot.dbus
@@ -64,11 +62,7 @@
Patch1: dbus-do-autolaunch.patch
# PATCH-FIX-OPENSUSE hpj(a)suse.com bnc#802525 - Avoid clients hanging after move to /run
Patch2: dbus-fall-back-to-old-run-directory.patch
-%if 0%{?suse_version} > 1100
%bcond_without selinux
-%else
-%bcond_with selinux
-%endif
%if %{with selinux}
BuildRequires: libselinux-devel
%endif
@@ -81,6 +75,42 @@
D-Bus contains some tools that require Xlib to be installed, those are
in this separate package so server systems need not install X.
+%package -n dbus-1-devel-doc
+Summary: Developer documentation package for D-Bus
+Group: Development/Libraries/Other
+Requires: dbus-1 = %{version}
+%if 0%{?suse_version} >= 1120
+BuildArch: noarch
+%endif
+
+%description -n dbus-1-devel-doc
+D-Bus is a message bus system, a simple way for applications to talk to
+one another. D-BUS supplies both a system daemon and a
+per-user-login-session daemon. Also, the message bus is built on top of
+a general one-to-one message passing framework, which can be used by
+any two apps to communicate directly (without going through the message
+bus daemon).
+
+%package -n dbus-1
+Summary: D-Bus Message Bus System
+Group: System/Daemons
+# bug437293
+%ifarch ppc64
+Obsoletes: dbus-1-64bit
+%endif
+%if 0%{?suse_version} < 1230
+PreReq: /sbin/insserv /etc/init.d/boot.localfs
+%endif
+PreReq: permissions /usr/sbin/groupadd /usr/sbin/useradd
+
+%description -n dbus-1
+D-Bus is a message bus system, a simple way for applications to talk to
+one another. D-Bus supplies both a system daemon and a
+per-user-login-session daemon. Also, the message bus is built on top of
+a general one-to-one message passing framework, which can be used by
+any two apps to communicate directly (without going through the message
+bus daemon).
+
%prep
# COMMON2-BEGIN
# COMMON2-BEGIN
@@ -105,11 +135,13 @@
--disable-static \
--with-pic \
--bindir=/bin \
- --libexecdir=/lib/%{name} \
+ --libexecdir=/lib/dbus-1 \
--libdir=/%{_lib} \
--with-init-scripts=suse \
--enable-inotify \
+%if %{with docs}
--enable-doxygen-docs \
+%endif
%if %{with selinux}
--enable-selinux \
%endif
@@ -122,21 +154,67 @@
--with-system-socket=/run/dbus/system_bus_socket \
--with-systemdsystemunitdir=%{_unitdir}
make %{?_smp_mflags}
+%if %{with docs}
doxygen -u && doxygen
./cleanup-man-pages.sh
+%endif
%install
# COMMON2-END
# COMMON2-END
-tdir=$(mktemp -d)
-make DESTDIR=$tdir install
+make DESTDIR=%{buildroot} install
mkdir -p %{buildroot}/%{_bindir}
mkdir -p %{buildroot}/%{_mandir}/man1
-mv $tdir/bin/dbus-launch %{buildroot}/%{_bindir}
-mv $tdir/bin/dbus-run-session %{buildroot}/%{_bindir}
-mv $tdir/%{_mandir}/man1/dbus-launch.1* %{buildroot}/%{_mandir}/man1
-mv $tdir/%{_mandir}/man1/dbus-run-session.1* %{buildroot}/%{_mandir}/man1
-rm -rf $tdir
+mkdir -p %{buildroot}/etc/init.d
+mkdir -p %{buildroot}/usr/sbin
+
+mv %{buildroot}/bin/dbus-launch %{buildroot}/%{_bindir}
+mv %{buildroot}/bin/dbus-run-session %{buildroot}/%{_bindir}
+install -m 755 %{SOURCE1} %{buildroot}/%{_sysconfdir}/init.d/dbus
+ln -sf %{_sysconfdir}/init.d/dbus %{buildroot}/%{_sbindir}/rcdbus
+install -d %{buildroot}/run/dbus
+mkdir -p %{buildroot}/%{_datadir}/susehelp/meta/Development/Libraries/
+install -m 0644 %SOURCE2 \
+ %{buildroot}/%{_datadir}/susehelp/meta/Development/Libraries/dbus-1.desktop
+mkdir -p %{buildroot}/%{_libdir}/pkgconfig
+mkdir -p %{buildroot}/lib/dbus-1/system-services
+mkdir -p %{buildroot}/%{_datadir}/dbus-1/system-services
+mkdir -p %{buildroot}/%{_datadir}/dbus-1/interfaces
+mkdir -p %{buildroot}/%{_libdir}/dbus-1.0/include/
+
+chmod a-x AUTHORS COPYING HACKING NEWS README doc/*.txt doc/file-boilerplate.c doc/TODO
+
+rm %{buildroot}%{_includedir}/dbus-1.0/dbus/*.h
+rm %{buildroot}/%{_lib}/libdbus-1* %{buildroot}/%{_lib}/pkgconfig/*pc
+rm %{buildroot}/%{_lib}/dbus-1.0/include/dbus/*.h
+
+#
+install -d %{buildroot}%{_sysconfdir}/ConsoleKit/run-session.d
+install -m 755 %{SOURCE3} %{buildroot}%{_sysconfdir}/ConsoleKit/run-session.d
+mkdir -p %{buildroot}%{_localstatedir}/lib/dbus
+touch %{buildroot}/%{_localstatedir}/lib/dbus/machine-id
+
+# Link the /bin/dbus-send binary to /usr/bin/dbus-send. This should be removed once dbus has been fully migrated to /usr
+# Currently required to make upower work together with systemd
+mkdir -p %{buildroot}/usr/bin
+ln -sf /bin/dbus-send %{buildroot}/usr/bin/dbus-send
+
+%pre -n dbus-1
+/usr/sbin/groupadd -r messagebus 2> /dev/null || :
+/usr/sbin/useradd -r -s /bin/false -c "User for D-Bus" -d /run/dbus -g messagebus messagebus 2> /dev/null || :
+
+%preun -n dbus-1
+%{stop_on_removal dbus}
+
+%post -n dbus-1
+/bin/dbus-uuidgen --ensure
+%{insserv_force_if_yast dbus}
+/sbin/ldconfig
+%verifyscript
+%verify_permissions -e /lib/dbus-1/dbus-daemon-launch-helper
+
+%postun -n dbus-1
+%{insserv_cleanup}
%files
%defattr(-,root,root)
@@ -145,4 +223,69 @@
%{_mandir}/man1/dbus-launch.1*
%{_mandir}/man1/dbus-run-session.1*
+%files -n dbus-1
+%defattr(-, root, root)
+%dir %{_localstatedir}/lib/dbus
+%dir /lib/dbus-1
+%dir /lib/dbus-1/system-services
+%doc AUTHORS COPYING HACKING NEWS README
+%config(noreplace) %{_sysconfdir}/dbus-1/session.conf
+%config(noreplace) %{_sysconfdir}/dbus-1/system.conf
+%{_sysconfdir}/init.d/dbus
+%{_sysconfdir}/ConsoleKit
+/bin/dbus-cleanup-sockets
+/bin/dbus-daemon
+/bin/dbus-monitor
+/bin/dbus-send
+/usr/bin/dbus-send
+/bin/dbus-uuidgen
+%{_mandir}/man1/dbus-cleanup-sockets.1.*
+%{_mandir}/man1/dbus-daemon.1.*
+%{_mandir}/man1/dbus-monitor.1.*
+%{_mandir}/man1/dbus-send.1.*
+%{_mandir}/man1/dbus-uuidgen.1.*
+%{_sbindir}/rcdbus
+# See doc/system-activation.txt in source tarball for the rationale
+# behind these permissions
+%attr(4750,root,messagebus) %verify(not mode) /lib/dbus-1/dbus-daemon-launch-helper
+%ghost /run/dbus
+%ghost %{_localstatedir}/lib/dbus/machine-id
+%if ! %{with_systemd}
+%if 0%{?suse_version} < 1230
+%dir /lib/systemd
+%else
+%dir /usr/lib/systemd
+%dir %{_unitdir}
+%endif
+%endif
+%{_unitdir}/dbus.service
+%{_unitdir}/dbus.socket
+%dir %{_unitdir}/dbus.target.wants
+%{_unitdir}/dbus.target.wants/dbus.socket
+%dir %{_unitdir}/multi-user.target.wants
+%{_unitdir}/multi-user.target.wants/dbus.service
+%dir %{_unitdir}/sockets.target.wants
+%{_unitdir}/sockets.target.wants/dbus.socket
+
+%files -n dbus-1-devel-doc
+%defattr(-,root,root)
+%dir %{_datadir}/doc/dbus
+%{_datadir}/doc/dbus/api/
+%doc %{_datadir}/doc/dbus/dbus-faq.html
+%doc %{_datadir}/doc/dbus/dbus-specification.html
+%doc %{_datadir}/doc/dbus/dbus-test-plan.html
+%doc %{_datadir}/doc/dbus/dbus-tutorial.html
+%doc %{_datadir}/doc/dbus/diagram.*
+%doc %{_datadir}/doc/dbus/system-activation.txt
+%doc %{_datadir}/doc/dbus/dbus-cleanup-sockets.1.html
+%doc %{_datadir}/doc/dbus/dbus-daemon.1.html
+%doc %{_datadir}/doc/dbus/dbus-launch.1.html
+%doc %{_datadir}/doc/dbus/dbus-run-session.1.html
+%doc %{_datadir}/doc/dbus/dbus-monitor.1.html
+%doc %{_datadir}/doc/dbus/dbus-send.1.html
+%doc %{_datadir}/doc/dbus/dbus-uuidgen.1.html
+%doc %{_datadir}/doc/dbus/dbus.devhelp
+%doc doc/*.txt doc/file-boilerplate.c doc/TODO
+%{_datadir}/susehelp
+
%changelog
++++++ dbus-1.spec ++++++
--- /var/tmp/diff_new_pack.TxkhAI/_old 2013-06-29 14:24:12.000000000 +0200
+++ /var/tmp/diff_new_pack.TxkhAI/_new 2013-06-29 14:24:12.000000000 +0200
@@ -16,6 +16,9 @@
#
+%define with_systemd 0
+%bcond_with docs
+
Name: dbus-1
%define _name dbus
%define _libname libdbus-1-3
@@ -23,9 +26,8 @@
Summary: D-Bus Message Bus System
License: GPL-2.0+ or AFL-2.1
Group: System/Daemons
-# COMMON1-BEGIN
-%define with_systemd 1
+# COMMON1-BEGIN
%if ! %{with_systemd}
%if 0%{?suse_version} < 1230
@@ -35,23 +37,15 @@
%endif
%endif
-BuildRequires: audit-devel
-BuildRequires: doxygen
-BuildRequires: libexpat-devel
-BuildRequires: libtool
-BuildRequires: pkg-config
-BuildRequires: update-desktop-files
-BuildRequires: xmlto
%if %{with_systemd}
BuildRequires: pkgconfig(libsystemd-daemon)
BuildRequires: pkgconfig(libsystemd-login)
%endif
+BuildRequires: libexpat-devel
+BuildRequires: libtool
+BuildRequires: pkg-config
Version: 1.7.4
Release: 0
-# bug437293
-%ifarch ppc64
-Obsoletes: dbus-1-64bit
-%endif
#
Source0: http://dbus.freedesktop.org/releases/dbus/%{_name}-%{version}.tar.gz
Source1: rc.boot.dbus
@@ -63,44 +57,25 @@
Patch1: dbus-do-autolaunch.patch
# PATCH-FIX-OPENSUSE hpj(a)suse.com bnc#802525 - Avoid clients hanging after move to /run
Patch2: dbus-fall-back-to-old-run-directory.patch
-%if 0%{?suse_version} > 1100
%bcond_without selinux
-%else
-%bcond_with selinux
-%endif
%if %{with selinux}
BuildRequires: libselinux-devel
%endif
BuildRequires: libcap-ng-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# COMMON1-END
-%if 0%{?suse_version} < 1230
-PreReq: /sbin/insserv /etc/init.d/boot.localfs
-%endif
-PreReq: permissions /usr/sbin/groupadd /usr/sbin/useradd
%package -n %{_libname}
-
Summary: Library package for D-Bus
Group: Development/Libraries/Other
%package -n dbus-1-devel
-
Summary: Developer package for D-Bus
Group: Development/Libraries/Other
Requires: %{_libname} = %{version}
Requires: dbus-1
Requires: glibc-devel
-%package -n dbus-1-devel-doc
-
-Summary: Developer documentation package for D-Bus
-Group: Development/Libraries/Other
-Requires: %{name} = %{version}
-%if 0%{?suse_version} >= 1120
-BuildArch: noarch
-%endif
-
%description
D-Bus is a message bus system, a simple way for applications to talk to
one another. D-Bus supplies both a system daemon and a
@@ -125,14 +100,6 @@
any two apps to communicate directly (without going through the message
bus daemon).
-%description -n dbus-1-devel-doc
-D-Bus is a message bus system, a simple way for applications to talk to
-one another. D-BUS supplies both a system daemon and a
-per-user-login-session daemon. Also, the message bus is built on top of
-a general one-to-one message passing framework, which can be used by
-any two apps to communicate directly (without going through the message
-bus daemon).
-
%prep
# COMMON2-BEGIN
%setup -n %{_name}-%{version} -q
@@ -156,11 +123,13 @@
--disable-static \
--with-pic \
--bindir=/bin \
- --libexecdir=/lib/%{name} \
+ --libexecdir=/lib/dbus-1 \
--libdir=/%{_lib} \
--with-init-scripts=suse \
--enable-inotify \
+%if %{with docs}
--enable-doxygen-docs \
+%endif
%if %{with selinux}
--enable-selinux \
%endif
@@ -173,119 +142,48 @@
--with-system-socket=/run/dbus/system_bus_socket \
--with-systemdsystemunitdir=%{_unitdir}
make %{?_smp_mflags}
+%if %{with docs}
doxygen -u && doxygen
./cleanup-man-pages.sh
+%endif
%install
# COMMON2-END
-make DESTDIR=%{buildroot} install
-mkdir -p %{buildroot}/etc/init.d
-mkdir -p %{buildroot}/usr/sbin
-install -m 755 %{SOURCE1} %{buildroot}/%{_sysconfdir}/init.d/dbus
-ln -sf %{_sysconfdir}/init.d/dbus %{buildroot}/%{_sbindir}/rcdbus
-install -d %{buildroot}/run/dbus
-mkdir -p %{buildroot}/%{_datadir}/susehelp/meta/Development/Libraries/
-install -m 0644 %SOURCE2 \
- %{buildroot}/%{_datadir}/susehelp/meta/Development/Libraries/dbus-1.desktop
-mkdir -p %{buildroot}/%{_libdir}/pkgconfig
-mkdir -p %{buildroot}/lib/dbus-1/system-services
-mkdir -p %{buildroot}/%{_datadir}/dbus-1/system-services
-mkdir -p %{buildroot}/%{_datadir}/dbus-1/interfaces
-mkdir -p %{buildroot}/%{_libdir}/dbus-1.0/include/
-mv -f %{buildroot}/%{_lib}/dbus-1.0/include/* %{buildroot}/%{_libdir}/dbus-1.0/include/
-rm -f %{buildroot}/%{_lib}/*.la
+tdir=$(mktemp -d)
+make DESTDIR=$tdir install
+
# devel stuff must not be in /lib
-%{__ln_s} -v /%{_lib}/$(readlink %{buildroot}/%{_lib}/lib%{name}.so) %{buildroot}%{_libdir}/lib%{name}.so
-%{__rm} -v %{buildroot}/%{_lib}/lib%{name}.so
+mkdir -p %{buildroot}%{_libdir}
+%{__ln_s} -v /%{_lib}/$(readlink $tdir/%{_lib}/lib%{name}.so) %{buildroot}%{_libdir}/lib%{name}.so
+%{__rm} -v $tdir/%{_lib}/lib%{name}.so
+mkdir -p %{buildroot}/%{_libdir}/dbus-1.0/include/
+mv -f $tdir/%{_lib}/dbus-1.0/include/* %{buildroot}/%{_libdir}/dbus-1.0/include/
+rm -f $tdir/%{_lib}/*.la
+
# fix up pkgconfig file
-sed -e 's@^\(libdir=\).*@\1%{_libdir}@' %{buildroot}/%{_lib}/pkgconfig/dbus-1.pc > %{buildroot}/%{_libdir}/pkgconfig/dbus-1.pc
-rm -f %{buildroot}/%{_lib}/pkgconfig/dbus-1.pc
-#
-rm -f %{buildroot}/bin/dbus-launch
-rm -f %{buildroot}/%{_mandir}/man1/dbus-launch.1*
-rm -f %{buildroot}/bin/dbus-run-session
-rm -f %{buildroot}/%{_mandir}/man1/dbus-run-session.1*
-rm -f %{buildroot}/%{_datadir}/doc/dbus/dbus-run-session.1.html
-chmod a-x AUTHORS COPYING HACKING NEWS README doc/*.txt doc/file-boilerplate.c doc/TODO
-#
-install -d %{buildroot}%{_sysconfdir}/ConsoleKit/run-session.d
-install -m 755 %{SOURCE3} %{buildroot}%{_sysconfdir}/ConsoleKit/run-session.d
-mkdir -p %{buildroot}%{_localstatedir}/lib/dbus
-touch %{buildroot}/%{_localstatedir}/lib/dbus/machine-id
-
-# Link the /bin/dbus-send binary to /usr/bin/dbus-send. This should be removed once dbus has been fully migrated to /usr
-# Currently required to make upower work together with systemd
-mkdir -p %{buildroot}/usr/bin
-ln -sf /bin/dbus-send %{buildroot}/usr/bin/dbus-send
-
-%pre
-/usr/sbin/groupadd -r messagebus 2> /dev/null || :
-/usr/sbin/useradd -r -s /bin/false -c "User for D-Bus" -d /run/dbus -g messagebus messagebus 2> /dev/null || :
-%if 0%{?suse_version:1}
-
-%preun
-%{stop_on_removal dbus}
-
-%post
-
-/bin/dbus-uuidgen --ensure
-%{insserv_force_if_yast dbus}
-/sbin/ldconfig
-%verifyscript
-%verify_permissions -e /lib/dbus-1/dbus-daemon-launch-helper
-
-%postun
-%{insserv_cleanup}
-/sbin/ldconfig
-%endif
+mkdir -p %{buildroot}/%{_libdir}/pkgconfig
+sed -e 's@^\(libdir=\).*@\1%{_libdir}@' $tdir/%{_lib}/pkgconfig/dbus-1.pc > %{buildroot}/%{_libdir}/pkgconfig/dbus-1.pc
+rm -f $tdir/%{_lib}/pkgconfig/dbus-1.pc
+
+pushd $tdir
+filelist=$(mktemp)
+find .%{_includedir} -type f > $filelist
+find ./%{_lib} -name "*.so*" >> $filelist
+cat $filelist | while read file; do
+ mkdir -p $(dirname %{buildroot}/$file)
+ cp -a $file %{buildroot}/$file
+done
+popd
+rm -rf $tdir
+
+for i in /etc/dbus-1/session.d /etc/dbus-1/system.d \
+ /usr/share/dbus-1/interfaces /usr/share/dbus-1/services /usr/share/dbus-1/system-services; do
+ mkdir -p %{buildroot}$i
+done
%post -n %{_libname} -p /sbin/ldconfig
%postun -n %{_libname} -p /sbin/ldconfig
-%files
-%defattr(-, root, root)
-%dir %{_localstatedir}/lib/dbus
-%dir /lib/dbus-1
-%dir /lib/dbus-1/system-services
-%doc AUTHORS COPYING HACKING NEWS README
-%config(noreplace) %{_sysconfdir}/dbus-1/session.conf
-%config(noreplace) %{_sysconfdir}/dbus-1/system.conf
-%{_sysconfdir}/init.d/dbus
-%{_sysconfdir}/ConsoleKit
-/bin/dbus-cleanup-sockets
-/bin/dbus-daemon
-/bin/dbus-monitor
-/bin/dbus-send
-/usr/bin/dbus-send
-/bin/dbus-uuidgen
-%{_mandir}/man1/dbus-cleanup-sockets.1.*
-%{_mandir}/man1/dbus-daemon.1.*
-%{_mandir}/man1/dbus-monitor.1.*
-%{_mandir}/man1/dbus-send.1.*
-%{_mandir}/man1/dbus-uuidgen.1.*
-%{_sbindir}/rcdbus
-# See doc/system-activation.txt in source tarball for the rationale
-# behind these permissions
-%attr(4750,root,messagebus) %verify(not mode) /lib/%{name}/dbus-daemon-launch-helper
-%ghost /run/dbus
-%ghost %{_localstatedir}/lib/dbus/machine-id
-%if ! %{with_systemd}
-%if 0%{?suse_version} < 1230
-%dir /lib/systemd
-%else
-%dir /usr/lib/systemd
-%dir %{_unitdir}
-%endif
-%endif
-%{_unitdir}/dbus.service
-%{_unitdir}/dbus.socket
-%dir %{_unitdir}/dbus.target.wants
-%{_unitdir}/dbus.target.wants/dbus.socket
-%dir %{_unitdir}/multi-user.target.wants
-%{_unitdir}/multi-user.target.wants/dbus.service
-%dir %{_unitdir}/sockets.target.wants
-%{_unitdir}/sockets.target.wants/dbus.socket
-
%files -n %{_libname}
%defattr(-, root, root)
/%{_lib}/libdbus-1.so.*
@@ -307,24 +205,4 @@
%{_libdir}/dbus-1.0/include
%{_libdir}/pkgconfig/dbus-1.pc
-%files -n dbus-1-devel-doc
-%defattr(-,root,root)
-%dir %{_datadir}/doc/dbus
-%{_datadir}/doc/dbus/api/
-%doc %{_datadir}/doc/dbus/dbus-faq.html
-%doc %{_datadir}/doc/dbus/dbus-specification.html
-%doc %{_datadir}/doc/dbus/dbus-test-plan.html
-%doc %{_datadir}/doc/dbus/dbus-tutorial.html
-%doc %{_datadir}/doc/dbus/diagram.*
-%doc %{_datadir}/doc/dbus/system-activation.txt
-%doc %{_datadir}/doc/dbus/dbus-cleanup-sockets.1.html
-%doc %{_datadir}/doc/dbus/dbus-daemon.1.html
-%doc %{_datadir}/doc/dbus/dbus-launch.1.html
-%doc %{_datadir}/doc/dbus/dbus-monitor.1.html
-%doc %{_datadir}/doc/dbus/dbus-send.1.html
-%doc %{_datadir}/doc/dbus/dbus-uuidgen.1.html
-%doc %{_datadir}/doc/dbus/dbus.devhelp
-%doc doc/*.txt doc/file-boilerplate.c doc/TODO
-%{_datadir}/susehelp
-
%changelog
++++++ dbus-1-x11.spec.in ++++++
--- /var/tmp/diff_new_pack.TxkhAI/_old 2013-06-29 14:24:12.000000000 +0200
+++ /var/tmp/diff_new_pack.TxkhAI/_new 2013-06-29 14:24:12.000000000 +0200
@@ -15,6 +15,9 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+%define with_systemd 1
+%bcond_without docs
+
Name: dbus-1-x11
%define _name dbus
BuildRequires: pkgconfig(x11)
@@ -22,6 +25,11 @@
License: GPL2+ or AFL 2.1
Group: System/Daemons
Summary: D-Bus Message Bus System
+BuildRequires: audit-devel
+BuildRequires: doxygen
+BuildRequires: update-desktop-files
+BuildRequires: xmlto
+
# COMMON1-BEGIN
# COMMON1-END
@@ -29,18 +37,98 @@
D-Bus contains some tools that require Xlib to be installed, those are
in this separate package so server systems need not install X.
+%package -n dbus-1-devel-doc
+Summary: Developer documentation package for D-Bus
+Group: Development/Libraries/Other
+Requires: dbus-1 = %{version}
+%if 0%{?suse_version} >= 1120
+BuildArch: noarch
+%endif
+
+%description -n dbus-1-devel-doc
+D-Bus is a message bus system, a simple way for applications to talk to
+one another. D-BUS supplies both a system daemon and a
+per-user-login-session daemon. Also, the message bus is built on top of
+a general one-to-one message passing framework, which can be used by
+any two apps to communicate directly (without going through the message
+bus daemon).
+
+%package -n dbus-1
+Summary: D-Bus Message Bus System
+Group: System/Daemons
+# bug437293
+%ifarch ppc64
+Obsoletes: dbus-1-64bit
+%endif
+%if 0%{?suse_version} < 1230
+PreReq: /sbin/insserv /etc/init.d/boot.localfs
+%endif
+PreReq: permissions /usr/sbin/groupadd /usr/sbin/useradd
+
+%description -n dbus-1
+D-Bus is a message bus system, a simple way for applications to talk to
+one another. D-Bus supplies both a system daemon and a
+per-user-login-session daemon. Also, the message bus is built on top of
+a general one-to-one message passing framework, which can be used by
+any two apps to communicate directly (without going through the message
+bus daemon).
+
%prep
# COMMON2-BEGIN
# COMMON2-END
-tdir=$(mktemp -d)
-make DESTDIR=$tdir install
+make DESTDIR=%{buildroot} install
mkdir -p %{buildroot}/%{_bindir}
mkdir -p %{buildroot}/%{_mandir}/man1
-mv $tdir/bin/dbus-launch %{buildroot}/%{_bindir}
-mv $tdir/bin/dbus-run-session %{buildroot}/%{_bindir}
-mv $tdir/%{_mandir}/man1/dbus-launch.1* %{buildroot}/%{_mandir}/man1
-mv $tdir/%{_mandir}/man1/dbus-run-session.1* %{buildroot}/%{_mandir}/man1
-rm -rf $tdir
+mkdir -p %{buildroot}/etc/init.d
+mkdir -p %{buildroot}/usr/sbin
+
+mv %{buildroot}/bin/dbus-launch %{buildroot}/%{_bindir}
+mv %{buildroot}/bin/dbus-run-session %{buildroot}/%{_bindir}
+install -m 755 %{SOURCE1} %{buildroot}/%{_sysconfdir}/init.d/dbus
+ln -sf %{_sysconfdir}/init.d/dbus %{buildroot}/%{_sbindir}/rcdbus
+install -d %{buildroot}/run/dbus
+mkdir -p %{buildroot}/%{_datadir}/susehelp/meta/Development/Libraries/
+install -m 0644 %SOURCE2 \
+ %{buildroot}/%{_datadir}/susehelp/meta/Development/Libraries/dbus-1.desktop
+mkdir -p %{buildroot}/%{_libdir}/pkgconfig
+mkdir -p %{buildroot}/lib/dbus-1/system-services
+mkdir -p %{buildroot}/%{_datadir}/dbus-1/system-services
+mkdir -p %{buildroot}/%{_datadir}/dbus-1/interfaces
+mkdir -p %{buildroot}/%{_libdir}/dbus-1.0/include/
+
+chmod a-x AUTHORS COPYING HACKING NEWS README doc/*.txt doc/file-boilerplate.c doc/TODO
+
+rm %{buildroot}%{_includedir}/dbus-1.0/dbus/*.h
+rm %{buildroot}/%{_lib}/libdbus-1* %{buildroot}/%{_lib}/pkgconfig/*pc
+rm %{buildroot}/%{_lib}/dbus-1.0/include/dbus/*.h
+
+#
+install -d %{buildroot}%{_sysconfdir}/ConsoleKit/run-session.d
+install -m 755 %{SOURCE3} %{buildroot}%{_sysconfdir}/ConsoleKit/run-session.d
+mkdir -p %{buildroot}%{_localstatedir}/lib/dbus
+touch %{buildroot}/%{_localstatedir}/lib/dbus/machine-id
+
+# Link the /bin/dbus-send binary to /usr/bin/dbus-send. This should be removed once dbus has been fully migrated to /usr
+# Currently required to make upower work together with systemd
+mkdir -p %{buildroot}/usr/bin
+ln -sf /bin/dbus-send %{buildroot}/usr/bin/dbus-send
+
+%pre -n dbus-1
+/usr/sbin/groupadd -r messagebus 2> /dev/null || :
+/usr/sbin/useradd -r -s /bin/false -c "User for D-Bus" -d /run/dbus -g messagebus messagebus 2> /dev/null || :
+
+%preun -n dbus-1
+%{stop_on_removal dbus}
+
+%post -n dbus-1
+/bin/dbus-uuidgen --ensure
+%{insserv_force_if_yast dbus}
+/sbin/ldconfig
+%verifyscript
+%verify_permissions -e /lib/dbus-1/dbus-daemon-launch-helper
+
+%postun -n dbus-1
+%{insserv_cleanup}
%files
%defattr(-,root,root)
@@ -49,4 +137,69 @@
%{_mandir}/man1/dbus-launch.1*
%{_mandir}/man1/dbus-run-session.1*
+%files -n dbus-1
+%defattr(-, root, root)
+%dir %{_localstatedir}/lib/dbus
+%dir /lib/dbus-1
+%dir /lib/dbus-1/system-services
+%doc AUTHORS COPYING HACKING NEWS README
+%config(noreplace) %{_sysconfdir}/dbus-1/session.conf
+%config(noreplace) %{_sysconfdir}/dbus-1/system.conf
+%{_sysconfdir}/init.d/dbus
+%{_sysconfdir}/ConsoleKit
+/bin/dbus-cleanup-sockets
+/bin/dbus-daemon
+/bin/dbus-monitor
+/bin/dbus-send
+/usr/bin/dbus-send
+/bin/dbus-uuidgen
+%{_mandir}/man1/dbus-cleanup-sockets.1.*
+%{_mandir}/man1/dbus-daemon.1.*
+%{_mandir}/man1/dbus-monitor.1.*
+%{_mandir}/man1/dbus-send.1.*
+%{_mandir}/man1/dbus-uuidgen.1.*
+%{_sbindir}/rcdbus
+# See doc/system-activation.txt in source tarball for the rationale
+# behind these permissions
+%attr(4750,root,messagebus) %verify(not mode) /lib/dbus-1/dbus-daemon-launch-helper
+%ghost /run/dbus
+%ghost %{_localstatedir}/lib/dbus/machine-id
+%if ! %{with_systemd}
+%if 0%{?suse_version} < 1230
+%dir /lib/systemd
+%else
+%dir /usr/lib/systemd
+%dir %{_unitdir}
+%endif
+%endif
+%{_unitdir}/dbus.service
+%{_unitdir}/dbus.socket
+%dir %{_unitdir}/dbus.target.wants
+%{_unitdir}/dbus.target.wants/dbus.socket
+%dir %{_unitdir}/multi-user.target.wants
+%{_unitdir}/multi-user.target.wants/dbus.service
+%dir %{_unitdir}/sockets.target.wants
+%{_unitdir}/sockets.target.wants/dbus.socket
+
+%files -n dbus-1-devel-doc
+%defattr(-,root,root)
+%dir %{_datadir}/doc/dbus
+%{_datadir}/doc/dbus/api/
+%doc %{_datadir}/doc/dbus/dbus-faq.html
+%doc %{_datadir}/doc/dbus/dbus-specification.html
+%doc %{_datadir}/doc/dbus/dbus-test-plan.html
+%doc %{_datadir}/doc/dbus/dbus-tutorial.html
+%doc %{_datadir}/doc/dbus/diagram.*
+%doc %{_datadir}/doc/dbus/system-activation.txt
+%doc %{_datadir}/doc/dbus/dbus-cleanup-sockets.1.html
+%doc %{_datadir}/doc/dbus/dbus-daemon.1.html
+%doc %{_datadir}/doc/dbus/dbus-launch.1.html
+%doc %{_datadir}/doc/dbus/dbus-run-session.1.html
+%doc %{_datadir}/doc/dbus/dbus-monitor.1.html
+%doc %{_datadir}/doc/dbus/dbus-send.1.html
+%doc %{_datadir}/doc/dbus/dbus-uuidgen.1.html
+%doc %{_datadir}/doc/dbus/dbus.devhelp
+%doc doc/*.txt doc/file-boilerplate.c doc/TODO
+%{_datadir}/susehelp
+
%changelog
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package chromium for openSUSE:Factory checked in at 2013-06-29 14:23:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/chromium (Old)
and /work/SRC/openSUSE:Factory/.chromium.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "chromium"
Changes:
--------
--- /work/SRC/openSUSE:Factory/chromium/chromium.changes 2013-06-17 10:03:12.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.chromium.new/chromium.changes 2013-06-29 14:23:55.000000000 +0200
@@ -1,0 +2,14 @@
+Fri Jun 28 07:46:04 UTC 2013 - tittiatcoke(a)gmail.com
+
+- Add the flag --disable-gpu-sandbox to prevent crashes and/or
+ slowness. The GPU Sandbox is a new sandbox introduces in M28 and
+ is currently causing issues
+ (http://code.google.com/p/chromium/issues/detail?id=255063)
+
+-------------------------------------------------------------------
+Tue Jun 25 12:27:22 UTC 2013 - tittiatcoke(a)gmail.com
+
+- Update to 29.0.1548
+ * Bug and Stability fixes
+
+-------------------------------------------------------------------
Old:
----
chromium.29.0.1541.0.svn206641.tar.xz
New:
----
chromium.29.0.1548.0.svn208524.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ chromium.spec ++++++
--- /var/tmp/diff_new_pack.pJNKzW/_old 2013-06-29 14:24:10.000000000 +0200
+++ /var/tmp/diff_new_pack.pJNKzW/_new 2013-06-29 14:24:10.000000000 +0200
@@ -16,12 +16,12 @@
#
-%define svn_revision 206641
+%define svn_revision 208524
%define chromium_no_dlopen 1
%define chromium_system_libs 0%{?suse_version} > 1220
Name: chromium
-Version: 29.0.1541.0
+Version: 29.0.1548.0
Release: 0
Summary: Google's opens source browser project
License: BSD-3-Clause and LGPL-2.1+
++++++ chromium-browser.sh ++++++
--- /var/tmp/diff_new_pack.pJNKzW/_old 2013-06-29 14:24:10.000000000 +0200
+++ /var/tmp/diff_new_pack.pJNKzW/_new 2013-06-29 14:24:10.000000000 +0200
@@ -127,6 +127,6 @@
$GDB "$LIBDIR/$APPNAME" -x $tmpfile
exit $?
else
- exec $LIBDIR/$APPNAME $SANDBOX ${CHROMIUM_FLAGS} ${PEPPERFLASH} "--password-store=basic" "$@"
+ exec $LIBDIR/$APPNAME $SANDBOX ${CHROMIUM_FLAGS} ${PEPPERFLASH} "--password-store=basic" "--disable-gpu-sandbox" "$@"
fi
++++++ chromium-no-courgette.patch ++++++
--- /var/tmp/diff_new_pack.pJNKzW/_old 2013-06-29 14:24:10.000000000 +0200
+++ /var/tmp/diff_new_pack.pJNKzW/_new 2013-06-29 14:24:10.000000000 +0200
@@ -9,4 +9,26 @@
'../dbus/dbus.gyp:*',
'../sandbox/sandbox.gyp:*',
],
-diff -up chromium-20100218svn39394/src/chrome/chrome.gyp.no-courgette chromium-20100218svn39394/src/chrome/chrome.gyp
+
+--- chromium/src/chrome/chrome_tests.gypi 2013-06-23 12:39:24.165359694 +0200
++++ chromium/src/chrome/chrome_tests.gypi 2013-06-23 12:39:24.165359694 +0200
+@@ -3160,7 +3160,6 @@
+ # Disabled from running in coverage_posix.py.
+ # We need to build this during compile step, so enabling here.
+ '../content/content.gyp:content_browsertests',
+- '../courgette/courgette.gyp:courgette_unittests',
+ '../crypto/crypto.gyp:crypto_unittests',
+ '../jingle/jingle.gyp:jingle_unittests',
+ '../net/net.gyp:net_perftests',
+
+--- chromium/src/chrome/chrome_tests_unit.gypi 2013-06-23 12:39:10.508359033 +0200
++++ chromium/src/chrome/chrome_tests_unit.gypi 2013-06-23 12:39:10.508359033 +0200
+@@ -447,7 +447,6 @@
+ 'test_support_common',
+ 'test_support_unit',
+ # 3) anything tests directly depend on
+- '../courgette/courgette.gyp:courgette_lib',
+ '../google_apis/google_apis.gyp:google_apis',
+ '../skia/skia.gyp:skia',
+ '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
+
++++++ chromium.29.0.1541.0.svn206641.tar.xz -> chromium.29.0.1548.0.svn208524.tar.xz ++++++
/work/SRC/openSUSE:Factory/chromium/chromium.29.0.1541.0.svn206641.tar.xz /work/SRC/openSUSE:Factory/.chromium.new/chromium.29.0.1548.0.svn208524.tar.xz differ: char 27, line 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package cadaver for openSUSE:Factory checked in at 2013-06-29 14:23:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cadaver (Old)
and /work/SRC/openSUSE:Factory/.cadaver.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cadaver"
Changes:
--------
--- /work/SRC/openSUSE:Factory/cadaver/cadaver.changes 2012-03-26 11:00:46.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.cadaver.new/cadaver.changes 2013-06-29 14:23:28.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Jun 27 13:12:38 UTC 2013 - coolo(a)suse.com
+
+- avoid auto*, fixes build
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cadaver.spec ++++++
--- /var/tmp/diff_new_pack.7JeUGw/_old 2013-06-29 14:23:29.000000000 +0200
+++ /var/tmp/diff_new_pack.7JeUGw/_new 2013-06-29 14:23:29.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package cadaver
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: cadaver
-BuildRequires: automake
+#BuildRequires: automake
BuildRequires: libneon-devel
BuildRequires: libxml2-devel
BuildRequires: openssl-devel
@@ -42,10 +42,10 @@
%patch0
%build
-gettextize --force
-aclocal -I m4 -I m4/neon
-autoconf --force
-autoheader --force
+#gettextize --force
+#aclocal -I m4 -I m4/neon
+#autoconf --force
+#autoheader --force
export LDFLAGS=-pie CFLAGS="$RPM_OPT_FLAGS -fPIE -Wall"
%configure \
--with-ssl \
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package at for openSUSE:Factory checked in at 2013-06-29 14:22:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/at (Old)
and /work/SRC/openSUSE:Factory/.at.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "at"
Changes:
--------
--- /work/SRC/openSUSE:Factory/at/at.changes 2013-06-19 14:42:11.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.at.new/at.changes 2013-06-29 14:22:43.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Jun 20 01:52:46 UTC 2013 - crrodriguez(a)opensuse.org
+
+- at.sleep move away from pm-utils to systemd-sleep
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ at.spec ++++++
--- /var/tmp/diff_new_pack.jRCMyw/_old 2013-06-29 14:22:44.000000000 +0200
+++ /var/tmp/diff_new_pack.jRCMyw/_new 2013-06-29 14:22:44.000000000 +0200
@@ -66,7 +66,7 @@
%if 0%{?suse_version} > 1140
BuildRequires: libHX-devel
BuildRequires: pkgconfig
-BuildRequires: systemd
+BuildRequires: pkgconfig(systemd)
%{?systemd_requires}
%define has_systemd 1
%endif
@@ -119,9 +119,9 @@
ln -sf ../../etc/init.d/atd $RPM_BUILD_ROOT%{_sbindir}/rcatd
install -m644 %SOURCE2 $RPM_BUILD_ROOT/etc/pam.d/atd
install -m644 %SOURCE3 $RPM_BUILD_ROOT/var/adm/fillup-templates
-%{__install} -D -m 0755 %{S:4} %{buildroot}%{_sysconfdir}/pm/sleep.d/99%{name}
%if 0%{?has_systemd}
install -D -m 0644 %{S:5} %{buildroot}%{_unitdir}/atd.service
+%{__install} -D -m 0755 %{S:4} %{buildroot}%{_prefix}/lib/systemd/system-sleep/atd.sh
%endif
%pre
@@ -163,9 +163,6 @@
%defattr(-,root,root)
%doc Problems Copyright COPYING README ChangeLog timespec
%config(noreplace) /etc/at.deny
-%dir %{_sysconfdir}/pm
-%dir %{_sysconfdir}/pm/sleep.d
-%config %{_sysconfdir}/pm/sleep.d/99%{name}
%{_sbindir}/rcatd
%config /etc/init.d/atd
%config %attr(644,root,root) /etc/pam.d/atd
@@ -182,6 +179,7 @@
/var/adm/fillup-templates/sysconfig.atd
%if 0%{?has_systemd}
%{_unitdir}/atd.service
+%{_prefix}/lib/systemd/system-sleep/atd.sh
%endif
%changelog
++++++ at.sleep ++++++
--- /var/tmp/diff_new_pack.jRCMyw/_old 2013-06-29 14:22:44.000000000 +0200
+++ /var/tmp/diff_new_pack.jRCMyw/_new 2013-06-29 14:22:44.000000000 +0200
@@ -1,16 +1,9 @@
-#!/bin/bash
-
-. $PM_UTILS_LIBDIR/functions
-
-case "$1" in
- hibernate|suspend)
- stopservice atd
- ;;
- thaw|resume)
- restartservice atd
- ;;
- *)
- ;;
+#!/bin/sh
+case $1/$2 in
+ pre/*)
+ systemctl --quiet is-enabled atd && systemctl stop atd
+ ;;
+ post/*)
+ systemctl --quiet is-enabled atd && systemctl restart atd
+ ;;
esac
-
-exit 0
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package arabic-fonts for openSUSE:Factory checked in at 2013-06-29 14:22:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/arabic-fonts (Old)
and /work/SRC/openSUSE:Factory/.arabic-fonts.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "arabic-fonts"
Changes:
--------
--- /work/SRC/openSUSE:Factory/arabic-fonts/arabic-fonts.changes 2012-09-14 12:12:31.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.arabic-fonts.new/arabic-fonts.changes 2013-06-29 14:22:13.000000000 +0200
@@ -1,0 +2,13 @@
+Wed Jun 26 08:56:48 UTC 2013 - pgajdos(a)suse.com
+
+- new font: Amiri 0.106 [bnc#825961]
+
+-------------------------------------------------------------------
+Mon Jun 24 14:44:04 UTC 2013 - pgajdos(a)suse.com
+
+- arabic-fonts splitted into subpackages [bnc#825954]
+- new font: KacstOne 5.0 [bnc#825955]
+- %if-0-out Haydar and Nesf2 family because of missing license
+ specification
+
+-------------------------------------------------------------------
New:
----
amiri-0.106.tar.bz2
kacst_one_5.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ arabic-fonts.spec ++++++
--- /var/tmp/diff_new_pack.ZQLeRp/_old 2013-06-29 14:22:15.000000000 +0200
+++ /var/tmp/diff_new_pack.ZQLeRp/_new 2013-06-29 14:22:15.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package arabic-fonts
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,20 +16,29 @@
#
+# missing license specification for Haydar family,
+# sent mail to sales(a)haydarnet.nl, info(a)haydarlinux.org
+%define with_haydar 0
+# missing license to Nesf2 family,
+# sent mail to lucdevroye(a)gmail.com
+%define with_nesf2 0
+
Name: arabic-fonts
-Version: 0.20091208
+Version: 0.20130624
Release: 0
Summary: A Collection of Free Arabic Fonts
-License: GPL-2.0+
+License: GPL-2.0 and SUSE-Public-Domain and OFL-1.1
Group: System/X11/Fonts
Url: http://www.arabeyes.org/resources.php
# public domain:
-Source0: ae_fonts_mono.tar.bz2
-Source1: http://heanet.dl.sourceforge.net/sourceforge/arabeyes/haydar_fonts.tar.bz2
-Source2: kacst_fonts_2.01.tar.bz2
-Source3: http://heanet.dl.sourceforge.net/sourceforge/arabeyes/lateef.shaikh_fonts.t…
-Source4: http://heanet.dl.sourceforge.net/sourceforge/arabeyes/sharif.univ_ttf.bz2
+Source0: http://downloads.sourceforge.net/arabeyes/ae_fonts_mono.tar.bz2
+Source1: http://downloads.sourceforge.net/arabeyes/haydar_fonts.tar.bz2
+Source2: http://downloads.sourceforge.net/arabeyes/kacst_fonts_2.01.tar.bz2
+Source3: http://downloads.sourceforge.net/arabeyes/lateef.shaikh_fonts.tar.bz2
+Source4: http://downloads.sourceforge.net/arabeyes/sharif.univ_ttf.bz2
Source5: http://downloads.sourceforge.net/arabeyes/ae_fonts_2.0.tar.bz2
+Source6: http://downloads.sourceforge.net/arabeyes/kacst_one_5.0.tar.bz2
+Source7: http://downloads.sourceforge.net/project/amiri/amiri-0.106.tar.bz2
BuildRequires: dos2unix
BuildRequires: fontpackages-devel
%if 0%{?suse_version} >= 1220
@@ -42,10 +51,20 @@
BuildRequires: xorg-x11
%endif
%reconfigure_fonts_prereq
+Requires: arabic-ae-fonts
+Requires: arabic-bitmap-fonts
+%if %{with_haydar}
+Requires: arabic-haydar-bitmap-fonts
+%endif
+Requires: arabic-kacst-fonts
+Requires: arabic-kacstone-fonts
+Requires: arabic-naqsh-fonts
+%if %{with_nesf2}
+Requires: arabic-nesf2-fonts
+%endif
Provides: scalable-font-ar
Provides: locale(ar)
-# FIXME: This causes a rpmlint warning; change <= to < once here's a new upstream version
-Obsoletes: fonts-arabic <= %{version}
+Obsoletes: fonts-arabic <= 0.20091208
Provides: fonts-arabic = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
@@ -54,17 +73,110 @@
A collection of free Arabic fonts available from
http://www.arabeyes.org/resources.php.
+%package -n arabic-bitmap-fonts
+Summary: Arabic Bitmap Font
+License: SUSE-Public-Domain
+Group: System/X11/Fonts
+Version: 1.0
+Release: 0
+# according to PS Names Copyright:
+Provides: locale(ar)
+
+%description -n arabic-bitmap-fonts
+Misc Fixed family with arabic symbols.
+
+%if %{with_haydar}
+%package -n arabic-haydar-bitmap-fonts
+Summary: Arabic Bitmap Font
+License: SUSE-Public-Domain
+Group: System/X11/Fonts
+Version: 1.0
+Release: 0
+Provides: locale(ar)
+
+%description -n arabic-haydar-bitmap-fonts
+Arabic bitmap font (Haydar family).
+%endif
+
+%package -n arabic-kacst-fonts
+Summary: Arabic Kacst Fonts
+License: GPL-2.0
+Group: System/X11/Fonts
+Version: 2.01
+Release: 0
+Provides: locale(ar)
+
+%description -n arabic-kacst-fonts
+TrueType families developed by Kacst institution.
+
+%package -n arabic-kacstone-fonts
+Summary: Arabic Kacst One Fonts
+License: GPL-2.0
+Group: System/X11/Fonts
+Version: 5.0
+Release: 0
+Provides: locale(ar)
+
+%description -n arabic-kacstone-fonts
+KacstOne family developed by Kacst institution.
+
+%package -n arabic-naqsh-fonts
+Summary: Arabic Naqsh Font
+License: GPL-2.0
+Group: System/X11/Fonts
+Version: 2.1
+Release: 0
+Provides: locale(ar)
+
+%description -n arabic-naqsh-fonts
+Arabic TrueType font (Naqsh family).
+
+%if %{with_nesf2}
+%package -n arabic-nesf2-fonts
+Summary: Arabic Nesf2 Font
+License: SUSE-Public-Domain
+Group: System/X11/Fonts
+Version: 20000102
+Release: 0
+Provides: locale(ar)
+
+%description -n arabic-nesf2-fonts
+Arabic TrueType font (Nesf2 family).
+%endif
+
+%package -n arabic-ae-fonts
+Summary: Arabic Free and Open Source Fonts
+License: GPL-2.0
+Group: System/X11/Fonts
+Version: 2.0
+Release: 0
+Provides: locale(ar)
+
+%description -n arabic-ae-fonts
+Arabic TrueType fonts collected by Arab Eyes (www.arabeyes.org).
+
+%package -n arabic-amiri-fonts
+Summary: Amiri Naksh Typeface
+License: OFL-1.1
+Group: System/X11/Fonts
+Version: 0.106
+Release: 0
+Provides: locale(ar)
+
+%description -n arabic-amiri-fonts
+Amiri family is high quality Arabic Naskh typeface.
+
%prep
-%setup -T -c %{name} -n %{name} -a 0 -a 1 -a 2 -a 3 -a 5
-bunzip2 --stdout $RPM_SOURCE_DIR/sharif.univ_ttf.bz2 > sharif.univ.ttf
-dos2unix License.txt
-mv License.txt License.Naqsh.txt
-cp KacstArabicFonts-*/LICENSE LICENSE.Kacst
-cp ae_fonts*/COPYING COPYING.ae_fonts
-cp ae_fonts*/ChangeLog ChangeLog.ae_fonts
-cp ae_fonts*/README README.ae_fonts
+%setup -T -c %{name} -n %{name} -a 0 -a 2 -a 3 -a 5 -a 6 -a 7
+%if %{with_haydar}
+tar xf %{SOURCE1}
+%endif
+%if %{with_nesf2}
+bunzip2 --stdout $RPM_SOURCE_DIR/sharif.univ_ttf.bz2 > Nesf2.ttf
+%endif
%build
+dos2unix License.txt
%install
mkdir -p %{buildroot}%{_miscfontsdir}
@@ -89,8 +201,49 @@
%files
%defattr(-, root,root)
-%doc License* LICENSE*
-%{_miscfontsdir}
-%{_ttfontsdir}
+%dir %{_miscfontsdir}
+%dir %{_ttfontsdir}
+
+%files -n arabic-bitmap-fonts
+%defattr(-,root,root)
+%{_miscfontsdir}/10x21.pcf.gz
+
+%if %{with_haydar}
+%files -n arabic-haydar-bitmap-fonts
+%defattr(-,root,root)
+%{_miscfontsdir}/haydar*.pcf.gz
+%endif
+
+%files -n arabic-kacst-fonts
+%defattr(-,root,root)
+%doc KacstArabicFonts-*/{Copyright,LICENSE,README}
+%{_ttfontsdir}/Kacst*.ttf
+%exclude %{_ttfontsdir}/KacstOne*.ttf
+
+%files -n arabic-kacstone-fonts
+%defattr(-,root,root)
+%doc kacst_one_*/{BUGS,ChangeLog,Copyright,LICENSE,NEWS,README}
+%{_ttfontsdir}/KacstOne*.ttf
+
+%files -n arabic-naqsh-fonts
+%defattr(-,root,root)
+%doc License.txt
+%{_ttfontsdir}/Naqsh.ttf
+
+%if %{with_nesf2}
+%files -n arabic-nesf2-fonts
+%defattr(-,root,root)
+%{_ttfontsdir}/Nesf2.ttf
+%endif
+
+%files -n arabic-ae-fonts
+%defattr(-,root,root)
+%doc ae_fonts_*/{ChangeLog,COPYING,README}
+%{_ttfontsdir}/ae_*.ttf
+
+%files -n arabic-amiri-fonts
+%defattr(-,root,root)
+%doc amiri*/README.txt amiri*/OFL-FAQ.txt amiri*/OFL.txt amiri*/documentation
+%{_ttfontsdir}/amiri*.ttf
%changelog
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0