October 2015 - openSUSE Commits - openSUSE Mailing Lists

commit ghc-mod for openSUSE:Factory
by root＠hilbert.suse.de 30 Oct '15

30 Oct '15

Hello community, here is the log from the commit of package ghc-mod for openSUSE:Factory checked in at 2015-10-30 13:44:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-mod (Old) and /work/SRC/openSUSE:Factory/.ghc-mod.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-mod" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-mod/ghc-mod.changes 2015-09-30 05:53:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-mod.new/ghc-mod.changes 2015-10-30 13:44:09.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Oct 30 08:52:01 UTC 2015 - mimi.vx(a)gmail.com + +- mark config files +- Suggests emacs-haskell-mode + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-mod.spec ++++++ --- /var/tmp/diff_new_pack.qw11e3/_old 2015-10-30 13:44:10.000000000 +0100 +++ /var/tmp/diff_new_pack.qw11e3/_new 2015-10-30 13:44:10.000000000 +0100 @@ -70,6 +70,7 @@ BuildRequires: ghc-doctest-devel BuildRequires: ghc-hspec-devel %endif +Suggests: emacs-haskel-mode # End cabal-rpm deps %description @@ -137,8 +138,8 @@ %{_bindir}/%{name} %{_bindir}/ghc-modi %{_datadir}/%{name}-%{version} -%{_sysconfdir}/profile.d/ghc-mod.sh -%{_sysconfdir}/profile.d/ghc-mod.csh +%config %{_sysconfdir}/profile.d/ghc-mod.sh +%config %{_sysconfdir}/profile.d/ghc-mod.csh %files -n ghc-%{name} -f ghc-%{name}.files %defattr(-,root,root,-)

1 0

commit hawk2 for openSUSE:Factory
by root＠hilbert.suse.de 30 Oct '15

30 Oct '15

Hello community, here is the log from the commit of package hawk2 for openSUSE:Factory checked in at 2015-10-30 13:44:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hawk2 (Old) and /work/SRC/openSUSE:Factory/.hawk2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hawk2" Changes: -------- --- /work/SRC/openSUSE:Factory/hawk2/hawk2.changes 2015-10-25 19:13:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.hawk2.new/hawk2.changes 2015-10-30 13:44:06.000000000 +0100 @@ -1,0 +2,20 @@ +Fri Oct 30 09:38:24 UTC 2015 - kgronlund(a)suse.com + +- Update to version 1.0.1+git.1446137442.d9c6c0e: + + Simulator: Fix ticket simulation (bsc#952489) + +------------------------------------------------------------------- +Wed Oct 28 16:15:17 UTC 2015 - kgronlund(a)suse.com + +- Update to version 1.0.1+git.1446048276.98c4de1: + + Fix help text for clone / multi-state (bsc#952439) + + Dashboard: Fix ownership of dashboard config (bsc#952442) + + Dashboard: Fix bad error message + +------------------------------------------------------------------- +Tue Oct 27 07:19:42 UTC 2015 - kgronlund(a)suse.com + +- Update to version 1.0.0~alpha1+git.1445930333.51d3703: + + Report: Enable uploading gzipped archives (bsc#952136) + +------------------------------------------------------------------- Old: ---- hawk2-1.0.0~alpha1+git.1445537620.7637b7f.tar.bz2 New: ---- hawk2-1.0.1+git.1446137442.d9c6c0e.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hawk2.spec ++++++ --- /var/tmp/diff_new_pack.3wbnvc/_old 2015-10-30 13:44:07.000000000 +0100 +++ /var/tmp/diff_new_pack.3wbnvc/_new 2015-10-30 13:44:07.000000000 +0100 @@ -39,7 +39,7 @@ Summary: HA Web Konsole License: GPL-2.0 Group: %{pkg_group} -Version: 1.0.0~alpha1+git.1445537620.7637b7f +Version: 1.0.1+git.1446137442.d9c6c0e Release: 0 Url: http://www.clusterlabs.org/wiki/Hawk Source: %{name}-%{version}.tar.bz2 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.3wbnvc/_old 2015-10-30 13:44:07.000000000 +0100 +++ /var/tmp/diff_new_pack.3wbnvc/_new 2015-10-30 13:44:07.000000000 +0100 @@ -4,7 +4,7 @@ <param name="scm">git</param> <param name="exclude">.git</param> <param name="filename">hawk2</param> - <param name="versionformat">1.0.0~alpha1+git.%ct.%h</param> + <param name="versionformat">1.0.1+git.%ct.%h</param> <param name="revision">master</param> <param name="changesgenerate">enable</param> </service> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.3wbnvc/_old 2015-10-30 13:44:07.000000000 +0100 +++ /var/tmp/diff_new_pack.3wbnvc/_new 2015-10-30 13:44:07.000000000 +0100 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/ClusterLabs/hawk.git</param> - <param name="changesrevision">7637b7ffbf6688f8778d574971bff88d96cb204b</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">d9c6c0e97fafeb9b9071ed2a10fd88652f7a8c93</param></service></servicedata> \ No newline at end of file ++++++ hawk2-1.0.0~alpha1+git.1445537620.7637b7f.tar.bz2 -> hawk2-1.0.1+git.1446137442.d9c6c0e.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-1.0.0~alpha1+git.1445537620.7637b7f/hawk/app/assets/javascripts/dashboard.js new/hawk2-1.0.1+git.1446137442.d9c6c0e/hawk/app/assets/javascripts/dashboard.js --- old/hawk2-1.0.0~alpha1+git.1445537620.7637b7f/hawk/app/assets/javascripts/dashboard.js 2015-10-22 23:51:44.000000000 +0200 +++ new/hawk2-1.0.1+git.1446137442.d9c6c0e/hawk/app/assets/javascripts/dashboard.js 2015-10-30 10:38:16.000000000 +0100 @@ -37,7 +37,7 @@ return __('Permission denied'); }, err_failed_op: function(op, node, rc, reason) { - return __('%{op} failed on _NODE_} (rc=_RC_, reason=_REASON_)').replace('_OP_', op).replace('_NODE_', node).replace('_RC_', rc).replace('_REASON_', reason); + return __('_OP_ failed on _NODE_} (rc=_RC_, reason=_REASON_)').replace('_OP_', op).replace('_NODE_', node).replace('_RC_', rc).replace('_REASON_', reason); } }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-1.0.0~alpha1+git.1445537620.7637b7f/hawk/app/assets/javascripts/module/simulator.js new/hawk2-1.0.1+git.1446137442.d9c6c0e/hawk/app/assets/javascripts/module/simulator.js --- old/hawk2-1.0.0~alpha1+git.1445537620.7637b7f/hawk/app/assets/javascripts/module/simulator.js 2015-10-22 23:51:44.000000000 +0200 +++ new/hawk2-1.0.1+git.1446137442.d9c6c0e/hawk/app/assets/javascripts/module/simulator.js 2015-10-30 10:38:16.000000000 +0100 @@ -186,7 +186,8 @@ }); self.find("#sim-addticket").click(function() { - $("#modal .modal-content").html($("#inject-ticket").render()); + var content = $("#modal .modal-content"); + content.html($("#inject-ticket").render()); content.find("form").submit(function(event) { var ticket = content.find("#ticket-inject-ticket").val(); var action = content.find("#ticket-inject-action").val(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-1.0.0~alpha1+git.1445537620.7637b7f/hawk/app/models/cluster.rb new/hawk2-1.0.1+git.1446137442.d9c6c0e/hawk/app/models/cluster.rb --- old/hawk2-1.0.0~alpha1+git.1445537620.7637b7f/hawk/app/models/cluster.rb 2015-10-22 23:51:44.000000000 +0200 +++ new/hawk2-1.0.1+git.1446137442.d9c6c0e/hawk/app/models/cluster.rb 2015-10-30 10:38:16.000000000 +0100 @@ -49,14 +49,21 @@ clusters = {} end clusters[@name] = self.to_hash - Rails.logger.debug "Writing #{fname}..." - File.open(fname, "w") { |f| f.write(JSON.pretty_generate(clusters)) } - Rails.logger.debug "chmod 0660 #{fname}..." - File.chmod(0660, fname) - Rails.logger.debug "Copy #{fname}..." - out, err, rc = Util.run_as("root", "crm", "cluster", "copy", fname) - Rails.logger.debug "Copy returned #{out} #{err} #{rc}" - rc == 0 ? true : err + begin + Rails.logger.debug "Writing #{fname}..." + File.open(fname, "w") { |f| f.write(JSON.pretty_generate(clusters)) } + Rails.logger.debug "chmod 0664 #{fname}..." + File.chmod(0660, fname) + Rails.logger.debug "Copy #{fname}..." + out, err, rc = Util.run_as("root", "crm", "cluster", "copy", fname) + if rc == 0 + out, err, rc = Util.run_as("root", "crm", "cluster", "run", "chown hacluster:haclient #{fname}") + end + Rails.logger.debug "Copy returned #{out} #{err} #{rc}" + rc == 0 ? true : err + rescue Exception => e + e.message + end end def update @@ -78,8 +85,12 @@ fname = "#{Rails.root}/tmp/dashboard.js" return [] unless File.exists?(fname) clusters = [] - JSON.parse(File.read(fname)).each do |id, data| - clusters << parse(data) + begin + JSON.parse(File.read(fname)).each do |id, data| + clusters << parse(data) + end + rescue Exception => e + Rails.logger.debug "Error: #{e}" end clusters end @@ -88,14 +99,21 @@ Rails.logger.debug "remove: Removing #{name}..." fname = "#{Rails.root}/tmp/dashboard.js" return true unless File.exist?(fname) - clusters = JSON.parse(File.read(fname)) - clusters = clusters.delete_if { |key, _| key == name } - Rails.logger.debug "remove: Writing #{fname}..." - File.open(fname, "w") { |f| f.write(JSON.pretty_generate(clusters)) } - File.chmod(0660, fname) - out, err, rc = Util.run_as("root", "crm", "cluster", "copy", fname) - Rails.logger.debug "remove: Copy returned #{out} #{err} #{rc}" - [out, err, rc] + begin + clusters = JSON.parse(File.read(fname)) + clusters = clusters.delete_if { |key, _| key == name } + Rails.logger.debug "remove: Writing #{fname}..." + File.open(fname, "w") { |f| f.write(JSON.pretty_generate(clusters)) } + File.chmod(0660, fname) + out, err, rc = Util.run_as("root", "crm", "cluster", "copy", fname) + if rc == 0 + out, err, rc = Util.run_as("root", "crm", "cluster", "run", "chown hacluster:haclient #{fname}") + end + Rails.logger.debug "remove: Copy returned #{out} #{err} #{rc}" + [out, err, rc] + rescue Exception => e + ["", e.message, 1] + end end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-1.0.0~alpha1+git.1445537620.7637b7f/hawk/app/models/report.rb new/hawk2-1.0.1+git.1446137442.d9c6c0e/hawk/app/models/report.rb --- old/hawk2-1.0.0~alpha1+git.1445537620.7637b7f/hawk/app/models/report.rb 2015-10-22 23:51:44.000000000 +0200 +++ new/hawk2-1.0.1+git.1446137442.d9c6c0e/hawk/app/models/report.rb 2015-10-30 10:38:16.000000000 +0100 @@ -34,7 +34,7 @@ elsif archive.extname == ".xz" "application/x-xz" elsif archive.extname == ".gz" - "application/x-gz" + "application/gzip" else "application/x-compressed" end @@ -281,8 +281,11 @@ attribute :upload, ActionDispatch::Http::UploadedFile validate do |record| - unless ["application/x-bzip", "application/x-xz", "application/x-gz"].include? record.upload.content_type - errors.add(:upload, _("must have correct MIME type")) + unless ["application/gzip", + "application/x-bzip", + "application/x-xz", + "application/x-gz"].include? record.upload.content_type + errors.add(:upload, _("must have correct MIME type (was %s)") % record.upload.content_type) end unless record.upload.original_filename =~ /\.tar\.(bz2|gz|xz)\z/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-1.0.0~alpha1+git.1445537620.7637b7f/hawk/app/views/clones/_form.html.haml new/hawk2-1.0.1+git.1446137442.d9c6c0e/hawk/app/views/clones/_form.html.haml --- old/hawk2-1.0.0~alpha1+git.1445537620.7637b7f/hawk/app/views/clones/_form.html.haml 2015-10-22 23:51:44.000000000 +0200 +++ new/hawk2-1.0.1+git.1446137442.d9c6c0e/hawk/app/views/clones/_form.html.haml 2015-10-30 10:38:16.000000000 +0100 @@ -1,5 +1,5 @@ .panel.panel-default - .panel-body + .panel-body{ data: { help_target: "#rightbar > .container-fluid > #helpentries > .attrhelp" } } = form_for [cib, clone], horizontal: true do |main_form| = errors_for clone diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-1.0.0~alpha1+git.1445537620.7637b7f/hawk/app/views/clones/edit.html.haml new/hawk2-1.0.1+git.1446137442.d9c6c0e/hawk/app/views/clones/edit.html.haml --- old/hawk2-1.0.0~alpha1+git.1445537620.7637b7f/hawk/app/views/clones/edit.html.haml 2015-10-22 23:51:44.000000000 +0200 +++ new/hawk2-1.0.1+git.1446137442.d9c6c0e/hawk/app/views/clones/edit.html.haml 2015-10-30 10:38:16.000000000 +0100 @@ -15,11 +15,12 @@ .row.clone = localized_help_for :resources, :clone - - @clone.mapping.each do |key, values| - - next unless values[:longdesc] + #helpentries + - @clone.mapping.each do |key, values| + - next unless values[:longdesc] - .row{ class: key } - %h2.margin-bottom - = key + .row.attrhelp{ class: key } + %h2.margin-bottom + = key - = simple_format values[:longdesc] + = simple_format values[:longdesc] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-1.0.0~alpha1+git.1445537620.7637b7f/hawk/app/views/clones/new.html.haml new/hawk2-1.0.1+git.1446137442.d9c6c0e/hawk/app/views/clones/new.html.haml --- old/hawk2-1.0.0~alpha1+git.1445537620.7637b7f/hawk/app/views/clones/new.html.haml 2015-10-22 23:51:44.000000000 +0200 +++ new/hawk2-1.0.1+git.1446137442.d9c6c0e/hawk/app/views/clones/new.html.haml 2015-10-30 10:38:16.000000000 +0100 @@ -14,11 +14,12 @@ .row.clone = localized_help_for :resources, :clone - - @clone.mapping.each do |key, values| - - next unless values[:longdesc] + #helpentries + - @clone.mapping.each do |key, values| + - next unless values[:longdesc] - .row{ class: key } - %h2.margin-bottom - = key + .row.attrhelp{ class: key } + %h2.margin-bottom + = key - = simple_format values[:longdesc] + = simple_format values[:longdesc] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-1.0.0~alpha1+git.1445537620.7637b7f/hawk/app/views/masters/_form.html.haml new/hawk2-1.0.1+git.1446137442.d9c6c0e/hawk/app/views/masters/_form.html.haml --- old/hawk2-1.0.0~alpha1+git.1445537620.7637b7f/hawk/app/views/masters/_form.html.haml 2015-10-22 23:51:44.000000000 +0200 +++ new/hawk2-1.0.1+git.1446137442.d9c6c0e/hawk/app/views/masters/_form.html.haml 2015-10-30 10:38:16.000000000 +0100 @@ -1,5 +1,5 @@ .panel.panel-default - .panel-body + .panel-body{ data: { help_target: "#rightbar > .container-fluid > #helpentries > .attrhelp" } } = form_for [cib, master], horizontal: true do |main_form| = errors_for master diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-1.0.0~alpha1+git.1445537620.7637b7f/hawk/app/views/masters/edit.html.haml new/hawk2-1.0.1+git.1446137442.d9c6c0e/hawk/app/views/masters/edit.html.haml --- old/hawk2-1.0.0~alpha1+git.1445537620.7637b7f/hawk/app/views/masters/edit.html.haml 2015-10-22 23:51:44.000000000 +0200 +++ new/hawk2-1.0.1+git.1446137442.d9c6c0e/hawk/app/views/masters/edit.html.haml 2015-10-30 10:38:16.000000000 +0100 @@ -15,11 +15,12 @@ .row.master = localized_help_for :resources, :master - - @master.mapping.each do |key, values| - - next unless values[:longdesc] + #helpentries + - @master.mapping.each do |key, values| + - next unless values[:longdesc] - .row{ class: key } - %h2.margin-bottom - = key + .row.attrhelp{ class: key } + %h2.margin-bottom + = key - = simple_format values[:longdesc] + = simple_format values[:longdesc] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-1.0.0~alpha1+git.1445537620.7637b7f/hawk/app/views/masters/new.html.haml new/hawk2-1.0.1+git.1446137442.d9c6c0e/hawk/app/views/masters/new.html.haml --- old/hawk2-1.0.0~alpha1+git.1445537620.7637b7f/hawk/app/views/masters/new.html.haml 2015-10-22 23:51:44.000000000 +0200 +++ new/hawk2-1.0.1+git.1446137442.d9c6c0e/hawk/app/views/masters/new.html.haml 2015-10-30 10:38:16.000000000 +0100 @@ -14,11 +14,12 @@ .row.master = localized_help_for :resources, :master - - @master.mapping.each do |key, values| - - next unless values[:longdesc] + #helpentries + - @master.mapping.each do |key, values| + - next unless values[:longdesc] - .row{ class: key } - %h2.margin-bottom - = key + .row.attrhelp{ class: key } + %h2.margin-bottom + = key - = simple_format values[:longdesc] + = simple_format values[:longdesc] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-1.0.0~alpha1+git.1445537620.7637b7f/tools/hawk_invoke.c new/hawk2-1.0.1+git.1446137442.d9c6c0e/tools/hawk_invoke.c --- old/hawk2-1.0.0~alpha1+git.1445537620.7637b7f/tools/hawk_invoke.c 2015-10-22 23:51:44.000000000 +0200 +++ new/hawk2-1.0.1+git.1446137442.d9c6c0e/tools/hawk_invoke.c 2015-10-30 10:38:16.000000000 +0100 @@ -108,6 +108,13 @@ strcmp(argv[4], "copy") == 0 && strendswith(argv[5], "/tmp/dashboard.js")) return 1; + if (argc == 6 && + strcmp(argv[2], "crm") == 0 && + strcmp(argv[3], "cluster") == 0 && + strcmp(argv[4], "run") == 0 && + strendswith(argv[5], "/tmp/dashboard.js") && + strncmp(argv[5], "chown hacluster:haclient", 24) == 0) + return 1; return 0; }

1 0

commit kdevelop4 for openSUSE:Factory
by root＠hilbert.suse.de 30 Oct '15

30 Oct '15

Hello community, here is the log from the commit of package kdevelop4 for openSUSE:Factory checked in at 2015-10-30 13:44:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdevelop4 (Old) and /work/SRC/openSUSE:Factory/.kdevelop4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdevelop4" Changes: -------- --- /work/SRC/openSUSE:Factory/kdevelop4/kdevelop4.changes 2015-10-02 09:23:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdevelop4.new/kdevelop4.changes 2015-10-30 13:44:05.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Oct 9 16:12:38 UTC 2015 - alarrosa(a)suse.com + +- Modified BuildRequires to allow kdevelop4 to build in SLE12 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdevelop4.spec ++++++ --- /var/tmp/diff_new_pack.wl5xFn/_old 2015-10-30 13:44:06.000000000 +0100 +++ /var/tmp/diff_new_pack.wl5xFn/_new 2015-10-30 13:44:06.000000000 +0100 @@ -27,11 +27,16 @@ #PATCH-FIX-UPSTREAM Do-not-use-function-returning-reference-to-temporary.patch boo#942358, kde#347178 -- fixes crashes in the cppsupport plugin when built with GCC5 Patch0: Do-not-use-function-returning-reference-to-temporary.patch BuildRequires: fdupes +# SLE12 doesn't have kdebase4-workspace[-devel] +%if 0%{?suse_version} != 1315 || 0%{?is_opensuse} BuildRequires: kdebase4-workspace-devel +%else +BuildRequires: libkde4-devel +%endif BuildRequires: libkdevplatform-devel >= 1.7.1 BuildRequires: libqjson-devel -# Catch 13.2, but not Leap -%if 0%{?suse_version} <= 1320 && ! 0%{?is_opensuse} +# Catch 13.2, but not Leap nor SLE12 +%if 0%{?suse_version} <= 1320 && ! 0%{?is_opensuse} && 0%{?suse_version} != 1315 BuildRequires: okteta-devel %endif BuildRequires: valgrind-devel @@ -170,8 +175,8 @@ %{_kde4_appsdir}/kdevfiletemplates/ %{_kde4_appsdir}/kdevgdb/ %{_kde4_appsdir}/kdevmanpage/ -# Catch 13.2, but not Leap -%if 0%{?suse_version} <= 1320 && ! 0%{?is_opensuse} +# Catch 13.2, but not Leap nor SLE12 +%if 0%{?suse_version} <= 1320 && ! 0%{?is_opensuse} && 0%{?suse_version} != 1315 %{_kde4_appsdir}/kdevokteta/ %endif %{_kde4_appsdir}/plasma/plasmoids/kdevelopsessions/

1 0

commit kdevelop4-plugins for openSUSE:Factory
by root＠hilbert.suse.de 30 Oct '15

30 Oct '15

Hello community, here is the log from the commit of package kdevelop4-plugins for openSUSE:Factory checked in at 2015-10-30 13:44:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdevelop4-plugins (Old) and /work/SRC/openSUSE:Factory/.kdevelop4-plugins.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdevelop4-plugins" Changes: -------- --- /work/SRC/openSUSE:Factory/kdevelop4-plugins/kdevelop4-plugins.changes 2015-03-05 18:16:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdevelop4-plugins.new/kdevelop4-plugins.changes 2015-10-30 13:44:04.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Oct 9 16:23:35 UTC 2015 - alarrosa(a)suse.com + +- Modified BuildRequires to allow kdevelop4-plugins to build in SLE12 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdevelop4-plugins.spec ++++++ --- /var/tmp/diff_new_pack.SNm0LH/_old 2015-10-30 13:44:04.000000000 +0100 +++ /var/tmp/diff_new_pack.SNm0LH/_new 2015-10-30 13:44:04.000000000 +0100 @@ -27,7 +27,12 @@ Source0: http://download.kde.org/stable/kdevelop/%{kdevelop_version}/src/kdevelop-ph… Source1: http://download.kde.org/stable/kdevelop/%{kdevelop_version}/src/kdevelop-ph… Patch0: add-php-docs.diff +# SLE12 doesn't have kdebase4-workspace[-devel] +%if 0%{?suse_version} != 1315 || 0%{?is_opensuse} BuildRequires: kdebase4-workspace-devel +%else +BuildRequires: libkde4-devel +%endif BuildRequires: kdevelop4-devel BuildRequires: kdevelop4-pg-qt BuildRequires: libkde4-devel

1 0

commit abook for openSUSE:Factory
by root＠hilbert.suse.de 30 Oct '15

30 Oct '15

Hello community, here is the log from the commit of package abook for openSUSE:Factory checked in at 2015-10-30 13:44:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/abook (Old) and /work/SRC/openSUSE:Factory/.abook.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "abook" Changes: -------- --- /work/SRC/openSUSE:Factory/abook/abook.changes 2015-06-23 11:57:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.abook.new/abook.changes 2015-10-30 13:44:02.000000000 +0100 @@ -1,0 +2,41 @@ +Mon Oct 26 23:14:46 UTC 2015 - p.drouand(a)gmail.com + +- Update to version 0.6.1 + * support for mouse + * scrolling now affects the viewport instead of the cursor + * support for a colored UI + * added "groups" as a default field + * the UI now supports merging selected entries [key M] + and removing duplicates [key U] + * a "custom" output filter allows the specification of an output + format using placeholders + * search-next is now bound to "/" too + * some output filters can now be used in the context + of --mutt-query. This is the case of "vcard" and "custom" + [ no --query option has been created and --mutt-query is fully + backward compatible ] + * ldif output filter has been fixed [output modified] in multiple + ways, does not force output to latin1 anymore and supports input + from stdin. + * vcard input/output support: + An original input filter implementation was provided soon + after 0.6.0pre2. + In 2012, an optional build-time option to link against libvformat + was added for the very same task: parsing vcard. + - It depends on the --enable-vformat ./configure switch + - It's only used as an input filter, especially useful to + deal with multi-valued fields and encoded characters. + * when the UI requests a confirmation from the user before a + destructive operation it does not treat unknown key as "yes" anymore. + * allcsv output changes: + - header line uses lowercase + - "MOBILEPHONE" column name changed to "mobile" (consistent w.r.t. + standard_fields) + - defined custom fields as well are part of the output now +- Remove abook_vcard_import.patch; fixed on upstream release +- Split out language files into their own package +- Add autoconf and automake dependencies; automake is required by + the configure script itself and autoconf is needed to run + autoreconf + +------------------------------------------------------------------- Old: ---- abook-0.6.0pre2.tar.bz2 abook_vcard_import.patch New: ---- abook-0.6.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ abook.spec ++++++ --- /var/tmp/diff_new_pack.LCuF8y/_old 2015-10-30 13:44:03.000000000 +0100 +++ /var/tmp/diff_new_pack.LCuF8y/_new 2015-10-30 13:44:03.000000000 +0100 @@ -17,16 +17,18 @@ Name: abook +BuildRequires: autoconf +BuildRequires: automake BuildRequires: gettext BuildRequires: ncurses-devel BuildRequires: readline-devel +Recommends: %{name}-lang Summary: Text-based addressbook program License: GPL-2.0+ Group: Productivity/Other -Version: 0.6.0pre2 +Version: 0.6.1 Release: 0 -Source: http://abook.sourceforge.net/devel/%{name}-%{version}.tar.bz2 -Patch0: abook_vcard_import.patch +Source: http://abook.sourceforge.net/devel/%{name}-%{version}.tar.gz Url: http://abook.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -34,25 +36,29 @@ Abook is a text-based addressbook program designed to use with mutt mail client. +%lang_package %prep %setup -q -n %{name}-%{version} -%patch0 -p1 %build +autoreconf -fiv export CFLAGS="%{optflags} -fgnu89-inline" %configure -make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} +make %{?_smp_mflags} %install -%makeinstall +%make_install %find_lang %{name} -%files -f %{name}.lang +%files %defattr(-,root,root) %doc AUTHORS BUGS COPYING ChangeLog FAQ NEWS README THANKS TODO sample.abookrc %{_bindir}/abook %{_mandir}/man1/abook.* %{_mandir}/man5/abookrc.* +%files lang -f %{name}.lang +%defattr(-,root,root) + %changelog

1 0

commit vym for openSUSE:Factory
by root＠hilbert.suse.de 30 Oct '15

30 Oct '15

Hello community, here is the log from the commit of package vym for openSUSE:Factory checked in at 2015-10-30 13:44:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vym (Old) and /work/SRC/openSUSE:Factory/.vym.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vym" Changes: -------- --- /work/SRC/openSUSE:Factory/vym/vym.changes 2015-09-09 20:20:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vym.new/vym.changes 2015-10-30 13:44:01.000000000 +0100 @@ -1,0 +2,12 @@ +Wed Oct 28 08:53:55 UTC 2015 - vym(a)insilmaril.de + +- Version 2.5.0 +- Bugfix: Update recent maps menu after loading of map +- Bugfix: Empty window with update information on startup + +------------------------------------------------------------------- +Tue Aug 25 14:42:01 UTC 2015 - vym(a)insilmaril.de + +- Version 2.4.8 + +------------------------------------------------------------------- Old: ---- vym-2.4.7.tar.bz2 New: ---- vym-2.5.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vym.spec ++++++ --- /var/tmp/diff_new_pack.qtEldb/_old 2015-10-30 13:44:02.000000000 +0100 +++ /var/tmp/diff_new_pack.qtEldb/_new 2015-10-30 13:44:02.000000000 +0100 @@ -20,7 +20,6 @@ BuildRequires: libQt5Core-devel BuildRequires: libQt5Gui-devel BuildRequires: libqt5-qtbase-devel -#BuildRequires: libqt5-qtbase-common-devel BuildRequires: libqt5-qtsvg-devel BuildRequires: libqt5-linguist-devel BuildRequires: update-desktop-files @@ -31,7 +30,7 @@ Summary: View Your Mind - generate and manipulate maps which show your thoughts License: GPL-2.0 Group: Productivity/Office/Other -Version: 2.4.7 +Version: 2.5.0 Release: 0 Source0: %name-%version.tar.bz2 Source1: %name.xml @@ -48,12 +47,6 @@ tasks, to get an overview over complex contexts, to sort your ideas etc. Some people even think it is fun to work with such maps... - - -Authors: --------- - Uwe Drechsel <vym(a)insilmaril.de> - %prep %setup -q ++++++ debian.changelog ++++++ --- /var/tmp/diff_new_pack.qtEldb/_old 2015-10-30 13:44:02.000000000 +0100 +++ /var/tmp/diff_new_pack.qtEldb/_new 2015-10-30 13:44:02.000000000 +0100 @@ -1,3 +1,15 @@ +vym (2.5.0.1) unstable; urgency=low + + * New upstream release + + -- Uwe Drechsel <vym(a)insilmaril.de> Wed, 28 Oct 2015 10:04:00 +0100 + +vym (2.4.8.1) unstable; urgency=low + + * New upstream release + + -- Uwe Drechsel <vym(a)insilmaril.de> Tue, 25 Aug 2015 12:10:00 +0100 + vym (2.4.7.1) unstable; urgency=low * New upstream release ++++++ makedist.config ++++++ --- /var/tmp/diff_new_pack.qtEldb/_old 2015-10-30 13:44:02.000000000 +0100 +++ /var/tmp/diff_new_pack.qtEldb/_new 2015-10-30 13:44:02.000000000 +0100 @@ -1,3 +1,3 @@ -VERSION=2.4.7 +VERSION=2.5.0 BRANCH="qt5" REMOTE="sf" ++++++ vym-2.4.7.tar.bz2 -> vym-2.5.0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/vym/vym-2.4.7.tar.bz2 /work/SRC/openSUSE:Factory/.vym.new/vym-2.5.0.tar.bz2 differ: char 11, line 1

1 0

commit python-oslo.service for openSUSE:Factory
by root＠hilbert.suse.de 30 Oct '15

30 Oct '15

Hello community, here is the log from the commit of package python-oslo.service for openSUSE:Factory checked in at 2015-10-30 13:43:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-oslo.service (Old) and /work/SRC/openSUSE:Factory/.python-oslo.service.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-oslo.service" Changes: -------- --- /work/SRC/openSUSE:Factory/python-oslo.service/python-oslo.service.changes 2015-09-09 20:20:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-oslo.service.new/python-oslo.service.changes 2015-10-30 13:44:00.000000000 +0100 @@ -1,0 +2,23 @@ +Mon Oct 19 07:21:49 UTC 2015 - dmueller(a)suse.com + +- update to 0.10.0: + * RetryDecorator should not log warnings/errors for expected exceptions + * Termination children on SIGHUP added + * Fix coverage configuration and execution + * Add register_opts function to sslutils + * Move the common thread manipulating routine to a shared routine + * Update log string to correctly denote what it waits on + * Cleanup thread on thread done callback + * Move 'history' -> release notes section + * Add unit tests for sslutils + * Expand README and clean up intro to sphinx docs + * Add shields.io version/downloads links/badges into README.rst + * add auto-generated docs for config options + * Change ignore-errors to ignore_errors + * Fix the home-page value in setup.cfg + * WSGI module was corrected + * Updated from global requirements + * ThreadGroup's stop didn't recognise the current thread correctly + * doing monkey_patch for unittest + +------------------------------------------------------------------- Old: ---- oslo.service-0.9.0.tar.gz New: ---- oslo.service-0.10.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-oslo.service.spec ++++++ --- /var/tmp/diff_new_pack.8jrTCZ/_old 2015-10-30 13:44:00.000000000 +0100 +++ /var/tmp/diff_new_pack.8jrTCZ/_new 2015-10-30 13:44:00.000000000 +0100 @@ -17,7 +17,7 @@ Name: python-oslo.service -Version: 0.9.0 +Version: 0.10.0 Release: 0 Summary: Oslo service library License: Apache-2.0 ++++++ oslo.service-0.9.0.tar.gz -> oslo.service-0.10.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.service-0.9.0/.coveragerc new/oslo.service-0.10.0/.coveragerc --- old/oslo.service-0.9.0/.coveragerc 2015-09-01 20:39:05.000000000 +0200 +++ new/oslo.service-0.10.0/.coveragerc 2015-10-12 17:37:58.000000000 +0200 @@ -1,7 +1,8 @@ [run] branch = True -source = service -omit = service/tests/*,service/openstack/* +source = oslo_service +omit = oslo_service/tests/*,oslo_service/openstack/* [report] -ignore-errors = True +ignore_errors = True +precision = 2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.service-0.9.0/AUTHORS new/oslo.service-0.10.0/AUTHORS --- old/oslo.service-0.9.0/AUTHORS 2015-09-01 20:39:42.000000000 +0200 +++ new/oslo.service-0.10.0/AUTHORS 2015-10-12 17:38:47.000000000 +0200 @@ -64,6 +64,7 @@ Qin Zhao <chaochin(a)gmail.com> Raymond Pekowski <pekowski(a)gmail.com> Rohit Jaiswal <rohit.jaiswal(a)hp.com> +Ronald Bradford <ronald.bradford(a)gmail.com> Russell Bryant <rbryant(a)redhat.com> Sean Dague <sean.dague(a)samsung.com> Sean McGinnis <sean_mcginnis(a)dell.com> @@ -80,9 +81,11 @@ Victor Sergeyev <vsergeyev(a)mirantis.com> Victor Stinner <vstinner(a)redhat.com> Zhongyue Luo <zhongyue.nah(a)intel.com> +apporc <appleorchard2000(a)gmail.com> fujioka yuuichi <fujioka-yuuichi(a)zx.mxh.nes.nec.co.jp> gongysh <gongysh(a)cn.ibm.com> liu-sheng <liusheng(a)huawei.com> liyingjun <yingjun.li(a)kylin-cloud.com> ravikumar-venkatesan <ravikumar.venkatesan(a)hp.com> stanzgy <stanzgy(a)gmail.com> +venkatamahesh <venkatamaheshkotha(a)gmail.com> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.service-0.9.0/ChangeLog new/oslo.service-0.10.0/ChangeLog --- old/oslo.service-0.9.0/ChangeLog 2015-09-01 20:39:41.000000000 +0200 +++ new/oslo.service-0.10.0/ChangeLog 2015-10-12 17:38:47.000000000 +0200 @@ -1,6 +1,28 @@ CHANGES ======= +0.10.0 +------ + +* RetryDecorator should not log warnings/errors for expected exceptions +* Termination children on SIGHUP added +* Fix coverage configuration and execution +* Add register_opts function to sslutils +* Move the common thread manipulating routine to a shared routine +* Update log string to correctly denote what it waits on +* Cleanup thread on thread done callback +* Move 'history' -> release notes section +* Add unit tests for sslutils +* Expand README and clean up intro to sphinx docs +* Add shields.io version/downloads links/badges into README.rst +* add auto-generated docs for config options +* Change ignore-errors to ignore_errors +* Fix the home-page value in setup.cfg +* WSGI module was corrected +* Updated from global requirements +* ThreadGroup's stop didn't recognise the current thread correctly +* doing monkey_patch for unittest + 0.9.0 ----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.service-0.9.0/PKG-INFO new/oslo.service-0.10.0/PKG-INFO --- old/oslo.service-0.9.0/PKG-INFO 2015-09-01 20:39:42.000000000 +0200 +++ new/oslo.service-0.10.0/PKG-INFO 2015-10-12 17:38:47.000000000 +0200 @@ -1,16 +1,28 @@ Metadata-Version: 1.1 Name: oslo.service -Version: 0.9.0 +Version: 0.10.0 Summary: oslo.service library -Home-page: http://launchpad.net/oslo +Home-page: http://wiki.openstack.org/wiki/Oslo#oslo.service Author: OpenStack Author-email: openstack-dev(a)lists.openstack.org License: UNKNOWN -Description: =================================== - oslo.service - =================================== +Description: ======================================================== + oslo.service -- Library for running OpenStack services + ======================================================== - Library for running OpenStack services + .. image:: https://img.shields.io/pypi/v/oslo.service.svg + :target: https://pypi.python.org/pypi/oslo.service/ + :alt: Latest Version + + .. image:: https://img.shields.io/pypi/dm/oslo.service.svg + :target: https://pypi.python.org/pypi/oslo.service/ + :alt: Downloads + + oslo.service provides a framework for defining new long-running + services using the patterns established by other OpenStack + applications. It also includes utilities long-running applications + might need for working with SSL or WSGI, performing periodic + operations, interacting with systemd, etc. * Free software: Apache license * Documentation: http://docs.openstack.org/developer/oslo.service diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.service-0.9.0/README.rst new/oslo.service-0.10.0/README.rst --- old/oslo.service-0.9.0/README.rst 2015-09-01 20:39:05.000000000 +0200 +++ new/oslo.service-0.10.0/README.rst 2015-10-12 17:37:58.000000000 +0200 @@ -1,8 +1,20 @@ -=================================== -oslo.service -=================================== +======================================================== + oslo.service -- Library for running OpenStack services +======================================================== -Library for running OpenStack services +.. image:: https://img.shields.io/pypi/v/oslo.service.svg + :target: https://pypi.python.org/pypi/oslo.service/ + :alt: Latest Version + +.. image:: https://img.shields.io/pypi/dm/oslo.service.svg + :target: https://pypi.python.org/pypi/oslo.service/ + :alt: Downloads + +oslo.service provides a framework for defining new long-running +services using the patterns established by other OpenStack +applications. It also includes utilities long-running applications +might need for working with SSL or WSGI, performing periodic +operations, interacting with systemd, etc. * Free software: Apache license * Documentation: http://docs.openstack.org/developer/oslo.service diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.service-0.9.0/doc/source/conf.py new/oslo.service-0.10.0/doc/source/conf.py --- old/oslo.service-0.9.0/doc/source/conf.py 2015-09-01 20:39:05.000000000 +0200 +++ new/oslo.service-0.10.0/doc/source/conf.py 2015-10-12 17:37:58.000000000 +0200 @@ -22,8 +22,8 @@ # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones. extensions = [ 'sphinx.ext.autodoc', - #'sphinx.ext.intersphinx', - 'oslosphinx' + 'oslosphinx', + 'oslo_config.sphinxext', ] # autodoc generation is a bit aggressive and a nuisance when doing heavy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.service-0.9.0/doc/source/index.rst new/oslo.service-0.10.0/doc/source/index.rst --- old/oslo.service-0.9.0/doc/source/index.rst 2015-09-01 20:39:05.000000000 +0200 +++ new/oslo.service-0.10.0/doc/source/index.rst 2015-10-12 17:37:58.000000000 +0200 @@ -1,16 +1,20 @@ -======================================== -Welcome to oslo.service's documentation! -======================================== - -Library for running OpenStack services +======================================================== + oslo.service -- Library for running OpenStack services +======================================================== + +oslo.service provides a framework for defining new long-running +services using the patterns established by other OpenStack +applications. It also includes utilities long-running applications +might need for working with SSL or WSGI, performing periodic +operations, interacting with systemd, etc. .. toctree:: :maxdepth: 2 installation usage + opts contributing - history API Documentation ================= @@ -26,6 +30,14 @@ api/systemd api/threadgroup +Release Notes +============= + +.. toctree:: + :maxdepth: 1 + + history + Indices and tables ================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.service-0.9.0/doc/source/opts.rst new/oslo.service-0.10.0/doc/source/opts.rst --- old/oslo.service-0.9.0/doc/source/opts.rst 1970-01-01 01:00:00.000000000 +0100 +++ new/oslo.service-0.10.0/doc/source/opts.rst 2015-10-12 17:37:58.000000000 +0200 @@ -0,0 +1,36 @@ +======================= + Configuration Options +======================= + +oslo.service uses oslo.config to define and manage configuration options +to allow the deployer to control how an application uses this library. + +periodic_task +============= + +These options apply to services using the periodic task features of +oslo.service. + +.. show-options:: oslo.service.periodic_task + +service +======= + +These options apply to services using the basic service framework. + +.. show-options:: oslo.service.service + +sslutils +======== + +These options apply to services using the SSL utilities module. + +.. show-options:: oslo.service.sslutils + +wsgi +==== + +These options apply to services using the WSGI (Web Service Gateway +Interface) module. + +.. show-options:: oslo.service.wsgi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.service-0.9.0/oslo.service.egg-info/PKG-INFO new/oslo.service-0.10.0/oslo.service.egg-info/PKG-INFO --- old/oslo.service-0.9.0/oslo.service.egg-info/PKG-INFO 2015-09-01 20:39:42.000000000 +0200 +++ new/oslo.service-0.10.0/oslo.service.egg-info/PKG-INFO 2015-10-12 17:38:47.000000000 +0200 @@ -1,16 +1,28 @@ Metadata-Version: 1.1 Name: oslo.service -Version: 0.9.0 +Version: 0.10.0 Summary: oslo.service library -Home-page: http://launchpad.net/oslo +Home-page: http://wiki.openstack.org/wiki/Oslo#oslo.service Author: OpenStack Author-email: openstack-dev(a)lists.openstack.org License: UNKNOWN -Description: =================================== - oslo.service - =================================== +Description: ======================================================== + oslo.service -- Library for running OpenStack services + ======================================================== - Library for running OpenStack services + .. image:: https://img.shields.io/pypi/v/oslo.service.svg + :target: https://pypi.python.org/pypi/oslo.service/ + :alt: Latest Version + + .. image:: https://img.shields.io/pypi/dm/oslo.service.svg + :target: https://pypi.python.org/pypi/oslo.service/ + :alt: Downloads + + oslo.service provides a framework for defining new long-running + services using the patterns established by other OpenStack + applications. It also includes utilities long-running applications + might need for working with SSL or WSGI, performing periodic + operations, interacting with systemd, etc. * Free software: Apache license * Documentation: http://docs.openstack.org/developer/oslo.service diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.service-0.9.0/oslo.service.egg-info/SOURCES.txt new/oslo.service-0.10.0/oslo.service.egg-info/SOURCES.txt --- old/oslo.service-0.9.0/oslo.service.egg-info/SOURCES.txt 2015-09-01 20:39:42.000000000 +0200 +++ new/oslo.service-0.10.0/oslo.service.egg-info/SOURCES.txt 2015-10-12 17:38:47.000000000 +0200 @@ -20,6 +20,7 @@ doc/source/history.rst doc/source/index.rst doc/source/installation.rst +doc/source/opts.rst doc/source/usage.rst doc/source/api/eventlet_backdoor.rst doc/source/api/loopingcall.rst @@ -59,6 +60,7 @@ oslo_service/tests/test_loopingcall.py oslo_service/tests/test_periodic.py oslo_service/tests/test_service.py +oslo_service/tests/test_sslutils.py oslo_service/tests/test_systemd.py oslo_service/tests/test_threadgroup.py oslo_service/tests/test_wsgi.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.service-0.9.0/oslo.service.egg-info/pbr.json new/oslo.service-0.10.0/oslo.service.egg-info/pbr.json --- old/oslo.service-0.9.0/oslo.service.egg-info/pbr.json 2015-09-01 20:39:42.000000000 +0200 +++ new/oslo.service-0.10.0/oslo.service.egg-info/pbr.json 2015-10-12 17:38:47.000000000 +0200 @@ -1 +1 @@ -{"is_release": true, "git_version": "fad5b04"} \ No newline at end of file +{"git_version": "7ecf3be", "is_release": true} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.service-0.9.0/oslo_service/_options.py new/oslo.service-0.10.0/oslo_service/_options.py --- old/oslo.service-0.9.0/oslo_service/_options.py 2015-09-01 20:39:05.000000000 +0200 +++ new/oslo.service-0.10.0/oslo_service/_options.py 2015-10-12 17:37:58.000000000 +0200 @@ -80,11 +80,17 @@ ssl_opts = [ cfg.StrOpt('ca_file', help="CA certificate file to use to verify " - "connecting clients."), + "connecting clients.", + deprecated_group='DEFAULT', + deprecated_name='ssl_ca_file'), cfg.StrOpt('cert_file', help="Certificate file to use when starting " - "the server securely."), + "the server securely.", + deprecated_group='DEFAULT', + deprecated_name='ssl_cert_file'), cfg.StrOpt('key_file', help="Private key file to use when starting " - "the server securely."), + "the server securely.", + deprecated_group='DEFAULT', + deprecated_name='ssl_key_file'), ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.service-0.9.0/oslo_service/loopingcall.py new/oslo.service-0.10.0/oslo_service/loopingcall.py --- old/oslo.service-0.9.0/oslo_service/loopingcall.py 2015-09-01 20:39:05.000000000 +0200 +++ new/oslo.service-0.10.0/oslo_service/loopingcall.py 2015-10-12 17:37:58.000000000 +0200 @@ -247,18 +247,17 @@ result = f(*args, **kwargs) except self._exceptions: with excutils.save_and_reraise_exception() as ctxt: - LOG.warn(_LW("Exception which is in the suggested list of " - "exceptions occurred while invoking function:" - " %s."), - func_name, - exc_info=True) + LOG.debug("Exception which is in the suggested list of " + "exceptions occurred while invoking function:" + " %s.", + func_name) if (self._max_retry_count != -1 and self._retry_count >= self._max_retry_count): - LOG.error(_LE("Cannot retry %(func_name)s upon " - "suggested exception " - "since retry count (%(retry_count)d) " - "reached max retry count " - "(%(max_retry_count)d)."), + LOG.debug("Cannot retry %(func_name)s upon " + "suggested exception " + "since retry count (%(retry_count)d) " + "reached max retry count " + "(%(max_retry_count)d).", {'retry_count': self._retry_count, 'max_retry_count': self._max_retry_count, 'func_name': func_name}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.service-0.9.0/oslo_service/service.py new/oslo.service-0.10.0/oslo_service/service.py --- old/oslo.service-0.9.0/oslo_service/service.py 2015-09-01 20:39:05.000000000 +0200 +++ new/oslo.service-0.10.0/oslo_service/service.py 2015-10-12 17:37:58.000000000 +0200 @@ -524,7 +524,7 @@ service.reset() for pid in self.children: - os.kill(pid, signal.SIGHUP) + os.kill(pid, signal.SIGTERM) self.running = True self.sigcaught = None diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.service-0.9.0/oslo_service/sslutils.py new/oslo.service-0.10.0/oslo_service/sslutils.py --- old/oslo.service-0.9.0/oslo_service/sslutils.py 2015-09-01 20:39:05.000000000 +0200 +++ new/oslo.service-0.10.0/oslo_service/sslutils.py 2015-10-12 17:37:58.000000000 +0200 @@ -28,6 +28,11 @@ return [(config_section, copy.deepcopy(_options.ssl_opts))] +def register_opts(conf): + """Registers sslutils config options.""" + return conf.register_opts(_options.ssl_opts, config_section) + + def is_enabled(conf): conf.register_opts(_options.ssl_opts, config_section) cert_file = conf.ssl.cert_file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.service-0.9.0/oslo_service/tests/__init__.py new/oslo.service-0.10.0/oslo_service/tests/__init__.py --- old/oslo.service-0.9.0/oslo_service/tests/__init__.py 2015-09-01 20:39:05.000000000 +0200 +++ new/oslo.service-0.10.0/oslo_service/tests/__init__.py 2015-10-12 17:37:58.000000000 +0200 @@ -0,0 +1,27 @@ +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +import os + +import eventlet + +if os.name == 'nt': + # eventlet monkey patching the os and thread modules causes + # subprocess.Popen to fail on Windows when using pipes due + # to missing non-blocking IO support. + # + # bug report on eventlet: + # https://bitbucket.org/eventlet/eventlet/issue/132/ + # eventletmonkey_patch-breaks + eventlet.monkey_patch(os=False, thread=False) +else: + eventlet.monkey_patch() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.service-0.9.0/oslo_service/tests/base.py new/oslo.service-0.10.0/oslo_service/tests/base.py --- old/oslo.service-0.9.0/oslo_service/tests/base.py 2015-09-01 20:39:05.000000000 +0200 +++ new/oslo.service-0.10.0/oslo_service/tests/base.py 2015-10-12 17:37:58.000000000 +0200 @@ -16,6 +16,7 @@ from oslotest import base as test_base from oslo_service import _options +from oslo_service import sslutils class ServiceBaseTestCase(test_base.BaseTestCase): @@ -25,7 +26,8 @@ self.conf_fixture = self.useFixture(config.Config()) self.conf_fixture.register_opts(_options.eventlet_backdoor_opts) self.conf_fixture.register_opts(_options.service_opts) - self.conf_fixture.register_opts(_options.ssl_opts) + self.conf_fixture.register_opts(_options.ssl_opts, + sslutils.config_section) self.conf_fixture.register_opts(_options.periodic_opts) self.conf = self.conf_fixture.conf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.service-0.9.0/oslo_service/tests/test_service.py new/oslo.service-0.10.0/oslo_service/tests/test_service.py --- old/oslo.service-0.9.0/oslo_service/tests/test_service.py 2015-09-01 20:39:05.000000000 +0200 +++ new/oslo.service-0.10.0/oslo_service/tests/test_service.py 2015-10-12 17:37:58.000000000 +0200 @@ -27,13 +27,13 @@ import os import signal import socket -import subprocess import sys import time import traceback import eventlet from eventlet import event +from eventlet.green import subprocess import mock from oslotest import base as test_base from six.moves import queue @@ -215,15 +215,16 @@ start_workers = self._spawn() os.kill(self.pid, signal.SIGHUP) + + def cond(): + workers = self._get_workers() + return (len(workers) == len(start_workers) and + not set(start_workers).intersection(workers)) + # Wait at most 5 seconds to respawn a worker - cond = lambda: start_workers == self._get_workers() - timeout = 5 + timeout = 10 self._wait(cond, timeout) - - # Make sure worker pids match - end_workers = self._get_workers() - LOG.info('workers: %r' % end_workers) - self.assertEqual(start_workers, end_workers) + self.assertTrue(cond()) class ServiceRestartTest(ServiceTestBase): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.service-0.9.0/oslo_service/tests/test_sslutils.py new/oslo.service-0.10.0/oslo_service/tests/test_sslutils.py --- old/oslo.service-0.9.0/oslo_service/tests/test_sslutils.py 1970-01-01 01:00:00.000000000 +0100 +++ new/oslo.service-0.10.0/oslo_service/tests/test_sslutils.py 2015-10-12 17:37:58.000000000 +0200 @@ -0,0 +1,109 @@ +# Copyright 2015 Mirantis, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +import mock +import os +import ssl + +from oslo_config import cfg + +from oslo_service import sslutils +from oslo_service.tests import base + + +CONF = cfg.CONF + +SSL_CERT_DIR = os.path.normpath(os.path.join( + os.path.dirname(os.path.abspath(__file__)), + 'ssl_cert')) + + +class SslutilsTestCase(base.ServiceBaseTestCase): + """Test cases for sslutils.""" + + def setUp(self): + super(SslutilsTestCase, self).setUp() + self.cert_file_name = os.path.join(SSL_CERT_DIR, 'certificate.crt') + self.key_file_name = os.path.join(SSL_CERT_DIR, 'privatekey.key') + self.ca_file_name = os.path.join(SSL_CERT_DIR, 'ca.crt') + + @mock.patch("exceptions.RuntimeError") + @mock.patch("os.path.exists") + def test_is_enabled(self, exists_mock, runtime_error_mock): + exists_mock.return_value = True + self.conf.set_default("cert_file", self.cert_file_name, + group=sslutils.config_section) + self.conf.set_default("key_file", self.key_file_name, + group=sslutils.config_section) + self.conf.set_default("ca_file", self.ca_file_name, + group=sslutils.config_section) + sslutils.is_enabled(self.conf) + self.assertFalse(runtime_error_mock.called) + + @mock.patch("os.path.exists") + def test_is_enabled_no_ssl_cert_file_fails(self, exists_mock): + exists_mock.side_effect = [False] + self.conf.set_default("cert_file", "/no/such/file", + group=sslutils.config_section) + self.assertRaises(RuntimeError, sslutils.is_enabled, self.conf) + + @mock.patch("os.path.exists") + def test_is_enabled_no_ssl_key_file_fails(self, exists_mock): + exists_mock.side_effect = [True, False] + self.conf.set_default("cert_file", self.cert_file_name, + group=sslutils.config_section) + self.conf.set_default("key_file", "/no/such/file", + group=sslutils.config_section) + self.assertRaises(RuntimeError, sslutils.is_enabled, self.conf) + + @mock.patch("os.path.exists") + def test_is_enabled_no_ssl_ca_file_fails(self, exists_mock): + exists_mock.side_effect = [True, True, False] + self.conf.set_default("cert_file", self.cert_file_name, + group=sslutils.config_section) + self.conf.set_default("key_file", self.key_file_name, + group=sslutils.config_section) + self.conf.set_default("ca_file", "/no/such/file", + group=sslutils.config_section) + self.assertRaises(RuntimeError, sslutils.is_enabled, self.conf) + + @mock.patch("ssl.wrap_socket") + @mock.patch("os.path.exists") + def _test_wrap(self, exists_mock, wrap_socket_mock, **kwargs): + exists_mock.return_value = True + sock = mock.Mock() + self.conf.set_default("cert_file", self.cert_file_name, + group=sslutils.config_section) + self.conf.set_default("key_file", self.key_file_name, + group=sslutils.config_section) + ssl_kwargs = {'server_side': True, + 'certfile': self.conf.ssl.cert_file, + 'keyfile': self.conf.ssl.key_file, + 'cert_reqs': ssl.CERT_NONE, + } + if kwargs: + ssl_kwargs.update(**kwargs) + sslutils.wrap(self.conf, sock) + wrap_socket_mock.assert_called_once_with(sock, **ssl_kwargs) + + def test_wrap(self): + self._test_wrap() + + def test_wrap_ca_file(self): + self.conf.set_default("ca_file", self.ca_file_name, + group=sslutils.config_section) + ssl_kwargs = {'ca_certs': self.conf.ssl.ca_file, + 'cert_reqs': ssl.CERT_REQUIRED + } + self._test_wrap(**ssl_kwargs) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.service-0.9.0/oslo_service/tests/test_threadgroup.py new/oslo.service-0.10.0/oslo_service/tests/test_threadgroup.py --- old/oslo.service-0.9.0/oslo_service/tests/test_threadgroup.py 2015-09-01 20:39:05.000000000 +0200 +++ new/oslo.service-0.10.0/oslo_service/tests/test_threadgroup.py 2015-10-12 17:37:58.000000000 +0200 @@ -19,6 +19,8 @@ import time +from eventlet import event + from oslotest import base as test_base from oslo_service import threadgroup @@ -47,12 +49,32 @@ self.assertEqual(('arg',), timer.args) self.assertEqual({'kwarg': 'kwarg'}, timer.kw) + def test_stop_current_thread(self): + + stop_event = event.Event() + quit_event = event.Event() + + def stop_self(*args, **kwargs): + if args[0] == 1: + time.sleep(1) + self.tg.stop() + stop_event.send('stop_event') + quit_event.wait() + + for i in range(0, 4): + self.tg.add_thread(stop_self, i, kwargs='kwargs') + + stop_event.wait() + self.assertEqual(1, len(self.tg.threads)) + quit_event.send('quit_event') + def test_stop_immediately(self): def foo(*args, **kwargs): time.sleep(1) start_time = time.time() self.tg.add_thread(foo, 'arg', kwarg='kwarg') + time.sleep(0) self.tg.stop() end_time = time.time() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.service-0.9.0/oslo_service/threadgroup.py new/oslo.service-0.10.0/oslo_service/threadgroup.py --- old/oslo.service-0.9.0/oslo_service/threadgroup.py 2015-09-01 20:39:05.000000000 +0200 +++ new/oslo.service-0.10.0/oslo_service/threadgroup.py 2015-10-12 17:37:58.000000000 +0200 @@ -24,13 +24,13 @@ LOG = logging.getLogger(__name__) -def _thread_done(gt, *args, **kwargs): +def _on_thread_done(_greenthread, group, thread): """Callback function to be passed to GreenThread.link() when we spawn(). - Calls the :class:`ThreadGroup` to notify if. - + Calls the :class:`ThreadGroup` to notify it to remove this thread from + the associated group. """ - kwargs['group'].thread_done(kwargs['thread']) + group.thread_done(thread) class Thread(object): @@ -42,7 +42,12 @@ """ def __init__(self, thread, group): self.thread = thread - self.thread.link(_thread_done, group=group, thread=self) + self.thread.link(_on_thread_done, group, self) + self._ident = id(thread) + + @property + def ident(self): + return self._ident def stop(self): self.thread.kill() @@ -94,21 +99,25 @@ def timer_done(self, timer): self.timers.remove(timer) - def _stop_threads(self): + def _perform_action_on_threads(self, action_func, on_error_func): current = threading.current_thread() - # Iterate over a copy of self.threads so thread_done doesn't # modify the list while we're iterating for x in self.threads[:]: - if x is current: - # don't kill the current thread. + if x.ident == current.ident: + # Don't perform actions on the current thread. continue try: - x.stop() + action_func(x) except eventlet.greenlet.GreenletExit: pass except Exception: - LOG.exception(_LE('Error stopping thread.')) + on_error_func(x) + + def _stop_threads(self): + self._perform_action_on_threads( + lambda x: x.stop(), + lambda x: LOG.exception(_LE('Error stopping thread.'))) def stop_timers(self): for x in self.timers: @@ -142,17 +151,7 @@ except eventlet.greenlet.GreenletExit: pass except Exception: - LOG.exception(_LE('Error waiting on ThreadGroup.')) - current = threading.current_thread() - - # Iterate over a copy of self.threads so thread_done doesn't - # modify the list while we're iterating - for x in self.threads[:]: - if x is current: - continue - try: - x.wait() - except eventlet.greenlet.GreenletExit: - pass - except Exception as ex: - LOG.exception(ex) + LOG.exception(_LE('Error waiting on timer.')) + self._perform_action_on_threads( + lambda x: x.wait(), + lambda x: LOG.exception(_LE('Error waiting on thread.'))) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.service-0.9.0/oslo_service/wsgi.py new/oslo.service-0.10.0/oslo_service/wsgi.py --- old/oslo.service-0.9.0/oslo_service/wsgi.py 2015-09-01 20:39:05.000000000 +0200 +++ new/oslo.service-0.10.0/oslo_service/wsgi.py 2015-10-12 17:37:58.000000000 +0200 @@ -33,6 +33,7 @@ from oslo_log import log as logging from oslo_service import _options +from oslo_service import service from oslo_service import sslutils from oslo_service._i18n import _, _LE, _LI @@ -45,12 +46,17 @@ return [(None, copy.deepcopy(_options.wsgi_opts))] +def register_opts(conf): + """Registers WSGI config options.""" + return conf.register_opts(_options.wsgi_opts) + + class InvalidInput(Exception): message = _("Invalid input received: " "Unexpected argument for periodic task creation: %(arg)s.") -class Server(object): +class Server(service.ServiceBase): """Server class to manage a WSGI server, serving a WSGI application.""" def __init__(self, conf, name, app, host='0.0.0.0', port=0, pool_size=None, @@ -58,15 +64,19 @@ use_ssl=False, max_url_len=None): """Initialize, but do not start, a WSGI server. + :param conf: Instance of ConfigOpts. :param name: Pretty name for logging. :param app: The WSGI application to serve. :param host: IP address to serve the application. :param port: Port number to server the application. :param pool_size: Maximum number of eventlets to spawn concurrently. + :param protocol: Protocol class. :param backlog: Maximum number of queued connections. + :param use_ssl: Wraps the socket in an SSL context if True. :param max_url_len: Maximum length of permitted URLs. :returns: None :raises: InvalidInput + :raises: EnvironmentError """ self.conf = conf @@ -86,10 +96,9 @@ self._use_ssl = use_ssl self._max_url_len = max_url_len self.client_socket_timeout = conf.client_socket_timeout or None - self.default_pool_size = conf.wsgi_default_pool_size if backlog < 1: - raise InvalidInput(reason='The backlog must be more than 0') + raise InvalidInput(reason=_('The backlog must be more than 0')) bind_addr = (host, port) # TODO(dims): eventlet's green dns/socket module does not actually diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.service-0.9.0/setup.cfg new/oslo.service-0.10.0/setup.cfg --- old/oslo.service-0.9.0/setup.cfg 2015-09-01 20:39:42.000000000 +0200 +++ new/oslo.service-0.10.0/setup.cfg 2015-10-12 17:38:47.000000000 +0200 @@ -5,7 +5,7 @@ README.rst author = OpenStack author-email = openstack-dev(a)lists.openstack.org -home-page = http://launchpad.net/oslo +home-page = http://wiki.openstack.org/wiki/Oslo#oslo.service classifier = Environment :: OpenStack Intended Audience :: Information Technology @@ -60,7 +60,7 @@ universal = true [egg_info] -tag_build = -tag_svn_revision = 0 tag_date = 0 +tag_svn_revision = 0 +tag_build = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.service-0.9.0/setup.py new/oslo.service-0.10.0/setup.py --- old/oslo.service-0.9.0/setup.py 2015-09-01 20:39:05.000000000 +0200 +++ new/oslo.service-0.10.0/setup.py 2015-10-12 17:37:58.000000000 +0200 @@ -25,5 +25,5 @@ pass setuptools.setup( - setup_requires=['pbr>=1.3'], + setup_requires=['pbr>=1.8'], pbr=True) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.service-0.9.0/test-requirements.txt new/oslo.service-0.10.0/test-requirements.txt --- old/oslo.service-0.9.0/test-requirements.txt 2015-09-01 20:39:05.000000000 +0200 +++ new/oslo.service-0.10.0/test-requirements.txt 2015-10-12 17:37:58.000000000 +0200 @@ -9,3 +9,5 @@ # These are needed for docs generation oslosphinx>=2.5.0 # Apache-2.0 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 + +coverage>=3.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.service-0.9.0/tox.ini new/oslo.service-0.10.0/tox.ini --- old/oslo.service-0.9.0/tox.ini 2015-09-01 20:39:05.000000000 +0200 +++ new/oslo.service-0.10.0/tox.ini 2015-10-12 17:37:58.000000000 +0200 @@ -36,7 +36,7 @@ commands = python setup.py build_sphinx [testenv:cover] -commands = python setup.py testr --coverage --testr-args='{posargs}' +commands = python setup.py test --coverage --coverage-package-name=oslo_service --testr-args='{posargs}' [flake8] # E123, E125 skipped as they are invalid PEP-8.

1 0

commit python-sphinxcontrib-docbookrestapi for openSUSE:Factory
by root＠hilbert.suse.de 30 Oct '15

30 Oct '15

Hello community, here is the log from the commit of package python-sphinxcontrib-docbookrestapi for openSUSE:Factory checked in at 2015-10-30 13:43:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-sphinxcontrib-docbookrestapi (Old) and /work/SRC/openSUSE:Factory/.python-sphinxcontrib-docbookrestapi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-sphinxcontrib-docbookrestapi" Changes: -------- --- /work/SRC/openSUSE:Factory/python-sphinxcontrib-docbookrestapi/python-sphinxcontrib-docbookrestapi.changes 2014-04-20 11:36:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-sphinxcontrib-docbookrestapi.new/python-sphinxcontrib-docbookrestapi.changes 2015-10-30 13:43:56.000000000 +0100 @@ -2 +2 @@ -Mon Apr 14 13:36:51 UTC 2014 - dmueller(a)suse.com +Wed Jul 29 11:04:45 UTC 2015 - tbechtold(a)suse.com @@ -4 +4 @@ -- add 0001-Fix-the-code-to-work-with-Python2.6.patch +- Unify spec file. Use fedora compatible files macros @@ -7 +7 @@ -Wed Apr 9 13:09:49 UTC 2014 - dmueller(a)suse.com +Wed Sep 3 13:39:57 UTC 2014 - dmueller(a)suse.com @@ -9 +9,21 @@ -- go back to released version (0.1) +- update to 0.2.1: + * Bump to 0.2.1 + * add venv to tox.ini + * Bump to 0.2 + * Add the Python 3 classifiers in setup.cfg + * Declare sphinxcontrib.docbookrestapi package + * Properly declare namespace package + * Properly document the enumeration type + * Allow foo_name as well as foo_id in paths + * Remove 'xmlns' attribute of 'param' elements + * Use 'para' elements instead of 'p' ones + * Add the top-level comment that is now mandatory in WADL files + * Add an XML declaration in the output + * Use 'wadl:doc' instead of 'doc' and fix its attributes + * Add a mandatory 'id' attribute to 'resource' elements + * Removes whitespaces at the end of self-closing tags + * Sync with global requirements + * Add tests + * Python 3 compatibility + * Fix the code to work with Python2.6 + * tox.ini: clean the pep8 target @@ -11 +31 @@ ------------------------------------------------------------------- +------------------------------------------------------------------- Old: ---- 0001-Fix-the-code-to-work-with-Python2.6.patch sphinxcontrib-docbookrestapi-0.1.tar.gz New: ---- sphinxcontrib-docbookrestapi-0.2.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-sphinxcontrib-docbookrestapi.spec ++++++ --- /var/tmp/diff_new_pack.M4K4Qy/_old 2015-10-30 13:43:56.000000000 +0100 +++ /var/tmp/diff_new_pack.M4K4Qy/_new 2015-10-30 13:43:56.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-sphinxcontrib-docbookrestapi # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,16 +17,16 @@ Name: python-sphinxcontrib-docbookrestapi -Version: 0.1 +Version: 0.2.1 Release: 0 Summary: Extension to Sphinx for generating REST API documentation License: Apache-2.0 Group: Development/Languages/Python -Url: https://github.com/stackforge/sphinxcontrib-docbookrestapi -Source: sphinxcontrib-docbookrestapi-%{version}.tar.gz +Url: https://git.openstack.org/cgit/stackforge/sphinxcontrib-docbookrestapi/ +Source: https://pypi.python.org/packages/source/s/sphinxcontrib-docbookrestapi/sphi… # PATCH-FIX-UPSTREAM speilicke(a)suse.com -- https://review.openstack.org/#/c/84132/ Patch0: 0001-Properly-declare-namespace-package.patch -Patch1: 0001-Fix-the-code-to-work-with-Python2.6.patch +BuildRequires: openstack-suse-macros BuildRequires: python-devel BuildRequires: python-pbr Requires: python-Sphinx @@ -45,17 +45,16 @@ %prep %setup -q -n sphinxcontrib-docbookrestapi-%{version} %patch0 -p1 -%patch1 -p1 %build -python setup.py build +%{__python2} setup.py build %install -python setup.py install --prefix=%{_prefix} --root=%{buildroot} +%{__python2} setup.py install --prefix=%{_prefix} --root=%{buildroot} %files %defattr(-,root,root,-) %doc AUTHORS LICENSE ChangeLog README.rst -%{python_sitelib}/* +%{python2_sitelib}/* %changelog ++++++ _service ++++++ --- /var/tmp/diff_new_pack.M4K4Qy/_old 2015-10-30 13:43:57.000000000 +0100 +++ /var/tmp/diff_new_pack.M4K4Qy/_new 2015-10-30 13:43:57.000000000 +0100 @@ -1,16 +1,12 @@ <services> - <service mode="disabled" name="tar_scm"> - <param name="url">git://github.com/stackforge/sphinxcontrib-docbookrestapi.git</param> - <param name="scm">git</param> - <param name="package-meta">.git</param> - <param name="versionformat">@PARENT_TAG@+git.%ct.%h</param> - <param name="revision">master</param> + <service mode="disabled" name="download_files"> <param name="changesgenerate">enable</param> </service> - <service mode="disabled" name="python_sdist"> - <param name="basename">sphinxcontrib-docbookrestapi-*.tar</param> + <service mode="disabled" name="set_version"> + <param name="basename">sphinxcontrib-docbookrestapi</param> + </service> + <service mode="disabled" name="python_requires"> </service> - <service name="refresh_patches" mode="disabled"> <param name="changesgenerate">enable</param> </service> ++++++ sphinxcontrib-docbookrestapi-0.1.tar.gz -> sphinxcontrib-docbookrestapi-0.2.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sphinxcontrib-docbookrestapi-0.1/.testr.conf new/sphinxcontrib-docbookrestapi-0.2.1/.testr.conf --- old/sphinxcontrib-docbookrestapi-0.1/.testr.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/sphinxcontrib-docbookrestapi-0.2.1/.testr.conf 2014-05-05 17:20:24.000000000 +0200 @@ -0,0 +1,4 @@ +[DEFAULT] +test_command=${PYTHON:-python} -m subunit.run discover sphinxcontrib/docbookrestapi/tests $LISTOPT $IDOPTION +test_id_option=--load-list $IDFILE +test_list_option=--list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sphinxcontrib-docbookrestapi-0.1/AUTHORS new/sphinxcontrib-docbookrestapi-0.2.1/AUTHORS --- old/sphinxcontrib-docbookrestapi-0.1/AUTHORS 2013-12-03 17:34:28.000000000 +0100 +++ new/sphinxcontrib-docbookrestapi-0.2.1/AUTHORS 2014-05-05 17:20:45.000000000 +0200 @@ -1 +1 @@ -Cyril Roelandt <cyril.roelandt(a)enovance.com> + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sphinxcontrib-docbookrestapi-0.1/ChangeLog new/sphinxcontrib-docbookrestapi-0.2.1/ChangeLog --- old/sphinxcontrib-docbookrestapi-0.1/ChangeLog 2013-12-03 17:34:28.000000000 +0100 +++ new/sphinxcontrib-docbookrestapi-0.2.1/ChangeLog 2014-05-05 17:20:45.000000000 +0200 @@ -1,128 +1,50 @@ -commit ee217854eb3488464b4ad833d1d370e8e335036c -Author: Cyril Roelandt <cyril.roelandt(a)enovance.com> -Date: Mon Nov 18 14:17:48 2013 +0100 +CHANGES +======= - Allow complex types for parameters - - Tools like Ceilometer need to have "Alarm" as a type, instead of something as - simple as "string" or "int". - - Change-Id: I16af1e077ee4641f52a2607f6269e1dd633b4b54 +0.2.1 +----- -commit 220cd4907d6bc27256b42ecfae604900d4670840 -Merge: e1d097d fae50a8 -Author: Jenkins <jenkins(a)review.openstack.org> -Date: Fri Nov 15 19:26:59 2013 +0000 +* Bump to 0.2.1 +* add venv to tox.ini - Merge "Fix the generate_id function with PUT methods" - -commit fae50a847140fd69a031548be641c10bfbcfaf64 -Author: Cyril Roelandt <cyril.roelandt(a)enovance.com> -Date: Fri Nov 15 20:20:08 2013 +0100 - - Fix the generate_id function with PUT methods - - Now handle methods such as /v2/alarms/alarm_id/state. - - Change-Id: I15cdc6a65f38fee7e4ad6559741144fdf43eb1f6 - -commit e1d097d9150233d00d39300e6ea250231a0af28a -Author: Cyril Roelandt <cyril.roelandt(a)enovance.com> -Date: Fri Nov 15 20:07:29 2013 +0100 - - Add .gitreview file - - Change-Id: I054681c9c23747827a5b1708e7ddd37f1d12266b - -commit 819e98a84e39b3734ad08d7a62779354dd7194fa -Author: Cyril Roelandt <cyril.roelandt(a)enovance.com> -Date: Wed Oct 16 20:28:16 2013 +0000 - - Wrap lines in the generated WADL file - -commit 16c1a9c0625d5c8a2a54f71161ac17c26d286a90 -Author: Cyril Roelandt <cyril.roelandt(a)enovance.com> -Date: Wed Oct 16 20:16:51 2013 +0000 - - Generated human-readable method ids and titles - -commit 86a69a01c03ac97e9506f07da5dbe5a2a5fbf86b -Author: Cyril Roelandt <cyril.roelandt(a)enovance.com> -Date: Thu Oct 10 10:56:46 2013 +0000 - - Use '<para role="shortdoc">...</para>' - - Inside the 'wadl:doc', this is what should be used to write the description of - the method, instead of a simple 'p' element. - -commit 8698122d4f3c33174c1db63a4986ef472289a31f -Author: Cyril Roelandt <cyril.roelandt(a)enovance.com> -Date: Thu Oct 10 10:52:50 2013 +0000 - - Make the 'wadl:doc' element appear first - - Inside 'method' elements, the 'wadl:doc' element should appear before the - 'request' and 'response' elements. - -commit 0b6dce2be73a6c0c76ae81bcacd2d68287e03536 -Author: Cyril Roelandt <cyril.roelandt(a)enovance.com> -Date: Mon Oct 7 13:23:01 2013 +0000 - - Fix PEP8-related warnings - - Add a tox.ini (mostly stolen from ceilometer), so that one can run 'tox - -epep8'. - -commit 1f88543554ff64b5e5465dc2dd93d5c11e29fa2d -Author: Cyril Roelandt <cyril.roelandt(a)enovance.com> -Date: Mon Oct 7 12:11:41 2013 +0000 - - Remove the version hack in setup.py - -commit 7d446b37a3fc604aa7f3cfb385cb3c537b752844 -Author: Cyril Roelandt <cyril.roelandt(a)enovance.com> -Date: Mon Oct 7 12:00:17 2013 +0000 - - Indent the generated WADL file - - Also, remove the lxml import that was never needed. - -commit 552b8c94046d4e7d2e07dbc3f699d95fbc1e869a -Author: Cyril Roelandt <cyril.roelandt(a)enovance.com> -Date: Mon Oct 7 10:36:09 2013 +0000 - - Only parse the intended files - - Files meant to be parsed by sphinxcontrib-docbookrestapi should now have a - comment that reads 'docbookrestapi' before the first section of the RST, - otherwise they'll be ignored. - -commit 3753d6bfdec29b98d28d2420ca983c075fffc596 -Author: Cyril Roelandt <cyril.roelandt(a)enovance.com> -Date: Tue Oct 1 12:41:19 2013 +0000 - - Move code to sphinxcontrib/docbookrestapi. - -commit 3a7d7976793246a6a7654dd213a0ff26a1b595f5 -Author: Cyril Roelandt <cyril.roelandt(a)enovance.com> -Date: Fri Sep 27 13:22:04 2013 +0000 - - MyNodeVisitor: call SparseNodeVisitor.__init__() - -commit 79720726fd756278f926a736b1d84028e3d0e973 -Author: Cyril Roelandt <cyril.roelandt(a)enovance.com> -Date: Fri Sep 27 12:12:33 2013 +0000 - - sphinxcontrib/setup.py: Add license header. - -commit 3111e93bee6609d7e174d395374518f5651f7755 -Author: Cyril Roelandt <cyril.roelandt(a)enovance.com> -Date: Fri Sep 27 12:12:09 2013 +0000 - - Add missing shebangs. - -commit 2df0486705dc610909527c2e2a495cddd83c86d1 -Author: Cyril Roelandt <cyril.roelandt(a)enovance.com> -Date: Thu Sep 26 14:59:01 2013 +0000 - - Initial commit. \ No newline at end of file +0.2 +--- + +* Bump to 0.2 +* Add the Python 3 classifiers in setup.cfg +* Declare sphinxcontrib.docbookrestapi package +* Properly declare namespace package +* Properly document the enumeration type +* Allow foo_name as well as foo_id in paths +* Remove 'xmlns' attribute of 'param' elements +* Use 'para' elements instead of 'p' ones +* Add the top-level comment that is now mandatory in WADL files +* Add an XML declaration in the output +* Use 'wadl:doc' instead of 'doc' and fix its attributes +* Add a mandatory 'id' attribute to 'resource' elements +* Removes whitespaces at the end of self-closing tags +* Sync with global requirements +* Add tests +* Python 3 compatibility +* Fix the code to work with Python2.6 +* tox.ini: clean the pep8 target + +0.1 +--- + +* Allow complex types for parameters +* Fix the generate_id function with PUT methods +* Add .gitreview file +* Wrap lines in the generated WADL file +* Generated human-readable method ids and titles +* Use '<para role="shortdoc">...</para>' +* Make the 'wadl:doc' element appear first +* Fix PEP8-related warnings +* Remove the version hack in setup.py +* Indent the generated WADL file +* Only parse the intended files +* Move code to sphinxcontrib/docbookrestapi +* MyNodeVisitor: call SparseNodeVisitor.__init__() +* sphinxcontrib/setup.py: Add license header +* Add missing shebangs +* Initial commit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sphinxcontrib-docbookrestapi-0.1/PKG-INFO new/sphinxcontrib-docbookrestapi-0.2.1/PKG-INFO --- old/sphinxcontrib-docbookrestapi-0.1/PKG-INFO 2013-12-03 17:34:28.000000000 +0100 +++ new/sphinxcontrib-docbookrestapi-0.2.1/PKG-INFO 2014-05-05 17:20:45.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: sphinxcontrib-docbookrestapi -Version: 0.1 +Version: 0.2.1 Summary: Extension to Sphinx for generating REST API documentation for http://api.openstack.org/ Home-page: UNKNOWN Author: Cyril Roelandt @@ -24,4 +24,6 @@ Classifier: Operating System :: OS Independent Classifier: Programming Language :: Python Classifier: Programming Language :: Python :: 2.7 +Classifier: Programming Language :: Python :: 3 +Classifier: Programming Language :: Python :: 3.3 Classifier: Topic :: Software Development :: Documentation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sphinxcontrib-docbookrestapi-0.1/requirements.txt new/sphinxcontrib-docbookrestapi-0.2.1/requirements.txt --- old/sphinxcontrib-docbookrestapi-0.1/requirements.txt 2013-12-03 12:48:06.000000000 +0100 +++ new/sphinxcontrib-docbookrestapi-0.2.1/requirements.txt 2014-05-05 17:20:24.000000000 +0200 @@ -1 +1,3 @@ -pytidylib>=0.2.1 +docutils==0.9.1 +pytidylib6 +sphinx>=1.1.2,<1.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sphinxcontrib-docbookrestapi-0.1/setup.cfg new/sphinxcontrib-docbookrestapi-0.2.1/setup.cfg --- old/sphinxcontrib-docbookrestapi-0.1/setup.cfg 2013-12-03 17:34:28.000000000 +0100 +++ new/sphinxcontrib-docbookrestapi-0.2.1/setup.cfg 2014-05-05 17:20:45.000000000 +0200 @@ -14,16 +14,19 @@ Operating System :: OS Independent Programming Language :: Python Programming Language :: Python :: 2.7 + Programming Language :: Python :: 3 + Programming Language :: Python :: 3.3 Topic :: Software Development :: Documentation keywords = documentation docbook sphinx -version = 0.1 +version = 0.2.1 [files] packages = sphinxcontrib + sphinxcontrib.docbookrestapi namespace_packages = sphinxcontrib diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sphinxcontrib-docbookrestapi-0.1/sphinxcontrib/__init__.py new/sphinxcontrib-docbookrestapi-0.2.1/sphinxcontrib/__init__.py --- old/sphinxcontrib-docbookrestapi-0.1/sphinxcontrib/__init__.py 2013-11-15 19:47:04.000000000 +0100 +++ new/sphinxcontrib-docbookrestapi-0.2.1/sphinxcontrib/__init__.py 2014-05-05 17:20:24.000000000 +0200 @@ -0,0 +1,17 @@ +# Copyright (C) 2013 eNovance SAS <licensing(a)enovance.com> +# +# Author: Cyril Roelandt <cyril.roelandt(a)enovance.com> +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +__import__('pkg_resources').declare_namespace(__name__) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sphinxcontrib-docbookrestapi-0.1/sphinxcontrib/docbookrestapi/docbook.py new/sphinxcontrib-docbookrestapi-0.2.1/sphinxcontrib/docbookrestapi/docbook.py --- old/sphinxcontrib-docbookrestapi-0.1/sphinxcontrib/docbookrestapi/docbook.py 2013-12-03 17:32:08.000000000 +0100 +++ new/sphinxcontrib-docbookrestapi-0.2.1/sphinxcontrib/docbookrestapi/docbook.py 2014-05-05 17:20:24.000000000 +0200 @@ -15,6 +15,7 @@ # License for the specific language governing permissions and limitations # under the License. +from datetime import date from docutils.nodes import SparseNodeVisitor, StopTraversal import json import os @@ -30,7 +31,7 @@ path = path.replace('(', '') path = path.replace(')', '') elems = path.split('/') - elems = filter(lambda x: x, elems) # Remove empty strings + elems = list(filter(lambda x: x, elems)) # Remove empty strings elems = elems[1:] # Remove "vx" (v1, v2...) n_elems = len(elems) @@ -42,15 +43,22 @@ elif method == 'get': if elems[-1].endswith('_id'): name += "show" + elems[-1][0:-3].capitalize() + elif elems[-1].endswith('_name'): + name += "show" + elems[-1][0:-5].capitalize() elif n_elems > 2: if elems[-3][:-1] + '_id' == elems[-2]: name += 'show' + elems[-3][:-1].capitalize() name += elems[-1].capitalize() + elif elems[-3][:-1] + '_name' == elems[-2]: + name += 'show' + elems[-3][:-1].capitalize() + name += elems[-1].capitalize() else: name += "list" + elems[-1].capitalize() elif method == 'post': if elems[-1].endswith('_id'): name += "create" + elems[-1][0:-3].capitalize() + elif elems[-1].endswith('_name'): + name += "create" + elems[-1][0:-5].capitalize() else: name += "create" + elems[-1][:-1].capitalize() elif method == 'put': @@ -82,6 +90,37 @@ return ' '.join(words).capitalize() +def clean_up_xml(xml_str): + # When using UTF-8, tidy does not add an encoding attribute. Do it + # ourselves. See + # http://tidy.cvs.sourceforge.net/viewvc/tidy/tidy/src/lexer.c? + # revision=1.194&view=markup + xml_str = xml_str.replace('?>', ' encoding="UTF-8"?>', 1) + + # tidy automatically inserts a whitespace at the end of a self-closing tag. + # See line 1347 at: + # http://tidy.cvs.sourceforge.net/viewvc/tidy/tidy/src/pprint.c? + # revision=1.119&view=markup + + xml_str = xml_str.replace(' />', '/>') + + # Add this comment right after the <?...?> line. Not sure how to do this + # using ElementTree.Comment(), since there is no parent element here. + # XXX(cyril): The starting year may not be the right one for every project. + xml_str = xml_str.replace('?>\n', '''?> + + + + + + + + +''' % date.today().year, 1) + + return xml_str + + class MyNodeVisitor(SparseNodeVisitor): def __init__(self, document): SparseNodeVisitor.__init__(self, document) @@ -130,7 +169,12 @@ def build_resources(root, d, path=''): for k, v in d.iteritems(): - tmp = ET.SubElement(root, 'resource', {'path': k}) + tmp = ET.SubElement(root, 'resource', { + # NOTE(cyril): sometimes, id and path might differ. This + # should be good enough, though. + 'id': k.replace('{', '').replace('}', ''), + 'path': k, + }) if path + '/' + k + '/' in self.paths: for method in self.paths[path + '/' + k + '/']: ET.SubElement(tmp, 'method', {'href': '#' + method}) @@ -145,16 +189,17 @@ # Finally, write the output. with open(output_file, 'w+') as f: options = { - 'add-xml-decl': False, + 'add-xml-decl': True, 'indent': True, 'indent-spaces': 4, 'input-xml': True, + 'output-encoding': 'utf8', 'output-xml': True, 'wrap': 70 } xml_str = tidylib.tidy_document(ET.tostring(self.root), options=options)[0] - f.write(xml_str) + f.write(clean_up_xml(xml_str)) # If we're inside a bullet list, all the "paragraph" elements will be # parameters description, so we need to know whether we currently are in a @@ -189,12 +234,12 @@ self.in_method_definition = False def visit_desc(self, node): - attrs = {k: v for (k, v) in node.attlist()} + attrs = dict(node.attlist()) if attrs['domain'] == 'http': self.in_method_definition = True def visit_desc_signature(self, node): - attrs = {k: v for (k, v) in node.attlist()} + attrs = dict(node.attlist()) if 'method' in attrs and 'path' in attrs: method_id = generate_id(attrs['path'], attrs['method']) self.current_method = ET.Element('method', { @@ -206,7 +251,7 @@ self.paths.setdefault(path, []).append(method_id) self.current_wadl_doc = ET.SubElement( self.current_method, 'wadl:doc', { - 'xmlns': 'http://www.w3.org/1999/xhtml', + 'xmlns': 'http://docbook.org/ns/docbook', 'xml:lang': 'EN', 'title': generate_title_from_id(method_id) } @@ -241,12 +286,20 @@ text = node.astext() dashes_index = text.find('--') param_name = text[0:text.find(' ')] - param_type = text[text.find(' ') + 1: dashes_index - 1] + param_type = text[text.find(' ') + 1: dashes_index - 2] param_descr = text[dashes_index + 3:] param_type = param_type[1:] # Remove '(' + # Sometimes (especially when using enumerations), only some values + # may be allowed. If so, they should be listed in the + # documentation; store them here, and insert them in the code when + # creating the required elements. + valid_values = None # There are probably more types. - if param_type.startswith("int"): + if param_type.startswith("Enum"): + valid_values = param_type[5:-1].split(', ') + param_type = 'xsd:dict' + elif param_type.startswith("int"): param_type = 'xsd:int' elif param_type.startswith("list"): param_type = 'xsd:list' @@ -256,16 +309,28 @@ param_type = param_type[:-1] # Remove ')' tmp = ET.SubElement(self.current_request, 'param', { - 'xmlns': 'http://wadl.dev.java.net/2009/02', 'name': param_name, 'type': param_type, 'required': 'false', # XXX Can we get the right value ? 'style': 'query' # XXX Can we get the right value ? }) - tmp = ET.SubElement(tmp, 'doc') - ET.SubElement(tmp, 'p', { - 'xmlns': 'http://www.w3.org/1999/xhtml' - }).text = param_descr + tmp = ET.SubElement(tmp, 'wadl:doc', { + 'xml:lang': 'EN', + 'xmlns': 'http://docbook.org/ns/docbook' + }) + tmp = ET.SubElement(tmp, 'para') + tmp.text = param_descr + if valid_values: + tmp.text += ' Valid values are ' + for i, value in enumerate(valid_values): + code = ET.SubElement(tmp, 'code') + code.text = value + if i + 1 != len(valid_values): + code.tail = ', ' + if i + 2 == len(valid_values): + code.tail += 'or ' + else: + code.tail = '.' elif self.in_request or self.in_response: self.visit_term(node) @@ -286,7 +351,7 @@ tmp = ET.SubElement(parent, 'representation', { 'mediaType': 'application/json' }) - tmp = ET.SubElement(tmp, 'doc', {'xml:lang': 'EN'}) + tmp = ET.SubElement(tmp, 'wadl:doc', {'xml:lang': 'EN'}) json_text = json.loads(''.join(body)) json_text = json.dumps(json_text, indent=4, sort_keys=True) ET.SubElement(tmp, 'xsdxt:code').text = json_text diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sphinxcontrib-docbookrestapi-0.1/sphinxcontrib/docbookrestapi/tests/test_utils.py new/sphinxcontrib-docbookrestapi-0.2.1/sphinxcontrib/docbookrestapi/tests/test_utils.py --- old/sphinxcontrib-docbookrestapi-0.1/sphinxcontrib/docbookrestapi/tests/test_utils.py 1970-01-01 01:00:00.000000000 +0100 +++ new/sphinxcontrib-docbookrestapi-0.2.1/sphinxcontrib/docbookrestapi/tests/test_utils.py 2014-05-05 17:20:24.000000000 +0200 @@ -0,0 +1,64 @@ +#!/usr/bin/env python +# Copyright (C) 2013 eNovance SAS <licensing(a)enovance.com> +# +# Author: Cyril Roelandt <cyril.roelandt(a)enovance.com> +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +import unittest + +from sphinxcontrib.docbookrestapi.docbook import clean_up_xml, generate_id + + +class TestUtils(unittest.TestCase): + def test_generate_id(self): + test_cases = [ + # (path, method, expected_result) + ('/v2/foos', 'get', 'listFoos'), + + ('/v2/foos/foo_id', 'delete', 'deleteFoo'), + ('/v2/foos/foo_id', 'get', 'showFoo'), + ('/v2/foos/foo_id', 'post', 'createFoo'), + ('/v2/foos/foo_id', 'put', 'updateFoo'), + + ('/v2/foos/foo_id/bar', 'get', 'showFooBar'), + ('/v2/foos/foo_id/bar', 'put', 'updateFooBar'), + + ('/v2/foos/foo_name', 'get', 'showFoo'), + ('/v2/foos/foo_name', 'post', 'createFoo'), + + ('/v2/foos/foo_name/bar', 'get', 'showFooBar'), + ] + + for (path, method, result) in test_cases: + self.assertEqual(generate_id(path, method), result) + + def test_clean_up_xml_encoding(self): + # Make sure the right encoding is added. + self.assertEqual( + clean_up_xml('<?xml version="1.0"?>'), + '<?xml version="1.0" encoding="UTF-8"?>' + ) + + def test_clean_up_xml(self): + # Make sure the whitespace at the end of a self-closing tag is removed. + bad_xml = ''' +<root> + <selfclosingtag /> +</root>''' + good_xml = ''' +<root> + <selfclosingtag/> +</root>''' + self.assertEqual(clean_up_xml(bad_xml), good_xml) + self.assertEqual(clean_up_xml(good_xml), good_xml) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sphinxcontrib-docbookrestapi-0.1/sphinxcontrib_docbookrestapi.egg-info/PKG-INFO new/sphinxcontrib-docbookrestapi-0.2.1/sphinxcontrib_docbookrestapi.egg-info/PKG-INFO --- old/sphinxcontrib-docbookrestapi-0.1/sphinxcontrib_docbookrestapi.egg-info/PKG-INFO 2013-12-03 17:34:28.000000000 +0100 +++ new/sphinxcontrib-docbookrestapi-0.2.1/sphinxcontrib_docbookrestapi.egg-info/PKG-INFO 2014-05-05 17:20:45.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: sphinxcontrib-docbookrestapi -Version: 0.1 +Version: 0.2.1 Summary: Extension to Sphinx for generating REST API documentation for http://api.openstack.org/ Home-page: UNKNOWN Author: Cyril Roelandt @@ -24,4 +24,6 @@ Classifier: Operating System :: OS Independent Classifier: Programming Language :: Python Classifier: Programming Language :: Python :: 2.7 +Classifier: Programming Language :: Python :: 3 +Classifier: Programming Language :: Python :: 3.3 Classifier: Topic :: Software Development :: Documentation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sphinxcontrib-docbookrestapi-0.1/sphinxcontrib_docbookrestapi.egg-info/SOURCES.txt new/sphinxcontrib-docbookrestapi-0.2.1/sphinxcontrib_docbookrestapi.egg-info/SOURCES.txt --- old/sphinxcontrib-docbookrestapi-0.1/sphinxcontrib_docbookrestapi.egg-info/SOURCES.txt 2013-12-03 17:34:28.000000000 +0100 +++ new/sphinxcontrib-docbookrestapi-0.2.1/sphinxcontrib_docbookrestapi.egg-info/SOURCES.txt 2014-05-05 17:20:45.000000000 +0200 @@ -1,3 +1,4 @@ +.testr.conf AUTHORS ChangeLog LICENSE @@ -5,12 +6,13 @@ requirements.txt setup.cfg setup.py +test-requirements.txt tox.ini sphinxcontrib/__init__.py sphinxcontrib/docbookrestapi/__init__.py sphinxcontrib/docbookrestapi/docbook.py sphinxcontrib/docbookrestapi/setup.py -sphinxcontrib/docbookrestapi/tests/__init__.py +sphinxcontrib/docbookrestapi/tests/test_utils.py sphinxcontrib_docbookrestapi.egg-info/PKG-INFO sphinxcontrib_docbookrestapi.egg-info/SOURCES.txt sphinxcontrib_docbookrestapi.egg-info/dependency_links.txt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sphinxcontrib-docbookrestapi-0.1/sphinxcontrib_docbookrestapi.egg-info/requires.txt new/sphinxcontrib-docbookrestapi-0.2.1/sphinxcontrib_docbookrestapi.egg-info/requires.txt --- old/sphinxcontrib-docbookrestapi-0.1/sphinxcontrib_docbookrestapi.egg-info/requires.txt 2013-12-03 17:34:28.000000000 +0100 +++ new/sphinxcontrib-docbookrestapi-0.2.1/sphinxcontrib_docbookrestapi.egg-info/requires.txt 2014-05-05 17:20:45.000000000 +0200 @@ -1 +1,3 @@ -pytidylib>=0.2.1 \ No newline at end of file +docutils==0.9.1 +pytidylib6 +sphinx>=1.1.2,<1.2 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sphinxcontrib-docbookrestapi-0.1/test-requirements.txt new/sphinxcontrib-docbookrestapi-0.2.1/test-requirements.txt --- old/sphinxcontrib-docbookrestapi-0.1/test-requirements.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/sphinxcontrib-docbookrestapi-0.2.1/test-requirements.txt 2014-05-05 17:20:24.000000000 +0200 @@ -0,0 +1,2 @@ +discover +testrepository>=0.0.17 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sphinxcontrib-docbookrestapi-0.1/tox.ini new/sphinxcontrib-docbookrestapi-0.2.1/tox.ini --- old/sphinxcontrib-docbookrestapi-0.1/tox.ini 2013-12-03 17:32:08.000000000 +0100 +++ new/sphinxcontrib-docbookrestapi-0.2.1/tox.ini 2014-05-05 17:20:24.000000000 +0200 @@ -1,18 +1,18 @@ [tox] minversion = 1.6 skipsdist = True -envlist = pep8 +envlist = pep8,py26,py27,py33 -#[testenv] +[testenv] deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt install_command = pip install -U {opts} {packages} usedevelop = True -setenv = VIRTUAL_ENV={envdir} - LANG=en_US.UTF-8 - LANGUAGE=en_US:en - LC_ALL=C - EVENTLET_NO_GREENDNS=yes +commands = + python setup.py testr --slowest --testr-args='{posargs}' + +[testenv:venv] +commands = {posargs} [testenv:pep8] # Install bounded pep8/pyflakes first, then let flake8 install @@ -25,7 +25,5 @@ [flake8] -#ignore = H301,H306,H506 -builtins = _ -exclude=.venv,.git,.tox,dist,doc,./ceilometer/openstack/common,*lib/python*,*egg,tools,nova_tests,build +exclude=.venv,.git,.tox,*egg,build show-source = True

1 0

commit hdf for openSUSE:Factory
by root＠hilbert.suse.de 30 Oct '15

30 Oct '15

Hello community, here is the log from the commit of package hdf for openSUSE:Factory checked in at 2015-10-30 13:43:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hdf (Old) and /work/SRC/openSUSE:Factory/.hdf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hdf" Changes: -------- --- /work/SRC/openSUSE:Factory/hdf/hdf.changes 2015-08-27 08:57:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.hdf.new/hdf.changes 2015-10-30 13:43:55.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Oct 29 11:47:06 UTC 2015 - schwab(a)suse.de + +- hdf-aarch64.patch: add support for aarch64 + +------------------------------------------------------------------- New: ---- hdf-aarch64.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hdf.spec ++++++ --- /var/tmp/diff_new_pack.q3anhG/_old 2015-10-30 13:43:56.000000000 +0100 +++ /var/tmp/diff_new_pack.q3anhG/_new 2015-10-30 13:43:56.000000000 +0100 @@ -28,8 +28,8 @@ Name: hdf %define libname libhdf Version: 4.2.11 -%define sonum 4 Release: 0 +%define sonum 4 Summary: Command-line programs for the HDF4 scientific data format License: BSD-4-Clause Group: Productivity/Scientific/Other @@ -46,6 +46,7 @@ Patch9: hdf-misc-test.patch # Fix a strict-aliasing warning. Patch10: hdf-strict-aliasing.patch +Patch11: hdf-aarch64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bison BuildRequires: bzip2 @@ -381,6 +382,7 @@ %patch8 -p1 %patch9 %patch10 +%patch11 -p1 for mpi in %_mpi; do @@ -434,7 +436,6 @@ make %{?_smp_mflags} popd - # parallel shared library pushd build_$mpi export CC="%{_libdir}/mpi/gcc/$mpi/bin/mpicc" ++++++ hdf-aarch64.patch ++++++ Index: hdf-4.2.11/hdf/src/hconv.h =================================================================== --- hdf-4.2.11.orig/hdf/src/hconv.h +++ hdf-4.2.11/hdf/src/hconv.h @@ -59,7 +59,7 @@ /* CONSTANT DEFINITIONS */ /*****************************************************************************/ /* Generally Big-Endian machines */ -#if !defined(INTEL86) && !defined(MIPSEL) && !defined(DEC_ALPHA) && !defined(I860) && !defined(SUN386) && !(defined(__ia64) && !(defined(hpux) || defined(__hpux))) && !defined(__x86_64__) && !defined(__arm__) +#if !defined(INTEL86) && !defined(MIPSEL) && !defined(DEC_ALPHA) && !defined(I860) && !defined(SUN386) && !(defined(__ia64) && !(defined(hpux) || defined(__hpux))) && !defined(__x86_64__) && !defined(__arm__) && !defined __aarch64__ # define UI8_IN DFKnb1b /* Unsigned Integer, 8 bits */ # define UI8_OUT DFKnb1b # define SI16_IN DFKnb2b /* S = Signed */ Index: hdf-4.2.11/hdf/src/hdfi.h =================================================================== --- hdf-4.2.11.orig/hdf/src/hdfi.h +++ hdf-4.2.11/hdf/src/hdfi.h @@ -1066,6 +1066,57 @@ typedef int hdf_pint_t; #endif /* Linux ARM */ +/* Linux ARM64 */ +#if defined __aarch64__ + +#ifdef GOT_MACHINE +If you get an error on this line more than one machine type has been defined. +Please check your Makefile. +#endif +#define GOT_MACHINE + +#include <sys/file.h> /* for unbuffered i/o stuff */ +#include <sys/stat.h> +#define DF_MT DFMT_LINUXARM +typedef void VOID; +typedef void *VOIDP; +typedef char *_fcd; +typedef signed char char8; +typedef unsigned char uchar8; +typedef signed char int8; +typedef unsigned char uint8; +typedef short int int16; +typedef unsigned short int uint16; +typedef int int32; +typedef unsigned int uint32; +typedef int intn; +typedef unsigned int uintn; +typedef int intf; /* size of INTEGERs in Fortran compiler */ +typedef float float32; +typedef double float64; +typedef long hdf_pint_t; /* an integer the same size as a pointer */ +#define FNAME_POST_UNDERSCORE +#define _fcdtocp(desc) (desc) +#ifdef HAVE_FMPOOL +#define FILELIB PAGEBUFIO /* enable page buffering */ +#else +#define FILELIB UNIXBUFIO +#endif + +/* JPEG #define's - Look in the JPEG docs before changing - (Q) */ + +/* Determine the memory manager we are going to use. Valid values are: */ +/* MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS. See the JPEG docs for details on */ +/* what each does */ +#define JMEMSYS MEM_ANSI + +#ifdef __GNUC__ +#define HAVE_STDC +#define INCLUDES_ARE_ANSI +#endif + +#endif /* Linux ARM64 */ + /*-----------------------------------------------------*/ /* 64-bit Free BSD */ Index: hdf-4.2.11/hdf/test/fortest.c =================================================================== --- hdf-4.2.11.orig/hdf/test/fortest.c +++ hdf-4.2.11/hdf/test/fortest.c @@ -92,7 +92,7 @@ main(int argc, char *argv[]) the size of C pointer; this happens on the 64-bit DEC Alpha, Solaris, Altix AIX and Mac Intel. We need a better fix; see Bugzilla #1694. */ -#if defined DEC_ALPHA || defined _WIN32 || (defined SUN && defined _LP64) || defined __ia64 || defined __x86_64 || defined AIX5L64 || (__APPLE__ && __LP64__) +#if defined DEC_ALPHA || defined _WIN32 || (defined SUN && defined _LP64) || defined __ia64 || defined __x86_64 || defined AIX5L64 || (__APPLE__ && __LP64__) || defined __aarch64__ printf(" Skipping stubs\n"); #else num_tests=InitTest("stubs", "tstubsf", ""); Index: hdf-4.2.11/mfhdf/fortran/jackets.c.in =================================================================== --- hdf-4.2.11.orig/mfhdf/fortran/jackets.c.in +++ hdf-4.2.11/mfhdf/fortran/jackets.c.in @@ -34,7 +34,7 @@ struct ncfils { /* This will be a common block from Fortran */ double dd; -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __aarch64__ int ll; #else long ll; @@ -65,7 +65,7 @@ struct ncfils { /* This will be a comm struct ncfils { /* This will be a common block from Fortran */ double dd; -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __aarch64__ int ll; #else long ll; @@ -420,7 +420,7 @@ stoig(shorts, ints, dims, basis, ndims) } #endif /* FORTRAN_HAS_NO_SHORT */ -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __aarch64__ /* * Convert multi-dimensional array of NCLONGs stored in ints to packed * array of longs, in malloc'ed space. Returns pointer to longs or NULL @@ -908,7 +908,7 @@ nncvpt1(cdfid, varid, indices, value, rc return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __aarch64__ #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long longs = *(int *)value; @@ -1022,7 +1022,7 @@ nncvpt(cdfid, varid, start, count, value return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __aarch64__ #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long *longs = itol (value, ncount, ndims); @@ -1133,7 +1133,7 @@ nncvptg(cdfid, varid, start, count, stri tmpbasis = nctypelen(NC_LONG); else #endif -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __aarch64__ if (datatype == NC_LONG) tmpbasis = sizeof(int); else @@ -1190,7 +1190,7 @@ nncvptg(cdfid, varid, start, count, stri return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __aarch64__ #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long *longs = itolg (value, ncount, nbasis, ndims); @@ -1326,7 +1326,7 @@ nncvgt1(cdfid, varid, indices, value, rc return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __aarch64__ #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long longs; @@ -1468,7 +1468,7 @@ nncvgt(cdfid, varid, start, count, value return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __aarch64__ #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long iocount = dimprod (ncount, ndims); /* product of dimensions */ @@ -1606,7 +1606,7 @@ nncvgtg(cdfid, varid, start, count, stri tmpbasis = nctypelen(NC_LONG); else #endif -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __aarch64__ if (datatype == NC_LONG) tmpbasis = sizeof(int); else @@ -1677,7 +1677,7 @@ nncvgtg(cdfid, varid, start, count, stri return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __aarch64__ #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long iocount = dimprod (ncount, ndims); /* product of dimensions */ @@ -1843,7 +1843,7 @@ nncapt(cdfid, varid, attname, datatype, return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __aarch64__ #ifdef HDF if ((nc_type) *datatype == NC_LONG && handle->file_type!=HDF_FILE) { long *longs = itol (value, attlen, 1); @@ -2008,7 +2008,7 @@ nncagt(cdfid, varid, attname, value, rco return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __aarch64__ #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { /* EIP We need to use int buffer to read data in on the platforms where long is 8 bytes Index: hdf-4.2.11/mfhdf/libsrc/array.c =================================================================== --- hdf-4.2.11.orig/mfhdf/libsrc/array.c +++ hdf-4.2.11/mfhdf/libsrc/array.c @@ -620,7 +620,7 @@ xdr_NC_array(xdrs, app) xdr_NC_fnct = xdr_shorts ; goto func ; case NC_LONG : -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __aarch64__ xdr_NC_fnct = xdr_int ; #else xdr_NC_fnct = xdr_long ; Index: hdf-4.2.11/mfhdf/libsrc/cdf.c =================================================================== --- hdf-4.2.11.orig/mfhdf/libsrc/cdf.c +++ hdf-4.2.11/mfhdf/libsrc/cdf.c @@ -3662,7 +3662,7 @@ NC_var *vp ; break ; case NC_LONG : alen /= 4 ; -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __aarch64__ xdr_NC_fnct = xdr_int ; #else xdr_NC_fnct = xdr_long ; Index: hdf-4.2.11/mfhdf/libsrc/netcdf.h.in =================================================================== --- hdf-4.2.11.orig/mfhdf/libsrc/netcdf.h.in +++ hdf-4.2.11/mfhdf/libsrc/netcdf.h.in @@ -293,7 +293,7 @@ typedef double ncdouble; /* * Variables/attributes of type NC_LONG should use the C type 'nclong' */ -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __aarch64__ /* * LP64 (also known as 4/8/8) denotes long and pointer as 64 bit types. * http://www.unix.org/version2/whatsnew/lp64_wp.html Index: hdf-4.2.11/mfhdf/libsrc/putget.c =================================================================== --- hdf-4.2.11.orig/mfhdf/libsrc/putget.c +++ hdf-4.2.11/mfhdf/libsrc/putget.c @@ -665,7 +665,7 @@ Void *values ; case NC_SHORT : return( xdr_NCvshort(xdrs, (unsigned)rem/2, (short *)values) ) ; case NC_LONG : -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __aarch64__ return( xdr_int(xdrs, (nclong *)values) ) ; #else return( xdr_long(xdrs, (nclong *)values) ) ; @@ -1976,7 +1976,7 @@ Void *values ; } /* else */ return(TRUE) ; case NC_LONG : -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __aarch64__ xdr_NC_fnct = xdr_int ; #else xdr_NC_fnct = xdr_long ; Index: hdf-4.2.11/mfhdf/libsrc/xdrposix.c =================================================================== --- hdf-4.2.11.orig/mfhdf/libsrc/xdrposix.c +++ hdf-4.2.11/mfhdf/libsrc/xdrposix.c @@ -254,7 +254,7 @@ int nbytes; static bool_t xdrposix_getlong(); static bool_t xdrposix_putlong(); -#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ +#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __aarch64__ static bool_t xdrposix_getint(); static bool_t xdrposix_putint(); #endif @@ -268,7 +268,7 @@ static long * xdrposix_inline(); #if (defined __sun && defined _LP64) static rpc_inline_t * xdrposix_inline(); #else -#if ((defined __x86_64__ ) && !(defined __sun && defined _LP64)) || defined __powerpc64__ +#if ((defined __x86_64__ ) && !(defined __sun && defined _LP64)) || defined __powerpc64__ || defined __aarch64__ static int32_t * xdrposix_inline(); #else #if (defined __alpha ) @@ -298,9 +298,9 @@ static struct xdr_ops xdrposix_ops = { xdrposix_getpos, /* get offset in the stream */ xdrposix_setpos, /* set offset in the stream */ xdrposix_inline, /* prime stream for inline macros */ -#if (defined __sun && defined _LP64) || defined __x86_64__ || defined __powerpc64__ +#if (defined __sun && defined _LP64) || defined __x86_64__ || defined __powerpc64__ || defined __aarch64__ xdrposix_destroy, /* destroy stream */ -#if !(defined __x86_64__) && !(defined __powerpc64__) || (defined __sun && defined _LP64) /* i.e. we are on SUN/Intel in 64-bit mode */ +#if !(defined __x86_64__) && !(defined __powerpc64__) && !defined __aarch64__ || (defined __sun && defined _LP64) /* i.e. we are on SUN/Intel in 64-bit mode */ NULL, /* no xdr_control function defined */ #endif /* Solaris 64-bit (arch=v9 and arch=amd64) has 64 bits long and 32 bits int. */ @@ -556,7 +556,7 @@ static rpc_inline_t * #if (defined __alpha) static int* #else -#if ((defined __x86_64__) && !(defined __sun && defined _LP64)) || defined __powerpc64__ +#if ((defined __x86_64__) && !(defined __sun && defined _LP64)) || defined __powerpc64__ || defined __aarch64__ static int32_t * #else static netlong * @@ -584,7 +584,7 @@ int return (NULL); } -#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ +#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __aarch64__ static bool_t xdrposix_getint(xdrs, lp) Index: hdf-4.2.11/mfhdf/ncgen/ncgen.l =================================================================== --- hdf-4.2.11.orig/mfhdf/ncgen/ncgen.l +++ hdf-4.2.11/mfhdf/ncgen/ncgen.l @@ -113,7 +113,7 @@ FloatInf|Infinity|Inf { /* float miss yyerror(errstr); } -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __aarch64__ if (dd < INT_MIN || dd > INT_MAX) #else if (dd < LONG_MIN || dd > LONG_MAX) Index: hdf-4.2.11/mfhdf/ncgen/ncgenyy.c =================================================================== --- hdf-4.2.11.orig/mfhdf/ncgen/ncgenyy.c +++ hdf-4.2.11/mfhdf/ncgen/ncgenyy.c @@ -989,7 +989,7 @@ YY_RULE_SETUP yyerror(errstr); } -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__ || defined __aarch64__ if (dd < INT_MIN || dd > INT_MAX) #else if (dd < LONG_MIN || dd > LONG_MAX)

1 0

commit libqt5-creator for openSUSE:Factory
by root＠hilbert.suse.de 30 Oct '15

30 Oct '15

Hello community, here is the log from the commit of package libqt5-creator for openSUSE:Factory checked in at 2015-10-30 13:43:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-creator (Old) and /work/SRC/openSUSE:Factory/.libqt5-creator.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libqt5-creator" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-creator/libqt5-creator.changes 2015-10-28 17:31:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libqt5-creator.new/libqt5-creator.changes 2015-10-30 13:43:53.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Oct 29 11:42:27 UTC 2015 - dvaleev(a)suse.com + +- Add disk constraints. + +------------------------------------------------------------------- New: ---- _constraints ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _constraints ++++++ <constraints> <hardware> <disk> <size unit="G">8</size> </disk> </hardware> </constraints>

1 0