September 2016 - openSUSE Commits - openSUSE Mailing Lists

commit conkeror for openSUSE:Factory
by root＠hilbert.suse.de 30 Sep '16

30 Sep '16

Hello community, here is the log from the commit of package conkeror for openSUSE:Factory checked in at 2016-09-30 15:35:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/conkeror (Old) and /work/SRC/openSUSE:Factory/.conkeror.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "conkeror" Changes: -------- --- /work/SRC/openSUSE:Factory/conkeror/conkeror.changes 2016-06-11 00:00:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.conkeror.new/conkeror.changes 2016-09-30 15:35:19.000000000 +0200 @@ -1,0 +2,11 @@ +Thu Sep 29 07:36:30 UTC 2016 - sleep_walker(a)opensuse.org + +- bump to 1.0.3 release +- remove patches: + fix-for-old-make.patch +- new patches: + 0001-Use-new-nsIPermission-api.patch + 0001-modules-download-manager.js-Fix-bug-preventing-compl.patch + 0001-application.ini-Fix-Goanna-version-number.patch + +------------------------------------------------------------------- Old: ---- conkeror-ab02f17.tar.gz fix-for-old-make.patch New: ---- 0001-Use-new-nsIPermission-api.patch 0001-application.ini-Fix-Goanna-version-number.patch 0001-modules-download-manager.js-Fix-bug-preventing-compl.patch conkeror-1.0.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ conkeror.spec ++++++ --- /var/tmp/diff_new_pack.DD0EOu/_old 2016-09-30 15:35:21.000000000 +0200 +++ /var/tmp/diff_new_pack.DD0EOu/_new 2016-09-30 15:35:21.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package conkeror # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,19 +16,21 @@ # -%define revision ab02f17 - Name: conkeror -Version: 1.0 +Version: 1.0.3 Release: 0 Summary: Keyboard-oriented customizable and extensible web browser License: MPL-1.1 or GPL-2.0 or LGPL-2.1 Group: Productivity/Networking/Web/Browsers Url: http://conkeror.org -# wget 'http://repo.or.cz/w/conkeror.git?a=snapshot;h=master;sf=tgz' -Source0: %{name}-%{revision}.tar.gz +Source0: %{name}-%{version}.tar.gz Source1: %{name}.svg -Patch0: fix-for-old-make.patch +# PATCH-FIX-UPSTREAM +Patch0: 0001-Use-new-nsIPermission-api.patch +# PATCH-FIX-UPSTREAM +Patch1: 0001-modules-download-manager.js-Fix-bug-preventing-compl.patch +# PATCH-FIX-UPSTREAM +Patch2: 0001-application.ini-Fix-Goanna-version-number.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: hicolor-icon-theme %if 0%{?suse_version} @@ -47,8 +49,10 @@ interactive help system. %prep -%setup -q -n %{name}-%{revision} +%setup -q %patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build make ++++++ 0001-Use-new-nsIPermission-api.patch ++++++ >From dc67cae174477498b2f2c7f5d0bc63971a210df2 Mon Sep 17 00:00:00 2001 From: Matt Lundin <mdl(a)imapmail.org> Date: Mon, 27 Jun 2016 21:37:38 -0500 Subject: [PATCH] Use new nsIPermission api * modules/permission-manager.js: Use new api for Mozilla/Firefox versions 42 and up. The new api uses protocol://domain instead of a simple domain (e.g., https://google.com instead of google.com). --- modules/permission-manager.js | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/modules/permission-manager.js b/modules/permission-manager.js index b2d54e1..803b329 100644 --- a/modules/permission-manager.js +++ b/modules/permission-manager.js @@ -96,7 +96,11 @@ interactive("permission-manager", "View or edit the host-specific " let max_type_len = 0; while (e.hasMoreElements()) { let p = e.getNext().QueryInterface(Ci.nsIPermission); - let host = p.host; + let host; + if (version_compare(get_mozilla_version(), "42.0") >= 0) + host = p.principal.origin; + else + host = p.host; let type = p.type; let cap = p.capability; if (max_host_len < host.length) @@ -128,9 +132,13 @@ interactive("permission-manager", "View or edit the host-specific " file_buf += "\n"; } + let example = (version_compare(get_mozilla_version(), "42.0") >= 0) ? + "https://google.com" : "google.com"; + let url_type = (version_compare(get_mozilla_version(), "42.0") >= 0) ? + "protocol://domain" : "domain"; file_buf += "\n" + - "# entry syntax (one per line): <domain> <type> <permission>\n\n" + - "# example: google.com popup allow\n\n" + + "# entry syntax (one per line): <" + url_type + "> <type> <permission>\n\n" + + "# example: " + example + " popup allow\n\n" + word_wrap("The <domain> must be a valid domain name. Depending on the <type>, only exact " + "matches may be used, or alternatively it may match any sub-domain if a more " + @@ -243,14 +251,23 @@ interactive("permission-manager", "View or edit the host-specific " } delete existing_perms[""+[host,type]]; } - if (add) - permission_manager.add(make_uri("http://" + host), type, cap); + if (add) { + if (version_compare(get_mozilla_version(), "42.0") >= 0) { + permission_manager.add(make_uri(host), type, cap); + } else { + permission_manager.add(make_uri("http://" + host), type, cap); + } + } } let num_removed = 0; for (let [k,v] in Iterator(existing_perms)) { let [host,type] = k.split(",",2); ++num_removed; - permission_manager.remove(host,type); + if (version_compare(get_mozilla_version(), "42.0") >= 0) { + permission_manager.remove(make_uri(host),type); + } else { + permission_manager.remove(host,type); + } } let msg; if (num_added == 0 && num_changed == 0 && num_removed == 0) -- 2.10.0 ++++++ 0001-application.ini-Fix-Goanna-version-number.patch ++++++ >From 745311e9564654c99d4dcfad60fca8646a273130 Mon Sep 17 00:00:00 2001 From: Scott Jaderholm <jaderholm(a)gmail.com> Date: Mon, 27 Jun 2016 22:31:38 -0700 Subject: [PATCH] application.ini: Fix Goanna version number --- application.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application.ini b/application.ini index 2b96b31..7257ace 100644 --- a/application.ini +++ b/application.ini @@ -10,7 +10,7 @@ MinVersion=2.0 MaxVersion=* [Goanna] -MinVersion=1.9.1 +MinVersion=2.0 MaxVersion=* [XRE] -- 2.10.0 ++++++ 0001-modules-download-manager.js-Fix-bug-preventing-compl.patch ++++++ >From ec37576ae232914d64ba7601bf3f88f2127a293c Mon Sep 17 00:00:00 2001 From: Dimitris Papavasiliou <dpapavas(a)gmail.com> Date: Fri, 9 Jan 2015 16:10:25 +0200 Subject: [PATCH] modules/download-manager.js: Fix bug preventing completion of downloads. --- modules/download-manager.js | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/modules/download-manager.js b/modules/download-manager.js index ecd032b..f66d736 100644 --- a/modules/download-manager.js +++ b/modules/download-manager.js @@ -1052,24 +1052,24 @@ function download_completer (completions) { }; } all_word_completer.call(this, forward_keywords(arguments), - $completions = completions); + $completions = completions, + $get_string = function (x) { + if (use_downloads_jsm) + return x.target.path; + else + return x.displayName; + }, + $get_description = function (x) { + if (use_downloads_jsm) + return x.source.url; + else + return x.source.spec + }); } download_completer.prototype = { constructor: download_completer, __proto__: all_word_completer.prototype, - toString: function () "#<download_completer>", - get_string: function (x) { - if (use_downloads_jsm) - return x.target.path; - else - return x.displayName; - }, - get_description: function (x) { - if (use_downloads_jsm) - return x.source.url; - else - return x.source.spec - } + toString: function () "#<download_completer>" }; minibuffer.prototype.read_download = function () { -- 2.10.0 ++++++ conkeror-ab02f17.tar.gz -> conkeror-1.0.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-ab02f17/application.ini new/conkeror-1.0.3/application.ini --- old/conkeror-ab02f17/application.ini 2016-04-14 00:57:39.000000000 +0200 +++ new/conkeror-1.0.3/application.ini 2016-06-07 23:11:29.000000000 +0200 @@ -2,12 +2,16 @@ Vendor=conkeror.mozdev.org Name=conkeror ID={a79fe89b-6662-4ff4-8e88-09950ad4dfde} -Version=1.0.0 +Version=1.0.3 BuildID=git [Gecko] MinVersion=2.0 MaxVersion=* +[Goanna] +MinVersion=1.9.1 +MaxVersion=* + [XRE] EnableExtensionManager=1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-ab02f17/components/application.js new/conkeror-1.0.3/components/application.js --- old/conkeror-ab02f17/components/application.js 2016-04-14 00:57:39.000000000 +0200 +++ new/conkeror-1.0.3/components/application.js 2016-06-07 23:11:29.000000000 +0200 @@ -99,7 +99,7 @@ this.loading_urls.join(",\n")); if (url.substr(-4) == ".jsx") { var scopename = url.substr(url.lastIndexOf('/')+1) - .replace('-', '_', 'g'); + .replace(/-/g, '_'); var dot = scopename.indexOf("."); if (dot > -1) scopename = scopename.substr(0, dot); @@ -222,7 +222,7 @@ return false; if (dot > 0) feature = feature.substr(0, dot); - feature = feature.replace('_', '-', 'g'); + feature = feature.replace(/_/g, '-'); if (this.featurep(feature)) return true; try { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-ab02f17/conkeror.in new/conkeror-1.0.3/conkeror.in --- old/conkeror-ab02f17/conkeror.in 2016-04-14 00:57:39.000000000 +0200 +++ new/conkeror-1.0.3/conkeror.in 2016-06-07 23:11:29.000000000 +0200 @@ -5,4 +5,4 @@ # Use, modification, and distribution are subject to the # terms specified in the COPYING file. -exec firefox --app "@datadir@/application.ini" "$@" +XUL_APP_FILE="@datadir@/application.ini" exec firefox "$@" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-ab02f17/modules/buffer.js new/conkeror-1.0.3/modules/buffer.js --- old/conkeror-ab02f17/modules/buffer.js 2016-04-14 00:57:39.000000000 +0200 +++ new/conkeror-1.0.3/modules/buffer.js 2016-06-07 23:11:29.000000000 +0200 @@ -1094,12 +1094,14 @@ define_keywords("$display_name", "$doc"); function buffer_mode (name, enable, disable) { keywords(arguments); - this.name = name.replace("-","_","g"); - this.hyphen_name = name.replace("_","-","g"); - if (enable) + this.name = name.replace(/-/g, "_"); + this.hyphen_name = name.replace(/_/g, "-"); + if (enable) { this._enable = enable; - if (disable) + } + if (disable) { this._disable = disable; + } this.display_name = arguments.$display_name; this.doc = arguments.$doc; this.enable_hook = this.name + "_enable_hook"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-ab02f17/modules/commands.js new/conkeror-1.0.3/modules/commands.js --- old/conkeror-ab02f17/modules/commands.js 2016-04-14 00:57:39.000000000 +0200 +++ new/conkeror-1.0.3/modules/commands.js 2016-06-07 23:11:29.000000000 +0200 @@ -10,17 +10,26 @@ define_coroutine_hook("before_quit_hook", RUN_HOOK_UNTIL_FAILURE); define_hook("quit_hook"); -function quit () { +function quit (I, restart) { var res = yield before_quit_hook.run(); if (res) { quit_hook.run(); var appStartup = Cc["@mozilla.org/toolkit/app-startup;1"] .getService(Ci.nsIAppStartup); - appStartup.quit(appStartup.eAttemptQuit); + if (restart) { + appStartup.quit(appStartup.eRestart | appStartup.eAttemptQuit); + } else { + appStartup.quit(appStartup.eAttemptQuit); + } } } interactive("quit", "Quit Conkeror", quit); +interactive("restart", + "Restart Conkeror", + function (I) { + yield quit(I, true); + }); function show_conkeror_version (window) { var xulrunner_version = Cc['@mozilla.org/xre/app-info;1'] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-ab02f17/modules/element.js new/conkeror-1.0.3/modules/element.js --- old/conkeror-ab02f17/modules/element.js 2016-04-14 00:57:39.000000000 +0200 +++ new/conkeror-1.0.3/modules/element.js 2016-06-07 23:11:29.000000000 +0200 @@ -58,7 +58,7 @@ // keywords: $hint function define_browser_object_class (name, doc, handler) { keywords(arguments); - var varname = 'browser_object_'+name.replace('-','_','g'); + var varname = 'browser_object_'+name.replace(/-/g , '_'); var ob = conkeror[varname] = new browser_object_class(name, doc, handler, forward_keywords(arguments)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-ab02f17/modules/env.js new/conkeror-1.0.3/modules/env.js --- old/conkeror-ab02f17/modules/env.js 2016-04-14 00:57:39.000000000 +0200 +++ new/conkeror-1.0.3/modules/env.js 2016-06-07 23:11:29.000000000 +0200 @@ -60,10 +60,11 @@ var home = getenv('HOME') || getenv('USERPROFILE') || getenv('HOMEDRIVE') + getenv('HOMEPATH'); - home = home.replace("/", "\\", "g"); + home = home.replace(/\//g, "\\"); dir.initWithPath(home); - } else + } else { dir.initWithPath(getenv('HOME')); + } return dir; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-ab02f17/modules/mode.js new/conkeror-1.0.3/modules/mode.js --- old/conkeror-ab02f17/modules/mode.js 2016-04-14 00:57:39.000000000 +0200 +++ new/conkeror-1.0.3/modules/mode.js 2016-06-07 23:11:29.000000000 +0200 @@ -10,7 +10,7 @@ define_keywords("$doc"); function define_global_mode (name, enable, disable) { keywords(arguments, $doc = null); - var hyphen_name = name.replace("_","-","g"); + var hyphen_name = name.replace(/_/g,"-"); var state = name + "_enabled"; this[state] = false; var enable_hook_name = hyphen_name + "-enable-hook"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-ab02f17/modules/mouse.js new/conkeror-1.0.3/modules/mouse.js --- old/conkeror-ab02f17/modules/mouse.js 1970-01-01 01:00:00.000000000 +0100 +++ new/conkeror-1.0.3/modules/mouse.js 2016-06-07 23:11:29.000000000 +0200 @@ -0,0 +1,114 @@ +/** + * (C) Copyright 2016 Ivy Foster + * + * Use, modification, and distribution are subject to the terms specified in the + * COPYING file. +**/ + +// Reference: https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent + +define_variable ( + "click_handler", [], + "An array of functions to run on click events. " + + "The function will be passed two arguments: " + + "the current window and the mouse event.\n" + + "To create an event, set 'click_handler[n] = some_function;', " + + "where n is the total value of the buttons pressed.\n" + + "left = 1\n" + "right = 2\n" + "middle = 4\n" + + "button4 = 8\n" + "button5 = 16\n\n" + + "For instance, click_handler.3 would run when " + + "left and right are pressed together.\n" + + "For more information, see " + + "<https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/buttons>." +); + +function handle_mouse_click (event) { + var chord = 0; + + // Translate MouseEvent.button events into MouseEvent.buttons events. + switch (event.button) { + case 0: + chord = 1; + break; + case 1: + chord = 4; + break; + case 2: + chord = 2; + break; + case 3: + chord = 8; + break; + case 4: + chord = 16; + break; + } + + chord += event.buttons; + + if (click_handler[chord]) { + click_handler[chord](this.ownerDocument.defaultView, event); + } +} + +define_variable( + "clicks_in_new_buffer_target", OPEN_NEW_BUFFER, + "Destination for new buffers created by clicks. " + + "Set to one the constants OPEN_NEW_BUFFER, " + + "OPEN_NEW_BUFFER_BACKGROUND, or OPEN_NEW_WINDOW.\n" + + "Default is OPEN_NEW_BUFFER." +); + +function clicked_link_in_new_buffer (window, event) { + let element = event.target; + let anchor = null; + if (element instanceof Ci.nsIDOMHTMLAnchorElement || + element instanceof Ci.nsIDOMHTMLAreaElement) { + anchor = element; + } else { + for (let p = element.parentNode; + p != null && p.tagName.toLowerCase() != "html"; + p = p.parentNode) { + if (p.tagName.toLowerCase() == "a") { + anchor = p; + break; + } else { return; } + } + } + + event.preventDefault(); + event.stopPropagation(); + let spec = load_spec(anchor); + let buffer = window.buffers.current; + create_buffer(window, + buffer_creator(content_buffer, + $opener = buffer, + $load = spec), + clicks_in_new_buffer_target); +} + +function handle_click_add_listener(buffer) { + buffer.browser.addEventListener("click", handle_mouse_click, true); +} + +function handle_click_remove_listener(buffer) { + buffer.browser.removeEventListener("click", handle_mouse_click, true); +} + +function mouse_click_event_mode_enable() { + add_hook("create_buffer_hook", handle_click_add_listener); + for_each_buffer(handle_click_add_listener); +} + +function mouse_click_event_mode_disable() { + remove_hook("create_buffer_hook", handle_click_add_listener); + for_each_buffer(handle_click_remove_listener); +} + +define_global_mode("mouse_click_event_mode", + mouse_click_event_mode_enable, mouse_click_event_mode_disable +); + +mouse_click_event_mode(true); + +provide("mouse"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-ab02f17/modules/new-tabs.js new/conkeror-1.0.3/modules/new-tabs.js --- old/conkeror-ab02f17/modules/new-tabs.js 2016-04-14 00:57:39.000000000 +0200 +++ new/conkeror-1.0.3/modules/new-tabs.js 2016-06-07 23:11:29.000000000 +0200 @@ -24,6 +24,12 @@ define_variable("tab_bar_show_index", true, "Whether or not to show the tab index in each tab."); +define_variable("tab_bar_smooth_scroll", true, + "Whether or not tab bar should scroll smoothly."); + +define_variable("tab_bar_flex_tabs", false, + "Whether or not tabs should use flex layout."); + /** * Constructs a tab bar for the given window. */ @@ -31,6 +37,9 @@ window.tab_bar = this; var scrollbox = create_XUL(window, "arrowscrollbox"); scrollbox.setAttribute("id", "tab2-bar"); + if (!tab_bar_smooth_scroll) { + scrollbox.setAttribute("smoothscroll", false); + } scrollbox.setAttribute("orient", "horizontal"); var after = window.buffers.container; this.window = window; @@ -115,6 +124,9 @@ // Create a tab and add it to the tab bar var tab = create_XUL(buffer.window, "hbox"); tab.buffer = buffer; + if (tab_bar_flex_tabs) { + tab.setAttribute("flex", "1"); + } tab.setAttribute("class", "tab2"); tab.addEventListener("click", function (event) { if (event.button == tab_bar_button_select) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-ab02f17/modules/page-modes/key-kill.js new/conkeror-1.0.3/modules/page-modes/key-kill.js --- old/conkeror-ab02f17/modules/page-modes/key-kill.js 2016-04-14 00:57:39.000000000 +0200 +++ new/conkeror-1.0.3/modules/page-modes/key-kill.js 2016-06-07 23:11:29.000000000 +0200 @@ -5,14 +5,23 @@ * COPYING file. **/ -function key_kill_event_kill (event) { - var elem = event.target; - if (elem instanceof Ci.nsIDOMHTMLInputElement || - elem instanceof Ci.nsIDOMHTMLTextAreaElement) - { - return; - } - event_kill(event); +define_variable("key_kill_input_fields", false, + "When true, key-kill-mode will operate in input fields and textareas."); + +{ let mozilla_version_below_25 = version_compare(get_mozilla_version(), "25.0") < 0; + function key_kill_event_kill (event) { + var elem = event.target; + if (!key_kill_input_fields && + (elem instanceof Ci.nsIDOMHTMLInputElement || + elem instanceof Ci.nsIDOMHTMLTextAreaElement)) + { + return; + } + if (mozilla_version_below_25) { + event.preventDefault(); + } + event.stopPropagation(); + } } define_page_mode("key-kill-mode", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-ab02f17/modules/page-modes/wikipedia.js new/conkeror-1.0.3/modules/page-modes/wikipedia.js --- old/conkeror-ab02f17/modules/page-modes/wikipedia.js 2016-04-14 00:57:39.000000000 +0200 +++ new/conkeror-1.0.3/modules/page-modes/wikipedia.js 2016-06-07 23:11:29.000000000 +0200 @@ -77,7 +77,7 @@ */ function define_wikipedia_webjumps() { if (arguments.length == 0) - var prefixes = [i for (i in wikipedia_versions)]; + var prefixes = object_keys(wikipedia_versions); else prefixes = Array.slice(arguments); for each (let i in prefixes) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-ab02f17/modules/rc.js new/conkeror-1.0.3/modules/rc.js --- old/conkeror-ab02f17/modules/rc.js 2016-04-14 00:57:39.000000000 +0200 +++ new/conkeror-1.0.3/modules/rc.js 2016-06-07 23:11:29.000000000 +0200 @@ -16,19 +16,25 @@ function load_rc () { var path; var rcfile = get_pref("conkeror.rcfile"); - if (rcfile.length == 0) - //FIXME: log that the rc is disabled + if (rcfile.length == 0) { + dumpln("w: preference conkeror.rcfile is unset"); return; + } path = make_file(rcfile); + if (! path.exists()) { - if (file_symlink_p(path)) + if (file_symlink_p(path)) { dumpln("w: broken symlink, \""+rcfile+"\""); - else if (pref_has_user_value("conkeror.rcfile")) + } else if (pref_has_user_value("conkeror.rcfile")) { dumpln("w: preference conkeror.rcfile is set to "+ "non-existent path, \""+rcfile+"\""); - //FIXME: else log that the rc does not exist + } else { + dumpln("w: conkeror.rcfile \"" + rcfile + + "\" does not exist"); + } return; } + var files = []; var ret; if (path.isDirectory()) { @@ -36,16 +42,18 @@ while (entries.hasMoreElements()) { var entry = entries.getNext(); entry.QueryInterface(Ci.nsIFile); - if (entry.leafName.substr(-3).toLowerCase() == '.js') + if (entry.leafName.substr(-3).toLowerCase() == '.js') { files.push(entry); + } } files.sort(function (a, b) { - if (a.leafName < b.leafName) + if (a.leafName < b.leafName) { return -1; - else if (a.leafName > b.leafName) + } else if (a.leafName > b.leafName) { return 1; - else + } else { return 0; + } }); path.appendRelativePath("a"); ret = path.path.substr(0, path.path.length - 1) + "*.js"; @@ -56,15 +64,14 @@ var obs = Cc["@mozilla.org/observer-service;1"] .getService(Ci.nsIObserverService); obs.notifyObservers(null, "startupcache-invalidate", null); - for (var i = 0; files[i]; i++) { + for (var file of files) { try { - load(files[i]); + load(file); + dumpln("i: loaded rc file " + file.leafName) } catch (e) { dump_error(e); } } - //FIXME: log what was loaded instead of returning the value to be - // logged by the caller. return ret; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-ab02f17/modules/string.js new/conkeror-1.0.3/modules/string.js --- old/conkeror-ab02f17/modules/string.js 2016-04-14 00:57:39.000000000 +0200 +++ new/conkeror-1.0.3/modules/string.js 2016-06-07 23:11:29.000000000 +0200 @@ -17,8 +17,8 @@ function shell_quote (str) { - var s = str.replace("\"", "\\\"", "g"); - s = s.replace("$", "\$", "g"); + var s = str.replace(/"/g, "\\\""); + s = s.replace(/\$/g, "\\$"); return s; } @@ -76,7 +76,7 @@ return str.replace(/&/g, '&') .replace(/</g, '<') .replace(/>/g, '>') - .replace('"', '"', 'g'); + .replace(/\"/g, '"'); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-ab02f17/modules/utils.js new/conkeror-1.0.3/modules/utils.js --- old/conkeror-ab02f17/modules/utils.js 2016-04-14 00:57:39.000000000 +0200 +++ new/conkeror-1.0.3/modules/utils.js 2016-06-07 23:11:29.000000000 +0200 @@ -27,12 +27,15 @@ function make_file (path) { - if (path instanceof Ci.nsILocalFile) + if (path instanceof Ci.nsILocalFile) { return path; - if (path == "~") + } + if (path == "~") { return get_home_directory(); - if (WINDOWS) - path = path.replace("/", "\\", "g"); + } + if (WINDOWS) { + path = path.replace(/\//g, "\\"); + } if ((POSIX && path.substring(0,2) == "~/") || (WINDOWS && path.substring(0,2) == "~\\")) {

1 0

commit converseen for openSUSE:Factory
by root＠hilbert.suse.de 30 Sep '16

30 Sep '16

Hello community, here is the log from the commit of package converseen for openSUSE:Factory checked in at 2016-09-30 15:34:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/converseen (Old) and /work/SRC/openSUSE:Factory/.converseen.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "converseen" Changes: -------- --- /work/SRC/openSUSE:Factory/converseen/converseen.changes 2016-09-01 14:03:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.converseen.new/converseen.changes 2016-09-30 15:35:16.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Sep 28 07:34:55 UTC 2016 - lazy.kent(a)opensuse.org + +- Update to 0.9.5.1. + * Updated French Translation. + * Updated Appdata file for Linux. + +------------------------------------------------------------------- Old: ---- converseen-0.9.5.tar.bz2 New: ---- converseen-0.9.5.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ converseen.spec ++++++ --- /var/tmp/diff_new_pack.yE3cex/_old 2016-09-30 15:35:18.000000000 +0200 +++ /var/tmp/diff_new_pack.yE3cex/_new 2016-09-30 15:35:18.000000000 +0200 @@ -17,7 +17,7 @@ Name: converseen -Version: 0.9.5 +Version: 0.9.5.1 Release: 0 Summary: Batch Image Conversion Tool License: GPL-3.0+ @@ -55,7 +55,7 @@ %lang_package %prep -%setup -q -n %{name} +%setup -q cp -p README.md README chmod -x README COPYING ++++++ converseen-0.9.5.tar.bz2 -> converseen-0.9.5.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/converseen.appdata.xml new/converseen-0.9.5.1/converseen.appdata.xml --- old/converseen/converseen.appdata.xml 2016-08-30 00:47:20.000000000 +0200 +++ new/converseen-0.9.5.1/converseen.appdata.xml 2016-09-08 00:13:50.000000000 +0200 @@ -1,35 +1,60 @@ <?xml version="1.0" encoding="UTF-8"?>  -<application> - <id type="desktop">converseen.desktop</id> - <metadata_license>CC0-1.0</metadata_license> - <project_license>GPL-3.0</project_license> - <name>Converseen</name> - <summary>A batch image processor</summary> - <description> - - Converseen is a free cross-platform batch image processor that allows you to convert, - resize, rotate and flip an infinite number of images with a mouse click. - Moreover, Converseen is able to transform an entire PDF file into a bunch of images - with the characteristics you prefer: you can choose one of the 100+ formats, - you can set the size, resolution and the filename. - - What can I do with Converseen. - <ul> - <li>Carry out a single or a multiple conversion</li> - <li>Resize one or multiple images</li> - <li>Compress images for your web pages</li> - <li>Rotate and flip images</li> - <li>Rename a bunch of images using a progressive number or a prefix/suffix</li> - <li>Selecting a resampling filter to resize images</li> - <li>Convert an entire PDF to a bunch of images</li> - <li>Extract an image from a Windows icon file (*ico)</li> - </ul> - </description> - <screenshots> - <screenshot type="default" width="1135" height="740">http://fasterland.net/images/converseen_kde4_1.jpg</screenshot> - <screenshot width="1135" height="740">http://fasterland.net/images/converseen_kde4_2.jpg</screenshot> - </screenshots> - <url type="homepage">http://converseen.fasterland.net/</url> - <updatecontact>faster3ck_AT_gmail.com</updatecontact> -</application> +<component type="desktop"> + <id>converseen.desktop</id> + <metadata_license>CC0-1.0</metadata_license> + <project_license>GPL-3.0</project_license> + <name>Converseen</name> + <summary>A batch image processor</summary> + <description> + + Converseen is a free cross-platform batch image processor that allows you to convert, + resize, rotate and flip an infinite number of images with a mouse click. + Moreover, Converseen is able to transform an entire PDF file into a bunch of images + with the characteristics you prefer: you can choose one of the 100+ formats, + you can set the size, resolution and the filename. + + What can I do with Converseen. + <ul> + <li>Carry out a single or a multiple conversion</li> + <li>Resize one or multiple images</li> + <li>Compress images for your web pages</li> + <li>Rotate and flip images</li> + <li>Rename a bunch of images using a progressive number or a prefix/suffix</li> + <li>Selecting a resampling filter to resize images</li> + <li>Convert an entire PDF to a bunch of images</li> + <li>Extract an image from a Windows icon file (*ico)</li> + </ul> + </description> + <screenshots> + <screenshot height="621" width="1104" type="default"> + <image>http://fasterland.net/images/converseen-appdata-1.png</image> + <caption>The main window showing the application in action</caption> + </screenshot> + <screenshot height="621" width="1104"> + <image>http://fasterland.net/images/converseen-appdata-2.png</image> + <caption>The program during the image processing</caption> + </screenshot> + <screenshot height="621" width="1104"> + <image>http://fasterland.net/images/converseen-appdata-3.png</image> + <caption>The image preferences window where you can change the settings</caption> + </screenshot> + </screenshots> + <keywords> + <keyword>graphic</keyword> + <keyword>image</keyword> + <keyword>batch</keyword> + <keyword>processor</keyword> + <keyword>converter</keyword> + <keyword>resizer</keyword> + <keyword>compressor</keyword> + <keyword>picture</keyword> + <keyword>qt</keyword> + </keywords> + <url type="homepage">http://converseen.fasterland.net/</url> + <update_contact>faster3ck(a)gmail.com</update_contact> + <developer_name>Francesco Mondello</developer_name> + <url type="bugtracker">https://github.com/Faster3ck/Converseen/issues</url> + <url type="donation">http://converseen.fasterland.net/thank/</url> + <url type="help">http://converseen.fasterland.net/help/</url> +</component> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/loc/converseen_fr_FR.ts new/converseen-0.9.5.1/loc/converseen_fr_FR.ts --- old/converseen/loc/converseen_fr_FR.ts 2016-08-30 00:47:20.000000000 +0200 +++ new/converseen-0.9.5.1/loc/converseen_fr_FR.ts 2016-09-08 00:13:50.000000000 +0200 @@ -110,7 +110,7 @@ <message> <location filename="../ui/dialogconversionstatus.ui" line="191"/> <source>Open destination </source> - <translation type="unfinished"></translation> + <translation>Ouvrir la destination</translation> </message> <message> <location filename="../ui/dialogconversionstatus.ui" line="211"/> @@ -125,12 +125,12 @@ <message> <location filename="../src/dialogconversionstatus.cpp" line="41"/> <source>Open all the destination folders</source> - <translation type="unfinished"></translation> + <translation>Ouvrir tous les dossiers de destination</translation> </message> <message> <location filename="../src/dialogconversionstatus.cpp" line="75"/> <source>Converted</source> - <translation type="unfinished"></translation> + <translation>Convertis</translation> </message> </context> <context> @@ -312,7 +312,14 @@ Author: Francesco Mondello (Faster) - <a href="http://fasterland.net/">fasterland.net</a> Email: <a href="faster3ck(a)gmail.com">faster3ck@gmail.com</a> Project Website: <a href="http://converseen.fasterland.net">converseen.fasterland.net</a></body></html></source> - <translation type="unfinished"></translation> + <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +Auteur: Francesco Mondello (Faster) - <a href="http://fasterland.net/">fasterland.net</a> +Email: <a href="faster3ck(a)gmail.com">faster3ck@gmail.com</a> +Site web du projet: <a href="http://converseen.fasterland.net">converseen.fasterland.net</a></body></html> +</translation> </message> <message> <location filename="../ui/dialoginfo.ui" line="95"/> @@ -330,60 +337,60 @@ <message> <location filename="../ui/dialoginfo.ui" line="127"/> <source>Hungarian translation: Charles Barcza - <a href="mailto:kbarcza@blackpanther.hu">kbarcza@blackpanther.hu</a></source> - <translation type="unfinished"></translation> + <translation>Traduction Hongroise: Charles Barcza - <a href="mailto:kbarcza@blackpanther.hu">kbarcza@blackpanther.hu</a></translation> </message> <message> <location filename="../ui/dialoginfo.ui" line="134"/> <source>Czech translation: Pavel Fric - <a href="mailto:pavelfric@seznam.cz">pavelfric@seznam.cz</a></source> - <translation type="unfinished"></translation> + <translation>Traduction Tchèque: Pavel Fric - <a href="mailto:pavelfric@seznam.cz">pavelfric@seznam.cz</a></translation> </message> <message> <location filename="../ui/dialoginfo.ui" line="141"/> <source>French Translation: Ludovic Troisi - <a href="mailto:axalis@cegetel.net">axalis@cegetel.net</a> </source> - <translation type="unfinished"></translation> + <translation>Traduction Française: Ludovic Troisi - <a href="mailto:axalis@cegetel.net">axalis@cegetel.net</a></translation> </message> <message> <location filename="../ui/dialoginfo.ui" line="149"/> <source>Brazilian Portuguese Translation: Márcio Moraes - <a href="mailto:marciopanto@gmail.com">marciopanto@gmail.com</a></source> - <translation type="unfinished"></translation> + <translation>Traduction Brésilienne et Portuguaise: Márcio Moraes - <a href="mailto:marciopanto@gmail.com">marciopanto@gmail.com</a></translation> </message> <message> <location filename="../ui/dialoginfo.ui" line="159"/> <source>German Translation: Marco Nickolai - <a href="mailto:nickolai@iad.tu-darmstadt.de">nickolai@iad.tu-darmstadt.de</a></source> - <translation type="unfinished"></translation> + <translation>Traduction Allemande: Marco Nickolai - <a href="mailto:nickolai@iad.tu-darmstadt.de">nickolai@iad.tu-darmstadt.de</a></translation> </message> <message> <location filename="../ui/dialoginfo.ui" line="166"/> <source>Spanish (Chile) Translation: Nelson Álvarez Sáez - <a href="mailto:alvareznelson@gmail.com">alvareznelson@gmail.com</a> </source> - <translation type="unfinished"></translation> + <translation>Traduction Espagnole (Chili): Nelson Álvarez Sáez - <a href="mailto:alvareznelson@gmail.com">alvareznelson@gmail.com</a></translation> </message> <message> <location filename="../ui/dialoginfo.ui" line="174"/> <source>Turkish Translation: Zeugma - <a href="mailto:sunder67@hotmail.com">sunder67@hotmail.com</a> </source> - <translation type="unfinished"></translation> + <translation>Traduction Turque: Zeugma - <a href="mailto:sunder67@hotmail.com">sunder67@hotmail.com</a></translation> </message> <message> <location filename="../ui/dialoginfo.ui" line="182"/> <source>Russian Translation: Stasik Savorovsky - <a href="mailto:stas_stv@mail.ru">stas_stv@mail.ru</a></source> - <translation type="unfinished"></translation> + <translation>Traduction Russe: Stasik Savorovsky - <a href="mailto:stas_stv@mail.ru">stas_stv@mail.ru</a></translation> </message> <message> <location filename="../ui/dialoginfo.ui" line="189"/> <source>Polish Translation: Michał Olber from OSWorld.pl - <a href="mailto:redakcja@osworld.pl">redakcja@osworld.pl</a></source> - <translation type="unfinished"></translation> + <translation>Traduction Polonaise: Michał Olber from OSWorld.pl - <a href="mailto:redakcja@osworld.pl">redakcja@osworld.pl</a></translation> </message> <message> <location filename="../ui/dialoginfo.ui" line="199"/> <source><html><head/><body>Japanese translation: Xenolith0 - <a href="mailto:xenolith0bytetestcomgreen@gmail.com">xenolith0bytetestcomgreen@gmail.com</a></body></html></source> - <translation type="unfinished"></translation> + <translation><html><head/><body>Traduction Japonaise: Xenolith0 - <a href="mailto:xenolith0bytetestcomgreen@gmail.com">xenolith0bytetestcomgreen@gmail.com</a></body></html></translation> </message> <message> <location filename="../ui/dialoginfo.ui" line="215"/> <source><html><head/><body>If you appreciate this work and would like to support the project, you are welcome to donate via PayPal or Flattr</body></html></source> - <translation type="unfinished"></translation> + <translation><html><head/><body>Si vous appréciez ce travail et que vous voulez supporter le projet, vous pouvez effectuer un don via PayPal ou Flattr</body></html></translation> </message> <message> <location filename="../ui/dialoginfo.ui" line="372"/> @@ -392,7 +399,11 @@ p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Noto Sans'; font-size:10pt; font-weight:400; font-style:normal;"> (c) 2009 - 2016 Francesco Mondello GNU - GPL v.3</body></html></source> - <translation type="unfinished"></translation> + <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Noto Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +(c) 2009 - 2016 Francesco Mondello GNU - GPL v3</body></html></translation> </message> <message> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> @@ -409,7 +420,7 @@ <message> <location filename="../ui/dialoginfo.ui" line="295"/> <source><html><head/><body>Follow Converseen:</body></html></source> - <translation type="unfinished"></translation> + <translation><html><head/><body>Suivre Converseen:</body></html></translation> </message> <message> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> @@ -574,7 +585,7 @@ <message> <location filename="../ui/dialoginfo.ui" line="44"/> <source>-</source> - <translation type="unfinished"></translation> + <translation>-</translation> </message> <message> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> @@ -701,7 +712,7 @@ <message> <location filename="../src/dialoginfo.cpp" line="50"/> <source>The batch image converter and resizer.</source> - <translation type="unfinished"></translation> + <translation>Le convertisseur et redimenssionneur d'images en lot.</translation> </message> </context> <context> @@ -709,62 +720,62 @@ <message> <location filename="../ui/dialogmultipageeditor.ui" line="14"/> <source>Import multipage document</source> - <translation type="unfinished"></translation> + <translation>Importer un document multipages</translation> </message> <message> <location filename="../ui/dialogmultipageeditor.ui" line="20"/> <source>Check the pages or subimages you want to import</source> - <translation type="unfinished"></translation> + <translation>Vérifier les pages ou sous-images que vous voulez importer</translation> </message> <message> <location filename="../ui/dialogmultipageeditor.ui" line="42"/> <source>Page</source> - <translation type="unfinished"></translation> + <translation>Page</translation> </message> <message> <location filename="../ui/dialogmultipageeditor.ui" line="47"/> <source>Pixel size</source> - <translation type="unfinished"></translation> + <translation>Taille du pixel</translation> </message> <message> <location filename="../ui/dialogmultipageeditor.ui" line="52"/> <source>Density</source> - <translation type="unfinished"></translation> + <translation>Densité</translation> </message> <message> <location filename="../ui/dialogmultipageeditor.ui" line="57"/> <source>Depth</source> - <translation type="unfinished"></translation> + <translation>Profondeur</translation> </message> <message> <location filename="../ui/dialogmultipageeditor.ui" line="80"/> <source>Cancel</source> - <translation type="unfinished">Annuler</translation> + <translation>Annuler</translation> </message> <message> <location filename="../ui/dialogmultipageeditor.ui" line="91"/> <source>Import</source> - <translation type="unfinished"></translation> + <translation>Importer</translation> </message> <message> <location filename="../ui/dialogmultipageeditor.ui" line="108"/> <source>Check</source> - <translation type="unfinished">Cocher</translation> + <translation>Cocher</translation> </message> <message> <location filename="../ui/dialogmultipageeditor.ui" line="117"/> <source>Check all</source> - <translation type="unfinished"></translation> + <translation>Tout cocher</translation> </message> <message> <location filename="../ui/dialogmultipageeditor.ui" line="126"/> <source>Uncheck</source> - <translation type="unfinished"></translation> + <translation>Décocher</translation> </message> <message> <location filename="../ui/dialogmultipageeditor.ui" line="135"/> <source>Uncheck all</source> - <translation type="unfinished"></translation> + <translation>Tout décocher</translation> </message> </context> <context> @@ -792,26 +803,26 @@ <message> <location filename="../ui/dialogoptions.ui" line="52"/> <source>As&k first</source> - <translation type="unfinished"></translation> + <translation>Deman&der avant</translation> </message> <message> <location filename="../ui/dialogoptions.ui" line="62"/> <source>O&verwrite all existing images</source> - <translation type="unfinished"></translation> + <translation>Écras&er toutes les images existantes</translation> </message> <message> <location filename="../ui/dialogoptions.ui" line="72"/> <source>Updates</source> - <translation type="unfinished"></translation> + <translation>Mises à jour</translation> </message> <message> <location filename="../ui/dialogoptions.ui" line="78"/> <source>Checks for updates automatically</source> - <translation type="unfinished"></translation> + <translation>Vérifier les mises à jour automatiquement</translation> </message> <message> <source>Ask first</source> - <translation type="obsolete">Demander en premier</translation> + <translation type="obsolete">Demander avant</translation> </message> <message> <source>Overwrite all existing images</source> @@ -859,17 +870,17 @@ <message> <location filename="../ui/dialogquality.ui" line="61"/> <source>Png compression level</source> - <translation>Niveau </translation> + <translation>Niveau de compression PNG</translation> </message> <message> <location filename="../ui/dialogquality.ui" line="99"/> <source>Interpolation</source> - <translation type="unfinished"></translation> + <translation>Interpolation</translation> </message> <message> <location filename="../ui/dialogquality.ui" line="107"/> <source>Filter:</source> - <translation type="unfinished"></translation> + <translation>Filtre: </translation> </message> <message> <source>Quality 0 - 9:</source> @@ -891,27 +902,27 @@ <message> <location filename="../ui/dialogshowupdatemsg.ui" line="14"/> <source>Dialog</source> - <translation type="unfinished"></translation> + <translation>Dialogue</translation> </message> <message> <location filename="../ui/dialogshowupdatemsg.ui" line="20"/> <source>TextLabel</source> - <translation type="unfinished"></translation> + <translation>TextLabel</translation> </message> <message> <location filename="../ui/dialogshowupdatemsg.ui" line="40"/> <source>Don't show again</source> - <translation type="unfinished"></translation> + <translation>Ne plus afficher</translation> </message> <message> <location filename="../ui/dialogshowupdatemsg.ui" line="62"/> <source>Update Now</source> - <translation type="unfinished"></translation> + <translation>Mettre à jour maintenant</translation> </message> <message> <location filename="../ui/dialogshowupdatemsg.ui" line="69"/> <source>Not Now</source> - <translation type="unfinished"></translation> + <translation>Pas maintenant</translation> </message> </context> <context> @@ -919,12 +930,12 @@ <message> <location filename="../src/formats.cpp" line="90"/> <source>All Supported Filters (%1)</source> - <translation type="unfinished"></translation> + <translation>Tous les filtres supportés (%1)</translation> </message> <message> <location filename="../src/formats.cpp" line="112"/> <source>Don't change the format</source> - <translation type="unfinished"></translation> + <translation>Ne pas changer le format</translation> </message> </context> <context> @@ -1046,7 +1057,7 @@ <message> <location filename="../ui/mainwindow.ui" line="166"/> <source>&Edit</source> - <translation>&Editer</translation> + <translation>&Édition</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="171"/> @@ -1163,7 +1174,7 @@ <message> <location filename="../ui/mainwindow.ui" line="524"/> <source>Dimensions</source> - <translation type="unfinished">Dimensions</translation> + <translation>Dimensions</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="558"/> @@ -1191,7 +1202,7 @@ <message> <location filename="../ui/mainwindow.ui" line="672"/> <source>Mantain aspect ratio</source> - <translation>Conserver l'aspect ratio</translation> + <translation>Conserver les proportions</translation> </message> <message> <source>Show image's attributes</source> @@ -1209,27 +1220,27 @@ <message> <location filename="../ui/mainwindow.ui" line="130"/> <source>Replace transparent background</source> - <translation type="unfinished"></translation> + <translation>Remplacer l'arrière plan transparent</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="137"/> <source>Choose color</source> - <translation type="unfinished"></translation> + <translation>Choisir une couleur</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="208"/> <source>A&ctions Panel</source> - <translation type="unfinished"></translation> + <translation>Panneau d'a&ctions</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="542"/> <source>Scale image</source> - <translation type="unfinished"></translation> + <translation>Echelle de l'image</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="665"/> <source>Link aspect with selected image</source> - <translation type="unfinished"></translation> + <translation>Lier l'aspect avec l'image sélectionnée</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="693"/> @@ -1250,52 +1261,52 @@ <location filename="../ui/mainwindow.ui" line="755"/> <location filename="../ui/mainwindow.ui" line="761"/> <source>Rotate and flip</source> - <translation type="unfinished"></translation> + <translation>Rotation et Retournement</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="776"/> <source>Rotate image:</source> - <translation type="unfinished"></translation> + <translation>Rotation de l'image :</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="785"/> <source>No rotation</source> - <translation type="unfinished"></translation> + <translation>Pas de rotation</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="802"/> <source>+ 90°</source> - <translation type="unfinished"></translation> + <translation>+90°</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="816"/> <source>- 90°</source> - <translation type="unfinished"></translation> + <translation>-90°</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="832"/> <source>180°</source> - <translation type="unfinished">180°</translation> + <translation>180°</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="857"/> <source>Flip image:</source> - <translation type="unfinished"></translation> + <translation>Retournement de l'image:</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="866"/> <source>No flip</source> - <translation type="unfinished"></translation> + <translation>Pas de retournement</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="884"/> <source>Horizontally</source> - <translation type="unfinished"></translation> + <translation>Horizontallement</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="898"/> <source>Vertically</source> - <translation type="unfinished"></translation> + <translation>Verticallement</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="948"/> @@ -1330,12 +1341,12 @@ <message> <location filename="../ui/mainwindow.ui" line="1024"/> <source>Prefi&x/Suffix</source> - <translation type="unfinished"></translation> + <translation>Préfi&xe/Suffixe</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="1034"/> <source>Progressi&ve Number</source> - <translation type="unfinished"></translation> + <translation>Nombre progressi&f</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="1051"/> @@ -1345,212 +1356,212 @@ <message> <location filename="../ui/mainwindow.ui" line="1058"/> <source>Start with:</source> - <translation type="unfinished"></translation> + <translation>Commencer avec :</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="1116"/> <source>toolBar</source> - <translation type="unfinished"></translation> + <translation>Barre d'outil</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="1147"/> <source>&Open images</source> - <translation type="unfinished"></translation> + <translation>&Ouvrir les images</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="1150"/> <source>Ctrl+O</source> - <translation type="unfinished">Ctrl+O</translation> + <translation>Ctrl+O</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="1159"/> <source>&Add images</source> - <translation type="unfinished"></translation> + <translation>&Ajouter des images</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="1162"/> <source>Ctrl+Alt+O</source> - <translation type="unfinished">Ctrl+Alt+O</translation> + <translation>Ctrl+Alt+O</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="1171"/> <source>&Remove images</source> - <translation type="unfinished"></translation> + <translation>Enleve&r les images</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="1174"/> <source>Remove selected pictures</source> - <translation type="unfinished"></translation> + <translation>Enlever les images sélectionnées</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="1177"/> <source>Del</source> - <translation type="unfinished"></translation> + <translation>Suppr</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="1186"/> <source>Remove &all</source> - <translation type="unfinished"></translation> + <translation>&Tout enlever</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="1189"/> <source>Remove all pictures</source> - <translation type="unfinished"></translation> + <translation>Enlever toutes les images</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="1192"/> <source>Alt+Del</source> - <translation type="unfinished"></translation> + <translation>Alt+Suppr</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="1201"/> <source>&Check</source> - <translation type="unfinished"></translation> + <translation>&Vérifier</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="1204"/> <source>Check selected items</source> - <translation type="unfinished"></translation> + <translation>Vérifier les éléments sélectionnés</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="1207"/> <source>Ctrl+H</source> - <translation type="unfinished"></translation> + <translation>Ctrl+H</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="1216"/> <source>Check a&ll</source> - <translation type="unfinished"></translation> + <translation>T&out vérifier</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="1219"/> <source>Check all items</source> - <translation type="unfinished"></translation> + <translation>Vérifier tous les éléments</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="1222"/> <source>Ctrl+Alt+H</source> - <translation type="unfinished"></translation> + <translation>Ctrl+Alt+H</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="1231"/> <source>&Convert</source> - <translation type="unfinished"></translation> + <translation>&Convertir</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="1234"/> <source>Start the conversion process</source> - <translation type="unfinished"></translation> + <translation>Démarrer le processus de conversion</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="1237"/> <source>F5</source> - <translation type="unfinished">F5</translation> + <translation>F5</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="1242"/> <source>&Settings</source> - <translation type="unfinished"></translation> + <translation>Paramètre&s</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="1245"/> <source>Open the settings dialog</source> - <translation type="unfinished"></translation> + <translation>Ouvrir la fenêtre de paramètres</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="1250"/> <source>&Exit</source> - <translation type="unfinished">&Quitter</translation> + <translation>&Quitter</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="1253"/> <source>Ctrl+X</source> - <translation type="unfinished"></translation> + <translation>Ctrl+X</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="1258"/> <source>Uncheck all &items</source> - <translation type="unfinished"></translation> + <translation>Décocher tous les éléme&nts</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="1261"/> <source>Ctrl+Alt+J</source> - <translation type="unfinished"></translation> + <translation>Ctrl+alt+J</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="1266"/> <source>&Uncheck Items</source> - <translation type="unfinished"></translation> + <translation>Décoc&her l'élément</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="1269"/> <source>Uncheck selected items</source> - <translation type="unfinished"></translation> + <translation>Décocher les éléments sélectionnés</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="1272"/> <source>Ctrl+J</source> - <translation type="unfinished"></translation> + <translation>Ctrl+J</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="1277"/> <source>&About</source> - <translation type="unfinished"></translation> + <translation>&À propos</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="1280"/> <source>F1</source> - <translation type="unfinished">F1</translation> + <translation>F1</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="1289"/> <source>&Donate via Paypal</source> - <translation type="unfinished"></translation> + <translation>Faire un &don via Paypal</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="1292"/> <source>Donate via Paypal</source> - <translation type="unfinished"></translation> + <translation>Faire un don via Paypal</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="1297"/> <source>&Report bug...</source> - <translation type="unfinished"></translation> + <translation>&Rapporter un bogue...</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="1319"/> <source>&Flattr This!</source> - <translation type="unfinished"></translation> + <translation>Faire un don sur &Flattr !</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="1327"/> <source>&Check for updates</source> - <translation type="unfinished"></translation> + <translation>Vérifier les mises à &jour</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="1330"/> <source>Check if a new version of Converseen is available</source> - <translation type="unfinished"></translation> + <translation>Vérifier si une nouvelle version de Converseen est disponible</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="1302"/> <source>Import PDF file</source> - <translation type="unfinished"></translation> + <translation>Importer un fichier PDF</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="1307"/> <source>Import windows icon (*.ico)</source> - <translation type="unfinished"></translation> + <translation>Importer un icône Windows (*.ico)</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="1310"/> <source>Import windows icon (*.ico *.icon)</source> - <translation type="unfinished"></translation> + <translation>Importer un icône Windows (*.ico *.icon)</translation> </message> <message> <location filename="../ui/mainwindow.ui" line="1322"/> <source>Donate via Flattr</source> - <translation type="unfinished"></translation> + <translation>Faire un don via Flattr</translation> </message> </context> <context> @@ -1663,27 +1674,27 @@ <message> <location filename="../src/mainwindowimpl.cpp" line="231"/> <source>Open Icon file</source> - <translation type="unfinished"></translation> + <translation>Ouvrir le fichier icône</translation> </message> <message> <location filename="../src/mainwindowimpl.cpp" line="231"/> <source>Microsoft icon (*.ico *.icon)</source> - <translation type="unfinished"></translation> + <translation>Icône Microsoft (*.ico *.icon)</translation> </message> <message> <location filename="../src/mainwindowimpl.cpp" line="242"/> <source>Open Pdf file</source> - <translation type="unfinished"></translation> + <translation>Ouvrir un fichier PDF</translation> </message> <message> <location filename="../src/mainwindowimpl.cpp" line="242"/> <source>Portable Document Format (*.pdf)</source> - <translation type="unfinished"></translation> + <translation>Portable Document Format (*.pdf)</translation> </message> <message> <location filename="../src/mainwindowimpl.cpp" line="252"/> <source>Analyzing the file. It may take a while, please wait...</source> - <translation type="unfinished"></translation> + <translation>Analyse du fichier. Cela peut prendre un moment, veuillez patienter...</translation> </message> <message> <location filename="../src/mainwindowimpl.cpp" line="323"/> @@ -1698,13 +1709,13 @@ <message> <location filename="../src/mainwindowimpl.cpp" line="349"/> <source>Processing...</source> - <translation>Transformation ...</translation> + <translation>Transformation...</translation> </message> <message> <location filename="../src/mainwindowimpl.cpp" line="805"/> <location filename="../src/mainwindowimpl.cpp" line="863"/> <source>Preview</source> - <translation type="unfinished"></translation> + <translation>Prévisualiser</translation> </message> <message> <location filename="../src/mainwindowimpl.cpp" line="943"/> @@ -1785,32 +1796,32 @@ <message> <location filename="../src/pixtreewidget.cpp" line="40"/> <source>To convert</source> - <translation type="unfinished">À convertir</translation> + <translation>À convertir</translation> </message> <message> <location filename="../src/pixtreewidget.cpp" line="41"/> <source>Status</source> - <translation type="unfinished">Statut</translation> + <translation>Statut</translation> </message> <message> <location filename="../src/pixtreewidget.cpp" line="42"/> <source>File name</source> - <translation type="unfinished">Nom du fichier</translation> + <translation>Nom du fichier</translation> </message> <message> <location filename="../src/pixtreewidget.cpp" line="43"/> <source>Image type</source> - <translation type="unfinished">Type d'image</translation> + <translation>Type d'image</translation> </message> <message> <location filename="../src/pixtreewidget.cpp" line="44"/> <source>File size</source> - <translation type="unfinished">Taille du fichier</translation> + <translation>Taille du fichier</translation> </message> <message> <location filename="../src/pixtreewidget.cpp" line="45"/> <source>File path</source> - <translation type="unfinished">Chemin du fichier</translation> + <translation>Chemin du fichier</translation> </message> </context> <context> @@ -1827,13 +1838,14 @@ <message> <location filename="../src/updatechecker.cpp" line="72"/> <source>New version is available!</source> - <translation type="unfinished"></translation> + <translation>Une nouvelle version est disponible !</translation> </message> <message> <location filename="../src/updatechecker.cpp" line="73"/> <source>A new version of %1 is available! Would you download it?</source> - <translation type="unfinished"></translation> + <translation>Une nouvelle version de %1 est disponible ! +Voulez-vous la télécharger ?</translation> </message> </context> <context> @@ -1841,7 +1853,7 @@ <message> <location filename="../src/mylabelpreviewer.cpp" line="50"/> <source>Preview</source> - <translation type="unfinished"></translation> + <translation>Prévisualiser</translation> </message> </context> </TS> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/res/converseen.desktop new/converseen-0.9.5.1/res/converseen.desktop --- old/converseen/res/converseen.desktop 2016-08-30 00:47:20.000000000 +0200 +++ new/converseen-0.9.5.1/res/converseen.desktop 2016-09-08 00:13:50.000000000 +0200 @@ -4,10 +4,12 @@ Name=Converseen GenericName=Converseen GenericName[en_GB]=Converseen +GenericName[fr]=Converseen GenericName[it]=Converseen GenericName[ru]=Converseen GenericName[ro]=Converseen Comment=Batch image converter +Comment[fr]=Convertisseur d'images par lots Comment[it]=Convertitore batch di immagini Comment[ru]=Пакетное преобразование изображений Comment[ro]=Batch converter pentru imagini diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/res/converseen_import.desktop new/converseen-0.9.5.1/res/converseen_import.desktop --- old/converseen/res/converseen_import.desktop 2016-08-30 00:47:20.000000000 +0200 +++ new/converseen-0.9.5.1/res/converseen_import.desktop 2016-09-08 00:13:50.000000000 +0200 @@ -4,6 +4,7 @@ Type=Service Actions=converseenImport; X-KDE-Submenu=Open with Converseen +X-KDE-Submenu[fr]=Ouvrir avec Converseen X-KDE-Submenu[it]=Apri con Converseen X-KDE-Submenu[ro]=Deschide cu Converseen X-KDE-Submenu[ru]=Открыть с помощью Converseen @@ -11,6 +12,7 @@ [Desktop Action converseenImport] Name=Import +Name[fr]=Importer Name[it]=Importa Name[ro]=Importați Name[ru]=Импортировать diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen/src/globals.h new/converseen-0.9.5.1/src/globals.h --- old/converseen/src/globals.h 2016-08-30 00:47:20.000000000 +0200 +++ new/converseen-0.9.5.1/src/globals.h 2016-09-08 00:13:50.000000000 +0200 @@ -29,8 +29,8 @@ namespace globals { const QString PROGRAM_NAME = "Converseen"; - const int CURRENT_INTERNAL_VERSION = 950; - const QString VERSION = "0.9.5"; + const int CURRENT_INTERNAL_VERSION = 951; + const QString VERSION = "0.9.5.1"; class Globals {

1 0

commit flamerobin for openSUSE:Factory
by root＠hilbert.suse.de 30 Sep '16

30 Sep '16

Hello community, here is the log from the commit of package flamerobin for openSUSE:Factory checked in at 2016-09-30 15:34:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/flamerobin (Old) and /work/SRC/openSUSE:Factory/.flamerobin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "flamerobin" Changes: -------- --- /work/SRC/openSUSE:Factory/flamerobin/flamerobin.changes 2015-07-05 18:03:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.flamerobin.new/flamerobin.changes 2016-09-30 15:35:14.000000000 +0200 @@ -1,0 +2,32 @@ +Thu Sep 29 00:19:02 UTC 2016 - badshah400(a)gmail.com + +- Update to version 0.9.3.1: + + New templating system allows you to add you own SQL statement + templates to the menu + + BLOB editor + + Extended dialog with SQL statement history makes it easier to + search + + View dependencies are resolved properly for Firebird 2.5 + + Fixed statistics for UPDATE OR INSERT statements + + DataGrid: implemented Copy as IN list + + DataGrid: Fixed keyboard navigation + + Added new context menu options + + Fixed error messages when different character set is used in + statements + + Warn when closing SQL editor with active transactions + + Ability to refresh list of objects in the main tree + + Fixed bug with quoted identifier when altering column type + + Generate change script is now available for columns as well + + Fixed truncating of Unicode characters with Firebird 1.5 +- Update required version of wxwidgets to >= 3.0. +- Drop flamerobin-0.9.2-wxWindowListNode.patch; fixed upstream. +- Use github tagged tarball for source; update %setup accordingly. +- Add flamerobin-desktop-file.patch to remove hardcoded reference + to location of icon file. +- Extract hicolor icons of all possible sizes from bundled icns + file and install them to hicolor icon dir; adds BuildRequires + on icns-utils, hicolor-icon-theme; run + %icon_theme_cache_post(un) post(un) scriptlets. +- Sed to fix a trailing ';' issue in .desktop file. + +------------------------------------------------------------------- Old: ---- flamerobin-0.9.2-src.tar.gz flamerobin-0.9.2-wxWindowListNode.patch New: ---- 0.9.3.1.tar.gz flamerobin-desktop-file.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ flamerobin.spec ++++++ --- /var/tmp/diff_new_pack.iKGkgc/_old 2016-09-30 15:35:15.000000000 +0200 +++ /var/tmp/diff_new_pack.iKGkgc/_new 2016-09-30 15:35:15.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package flamerobin # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,19 +19,22 @@ %define _use_internal_dependency_generator 0 %define __find_requires %wx_requires Name: flamerobin -Version: 0.9.2 +Version: 0.9.3.1 Release: 0 Summary: Graphical client for Firebird License: MIT and LGPL-2.1+ Group: Productivity/Databases/Tools Url: http://www.flamerobin.org/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tar.gz -Patch0: flamerobin-0.9.2-wxWindowListNode.patch +Source0: https://github.com/mariuz/flamerobin/archive/%{version}.tar.gz +# PATCH-FIX-UPSTREAM flamerobin-desktop-file.patch gh#mariuz/flamerobin#5 badshah400(a)gmail.com -- Unhardcode icon path in GNU/Linux laucher; patch taken from upstream git +Patch0: flamerobin-desktop-file.patch +BuildRequires: boost-devel BuildRequires: desktop-file-utils BuildRequires: gcc-c++ +BuildRequires: icns-utils BuildRequires: libfbclient2-devel >= 2.0.0.12748 BuildRequires: update-desktop-files -BuildRequires: wxWidgets-devel >= 2.8 +BuildRequires: wxWidgets-devel >= 3.0 Requires(post): update-desktop-files Requires(postun): update-desktop-files BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -41,10 +44,13 @@ toolkit. %prep -%setup -q -n %{name}-%{version}-src -%patch0 +%setup -q +%patch0 -p1 %build +# FIX A TRAILING SEMICOLON ISSUE FOR KEYWORDS TAG IN .desktop FILE +sed -i "s/^Keywords=firebird/Keywords=firebird;/" res/%{name}.desktop + export CFLAGS="%{optflags} -fpermissive" export CXXFLAGS="$CFLAGS" %configure @@ -52,18 +58,26 @@ %install make DESTDIR=%{buildroot} install %{?_smp_mflags} -rm -f %{buildroot}/%{_datadir}/pixmaps/%{name}.png -cp -f ./res/%{name}.xpm %{buildroot}/%{_datadir}/%{name}/%{name}.xpm -sed "s@Categories=Development;Database;GTK@Categories=System;Database;@" -i %{buildroot}/%{_datadir}/applications/%{name}.desktop -sed "s@Icon=%{_datadir}/pixmaps/flamerobin.png@Icon=%{_datadir}/%{name}/%{name}.xpm@" -i %{buildroot}/%{_datadir}/applications/%{name}.desktop -mv %{buildroot}%{_datadir}/applications/%{name}.desktop $RPM_SOURCE_DIR/%{name}.desktop -%suse_update_desktop_file -i -n %{name} System Database + +%suse_update_desktop_file -r %{name} Office Database rm -rf %{buildroot}%{_datadir}/%{name}/docs +# INSTALL HICOLOR ICONS EXTRACTED FROM ICNS FILE +pushd res +icns2png -x -d 32 flamerobin.icns +for sz in 16 32 48 128 +do + install -Dm0644 flamerobin_${sz}x${sz}x32.png %{buildroot}%{_datadir}/icons/hicolor/${sz}x${sz}/apps/%{name}.png +done +popd +rm %{buildroot}%{_datadir}/pixmaps/*.png + %post +%icon_theme_cache_post %desktop_database_post %postun +%icon_theme_cache_postun %desktop_database_postun %files @@ -73,5 +87,6 @@ %{_bindir}/%{name} %{_datadir}/applications/* %{_datadir}/%{name} +%{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog ++++++ flamerobin-0.9.2-src.tar.gz -> 0.9.3.1.tar.gz ++++++ ++++ 128632 lines of diff (skipped) ++++++ flamerobin-desktop-file.patch ++++++ >From d7c55b7dad45534e439e44b6a92a43d5bbe5b5b5 Mon Sep 17 00:00:00 2001 From: Vincent Bermel <palob(a)users.noreply.github.com> Date: Mon, 9 May 2016 01:29:55 +0200 Subject: [PATCH] Unhardcode icon path in GNU/Linux laucher --- res/flamerobin.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/flamerobin.desktop b/res/flamerobin.desktop index 082bdcc..8282d2e 100644 --- a/res/flamerobin.desktop +++ b/res/flamerobin.desktop @@ -3,7 +3,7 @@ Name=FlameRobin GenericName=Database administration tool Comment=Administration Tool for Firebird DBMS Exec=flamerobin -Icon=/usr/share/pixmaps/flamerobin.png +Icon=flamerobin Type=Application Terminal=false Categories=Development;Database;GTK

1 0

commit nodejs4 for openSUSE:Factory
by root＠hilbert.suse.de 30 Sep '16

30 Sep '16

Hello community, here is the log from the commit of package nodejs4 for openSUSE:Factory checked in at 2016-09-30 15:34:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nodejs4 (Old) and /work/SRC/openSUSE:Factory/.nodejs4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nodejs4" Changes: -------- --- /work/SRC/openSUSE:Factory/nodejs4/nodejs4.changes 2016-09-23 11:34:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.nodejs4.new/nodejs4.changes 2016-09-30 15:35:10.000000000 +0200 @@ -1,0 +2,21 @@ +Wed Sep 28 08:37:49 UTC 2016 - adam.majer(a)suse.de + +- enable usage of system certificate store on SLE11SP4 by + requiring openssl1 (boo#1000036) +- nodejs-libpath.patch: + * adapt patch from main nodejs project so it builds on SLE11 +- New upstream LTS version 4.6.0 + * openssl update (not applicable for SLE12SP2, Leap 42.2 and later) + + upgrade to 1.0.2j (CVE-2016-6304, CVE-2016-2183, CVE-2016-2178, + CVE-2016-6306, CVE-2016-7052) + + remove support for dynamic 3rd party engine modules + * http: Properly validate for allowable characters in input + user data. This introduces a new case where throw may occur + when configuring HTTP responses, users should already + be adopting try/catch here. (CVE-2016-5325, bnc#985201) + * tls: properly validate wildcard certificates + (CVE-2016-7099, bnc#1001652) + * buffer: Zero-fill excess bytes in new Buffer objects created + with Buffer.concat() + +------------------------------------------------------------------- Old: ---- node-v4.5.0.tar.xz New: ---- node-v4.6.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nodejs4.spec ++++++ --- /var/tmp/diff_new_pack.wZlDxi/_old 2016-09-30 15:35:13.000000000 +0200 +++ /var/tmp/diff_new_pack.wZlDxi/_new 2016-09-30 15:35:13.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package nodejs +# spec file for package nodejs4 # # Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # @@ -15,8 +15,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: nodejs4 -Version: 4.5.0 +Version: 4.6.0 Release: 0 %define npm_version 2.15.9 %define major_version 4 @@ -95,6 +96,13 @@ #this corresponds to the "engine" requirement in package.json Provides: nodejs(engine) = %{version} +# For SLE11, to be able to use the certificate store we need to have properly +# symlinked certificates. The compatability symlinks are provided by the +# openssl1 library in the Security Module +%if 0%{suse_version} == 1110 +Requires: openssl1 +%endif + #building nodejs makes sense only on v8 archs ExclusiveArch: %{ix86} x86_64 armv7hl aarch64 ppc ppc64 ppc64le BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ SHASUMS256.txt.asc ++++++ --- /var/tmp/diff_new_pack.wZlDxi/_old 2016-09-30 15:35:13.000000000 +0200 +++ /var/tmp/diff_new_pack.wZlDxi/_new 2016-09-30 15:35:13.000000000 +0200 @@ -1,52 +1,52 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -d171f0c859e3895b2430c317001b817866c4de45211ad540c59658ee6a2f689f node-v4.5.0-darwin-x64.tar.gz -61b570d0744bed2725a4d64ab28f641acb1206fee8760035df36f8ee63e54da3 node-v4.5.0-darwin-x64.tar.xz -12ee966eef2abc928f6d7fcf9cfcf2913ef0e59ae07e2dcc20726246ab174fd8 node-v4.5.0-headers.tar.gz -7a83d8e11089c16824dfcd82ca3f5cb9f727545a39f7138d034b67ed95fb922c node-v4.5.0-headers.tar.xz -ecdbb3cb55d0a87aeb10334b47310f1823393abe6273f1ce7c97bcb509051e68 node-v4.5.0-linux-arm64.tar.gz -9034e67629e1912d6dc0632627528565d9e412c6eba410d171f9fd80f700f84f node-v4.5.0-linux-arm64.tar.xz -87c6fb8269475d385a9b923c647890def45079f8e30b55c4737d70558fd36418 node-v4.5.0-linux-armv6l.tar.gz -bc3e33872b009e18f084efb9a595cc12cf8314df125ce80c2e8bde1c2213b5f1 node-v4.5.0-linux-armv6l.tar.xz -99d222ede2f38041c55a64da8e6a669e0128cfb40d40f968cae74d80e52ad566 node-v4.5.0-linux-armv7l.tar.gz -c01482d423b646542ba037cb5ce646cb26518aa2dc9f7728520e7ac1247932b3 node-v4.5.0-linux-armv7l.tar.xz -a517a56b5550567225c6820f99e44fc84ac9953e2fe9db67f3bab7a8d7661e9f node-v4.5.0-linux-ppc64le.tar.gz -e01cb29c51f05dd56e15e0a25918fe4a2ad10cf4b83c4eee89fb0a3598728e50 node-v4.5.0-linux-ppc64le.tar.xz -46bebb806e4e8273e66e02faf5f25145f5351958bda75d9aa49bee9df7ccafec node-v4.5.0-linux-ppc64.tar.gz -f910ffa6ff0dbe32d2e3dea7e73b4f83c37f8a7a0d4078d53f3d3b426e30a8cf node-v4.5.0-linux-ppc64.tar.xz -5678ad94ee35e40fc3a2c545e136a0dc946ac4c039fca5898e1ea51ecf9e7c39 node-v4.5.0-linux-x64.tar.gz -c6ee1f4303353e3605ff70de180431417eb594fe08daf612e692216236750c55 node-v4.5.0-linux-x64.tar.xz -a11ef26fa700eff8ea7acfa491fd362dd362590da2967335d87932e7036a06fd node-v4.5.0-linux-x86.tar.gz -0f5e51d913867eaf71332cd20fd9a98aeb3576b8a22a52e8e1cd97c89cf51feb node-v4.5.0-linux-x86.tar.xz -370b65e6cd27943afc18e517f86c7fc801c0d256cb40ca75b2ff01051223cbb6 node-v4.5.0.pkg -47f0f3c9e33d02a49a6c467d8a12539b0bb3c5bf8e1916bd938eaa956afb47bb node-v4.5.0-sunos-x64.tar.gz -0b83935c6e6decf11c347c1dcaeb1face825a6a103a04117c868239d226de492 node-v4.5.0-sunos-x64.tar.xz -190ff116905ce94291a7122779cbdf493af1ba415432a9a12a32263816b90ccd node-v4.5.0-sunos-x86.tar.gz -2d49973241a67c1a2da747ad469ba43299a84e8e9f7e2d147b08d22084d73c15 node-v4.5.0-sunos-x86.tar.xz -74ced83b8d890d90e2a8b0d54b0d0e9b5e01d6fd6148cec6e9911ff6eaf0cf21 node-v4.5.0.tar.gz -97b99d378c56802444208409568e2e66c46332897f06aead74d1ffbe733bd488 node-v4.5.0.tar.xz -e80a7bf9afb91a422b2955c95a6dd35fec3a7019e5adc21763ed18c9fa6c67a6 node-v4.5.0-win-x64.7z -16aab15b29e79746d1bae708f6a5dbed8ef3c87426a9408f7261163d0cda0f56 node-v4.5.0-win-x64.zip -9d68e8f4c8650b60dfc0955185d867302a9e63b0bd4ee39b8296fc473b033879 node-v4.5.0-win-x86.7z -f79c11ecc0eb6ecb4e95e27744753eaa6db8c255b6c808bc660722c72d45a892 node-v4.5.0-win-x86.zip -367a1872bac36bfd398b89027df80c9c0e604a466185ad4631c167ba1a5d24c8 node-v4.5.0-x64.msi -489e84902243b1adeb7218322bc0e87091c5e758c669e088ac20b4267a8d165d node-v4.5.0-x86.msi -ff1d2bbbc55b15fa3d23dc3d359224674b8d1f20b7f387c1e814099b9801288d win-x64/node.exe -5e54f544fd8ea5cc0a76ccc8b3942e4783de7a174f7cdcd04664a990905395cb win-x64/node.lib -b3c93cfa8155fc58ce86cdd64d28b2254d00b1d46bd3b69cdd965ffa0afa4493 win-x64/node_pdb.7z -973a47686ee5e3c30e986bcc5df5cecdd643d492ef689d33d801e35e912cd869 win-x64/node_pdb.zip -aa0458966999005a5df9d9d74a415022f92ba02ce641bd582cd46e93cd4b8a90 win-x86/node.exe -7e2ff7208dbe2612b55cc5f11be7e17c00b58b410580b3705cb86e7cba09cc97 win-x86/node.lib -a4e089ae072cf15ef247d16a4b7fb8177855e41bc595f395640dbb68d19a6738 win-x86/node_pdb.7z -355ea7df33f95a5d10377276cc7bf4e89b80457f16923b22fb6dad66ea77d3f5 win-x86/node_pdb.zip +525ab42c767525edb7e512c600dedb20d826a6f58e1d6d1b774651a1c782a267 node-v4.6.0-darwin-x64.tar.gz +3c728c25b541fd8b88826568e7867098658df7c45d2389b60877c093a9803bd0 node-v4.6.0-darwin-x64.tar.xz +5eb4b4324d72297066b4b8c91d0b1e7c82cabde9986c986682be66202f37176b node-v4.6.0-headers.tar.gz +862ce573bcfd592ea0c24861c0097bd23ca842d263e03f5dfa1ce08be888f20f node-v4.6.0-headers.tar.xz +bf03e7384b727bc80c0c59cf38ba5704d83faa7f455f40fa62a67c8331dde7d6 node-v4.6.0-linux-arm64.tar.gz +7683e664b648c4ec3f86935f4b4f9fbf56f19d171e1e29d5adf687fc4c392b5b node-v4.6.0-linux-arm64.tar.xz +e7db1c612eb9dd55e3ff246bfa7c35f0b87664e6e2bc7b32891de8cc1e48f5a7 node-v4.6.0-linux-armv6l.tar.gz +766d10a73886bbe1a3abd4b78563a825408cab7e116e590f1bbdc9b88cc3aa09 node-v4.6.0-linux-armv6l.tar.xz +9e46082bef5b521afd483532c8d3715f33d1d4302b7980b904bea3182817275f node-v4.6.0-linux-armv7l.tar.gz +def976771b4a2a4488b87a06c8295ffea55671f7f42df13e3718341d28bf2d40 node-v4.6.0-linux-armv7l.tar.xz +2aa9518ea637cc06877a01c40d4608cf9a7f1588000cf3e550e4ab24c170aee6 node-v4.6.0-linux-ppc64le.tar.gz +b06c39da4fae47e2d204cae183425a3a77849944c5be47c5807f4f08cef51f64 node-v4.6.0-linux-ppc64le.tar.xz +ee77fb6a1dfbe166c9faee25b4f110af25723c64b0abcb9085507b8445fa2e7b node-v4.6.0-linux-ppc64.tar.gz +e35955a846c1082e1681fdcbf488a66e43f56fb0aa7205b86a4aa0ce69dfb1eb node-v4.6.0-linux-ppc64.tar.xz +acf08148cecf245f28126122ac9128ff9909f00938b18d80fc0b92648d1c98a8 node-v4.6.0-linux-x64.tar.gz +a77ceb75a05984153304ad0f09b11d234ca54a67714ba575b52e4298df0343d1 node-v4.6.0-linux-x64.tar.xz +9aab75618de0dca640d747aa25073cbb5a01342dd8aa177df8112e26a39541f4 node-v4.6.0-linux-x86.tar.gz +8994ee2c180a97fc4280bfb390444a4bcb2629290aa8243e7ab6271efab593f4 node-v4.6.0-linux-x86.tar.xz +0359c50c5d7e887c7f17d7ea4f42b1776ac8df263c6471bf8054b5c9f3d42a67 node-v4.6.0.pkg +e9a02da71d0cd6a1874f4a7d227dfcbe6ab9492eba419b5c9a83c8c95065195f node-v4.6.0-sunos-x64.tar.gz +8ea3d2887b4850fb92f75573f30bbb257b7cd11f71cda12becc34868c535acf8 node-v4.6.0-sunos-x64.tar.xz +f8536a25629ef1ad3228b2d712e2fa43bf66980673d3cdf469da37c0407e9633 node-v4.6.0-sunos-x86.tar.gz +5750a8256356f43c6b80854b7c6ce46d6933e64cf5f2efecdf4841e4fe582a28 node-v4.6.0-sunos-x86.tar.xz +0838f12e329edb252e6e6baddca85632bf5ff2ec900e737e88f9bf9b38946b1b node-v4.6.0.tar.gz +42910dbd34e49bfc40580e06753947c30d31101455a38e9f0343a23d67c0c694 node-v4.6.0.tar.xz +0c6509c13cfa9795f08b9bf694383de7e4d93cde14a9e8979a92f21736e19498 node-v4.6.0-win-x64.7z +0782bd50251c2a159fba5b874c56fb4a6680f454cc16892cee8e62d17b7d6f60 node-v4.6.0-win-x64.zip +413f98f2b765fe862ff6971724c3f265dbfe5a2cb865dd1894b4447426542c91 node-v4.6.0-win-x86.7z +13a5dcb90a8397f62c55945b65cb1c7b9d7576af3cbfc8d9cb67f72edcf68201 node-v4.6.0-win-x86.zip +80926b2df6e7efc8adda2e1fcb6328b99fe878d728cf93f39b0c710adc1bcb35 node-v4.6.0-x64.msi +5f91bf57512c1fa96d016c8f6236c689998ed926faa13aaf2170154342ca915a node-v4.6.0-x86.msi +7564472c672e729a724ffe890ba06ec318c9e311684516a25a47b3f1e549504e win-x64/node.exe +24178152fc3a99b9b83a1620897c5624cb7e0ba0544da38e18ca0cde807435d4 win-x64/node.lib +44dbbec125f3c4804ed5d002628c7ddb8e51cd352af0542b9edebcfd718967b5 win-x64/node_pdb.7z +b92e5e5031f19f201ec4568d7761c263af9a20e02b34bdd9e5f7191750aee3fb win-x64/node_pdb.zip +7c9287cec4379082393d85af919a36a3512aa6bfcbf3deba3261a472580041f8 win-x86/node.exe +7d5988939f1567a4d7180010f49ec36b8d3897a8eccb78e461a774d8d2de614e win-x86/node.lib +98f955f69195f12ec429e4cff629c650a6b1dcb43a1c18cef9cf79a11067c88d win-x86/node_pdb.7z +0d0faf3bf0fcf50a943d8202d24d8eb8bb0695ea99498360c1a8a745c7811fd7 win-x86/node_pdb.zip -----BEGIN PGP SIGNATURE----- -iQEcBAEBAgAGBQJXszriAAoJEJM7AfQLXKlGQuEH/Rvw85bg3uDqCTgXxWaxlwLb -Ua/j3UOEJpqG+bdUn3Zvm0RvhyTWDyJkelb5NOdZhbzHd9/F4x8pPO1ZJa3uF7BF -vgBOxcpLIvL4UgpIelZXs/oLBfsD6RVHPIBNCGgeno0ryyEZp7tSrYbVmDO1zr8W -FqMNRN+E07fFbK+bTc9lMQVyclbdb2QHr4s4GmKrMg2i0GRWOndHfr+mQX3pcK9a -dP6dOKguLPAEOThFiPzks/dbMs++Zq/iWUAPXYzRkXZAvF7vVGOBYeAT7z49rlWT -J1qjH0RPlNzfLIHkTyhha9D6EV/4ZuPtDL+1wsXeCkHHWVa631IxhV1OMdFIivU= -=6paR +iQEcBAEBAgAGBQJX6xhwAAoJEMJzeS99g1RdoksH/139ljOj+Vjc0nVNRn5m2KxC +3gldiKMaNBeefV9JOA3tG1fei3KPvO/PRHVCYogQO8IEEpJ5Yer+zQpsLOg/xGDR +nsg9xOBupnSlUAfALilWhkDkBDgcauuiII3tP98GjDaSS+cH6Pctt08l2XTCROYk +YThc0nonmobDGSsHVf4biv+ySMocmpZGU0h10xS2lRVlrxMpEzsxVuCSv52fRDKy +gD0Hf9ZSFi9i1MIxKOIolYpdIVmrS29c6J0LbjW2WcTk21jIOENXEk1uEl71OWHD +plT4hauehu/3a89FcqsOu10MqLStFuEm0T1CXtmn4/Vm2FhJnZfdiCDT1YABD00= +=LyAk -----END PGP SIGNATURE----- ++++++ node-v4.5.0.tar.xz -> node-v4.6.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/nodejs4/node-v4.5.0.tar.xz /work/SRC/openSUSE:Factory/.nodejs4.new/node-v4.6.0.tar.xz differ: char 26, line 1 ++++++ nodejs-libpath.patch ++++++ --- /var/tmp/diff_new_pack.wZlDxi/_old 2016-09-30 15:35:13.000000000 +0200 +++ /var/tmp/diff_new_pack.wZlDxi/_new 2016-09-30 15:35:13.000000000 +0200 @@ -1,7 +1,7 @@ -Index: node-v4.4.5/lib/module.js +Index: node-v4.5.0/lib/module.js =================================================================== ---- node-v4.4.5.orig/lib/module.js -+++ node-v4.4.5/lib/module.js +--- node-v4.5.0.orig/lib/module.js ++++ node-v4.5.0/lib/module.js @@ -453,7 +453,7 @@ Module._initPaths = function() { homeDir = process.env.HOME; } @@ -11,15 +11,15 @@ if (homeDir) { paths.unshift(path.resolve(homeDir, '.node_libraries')); -Index: node-v4.4.5/tools/install.py +Index: node-v4.5.0/tools/install.py =================================================================== ---- node-v4.4.5.orig/tools/install.py -+++ node-v4.4.5/tools/install.py +--- node-v4.5.0.orig/tools/install.py ++++ node-v4.5.0/tools/install.py @@ -6,6 +6,7 @@ import os import re import shutil import sys -+from _sysconfigdata import build_time_vars ++from distutils import sysconfig # set at init time node_prefix = '/usr/local' # PREFIX variable from Makefile @@ -28,7 +28,7 @@ def npm_files(action): - target_path = 'lib/node_modules/npm/' -+ target_path = build_time_vars["LIB"] + '/node_modules/npm/' ++ target_path = sysconfig.get_config_var("LIB") + '/node_modules/npm/' # don't install npm if the target path is a symlink, it probably means # that a dev version of npm is installed there @@ -47,7 +47,7 @@ - else: - shebang = os.path.join(node_prefix or '/', 'bin/node') - update_shebang(link_path, shebang) -+ try_symlink("../" + build_time_vars["LIB"] + '/node_modules/npm/bin/npm-cli.js',link_path) ++ try_symlink("../" + sysconfig.get_config_var("LIB") + '/node_modules/npm/bin/npm-cli.js',link_path) else: assert(0) # unhandled action type @@ -56,7 +56,7 @@ if 'true' == variables.get('node_use_dtrace'): - action(['out/Release/node.d'], 'lib/dtrace/node.d') -+ action(['out/Release/node.d'], build_time_vars["LIB"] + '/dtrace/node.d') ++ action(['out/Release/node.d'], sysconfig.get_config_var("LIB") + '/dtrace/node.d') # behave similarly for systemtap action(['src/node.stp'], 'share/systemtap/tapset/')

1 0

commit man-pages-fr for openSUSE:Factory
by root＠hilbert.suse.de 30 Sep '16

30 Sep '16

Hello community, here is the log from the commit of package man-pages-fr for openSUSE:Factory checked in at 2016-09-30 15:34:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/man-pages-fr (Old) and /work/SRC/openSUSE:Factory/.man-pages-fr.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "man-pages-fr" Changes: -------- --- /work/SRC/openSUSE:Factory/man-pages-fr/man-pages-fr.changes 2016-01-11 19:11:34.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.man-pages-fr.new/man-pages-fr.changes 2016-09-30 15:35:07.000000000 +0200 @@ -2 +2,9 @@ -Thu Dec 25 00:01:23 UTC 2014 - antoine.belvire(a)laposte.net +Thu Sep 29 07:36:53 UTC 2016 - antoine.belvire(a)opensuse.org + +- Add 'Provides: locale(man-pages:fr)' so that the package is + automatically installed when locale is French. +- Add 'Suggests: man-pages-fr-extra'. It might be turned into + 'Recommends' in the future. + +------------------------------------------------------------------- +Thu Dec 25 00:01:23 UTC 2014 - antoine.belvire(a)opensuse.org ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ man-pages-fr.spec ++++++ --- /var/tmp/diff_new_pack.gazDgc/_old 2016-09-30 15:35:09.000000000 +0200 +++ /var/tmp/diff_new_pack.gazDgc/_new 2016-09-30 15:35:09.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package man-pages-fr # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,6 +28,8 @@ Group: Documentation/Man Url: http://traduc.org/ Source: http://perkamon.alioth.debian.org/archives/%{version}/man-pages-fr-%{versio… +Suggests: man-pages-fr-extra +Provides: locale(man-pages:fr) BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch

1 0

commit salt for openSUSE:Factory
by root＠hilbert.suse.de 30 Sep '16

30 Sep '16

Hello community, here is the log from the commit of package salt for openSUSE:Factory checked in at 2016-09-30 15:34:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/salt (Old) and /work/SRC/openSUSE:Factory/.salt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "salt" Changes: -------- --- /work/SRC/openSUSE:Factory/salt/salt.changes 2016-05-13 09:24:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.salt.new/salt.changes 2016-09-30 15:35:01.000000000 +0200 @@ -1,0 +2,288 @@ +Wed Sep 28 12:35:32 UTC 2016 - tampakrap(a)opensuse.org + +- Rename susemanager plugin to zyppnotify, as it is not SUSE Manager specific +- Remove the subpackage and put the plugin back to the main package + according to upstream + Add: + * 0007-Add-zypp-notify-plugin.patch + Remove: + * 0007-Add-SUSE-Manager-plugin.patch + +------------------------------------------------------------------- +Wed Sep 28 11:40:36 UTC 2016 - tampakrap(a)opensuse.org + +- Add upstream patch to fix pkg.upgrade for zypper + Add: + * 0021-Fix-pkg.upgrade-for-zypper.patch + +------------------------------------------------------------------- +Tue Sep 27 23:55:03 UTC 2016 - mrueckert(a)suse.de + +- splitting out the susemanager integration plugins into their own + subpackages. ATM this only contains the zypp plugin to tell + susemanager about manually installed packages. + +------------------------------------------------------------------- +Tue Sep 13 15:07:44 UTC 2016 - pablo.suarezhernandez(a)suse.com + +- Unit and integration tests fixes for 2016.3.2 + Add: + * 0018-Unit-tests-fixes-for-2016.3.2.patch + * 0019-Fix-snapper_test-for-python26.patch + * 0020-Integration-tests-fixes-for-2016.3.2.patch + +------------------------------------------------------------------- +Fri Sep 2 09:50:57 UTC 2016 - pablo.suarezhernandez(a)suse.com + +- Prevent pkg.install failure for expired keys (bsc#996455) + Add: + * 0017-Check-for-single-quote-before-splitting-on-single-qu.patch + +------------------------------------------------------------------- +Tue Aug 30 12:24:45 UTC 2016 - bmaryniuk(a)suse.com + +- Required D-Bus and generating machine ID where it is missing + +------------------------------------------------------------------- +Fri Aug 26 13:11:58 UTC 2016 - bmaryniuk(a)suse.com + +- Fix sphinx crashes when documentation is being generated + Add script for documentation update. + + Add: + * 0016-Improve-Mock-to-be-flexible-and-able-to-mock-methods.patch + * update-documentation.sh + +------------------------------------------------------------------- +Tue Aug 16 12:01:59 UTC 2016 - bmaryniuk(a)suse.com + +- Fix pkg.installed refresh repo failure (bsc#993549) + Fix salt.states.pkgrepo.management no change failure (bsc#990440) + Add: + * 0014-Add-ignore_repo_failure-option-to-suppress-zypper-s-.patch + * 0015-Remove-zypper-s-raise-exception-if-mod_repo-has-no-a.patch + +------------------------------------------------------------------- +Tue Aug 9 13:40:37 UTC 2016 - bmaryniuk(a)suse.com + +- Deprecate status.uptime one version later + Add: + * 0013-Deprecate-status.uptime-one-version-later.patch + +------------------------------------------------------------------- +Mon Aug 8 16:25:04 UTC 2016 - pablo.suarezhernandez(a)suse.com + +- Fix for 0008-checksum-validation-when-zypper-pkg.download.patch + after upstream merging conflict. Prevent zypper test failure. + Update: + * 0008-checksum-validation-when-zypper-pkg.download.patch + +------------------------------------------------------------------- +Thu Aug 4 14:56:42 UTC 2016 - mihai.dinca(a)suse.com + +- Update to v2016.3.2 + see https://docs.saltstack.com/en/latest/topics/releases/2016.3.2.html +- Removed Patches, applied upstream + * 0010-Getting-the-os-grain-from-CPE_NAME-inside-etc-os-rel.patch + * 0011-snapper-execution-module.patch + * 0012-Force-minion-exit-on-mis-configuration-read.patch + * 0013-fix-salt-summary-to-count-not-responding-minions-cor.patch + * 0014-Move-log-message-from-INFO-to-DEBUG.patch + * 0016-Run-salt-api-as-user-salt-bsc-990029.patch + * 0017-fix-beacon-list-to-include-all-beacons-being-process.patch +- Added Patches back + * 0010-snapper-execution-module.patch + * 0011-fix-salt-summary-to-count-not-responding-minions-cor.patch + * 0012-Run-salt-api-as-user-salt-bsc-990029.patch + +------------------------------------------------------------------- +Wed Aug 3 14:50:35 UTC 2016 - pablo.suarezhernandez(a)suse.com + +- Fix beacon list to include all beacons being process + Add: + * 0017-fix-beacon-list-to-include-all-beacons-being-process.patch + +------------------------------------------------------------------- +Fri Jul 29 11:48:37 UTC 2016 - kkaempf(a)suse.com + +- Redo patches, sync with github.com/openSUSE/salt + +- Renamed patches + * 0016-Getting-the-os-grain-from-CPE_NAME-inside-etc-os-rel.patch + -> 0010-Getting-the-os-grain-from-CPE_NAME-inside-etc-os-rel.patch + * 0017-snapper-execution-module.patch + -> 0011-snapper-execution-module.patch + * 0018-Force-minion-exit-on-mis-configuration-read.patch + -> 0012-Force-minion-exit-on-mis-configuration-read.patch + +- Added back (fix upstream merge problems): + * 0008-checksum-validation-when-zypper-pkg.download.patch + * 0009-unit-tests-for-rpm.checksum-and-zypper.download.patch + +- fix salt --summary to count not responding minions correctly + (bsc#972311) + * 0013-fix-salt-summary-to-count-not-responding-minions-cor.patch + +- Move log message from INFO to DEBUG (bsc#985661) + * 0014-Move-log-message-from-INFO-to-DEBUG.patch + +- pkg.list_products on "registerrelease" and "productline" + returns boolean.False if empty (bsc#989193) + * 0015-Bugfix-return-boolean-only-for-isbase-and-installed-.patch + +- Run salt-api as user salt like the master (bsc#990029) + * 0016-Run-salt-api-as-user-salt-bsc-990029.patch + +------------------------------------------------------------------- +Fri Jul 22 15:16:16 UTC 2016 - darin(a)darins.net + +- Update to v2016.3.1 + see https://docs.saltstack.com/en/latest/topics/releases/2016.3.1.html +- Removed Patches, applied upstream + * 0008-Prevent-several-minion-processes-on-the-same-machine.patch + * 0009-checksum-validation-when-zypper-pkg.download.patch + * 0010-unit-tests-for-rpm.checksum-and-zypper.download.patch + * 0011-jobs.exit_success-allow-to-check-if-a-job-has-execut.patch + * 0012-Fix-pkgrepo.managed-gpgkey-argument-bsc-979448.patch + * 0013-fix-groupadd-module-for-sles11-systems.patch + * 0014-Fix-crashing-Maintenence-process.patch + * 0015-Insert-no-refresh-before-install-in-Zypper.patch + +------------------------------------------------------------------- +Tue Jul 19 15:03:10 UTC 2016 - bmaryniuk(a)suse.com + +- Bugfix: Exit on configuration read (bsc#985667) + Add: + * 0018-Force-minion-exit-on-mis-configuration-read.patch + +------------------------------------------------------------------- +Mon Jul 18 08:32:04 UTC 2016 - pablo.suarezhernandez(a)suse.com + +- Backport: Snapper module for Salt. + Add: + * 0017-snapper-execution-module.patch + +------------------------------------------------------------------- +Wed Jun 22 07:56:44 UTC 2016 - pablo.suarezhernandez(a)suse.com + +- Bugfix: Fixed behavior for SUSE OS grains (bsc#970669) + Bugfix: Salt os_family does not detect SLES for SAP (bsc#983017) + Add: + * 0016-Getting-the-os-grain-from-CPE_NAME-inside-etc-os-rel.patch + +------------------------------------------------------------------- +Mon Jun 20 11:26:29 UTC 2016 - thipp(a)suse.com + +- Insert --no-refresh before install in Zypper + Add: + * 0015-Insert-no-refresh-before-install-in-Zypper.patch + +------------------------------------------------------------------- +Wed Jun 15 11:38:26 UTC 2016 - kkaempf(a)suse.com + +- Update to v2016.3.0 + see https://docs.saltstack.com/en/latest/topics/releases/2016.3.0.html + + * backwards-incompatible changes: + - The default path for the extension_modules master config option + has been changed. + +- add 0014-Fix-crashing-Maintenence-process.patch + see release notes + +------------------------------------------------------------------- +Wed Jun 1 09:52:40 UTC 2016 - mihai.dinca(a)suse.com + +- Fix pkgrepo.managed gpgkey argument doesn't work (bsc#979448) + Add: ++++ 91 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/salt/salt.changes ++++ and /work/SRC/openSUSE:Factory/.salt.new/salt.changes Old: ---- 0006-Update-to-2015.8.8.2.patch 0007-Force-sort-the-RPM-output-to-ensure-latest-version-o.patch 0008-Cleaner-deprecation-process-with-decorators.patch 0009-fix-sorting-by-latest-version-when-called-with-an-at.patch 0010-Prevent-metadata-download-when-getting-installed-pro.patch 0011-Check-if-EOL-is-available-in-a-particular-product-bs.patch 0012-Bugfix-salt-key-crashes-if-tries-to-generate-keys-to.patch 0013-Prevent-crash-if-pygit2-package-is-requesting-re-com.patch 0014-align-OS-grains-from-older-SLES-with-current-one-326.patch 0015-Unblock-Zypper.-Modify-environment.patch 0016-Bugfix-Restore-boolean-values-from-the-repo-configur.patch 0017-Add-SUSE-Manager-plugin.patch salt-2015.8.8.tar.gz New: ---- 0006-Create-salt-proxy-instantiated-service-file.patch 0007-Add-zypp-notify-plugin.patch 0008-checksum-validation-when-zypper-pkg.download.patch 0009-unit-tests-for-rpm.checksum-and-zypper.download.patch 0010-snapper-execution-module.patch 0011-fix-salt-summary-to-count-not-responding-minions-cor.patch 0012-Run-salt-api-as-user-salt-bsc-990029.patch 0013-Deprecate-status.uptime-one-version-later.patch 0014-Add-ignore_repo_failure-option-to-suppress-zypper-s-.patch 0015-Remove-zypper-s-raise-exception-if-mod_repo-has-no-a.patch 0016-Improve-Mock-to-be-flexible-and-able-to-mock-methods.patch 0017-Check-for-single-quote-before-splitting-on-single-qu.patch 0018-Unit-tests-fixes-for-2016.3.2.patch 0019-Fix-snapper_test-for-python26.patch 0020-Integration-tests-fixes-for-2016.3.2.patch 0021-Fix-pkg.upgrade-for-zypper.patch html.tar.bz2 salt-2016.3.2.tar.gz update-documentation.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ salt.spec ++++++ --- /var/tmp/diff_new_pack.7y20QC/_old 2016-09-30 15:35:06.000000000 +0200 +++ /var/tmp/diff_new_pack.7y20QC/_new 2016-09-30 15:35:06.000000000 +0200 @@ -34,54 +34,83 @@ %bcond_with test %bcond_with raet %bcond_without docs +%bcond_with builddocs Name: salt -Version: 2015.8.8 +Version: 2016.3.2 Release: 0 Summary: A parallel remote execution system License: Apache-2.0 Group: System/Monitoring Url: http://saltstack.org/ # Git: https://github.com/openSUSE/salt.git -Source0: http://pypi.python.org/packages/source/s/%{name}/%{name}-%{version}.tar.gz +Source0: https://pypi.io/packages/source/s/%{name}/%{name}-%{version}.tar.gz Source1: README.SUSE Source2: salt-tmpfiles.d +Source3: html.tar.bz2 +Source4: update-documentation.sh # PATCH-FIX-OPENSUSE use-forking-daemon.patch tserong(a)suse.com -- We don't have python-systemd, so notify can't work +# We do not upstream this patch because this is something that we have to fix on our side Patch1: 0001-tserong-suse.com-We-don-t-have-python-systemd-so-not.patch # PATCH-FIX-OPENSUSE use-salt-user-for-master.patch -- Run salt master as dedicated salt user +# We do not upstream this patch because this is suse custom configuration Patch2: 0002-Run-salt-master-as-dedicated-salt-user.patch # PATCH-FIX-OPENSUSE https://github.com/saltstack/salt/pull/30424 +# We do not upstream this patch because it has been fixed upstream +# (see: https://trello.com/c/wh96lCD4/1528-get-rid-of-0003-check-if-byte-strings-ar…) Patch3: 0003-Check-if-byte-strings-are-properly-encoded-in-UTF-8.patch # PATCH-FIX-OPENSUSE prevent rebuilds in OBS +# We do not upstream this patch because the issue is on our side Patch4: 0004-do-not-generate-a-date-in-a-comment-to-prevent-rebui.patch # PATCH-FIX-OPENSUSE - Upstream default hash type is set to MD5, while we require SHA256 (bsc#955373) +# PR https://github.com/saltstack/salt/pull/35341 (15.08.2016 - not merged yet) Patch5: 0005-Use-SHA256-hash-type-by-default.patch -# PATCH-FIX-UPSTREAM https://docs.saltstack.com/en/latest/topics/releases/2015.8.8.html#salt-201… -Patch6: 0006-Update-to-2015.8.8.2.patch -# PATCH-FIX-UPSTREAM https://github.com/saltstack/salt/pull/32243 -Patch7: 0007-Force-sort-the-RPM-output-to-ensure-latest-version-o.patch -# PATCH-FIX-UPSTREAM https://github.com/saltstack/salt/pull/32068 -Patch8: 0008-Cleaner-deprecation-process-with-decorators.patch -# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/32323 -Patch9: 0009-fix-sorting-by-latest-version-when-called-with-an-at.patch -# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/32353 -Patch10: 0010-Prevent-metadata-download-when-getting-installed-pro.patch -# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/32505 -Patch11: 0011-Check-if-EOL-is-available-in-a-particular-product-bs.patch -# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/32436 -Patch12: 0012-Bugfix-salt-key-crashes-if-tries-to-generate-keys-to.patch -# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/32652 -Patch13: 0013-Prevent-crash-if-pygit2-package-is-requesting-re-com.patch -# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/32649 -Patch14: 0014-align-OS-grains-from-older-SLES-with-current-one-326.patch -# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/32892 -Patch15: 0015-Unblock-Zypper.-Modify-environment.patch -# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/33088 -Patch16: 0016-Bugfix-Restore-boolean-values-from-the-repo-configur.patch +# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/31798 +# PR already merged. This will be gone in the next version +Patch6: 0006-Create-salt-proxy-instantiated-service-file.patch # PATCH-FIX-OPENSUSE Generate events from the Salt minion, # if Zypper has been used outside the Salt infrastructure -Patch17: 0017-Add-SUSE-Manager-plugin.patch +# We do not upstream this because this is for SUSE only (15.08.2016) +Patch7: 0007-Add-zypp-notify-plugin.patch +# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/33469 +# PR already merged. This will be gone in the next version +Patch8: 0008-checksum-validation-when-zypper-pkg.download.patch +# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/33501 +# PR already merged. This will be gone in the next version +Patch9: 0009-unit-tests-for-rpm.checksum-and-zypper.download.patch +# PATCH-FIX-UPSTREAM https://github.com/saltstack/salt/pull/34599 (backport from dev) +# PR already merged. This will be gone in the next version +Patch10: 0010-snapper-execution-module.patch +# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/34165 +Patch11: 0011-fix-salt-summary-to-count-not-responding-minions-cor.patch +# PATCH-FIX-OPENSUSE +# We do not upstream this patch because this is suse custom configuration +Patch12: 0012-Run-salt-api-as-user-salt-bsc-990029.patch +# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/35196 +# PR already merged. This will be gone in the next version +Patch13: 0013-Deprecate-status.uptime-one-version-later.patch +# PATCH-FIX-UPSTREAM https://github.com/saltstack/salt/pull/35448 +Patch14: 0014-Add-ignore_repo_failure-option-to-suppress-zypper-s-.patch +# PATCH-FIX-UPSTREAM https://github.com/saltstack/salt/pull/35451 +Patch15: 0015-Remove-zypper-s-raise-exception-if-mod_repo-has-no-a.patch +# PATCH-FIX-UPSTREAM https://github.com/saltstack/salt/pull/35763 +Patch16: 0016-Improve-Mock-to-be-flexible-and-able-to-mock-methods.patch +# PATCH-FIX-UPSTREAM https://github.com/saltstack/salt/pull/36000 +Patch17: 0017-Check-for-single-quote-before-splitting-on-single-qu.patch +# PATCH-FIX-UPSTREAM https://github.com/saltstack/salt/pull/36139 +# https://github.com/saltstack/salt/pull/36158 +# https://github.com/saltstack/salt/pull/36227 +Patch18: 0018-Unit-tests-fixes-for-2016.3.2.patch +# PATCH-FIX-UPSTREAM https://github.com/saltstack/salt/pull/35715 +# https://github.com/saltstack/salt/pull/35983 +# https://github.com/saltstack/salt/pull/34826 +Patch19: 0019-Fix-snapper_test-for-python26.patch +# PATCH-FIX-UPSTREAM https://github.com/saltstack/salt/pull/36263 +Patch20: 0020-Integration-tests-fixes-for-2016.3.2.patch +# PATCH-FIX-UPSTREAM https://github.com/saltstack/salt/pull/36495 +Patch21: 0021-Fix-pkg.upgrade-for-zypper.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: logrotate @@ -120,17 +149,27 @@ BuildRequires: python-unittest2 BuildRequires: python-xml %endif -%if %{with docs} -#for docs +%if %{with builddocs} BuildRequires: python-sphinx %endif +%if 0%{?suse_version} > 1010 +BuildRequires: fdupes +%endif Requires(pre): %{_sbindir}/groupadd Requires(pre): %{_sbindir}/useradd + %if 0%{?suse_version} Requires(pre): %fillup_prereq Requires(pre): pwdutils %endif + +%if 0%{?suse_version} +Requires(pre): dbus-1 +%else +Requires(pre): dbus +%endif + Requires: logrotate Requires: python # @@ -432,7 +471,11 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 + +# This is SUSE-only patch +%if 0%{?suse_version} %patch7 -p1 +%endif %patch8 -p1 %patch9 -p1 %patch10 -p1 @@ -442,16 +485,24 @@ %patch14 -p1 %patch15 -p1 %patch16 -p1 - -# This is SUSE-only patch -%if 0%{?suse_version} %patch17 -p1 -%endif +%patch18 -p1 +%patch19 -p1 +%patch20 -p1 +%patch21 -p1 %build python setup.py --salt-transport=both build -%if %{with docs} +%if %{with docs} && %{without builddocs} +# extract docs from the tarball +mkdir -p doc/_build +pushd doc/_build/ +tar xfv %{S:3} +popd +%endif + +%if %{with docs} && %{with builddocs} ## documentation cd doc && make html && rm _build/html/.buildinfo && rm _build/html/_images/proxy_minions.png && cd _build/html && chmod -R -x+X * %endif @@ -498,7 +549,7 @@ ## Install Zypper plugins only on SUSE machines %if 0%{?suse_version} install -Dd -m 0750 %{buildroot}%{_prefix}/lib/zypp/plugins/commit -%{__install} scripts/zypper/plugins/commit/susemanager %{buildroot}%{_prefix}/lib/zypp/plugins/commit/susemanager +%{__install} scripts/zypper/plugins/commit/zyppnotify %{buildroot}%{_prefix}/lib/zypp/plugins/commit/zyppnotify %endif ## install init and systemd scripts @@ -507,6 +558,7 @@ install -Dpm 0644 pkg/salt-minion.service %{buildroot}%{_unitdir}/salt-minion.service install -Dpm 0644 pkg/salt-syndic.service %{buildroot}%{_unitdir}/salt-syndic.service install -Dpm 0644 pkg/salt-api.service %{buildroot}%{_unitdir}/salt-api.service +install -Dpm 0644 pkg/salt-proxy@.service %{buildroot}%{_unitdir}/salt-proxy@.service ln -s service %{buildroot}%{_sbindir}/rcsalt-master ln -s service %{buildroot}%{_sbindir}/rcsalt-syndic ln -s service %{buildroot}%{_sbindir}/rcsalt-minion @@ -558,6 +610,11 @@ echo "transport: raet" > %{buildroot}%{_sysconfdir}/salt/master.d/transport-raet.conf echo "transport: raet" > %{buildroot}%{_sysconfdir}/salt/minion.d/transport-raet.conf +%if 0%{?suse_version} > 1020 +%fdupes %{buildroot}%{_docdir} +%fdupes %{buildroot}%{python_sitelib} +%endif + %check %if %{with test} python setup.py test --runtests-opts=-u @@ -567,9 +624,50 @@ getent group salt >/dev/null || %{_sbindir}/groupadd -r salt getent passwd salt >/dev/null || %{_sbindir}/useradd -r -g salt -d /srv/salt -s /bin/false -c "salt-master daemon" salt -%if %{with systemd} %post +%if %{with systemd} systemd-tmpfiles --create /usr/lib/tmpfiles.d/salt.conf || true +%else +dbus-uuidgen --ensure +%endif + +%preun proxy +%if %{with systemd} +%service_del_preun salt-proxy@.service +%else +%if 0%{?suse_version} +%stop_on_removal salt-proxy +%else + if [ $1 -eq 0 ] ; then + /sbin/service salt-proxy stop >/dev/null 2>&1 + /sbin/chkconfig --del salt-proxy + fi +%endif +%endif + +%pre proxy +%if %{with systemd} +%service_add_pre salt-proxy@.service +%endif + +%post proxy +%if %{with systemd} +%service_add_post salt-proxy@.service +%fillup_only +%else +%if 0%{?suse_version} +%fillup_and_insserv +%endif +%endif + +%postun proxy +%if %{with systemd} +%service_del_postun salt-proxy@.service +%else +%if 0%{?suse_version} +%insserv_cleanup +%restart_on_update salt-proxy +%endif %endif %preun syndic @@ -631,6 +729,20 @@ %endif %post master +if [ $1 -eq 2 ] ; then + # Upgrading from an earlier version. If this is from 2014, where daemons + # ran as root, we need to chown some stuff to salt in order for the new + # version to actually work. It seems a manual restart of salt-master may + # still be required, but at least this will actually work given the file + # ownership is correct. + for file in master.{pem,pub} ; do + [ -f /etc/salt/pki/master/$file ] && chown salt /etc/salt/pki/master/$file + done + for dir in file_lists minions jobs ; do + [ -d /var/cache/salt/master/$dir ] && chown -R salt:salt /var/cache/salt/master/$dir + done + true +fi %if %{with systemd} %service_add_post salt-master.service %fillup_only @@ -779,11 +891,12 @@ %dir %attr(0750, root, root) %{_sysconfdir}/salt/minion.d/ %dir %attr(0750, root, root) %{_sysconfdir}/salt/pki/minion/ %dir %attr(0750, root, root) %{_localstatedir}/cache/salt/minion/ +#%dir %ghost %attr(0750, root, salt) %{_localstatedir}/run/salt/minion %{_sbindir}/rcsalt-minion # Install plugin only on SUSE machines %if 0%{?suse_version} -%{_prefix}/lib/zypp/plugins/commit/susemanager +%{_prefix}/lib/zypp/plugins/commit/zyppnotify %endif %if %{with systemd} @@ -796,6 +909,9 @@ %defattr(-,root,root) %{_bindir}/salt-proxy %{_mandir}/man1/salt-proxy.1.gz +%if %{with systemd} +%{_unitdir}/salt-proxy@.service +%endif %files master %defattr(-,root,root) @@ -835,6 +951,7 @@ %dir %attr(0750, salt, salt) %{_localstatedir}/cache/salt/master/roots/ %dir %attr(0750, salt, salt) %{_localstatedir}/cache/salt/master/syndics/ %dir %attr(0750, salt, salt) %{_localstatedir}/cache/salt/master/tokens/ +#%dir %ghost %attr(0750, salt, salt) %{_localstatedir}/run/salt/master/ %files raet %defattr(-,root,root,-) @@ -848,6 +965,7 @@ %{_bindir}/salt-unity %{_mandir}/man1/salt-unity.1.gz %{_mandir}/man1/salt-call.1.gz +%{_mandir}/man1/spm.1.gz %config(noreplace) %{_sysconfdir}/logrotate.d/salt %{python_sitelib}/* %exclude %{python_sitelib}/salt/cloud/deploy/*.sh @@ -858,6 +976,7 @@ %dir %attr(0750, root, salt) %{_sysconfdir}/salt/pki %dir %attr(0750, salt, salt) %{_localstatedir}/log/salt %dir %attr(0750, root, salt) %{_localstatedir}/cache/salt +#%dir %ghost %attr(0750, root, salt) %{_localstatedir}/run/salt %dir %attr(0750, root, salt) /srv/spm %if %{with systemd} /usr/lib/tmpfiles.d/salt.conf ++++++ 0001-tserong-suse.com-We-don-t-have-python-systemd-so-not.patch ++++++ --- /var/tmp/diff_new_pack.7y20QC/_old 2016-09-30 15:35:07.000000000 +0200 +++ /var/tmp/diff_new_pack.7y20QC/_new 2016-09-30 15:35:07.000000000 +0200 @@ -1,7 +1,7 @@ -From f9dbfde1c3e7782d78f6b0b2b6b564f61749941f Mon Sep 17 00:00:00 2001 +From 3f8257601cb1224221e10e712c0377254714f6fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf(a)suse.de> Date: Wed, 20 Jan 2016 11:00:15 +0100 -Subject: [PATCH 01/12] tserong(a)suse.com -- We don't have python-systemd, so +Subject: [PATCH 01/13] tserong(a)suse.com -- We don't have python-systemd, so notify can't work --- @@ -9,7 +9,7 @@ 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/salt-master.service b/pkg/salt-master.service -index 0eadf88..2b0f326 100644 +index 0eadf88a3837..2b0f32623571 100644 --- a/pkg/salt-master.service +++ b/pkg/salt-master.service @@ -4,8 +4,7 @@ After=network.target @@ -23,5 +23,5 @@ KillMode=process -- -2.1.4 +2.8.3 ++++++ 0002-Run-salt-master-as-dedicated-salt-user.patch ++++++ --- /var/tmp/diff_new_pack.7y20QC/_old 2016-09-30 15:35:07.000000000 +0200 +++ /var/tmp/diff_new_pack.7y20QC/_new 2016-09-30 15:35:07.000000000 +0200 @@ -1,7 +1,7 @@ -From af193a109fcae502c4cdd47507aea9f67d809b4b Mon Sep 17 00:00:00 2001 +From e86b0bf279c7faea457dfb8152fe9f5c829e42be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf(a)suse.de> Date: Wed, 20 Jan 2016 11:01:06 +0100 -Subject: [PATCH 02/12] Run salt master as dedicated salt user +Subject: [PATCH 02/13] Run salt master as dedicated salt user --- conf/master | 3 ++- @@ -9,7 +9,7 @@ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/conf/master b/conf/master -index aae46ef..064828a 100644 +index 1bbeb50c51b4..54d5f8f3ca75 100644 --- a/conf/master +++ b/conf/master @@ -25,7 +25,8 @@ @@ -23,7 +23,7 @@ # The port used by the communication interface. The ret (return) port is the # interface used for the file server, authentication, job returns, etc. diff --git a/pkg/salt-common.logrotate b/pkg/salt-common.logrotate -index 3cd0023..8d970c0 100644 +index 3cd002308e83..8d970c0a64d0 100644 --- a/pkg/salt-common.logrotate +++ b/pkg/salt-common.logrotate @@ -1,4 +1,5 @@ @@ -49,5 +49,5 @@ missingok rotate 7 -- -2.1.4 +2.8.3 ++++++ 0003-Check-if-byte-strings-are-properly-encoded-in-UTF-8.patch ++++++ --- /var/tmp/diff_new_pack.7y20QC/_old 2016-09-30 15:35:07.000000000 +0200 +++ /var/tmp/diff_new_pack.7y20QC/_new 2016-09-30 15:35:07.000000000 +0200 @@ -1,4 +1,4 @@ -From 6035aef0c80ae12a068bee7613c5b7f7f48aa9d3 Mon Sep 17 00:00:00 2001 +From cad9f1a8fda2a4d8c666abcf74e03e7c6a8eb6be Mon Sep 17 00:00:00 2001 From: Bo Maryniuk <bo(a)suse.de> Date: Mon, 18 Jan 2016 16:28:48 +0100 Subject: [PATCH 03/12] Check if byte strings are properly encoded in UTF-8 @@ -9,10 +9,10 @@ 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/salt/modules/zypper.py b/salt/modules/zypper.py -index fecb671..27b00d5 100644 +index 7dd73dd..92c604e 100644 --- a/salt/modules/zypper.py +++ b/salt/modules/zypper.py -@@ -164,9 +164,9 @@ def info_installed(*names, **kwargs): +@@ -335,9 +335,9 @@ def info_installed(*names, **kwargs): summary, description. :param errors: @@ -25,7 +25,7 @@ Valid attributes are: ignore, report -@@ -179,7 +179,8 @@ def info_installed(*names, **kwargs): +@@ -350,7 +350,8 @@ def info_installed(*names, **kwargs): salt '*' pkg.info_installed <package1> <package2> <package3> ... salt '*' pkg.info_installed <package1> attr=version,vendor salt '*' pkg.info_installed <package1> <package2> <package3> ... attr=version,vendor @@ -35,7 +35,7 @@ ''' ret = dict() for pkg_name, pkg_nfo in __salt__['lowpkg.info'](*names, **kwargs).items(): -@@ -190,7 +191,7 @@ def info_installed(*names, **kwargs): +@@ -361,7 +362,7 @@ def info_installed(*names, **kwargs): # Check, if string is encoded in a proper UTF-8 value_ = value.decode('UTF-8', 'ignore').encode('UTF-8', 'ignore') if value != value_: @@ -45,5 +45,5 @@ if key == 'source_rpm': t_nfo['source'] = value -- -2.1.4 +2.9.2 ++++++ 0004-do-not-generate-a-date-in-a-comment-to-prevent-rebui.patch ++++++ --- /var/tmp/diff_new_pack.7y20QC/_old 2016-09-30 15:35:07.000000000 +0200 +++ /var/tmp/diff_new_pack.7y20QC/_new 2016-09-30 15:35:07.000000000 +0200 @@ -1,7 +1,7 @@ -From a2ffa8e54f3cd8dba3c4b73cad086a6b93fb3a41 Mon Sep 17 00:00:00 2001 +From a831380a6d7f323c9824d26d6f6e5966b10cbc6e Mon Sep 17 00:00:00 2001 From: Michael Calmer <mc(a)suse.de> Date: Fri, 4 Mar 2016 09:51:22 +0100 -Subject: [PATCH 04/12] do not generate a date in a comment to prevent rebuilds +Subject: [PATCH 04/13] do not generate a date in a comment to prevent rebuilds (bsc#969407) --- @@ -9,10 +9,10 @@ 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup.py b/setup.py -index 742eae5..d2dd8f7 100755 +index c84c19824a6f..819ec2b875d1 100755 --- a/setup.py +++ b/setup.py -@@ -605,8 +605,7 @@ class Clean(clean): +@@ -618,8 +618,7 @@ class Clean(clean): INSTALL_VERSION_TEMPLATE = '''\ @@ -23,5 +23,5 @@ from salt.version import SaltStackVersion -- -2.1.4 +2.8.3 ++++++ 0005-Use-SHA256-hash-type-by-default.patch ++++++ --- /var/tmp/diff_new_pack.7y20QC/_old 2016-09-30 15:35:07.000000000 +0200 +++ /var/tmp/diff_new_pack.7y20QC/_new 2016-09-30 15:35:07.000000000 +0200 @@ -1,4 +1,4 @@ -From d5fc00efc2f73018c4c6bf3bea03648dfd1340fc Mon Sep 17 00:00:00 2001 +From 03732c6879c45596b0a9a0e6500957ec4f9d8415 Mon Sep 17 00:00:00 2001 From: Bo Maryniuk <bo(a)suse.de> Date: Thu, 17 Mar 2016 12:30:23 +0100 Subject: [PATCH 05/12] Use SHA256 hash type by default @@ -10,10 +10,10 @@ 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/master b/conf/master -index 064828a..5e75b15 100644 +index 8bbe490..118f53b 100644 --- a/conf/master +++ b/conf/master -@@ -474,7 +474,7 @@ syndic_user: salt +@@ -509,7 +509,7 @@ syndic_user: salt # # Prior to changing this value, the master should be stopped and all Salt # caches should be cleared. @@ -23,10 +23,10 @@ # The buffer size in the file server can be adjusted here: #file_buffer_size: 1048576 diff --git a/conf/minion b/conf/minion -index b408942..32b0d0a 100644 +index 3ba8ba0..8e4dbd0 100644 --- a/conf/minion +++ b/conf/minion -@@ -451,7 +451,7 @@ +@@ -542,7 +542,7 @@ # # Warning: Prior to changing this value, the minion should be stopped and all # Salt caches should be cleared. @@ -36,10 +36,10 @@ # The Salt pillar is searched for locally if file_client is set to local. If # this is the case, and pillar data is defined, then the pillar_roots need to diff --git a/conf/proxy b/conf/proxy -index e6ca631..e697357 100644 +index 7b835e2..ab500f9 100644 --- a/conf/proxy +++ b/conf/proxy -@@ -427,7 +427,7 @@ +@@ -435,7 +435,7 @@ # # Warning: Prior to changing this value, the minion should be stopped and all # Salt caches should be cleared. @@ -49,5 +49,5 @@ # The Salt pillar is searched for locally if file_client is set to local. If # this is the case, and pillar data is defined, then the pillar_roots need to -- -2.1.4 +2.9.2 ++++++ 0006-Create-salt-proxy-instantiated-service-file.patch ++++++ >From 46476c37aa00d9cbbd0ac58e56b7e1c134d33b13 Mon Sep 17 00:00:00 2001 From: Christian McHugh <mchugh19(a)hotmail.com> Date: Thu, 10 Mar 2016 13:25:01 -0600 Subject: [PATCH 06/13] Create salt-proxy instantiated service file Add a systemd service file for salt-proxy. Instantiate a new proxy service with proxyid=p8000: # systemctl enable salt-proxy\(a)p8000.service # systemctl start salt-proxy\(a)p8000.service --- pkg/salt-proxy@.service | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 pkg/salt-proxy@.service diff --git a/pkg/salt-proxy@.service b/pkg/salt-proxy@.service new file mode 100644 index 000000000000..f97120a05589 --- /dev/null +++ b/pkg/salt-proxy@.service @@ -0,0 +1,12 @@ +[Unit] +Description=salt-proxy service +After=network.target + +[Service] +ExecStart=/usr/bin/salt-proxy --proxyid=%I +Type=simple +Restart=on-failure +RestartSec=5s + +[Install] +WantedBy=multi-user.target -- 2.8.3 ++++++ 0007-Add-zypp-notify-plugin.patch ++++++ >From c0aacf83fa51015fb6e50ab96204a7b3c31413a8 Mon Sep 17 00:00:00 2001 From: Bo Maryniuk <bo(a)suse.de> Date: Mon, 9 May 2016 10:33:44 +0200 Subject: [PATCH 07/21] Add zypp-notify plugin * Add unit test to the libzypp drift detector plugin --- scripts/zypper/plugins/commit/README.md | 3 ++ scripts/zypper/plugins/commit/zyppnotify | 59 +++++++++++++++++++++++++++++ tests/unit/zypp_plugins_test.py | 51 +++++++++++++++++++++++++ tests/zypp_plugin.py | 64 ++++++++++++++++++++++++++++++++ 4 files changed, 177 insertions(+) create mode 100644 scripts/zypper/plugins/commit/README.md create mode 100755 scripts/zypper/plugins/commit/zyppnotify create mode 100644 tests/unit/zypp_plugins_test.py create mode 100644 tests/zypp_plugin.py diff --git a/scripts/zypper/plugins/commit/README.md b/scripts/zypper/plugins/commit/README.md new file mode 100644 index 0000000..01c8917 --- /dev/null +++ b/scripts/zypper/plugins/commit/README.md @@ -0,0 +1,3 @@ +# Zypper plugins + +Plugins here are required to interact with SUSE Manager in conjunction of SaltStack and Zypper. diff --git a/scripts/zypper/plugins/commit/zyppnotify b/scripts/zypper/plugins/commit/zyppnotify new file mode 100755 index 0000000..268298b --- /dev/null +++ b/scripts/zypper/plugins/commit/zyppnotify @@ -0,0 +1,59 @@ +#!/usr/bin/python +# +# Copyright (c) 2016 SUSE Linux LLC +# All Rights Reserved. +# +# Author: Bo Maryniuk <bo(a)suse.de> + +import sys +import os +import hashlib + +from zypp_plugin import Plugin + + +class DriftDetector(Plugin): + """ + Return diff of the installed packages outside the Salt. + """ + def __init__(self): + Plugin.__init__(self) + self.ck_path = "/var/cache/salt/minion/rpmdb.cookie" + self.rpm_path = "/var/lib/rpm/Packages" + + def _get_mtime(self): + ''' + Get the modified time of the RPM Database. + Returns: + Unix ticks + ''' + return os.path.exists(self.rpm_path) and int(os.path.getmtime(self.rpm_path)) or 0 + + def _get_checksum(self): + ''' + Get the checksum of the RPM Database. + Returns: + hexdigest + ''' + digest = hashlib.md5() + with open(self.rpm_path, "rb") as rpm_db_fh: + while True: + buff = rpm_db_fh.read(0x1000) + if not buff: + break + digest.update(buff) + + return digest.hexdigest() + + def PLUGINEND(self, headers, body): + """ + Hook when plugin closes Zypper's transaction. + """ + if 'SALT_RUNNING' not in os.environ: + with open(self.ck_path, 'w') as ck_fh: + ck_fh.write('{chksum} {mtime}\n'.format(chksum=self._get_checksum(), mtime=self._get_mtime())) + + self.ack() + + +DriftDetector().main() diff --git a/tests/unit/zypp_plugins_test.py b/tests/unit/zypp_plugins_test.py new file mode 100644 index 0000000..550403c --- /dev/null +++ b/tests/unit/zypp_plugins_test.py @@ -0,0 +1,51 @@ +# -*- coding: utf-8 -*- +''' + :codeauthor: :email:`Bo Maryniuk <bo(a)suse.de>` +''' + +# Import Python Libs +from __future__ import absolute_import + +# Import Salt Testing Libs +from salttesting.helpers import ensure_in_syspath +from salttesting import TestCase, skipIf +from salttesting.mock import ( + MagicMock, + patch, + NO_MOCK, + NO_MOCK_REASON +) + +ensure_in_syspath('../') + +import os +import imp +from zypp_plugin import BogusIO + +zyppnotify = imp.load_source('zyppnotify', os.path.sep.join(os.path.dirname(__file__).split( + os.path.sep)[:-2] + ['scripts', 'zypper', 'plugins', 'commit', 'zyppnotify'])) + +@skipIf(NO_MOCK, NO_MOCK_REASON) +class ZyppPluginsTestCase(TestCase): + ''' + Test shipped libzypp plugins. + ''' + def test_drift_detector(self): + ''' + Test drift detector for a correct cookie file. + Returns: + + ''' + drift = zyppnotify.DriftDetector() + drift._get_mtime = MagicMock(return_value=123) + drift._get_checksum = MagicMock(return_value='deadbeef') + bogus_io = BogusIO() + with patch('zyppnotify.open', bogus_io): + drift.PLUGINEND(None, None) + self.assertEqual(str(bogus_io), 'deadbeef 123\n') + self.assertEqual(bogus_io.mode, 'w') + self.assertEqual(bogus_io.path, '/var/cache/salt/minion/rpmdb.cookie') + +if __name__ == '__main__': + from integration import run_tests + run_tests(ZyppPluginsTestCase, needs_daemon=False) diff --git a/tests/zypp_plugin.py b/tests/zypp_plugin.py new file mode 100644 index 0000000..218f703 --- /dev/null +++ b/tests/zypp_plugin.py @@ -0,0 +1,64 @@ +''' +Related to zypp_plugins_test.py module. +''' + + +class Plugin(object): + ''' + Bogus module for Zypp Plugins tests. + ''' + def ack(self): + ''' + Acknowledge that the plugin had finished the transaction + Returns: + + ''' + + def main(self): + ''' + Register plugin + Returns: + + ''' + + +class BogusIO(object): + ''' + Read/write logger. + ''' + + def __init__(self): + self.content = list() + self.closed = False + + def __str__(self): + return '\n'.join(self.content) + + def __call__(self, *args, **kwargs): + self.path, self.mode = args + return self + + def __exit__(self, exc_type, exc_val, exc_tb): + self.close() + + def __enter__(self): + return self + + def write(self, data): + ''' + Simulate writing data + Args: + data: + + Returns: + + ''' + self.content.append(data) + + def close(self): + ''' + Simulate closing the IO object. + Returns: + + ''' + self.closed = True -- 2.10.0 ++++++ 0008-checksum-validation-when-zypper-pkg.download.patch ++++++ >From c80528b9aad5305b06a07cadf752a45392d4a147 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?= <psuarezhernandez(a)suse.com> Date: Tue, 24 May 2016 11:01:55 +0100 Subject: [PATCH 08/12] checksum validation when zypper pkg.download check the signature of downloaded RPM files bugfix: showing errors when a package download fails using zypper pkg.download Renamed check_sig to checksum and some refactoring simpler rpm.checksum function --- salt/modules/zypper.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/salt/modules/zypper.py b/salt/modules/zypper.py index 92c604e..547d72b 100644 --- a/salt/modules/zypper.py +++ b/salt/modules/zypper.py @@ -1596,14 +1596,17 @@ def download(*packages, **kwargs): pkg_ret = {} for dld_result in __zypper__.xml.call('download', *packages).getElementsByTagName("download-result"): repo = dld_result.getElementsByTagName("repository")[0] + path = dld_result.getElementsByTagName("localfile")[0].getAttribute("path") pkg_info = { 'repository-name': repo.getAttribute('name'), 'repository-alias': repo.getAttribute('alias'), + 'path': path, } key = _get_first_aggregate_text( dld_result.getElementsByTagName('name') ) - pkg_ret[key] = pkg_info + if __salt__['lowpkg.checksum'](pkg_info['path']): + pkg_ret[key] = pkg_info if pkg_ret: failed = [pkg for pkg in packages if pkg not in pkg_ret] -- 2.8.2 ++++++ 0009-unit-tests-for-rpm.checksum-and-zypper.download.patch ++++++ >From f186137c0eb7a14697037bf46ec6a12287b9e0c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?= <psuarezhernandez(a)suse.com> Date: Wed, 25 May 2016 17:08:16 +0100 Subject: [PATCH 09/12] unit tests for rpm.checksum() and zypper.download() lint issue fixed --- tests/unit/modules/zypper_test.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/unit/modules/zypper_test.py b/tests/unit/modules/zypper_test.py index 308bf94..2f2b323 100644 --- a/tests/unit/modules/zypper_test.py +++ b/tests/unit/modules/zypper_test.py @@ -387,6 +387,7 @@ class ZypperTestCase(TestCase): test_out = { 'nmap': { + 'path': u'/var/cache/zypp/packages/SLE-12-x86_64-Pool/x86_64/nmap-6.46-1.72.x86_64.rpm', 'repository-alias': u'SLE-12-x86_64-Pool', 'repository-name': u'SLE-12-x86_64-Pool' } -- 2.9.2 ++++++ 0010-snapper-execution-module.patch ++++++ ++++ 1278 lines (skipped) ++++++ 0011-fix-salt-summary-to-count-not-responding-minions-cor.patch ++++++ >From e3969a80bdf2d0af0c87463af859d8daf314f018 Mon Sep 17 00:00:00 2001 From: Michael Calmer <mc(a)suse.de> Date: Tue, 21 Jun 2016 13:12:48 +0200 Subject: [PATCH 11/12] fix salt --summary to count not responding minions correctly (bsc#972311) In case a minion is not responding a dict is returned instead of a string. --- salt/cli/salt.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/salt/cli/salt.py b/salt/cli/salt.py index baeaf23..ec18f2e 100644 --- a/salt/cli/salt.py +++ b/salt/cli/salt.py @@ -264,7 +264,9 @@ class SaltCMD(parsers.SaltCMDOptionParser): not_connected_minions = [] failed_minions = [] for each_minion in ret: - minion_ret = ret[each_minion].get('ret') + minion_ret = ret[each_minion] + if (isinstance(minion_ret, dict) and 'ret' in minion_ret): + minion_ret = ret[each_minion].get('ret') if ( isinstance(minion_ret, string_types) and minion_ret.startswith("Minion did not return") -- 2.9.2 ++++++ 0012-Run-salt-api-as-user-salt-bsc-990029.patch ++++++ >From af2ff55739187c59dc04e396b7787301a49a9dba Mon Sep 17 00:00:00 2001 From: Michael Calmer <mc(a)suse.de> Date: Fri, 29 Jul 2016 10:50:21 +0200 Subject: [PATCH 12/12] Run salt-api as user salt (bsc#990029) --- pkg/salt-api.service | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/salt-api.service b/pkg/salt-api.service index 72379ba..9be2cb8 100644 --- a/pkg/salt-api.service +++ b/pkg/salt-api.service @@ -3,6 +3,7 @@ Description=The Salt API After=network.target [Service] +User=salt Type=simple LimitNOFILE=8192 ExecStart=/usr/bin/salt-api -- 2.9.2 ++++++ 0013-Deprecate-status.uptime-one-version-later.patch ++++++ >From d19c9591c1dfbafec24a7d76402dcc9e2b17b047 Mon Sep 17 00:00:00 2001 From: Bo Maryniuk <bo(a)suse.de> Date: Thu, 4 Aug 2016 11:28:19 +0200 Subject: [PATCH 13/13] Deprecate status.uptime one version later --- salt/modules/status.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/modules/status.py b/salt/modules/status.py index 029426b..cebd57b 100644 --- a/salt/modules/status.py +++ b/salt/modules/status.py @@ -132,7 +132,7 @@ def custom(): return ret -@with_deprecated(globals(), "Boron") +@with_deprecated(globals(), "Carbon") def uptime(): ''' Return the uptime for this system. -- 2.9.2 ++++++ 0014-Add-ignore_repo_failure-option-to-suppress-zypper-s-.patch ++++++ >From f860f7ccb3dba6b8f0cef61e2d9658a3116e3c3c Mon Sep 17 00:00:00 2001 From: Bo Maryniuk <bo(a)suse.de> Date: Mon, 15 Aug 2016 15:03:53 +0200 Subject: [PATCH 14/15] Add ignore_repo_failure option to suppress zypper's exit code 106 on unavailable repos --- salt/modules/zypper.py | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/salt/modules/zypper.py b/salt/modules/zypper.py index 547d72b..1c60f0f 100644 --- a/salt/modules/zypper.py +++ b/salt/modules/zypper.py @@ -100,6 +100,18 @@ class _Zypper(object): self.__no_lock = False self.__no_raise = False self.__refresh = False + self.__ignore_repo_failure = False + + def __call__(self, *args, **kwargs): + ''' + :param args: + :param kwargs: + :return: + ''' + # Ignore exit code for 106 (repo is not available) + if 'no_repo_failure' in kwargs: + self.__ignore_repo_failure = kwargs['no_repo_failure'] + return self def __getattr__(self, item): ''' @@ -275,7 +287,7 @@ class _Zypper(object): __salt__['event.fire_master']({'success': not len(self.error_msg), 'info': self.error_msg or 'Zypper has been released'}, self.TAG_RELEASED) - if self.error_msg and not self.__no_raise: + if self.error_msg and not self.__no_raise and not self.__ignore_repo_failure: raise CommandExecutionError('Zypper command failure: {0}'.format(self.error_msg)) return self._is_xml_mode() and dom.parseString(self.__call_result['stdout']) or self.__call_result['stdout'] @@ -863,6 +875,7 @@ def install(name=None, downloadonly=None, skip_verify=False, version=None, + ignore_repo_failure=False, **kwargs): ''' Install the passed package(s), add refresh=True to force a 'zypper refresh' @@ -929,6 +942,10 @@ def install(name=None, salt '*' pkg.install sources='[{"foo": "salt://foo.rpm"},{"bar": "salt://bar.rpm"}]' + ignore_repo_failure + Zypper returns error code 106 if one of the repositories are not available for various reasons. + In case to set strict check, this parameter needs to be set to True. Default: False. + Returns a dict containing the new package names and versions:: @@ -1000,7 +1017,7 @@ def install(name=None, while targets: cmd = cmd_install + targets[:500] targets = targets[500:] - for line in __zypper__.call(*cmd).splitlines(): + for line in __zypper__(no_repo_failure=ignore_repo_failure).call(*cmd).splitlines(): match = re.match(r"^The selected package '([^']+)'.+has lower version", line) if match: downgrades.append(match.group(1)) @@ -1008,7 +1025,7 @@ def install(name=None, while downgrades: cmd = cmd_install + ['--force'] + downgrades[:500] downgrades = downgrades[500:] - __zypper__.call(*cmd) + __zypper__(no_repo_failure=ignore_repo_failure).call(*cmd) __context__.pop('pkg.list_pkgs', None) new = list_pkgs() -- 2.9.3 ++++++ 0015-Remove-zypper-s-raise-exception-if-mod_repo-has-no-a.patch ++++++ >From 0809c60c693eb5d2e9569c24d995818097c6920d Mon Sep 17 00:00:00 2001 From: Bo Maryniuk <bo(a)suse.de> Date: Mon, 15 Aug 2016 17:35:01 +0200 Subject: [PATCH 15/15] Remove zypper's raise exception if mod_repo has no arguments and/or no changes * Fix Unit test for suppressing the exception removal on non-modified repos --- salt/modules/zypper.py | 11 +++++++---- tests/unit/modules/zypper_test.py | 15 +++------------ 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/salt/modules/zypper.py b/salt/modules/zypper.py index 1c60f0f..1ec903e 100644 --- a/salt/modules/zypper.py +++ b/salt/modules/zypper.py @@ -824,6 +824,7 @@ def mod_repo(repo, **kwargs): cmd_opt = global_cmd_opt + ['mr'] + cmd_opt + [repo] __zypper__.refreshable.xml.call(*cmd_opt) + comment = None if call_refresh: # when used with "zypper ar --refresh" or "zypper mr --refresh" # --gpg-auto-import-keys is not doing anything @@ -831,11 +832,13 @@ def mod_repo(repo, **kwargs): refresh_opts = global_cmd_opt + ['refresh'] + [repo] __zypper__.xml.call(*refresh_opts) elif not added and not cmd_opt: - raise CommandExecutionError( - 'Specified arguments did not result in modification of repo' - ) + comment = 'Specified arguments did not result in modification of repo' + + repo = get_repo(repo) + if comment: + repo['comment'] = comment - return get_repo(repo) + return repo def refresh_db(): diff --git a/tests/unit/modules/zypper_test.py b/tests/unit/modules/zypper_test.py index 2f2b323..7caa707 100644 --- a/tests/unit/modules/zypper_test.py +++ b/tests/unit/modules/zypper_test.py @@ -73,7 +73,7 @@ class ZypperTestCase(TestCase): self.zypper_patcher_config = { '_get_configured_repos': Mock(side_effect=side_effect), '__zypper__': Mock(), - 'get_repo': Mock() + 'get_repo': Mock(return_value={}) } def test_list_upgrades(self): @@ -493,17 +493,8 @@ class ZypperTestCase(TestCase): 'salt.modules.zypper', **self.zypper_patcher_config) with zypper_patcher: - with self.assertRaisesRegexp( - Exception, - 'Specified arguments did not result in modification of repo' - ): - zypper.mod_repo(name, **{'url': url}) - with self.assertRaisesRegexp( - Exception, - 'Specified arguments did not result in modification of repo' - ): - zypper.mod_repo(name, **{'url': url, 'gpgautoimport': 'a'}) - + self.assertEqual(zypper.mod_repo(name, **{'url': url}), + {'comment': 'Specified arguments did not result in modification of repo'}) zypper.__zypper__.xml.call.assert_not_called() zypper.__zypper__.refreshable.xml.call.assert_not_called() -- 2.9.3 ++++++ 0016-Improve-Mock-to-be-flexible-and-able-to-mock-methods.patch ++++++ >From 50865e300e6e90c5cc80c8878949a2f3bcaaeeec Mon Sep 17 00:00:00 2001 From: Bo Maryniuk <bo(a)suse.de> Date: Thu, 25 Aug 2016 16:47:08 +0200 Subject: [PATCH 16/16] Improve Mock to be flexible and able to mock methods from the mocked modules * Configure importing Mock to handle 'total' method from psutils properly --- doc/conf.py | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/doc/conf.py b/doc/conf.py index 9cefed8..b73ca2a 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -15,31 +15,40 @@ from sphinx.directives import TocTree # pylint: disable=R0903 class Mock(object): ''' - Mock out specified imports + Mock out specified imports. This allows autodoc to do its thing without having oodles of req'd installed libs. This doesn't work with ``import *`` imports. + This Mock class can be configured to return a specific values at specific names, if required. + http://read-the-docs.readthedocs.org/en/latest/faq.html#i-get-import-errors… ''' - def __init__(self, *args, **kwargs): - pass + def __init__(self, mapping=None, *args, **kwargs): + """ + Mapping allows to bypass the Mock object, but actually assign + a specific value, expected by a specific attribute returned. + """ + self.__mapping = mapping or {} __all__ = [] def __call__(self, *args, **kwargs): - ret = Mock() # If mocked function is used as a decorator, expose decorated function. # if args and callable(args[-1]): # functools.update_wrapper(ret, args[0]) - return ret - - @classmethod - def __getattr__(cls, name): - if name in ('__file__', '__path__'): - return '/dev/null' + return Mock(mapping=self.__mapping) + + def __getattr__(self, name): + #__mapping = {'total': 0} + data = None + if name in self.__mapping: + data = self.__mapping.get(name) + elif name in ('__file__', '__path__'): + data = '/dev/null' else: - return Mock() + data = Mock(mapping=self.__mapping) + return data # pylint: enable=R0903 MOCK_MODULES = [ @@ -133,7 +142,11 @@ MOCK_MODULES = [ ] for mod_name in MOCK_MODULES: - sys.modules[mod_name] = Mock() + if mod_name == 'psutil': + mock = Mock(mapping={'total': 0}) # Otherwise it will crash Sphinx + else: + mock = Mock() + sys.modules[mod_name] = mock def mock_decorator_with_params(*oargs, **okwargs): ''' -- 2.9.3 ++++++ 0017-Check-for-single-quote-before-splitting-on-single-qu.patch ++++++ >From e9b4a199f48abc94be71082c56b6b059c6694dc0 Mon Sep 17 00:00:00 2001 From: Eric Jackson <swiftgist(a)gmail.com> Date: Tue, 30 Aug 2016 15:47:07 -0400 Subject: [PATCH 17/17] Check for single quote before splitting on single quote Signed-off-by: Eric Jackson <ejackson(a)suse.com> Lint for #35916 Merges #35916 --- salt/modules/zypper.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/salt/modules/zypper.py b/salt/modules/zypper.py index 1ec903e..4bb9a09 100644 --- a/salt/modules/zypper.py +++ b/salt/modules/zypper.py @@ -859,11 +859,11 @@ def refresh_db(): for line in out.splitlines(): if not line: continue - if line.strip().startswith('Repository'): + if line.strip().startswith('Repository') and '\'' in line: key = line.split('\'')[1].strip() if 'is up to date' in line: ret[key] = False - elif line.strip().startswith('Building'): + elif line.strip().startswith('Building') and '\'' in line: key = line.split('\'')[1].strip() if 'done' in line: ret[key] = True -- 2.8.2 ++++++ 0018-Unit-tests-fixes-for-2016.3.2.patch ++++++ ++++ 927 lines (skipped) ++++++ 0019-Fix-snapper_test-for-python26.patch ++++++ >From df1f88c51a40e69935830d1664a46dadf514dc69 Mon Sep 17 00:00:00 2001 From: Justin Anderson <janderson(a)saltstack.com> Date: Tue, 23 Aug 2016 15:02:31 -0600 Subject: [PATCH 19/19] Fix snapper_test for python26 * Use assertCountEqual instead of assertItemsEqual for Python 3 * Skip one Snapper test on 2.6 There's a slight difference in the diff comparison but we should be able to catch true failures here with 2.7. --- tests/unit/modules/snapper_test.py | 41 ++++++++++++++++++++++++++++++-------- 1 file changed, 33 insertions(+), 8 deletions(-) diff --git a/tests/unit/modules/snapper_test.py b/tests/unit/modules/snapper_test.py index f27b2ba..43f8898 100644 --- a/tests/unit/modules/snapper_test.py +++ b/tests/unit/modules/snapper_test.py @@ -6,19 +6,26 @@ Unit tests for the Snapper module :codeauthor: Pablo Suárez Hernández <psuarezhernandez(a)suse.de> ''' +# Import Python libs from __future__ import absolute_import +import sys -from salttesting import TestCase +# Import Salt Testing libs +from salttesting import TestCase, skipIf from salttesting.mock import ( + NO_MOCK, + NO_MOCK_REASON, MagicMock, patch, mock_open, ) - -from salt.exceptions import CommandExecutionError from salttesting.helpers import ensure_in_syspath + ensure_in_syspath('../../') +# Import Salt libs +import salt.ext.six as six +from salt.exceptions import CommandExecutionError from salt.modules import snapper # Globals @@ -123,6 +130,13 @@ MODULE_RET = { "@@ -0,0 +1 @@\n" "+another foobar", }, + '/tmp/foo26': { + 'comment': 'text file created', + 'diff': "--- /.snapshots/55/snapshot/tmp/foo2 \n" + "+++ /tmp/foo2 \n" + "@@ -1,0 +1,1 @@\n" + "+another foobar", + }, '/tmp/foo3': { 'comment': 'binary file changed', 'old_sha256_digest': 'e61f8b762d83f3b4aeb3689564b0ffbe54fa731a69a1e208dc9440ce0f69d19b', @@ -132,6 +146,7 @@ MODULE_RET = { } +@skipIf(NO_MOCK, NO_MOCK_REASON) class SnapperTestCase(TestCase): def setUp(self): self.dbus_mock = MagicMock() @@ -220,10 +235,16 @@ class SnapperTestCase(TestCase): @patch('salt.modules.snapper.snapper.GetComparison', MagicMock()) @patch('salt.modules.snapper.snapper.GetFiles', MagicMock(return_value=DBUS_RET['GetFiles'])) def test_status(self): - self.assertItemsEqual(snapper.status(), MODULE_RET['GETFILES']) - self.assertItemsEqual(snapper.status(num_pre="42", num_post=43), MODULE_RET['GETFILES']) - self.assertItemsEqual(snapper.status(num_pre=42), MODULE_RET['GETFILES']) - self.assertItemsEqual(snapper.status(num_post=43), MODULE_RET['GETFILES']) + if six.PY3: + self.assertCountEqual(snapper.status(), MODULE_RET['GETFILES']) + self.assertCountEqual(snapper.status(num_pre="42", num_post=43), MODULE_RET['GETFILES']) + self.assertCountEqual(snapper.status(num_pre=42), MODULE_RET['GETFILES']) + self.assertCountEqual(snapper.status(num_post=43), MODULE_RET['GETFILES']) + else: + self.assertItemsEqual(snapper.status(), MODULE_RET['GETFILES']) + self.assertItemsEqual(snapper.status(num_pre="42", num_post=43), MODULE_RET['GETFILES']) + self.assertItemsEqual(snapper.status(num_pre=42), MODULE_RET['GETFILES']) + self.assertItemsEqual(snapper.status(num_post=43), MODULE_RET['GETFILES']) @patch('salt.modules.snapper.status', MagicMock(return_value=MODULE_RET['GETFILES'])) def test_changed_files(self): @@ -268,7 +289,10 @@ class SnapperTestCase(TestCase): @patch('os.path.isfile', MagicMock(side_effect=[False, True])) @patch('salt.utils.fopen', mock_open(read_data=FILE_CONTENT["/tmp/foo2"]['post'])) def test_diff_text_file(self): - self.assertEqual(snapper.diff(), {"/tmp/foo2": MODULE_RET['DIFF']['/tmp/foo2']}) + if sys.version_info < (2, 7): + self.assertEqual(snapper.diff(), {"/tmp/foo2": MODULE_RET['DIFF']['/tmp/foo26']}) + else: + self.assertEqual(snapper.diff(), {"/tmp/foo2": MODULE_RET['DIFF']['/tmp/foo2']}) @patch('salt.modules.snapper._get_num_interval', MagicMock(return_value=(55, 0))) @patch('salt.modules.snapper.snapper.MountSnapshot', MagicMock( @@ -278,6 +302,7 @@ class SnapperTestCase(TestCase): @patch('salt.modules.snapper._is_text_file', MagicMock(return_value=True)) @patch('os.path.isfile', MagicMock(side_effect=[True, True, False, True])) @patch('os.path.isdir', MagicMock(return_value=False)) + @skipIf(sys.version_info < (2, 7), 'Python 2.7 required to compare diff properly') def test_diff_text_files(self): fopen_effect = [ mock_open(read_data=FILE_CONTENT["/tmp/foo"]['pre']).return_value, -- 2.8.2 ++++++ 0020-Integration-tests-fixes-for-2016.3.2.patch ++++++ >From 65dba3e9ab088087943f67367dc27fce00e4cd92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?= <psuarezhernandez(a)suse.com> Date: Tue, 13 Sep 2016 11:05:35 +0100 Subject: [PATCH 20/20] Integration tests fixes for 2016.3.2 * Fix PillarModuleTest::test_pillar_items: 'info' does not exist in pillar * Fixing integration tests if azure is not present * Fixing integration tests failures if 'git' command is missing Skip git state integration tests if 'git' does not exists Prevent OSError if 'git' command not found during _git_version() --- tests/integration/cloud/providers/msazure.py | 17 +++++++++-------- tests/integration/modules/git.py | 15 +++++++++------ tests/integration/modules/pillar.py | 1 - tests/integration/states/git.py | 2 +- 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/tests/integration/cloud/providers/msazure.py b/tests/integration/cloud/providers/msazure.py index c4934e4..4e53add 100644 --- a/tests/integration/cloud/providers/msazure.py +++ b/tests/integration/cloud/providers/msazure.py @@ -53,14 +53,15 @@ def __has_required_azure(): ''' Returns True/False if the required version of the Azure SDK is installed. ''' - if hasattr(azure, '__version__'): - version = LooseVersion(azure.__version__) - else: - version = LooseVersion(azure.common.__version__) - if HAS_AZURE is True and REQUIRED_AZURE <= version: - return True - else: - return False + if HAS_AZURE: + if hasattr(azure, '__version__'): + version = LooseVersion(azure.__version__) + else: + version = LooseVersion(azure.common.__version__) + + if REQUIRED_AZURE <= version: + return True + return False @skipIf(HAS_AZURE is False, 'These tests require the Azure Python SDK to be installed.') diff --git a/tests/integration/modules/git.py b/tests/integration/modules/git.py index 7c40664..f5c15f3 100644 --- a/tests/integration/modules/git.py +++ b/tests/integration/modules/git.py @@ -36,12 +36,15 @@ log = logging.getLogger(__name__) def _git_version(): - git_version = subprocess.Popen( - ['git', '--version'], - shell=False, - close_fds=True, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE).communicate()[0] + try: + git_version = subprocess.Popen( + ['git', '--version'], + shell=False, + close_fds=True, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE).communicate()[0] + except OSError: + return False if not git_version: log.debug('Git not installed') return False diff --git a/tests/integration/modules/pillar.py b/tests/integration/modules/pillar.py index b081f76..3d55b4c 100644 --- a/tests/integration/modules/pillar.py +++ b/tests/integration/modules/pillar.py @@ -119,7 +119,6 @@ class PillarModuleTest(integration.ModuleCase): from pillar.items ''' get_items = self.run_function('pillar.items') - self.assertDictContainsSubset({'info': 'bar'}, get_items) self.assertDictContainsSubset({'monty': 'python'}, get_items) self.assertDictContainsSubset( {'knights': ['Lancelot', 'Galahad', 'Bedevere', 'Robin']}, diff --git a/tests/integration/states/git.py b/tests/integration/states/git.py index a78b271..87681ba 100644 --- a/tests/integration/states/git.py +++ b/tests/integration/states/git.py @@ -20,6 +20,7 @@ import integration import salt.utils +@skip_if_binaries_missing('git') class GitTest(integration.ModuleCase, integration.SaltReturnAssertsMixIn): ''' Validate the git state @@ -254,7 +255,6 @@ class GitTest(integration.ModuleCase, integration.SaltReturnAssertsMixIn): finally: shutil.rmtree(name, ignore_errors=True) - @skip_if_binaries_missing('git') def test_config_set_value_with_space_character(self): ''' git.config -- 2.8.2 ++++++ 0021-Fix-pkg.upgrade-for-zypper.patch ++++++ >From 2cac0c3839af12b0a474f4cb0c0854995cd8dc2a Mon Sep 17 00:00:00 2001 From: "C. R. Oldham" <cro(a)ncbt.org> Date: Wed, 21 Sep 2016 20:05:33 -0600 Subject: [PATCH 21/21] Fix pkg.upgrade for zypper --- salt/modules/zypper.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/salt/modules/zypper.py b/salt/modules/zypper.py index 4bb9a09..21b87b0 100644 --- a/salt/modules/zypper.py +++ b/salt/modules/zypper.py @@ -1079,10 +1079,11 @@ def upgrade(refresh=True, skip_verify=False): refresh_db() old = list_pkgs() - to_append = '' if skip_verify: - to_append = '--no-gpg-checks' - __zypper__.noraise.call('update', '--auto-agree-with-licenses', to_append) + __zypper__.noraise.call('update', '--auto-agree-with-licenses', '--no-gpg-checks') + else: + __zypper__.noraise.call('update', '--auto-agree-with-licenses') + if __zypper__.exit_code not in __zypper__.SUCCESS_EXIT_CODES: ret['result'] = False ret['comment'] = (__zypper__.stdout() + os.linesep + __zypper__.stderr()).strip() -- 2.10.0 ++++++ salt-2015.8.8.tar.gz -> salt-2016.3.2.tar.gz ++++++ /work/SRC/openSUSE:Factory/salt/salt-2015.8.8.tar.gz /work/SRC/openSUSE:Factory/.salt.new/salt-2016.3.2.tar.gz differ: char 5, line 1 ++++++ update-documentation.sh ++++++ #!/bin/bash # # Update html.tar.bz2 documentation tarball # Author: Bo Maryniuk <bo(a)suse.de> # function check_env() { for cmd in "sphinx-build" "make" "quilt"; do if [ -z "$(which $cmd 2>/dev/null)" ]; then echo "Error: '$cmd' is missing." exit 1; fi done } function quilt_setup() { quilt setup salt.spec cd $1 quilt push -a } function build_docs() { cd $1 make html rm _build/html/.buildinfo cd _build/html chmod -R -x+X * cd .. tar cvf - html | bzip2 > /tmp/html.tar.bz2 } function write_changelog() { mv salt.changes salt.changes.previous TIME=$(date -u +'%a %b %d %T %Z %Y') MAIL=$1 SEP="-------------------------------------------------------------------" cat <<EOF > salt.changes $SEP $TIME - $MAIL - Updated html.tar.bz2 documentation tarball. EOF cat salt.changes.previous >> salt.changes rm salt.changes.previous } if [ -z "$1" ]; then echo "Usage: $0 <your e-mail>" exit 1; fi check_env; START=$(pwd) SRC_DIR="salt-$(cat salt.spec | grep ^Version: | cut -d: -f2 | sed -e 's/[[:blank:]]//g')"; quilt_setup $SRC_DIR build_docs doc cd $START rm -rf $SRC_DIR mv /tmp/html.tar.bz2 $START echo "Done" echo "---------------"

1 0

commit nodejs for openSUSE:Factory
by root＠hilbert.suse.de 30 Sep '16

30 Sep '16

Hello community, here is the log from the commit of package nodejs for openSUSE:Factory checked in at 2016-09-30 15:34:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nodejs (Old) and /work/SRC/openSUSE:Factory/.nodejs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nodejs" Changes: -------- --- /work/SRC/openSUSE:Factory/nodejs/nodejs.changes 2016-09-20 13:27:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.nodejs.new/nodejs.changes 2016-09-30 15:34:57.000000000 +0200 @@ -1,0 +2,28 @@ +Thu Sep 29 02:22:42 UTC 2016 - qantas94heavy(a)gmail.com + +- Fix incorrect SHASUMS256.txt.asc file that prevented package update + being accepted into Factory + +------------------------------------------------------------------- +Wed Sep 28 08:37:49 UTC 2016 - adam.majer(a)suse.de + +- enable usage of system certificate store on SLE11SP4 by + requiring openssl1 (boo#1000036) +- new upstream version 6.7.0 + * openssl update (not applicable for SLE12SP2, Leap 42.2 and later) + + upgrade to 1.0.2j (CVE-2016-6304, CVE-2016-2183, CVE-2016-2178, + CVE-2016-6306, CVE-2016-7052) + + remove support for dynamic 3rd party engine modules + * http: Properly validate for allowable characters in input + user data. This introduces a new case where throw may occur + when configuring HTTP responses, users should already + be adopting try/catch here. (CVE-2016-5325, bnc#985201) + * tls: properly validate wildcard certificates + (CVE-2016-7099, bnc#1001652) + * v8: Fix regression where a regex on a frozen object was broken + * buffer: Zero-fill excess bytes in new Buffer objects created + with Buffer.concat() + * src: Fix regression where passing an empty password and/or + salt to crypto.pbkdf2() would cause a fatal error + +------------------------------------------------------------------- Old: ---- node-v6.6.0.tar.xz New: ---- node-v6.7.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nodejs.spec ++++++ --- /var/tmp/diff_new_pack.inQMak/_old 2016-09-30 15:34:59.000000000 +0200 +++ /var/tmp/diff_new_pack.inQMak/_new 2016-09-30 15:34:59.000000000 +0200 @@ -18,7 +18,7 @@ %define npm_version 3.10.3 Name: nodejs -Version: 6.6.0 +Version: 6.7.0 Release: 0 %if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120200 @@ -94,6 +94,13 @@ #this corresponds to the "engine" requirement in package.json Provides: nodejs(engine) = %{version} +# For SLE11, to be able to use the certificate store we need to have properly +# symlinked certificates. The compatability symlinks are provided by the +# openssl1 library in the Security Module +%if 0%{?suse_version} == 1110 +Requires: openssl1 +%endif + #building nodejs makes sense only on v8 archs ExclusiveArch: %{ix86} x86_64 armv7hl aarch64 ppc ppc64 ppc64le s390x BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ SHASUMS256.txt.asc ++++++ --- /var/tmp/diff_new_pack.inQMak/_old 2016-09-30 15:35:00.000000000 +0200 +++ /var/tmp/diff_new_pack.inQMak/_new 2016-09-30 15:35:00.000000000 +0200 @@ -1,61 +1,62 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 -c8d1fe38eb794ca46aacf6c8e90676eec7a8aeec83b4b09f57ce503509e7a19f node-v6.6.0-darwin-x64.tar.gz -e5e6248714618a81595cc2c04d3420535cd8a26d74274013a0eb61e0b3d23f5f node-v6.6.0-darwin-x64.tar.xz -60b81c7276105a51e71ad8bc7f59163105e7c5dd1d992b173b5b66449b6df3fc node-v6.6.0-headers.tar.gz -b3b6989c12cdf3652253c1b87d4328d151576a2ff4b189e05ebcba99ed84896c node-v6.6.0-headers.tar.xz -9abae64e411d8ea1541a4776e78d9cf53ad8e20e8b34cf77d9b3579e8edb6f65 node-v6.6.0-linux-arm64.tar.gz -fce02f2fc7bdc79899de4696395d02f3e7209e4ab4053336db790b8f58cce385 node-v6.6.0-linux-arm64.tar.xz -d311754cddc9b387a2798226ecb5487e515c555e050fdd08ef3d6665c3c0d336 node-v6.6.0-linux-armv6l.tar.gz -b6a5dce140b0795da61a9936454670887b431922e56326b53f1900e72e2ac48d node-v6.6.0-linux-armv6l.tar.xz -e4dc3295f6602b0f4cd3433a6e520294743e2c342692b4fad388d33910cdd465 node-v6.6.0-linux-armv7l.tar.gz -a3a1aac41c21d216ef380269b80225c658188f9182fc087e1823afe66935e3e1 node-v6.6.0-linux-armv7l.tar.xz -b38ff6058f0213567d31a5d194d669ce75894336f6d0324426f01722c989d3c4 node-v6.6.0-linux-ppc64le.tar.gz -c25c106ee0540f13cd119e47b85191f8a362e48d636a9e8398f5db42ac30d755 node-v6.6.0-linux-ppc64le.tar.xz -90d483c63fdbc6594185b3e143bf8d5627812288a029f02f578363d6dd505285 node-v6.6.0-linux-ppc64.tar.gz -3a2cbd56384217df585ad81eff7ddb92cf3601374152b05eafe27a2c7ef02fa9 node-v6.6.0-linux-ppc64.tar.xz -a2f109eb0fec81d90206e9c0bca05327c706b244b5d7c5bd247ac140f811e54e node-v6.6.0-linux-s390x.tar.gz -aa181bdba1a4f8d06e61fb5496be202c271dadc46a0ef6ecb4b7b4454f1909c4 node-v6.6.0-linux-s390x.tar.xz -c22ab0dfa9d0b8d9de02ef7c0d860298a5d1bf6cae7413fb18b99e8a3d25648a node-v6.6.0-linux-x64.tar.gz -fdf4377ea4dc9ba2f09d81d9ad1eae42e7eb870c4b1b69f2761f22f28cb5ba31 node-v6.6.0-linux-x64.tar.xz -05f3bfdfe8e1911e66b4bf645a439480212767e71664b8c97f0cba46671e8160 node-v6.6.0-linux-x86.tar.gz -e6fcca4783491c7b5866e7f969e93b66f47380e9cc92c08607d7683cfa200775 node-v6.6.0-linux-x86.tar.xz -7a9af7bf1eb98f8c206037a0dbbcd797c5684e2570d6acc8d915351bad4a5571 node-v6.6.0.pkg -21b05b3664c338b76ec8c139a7ae80fb9b1c65215ee2da6d899dcbd6c6d67554 node-v6.6.0-sunos-x64.tar.gz -b57733493ca428b859ca6f371f6fc0f93bca77926e81e80ddabe1c5d240431e8 node-v6.6.0-sunos-x64.tar.xz -ffa81fc834a7f24958b3c1bf07dc668f6d0e0cda48582a23bc749abca42cae8c node-v6.6.0-sunos-x86.tar.gz -3572cbe039cb4a791d4f1db3ed855250cb06c4136a5af0eb277aa27a75469c29 node-v6.6.0-sunos-x86.tar.xz -11b957de855a392ceaa8b300ec66236d6f9c6baa184837d00bdaba2da4aefe91 node-v6.6.0.tar.gz -640485d2b672d3313203eae164576539e61f1e55d68122ff2c7fb59896e21a33 node-v6.6.0.tar.xz -92d708377519f9c4cb6b6006ab50118fe98ea3b7fa49ecb8a1c02f2c13c8ab92 node-v6.6.0-win-x64.7z -5b1c49f8fd36bd9c277259773f42832db74c41f87033deaccfbd82e15330bae4 node-v6.6.0-win-x64.zip -3a3eaa4690ead41631e761f24f0e0cf2d66d1378f07a59153e397abdf470273d node-v6.6.0-win-x86.7z -95862922b8469e00a7ae5f1f82d51c739fdc6ee12a8e1d46c0f100f2ea18c082 node-v6.6.0-win-x86.zip -675f5088021b99c53136d9f7306ba93f2a126df75777f0b97fb6013da2e5c539 node-v6.6.0-x64.msi -8ce48431e7d0182d21efc398fcc478f8852b96df8a7287dd40db9ef53cca01a3 node-v6.6.0-x86.msi -1cd746e30ce1af03495858ee3f8c3e1c18350b8a8259e560b5ac25e95bc5b5de win-x64/node.exe -efd924b61fe3f6ba67c28ac605c13304ac16976e020a57480f555cffd0a9741d win-x64/node.lib -84b27e00d6c562dbc6d68f32c9755874c7f29932ebc04a57580cc05aac64d78b win-x64/node_pdb.7z -238b24d1b7c24ab7ba3c964fda775500965dbcf1dd1484fa3397eded5e9d3d94 win-x64/node_pdb.zip -708a825e7c5fdb1015ea3ca56e257c74fc5ec602a83e8794ea3ab4e100c38f0b win-x86/node.exe -461fd40ecd79bbea9710d0a940f4d143fc344ffff62309cd86ee414ccfd3916c win-x86/node.lib -7161b5361d67279a74d2564195be9bf5a9bb2d332d9c9dde6b59a2926bfb1636 win-x86/node_pdb.7z -2394477a698c40ae08bcb9ec01ea7ed7efe9f32498212c511bd9d67103662acc win-x86/node_pdb.zip +132855c123efdfa43dc4a256f15728f1bbd3f9996a4b9e29cd31908248be6bf2 node-v6.7.0-aix-ppc64.tar.gz +69fab7a1ebeee54d5e3160eb9366e88a61500731fad86dee98c79c4a14b56bc6 node-v6.7.0-darwin-x64.tar.gz +b10270f028be73771fa8536f0c69b33f30e1bb1fd15d9a493a7365cde56af0d2 node-v6.7.0-darwin-x64.tar.xz +42f0fdcd937409842d76a5852782acfdb0b6fa8e3520df6694f2abaa7c9e942c node-v6.7.0-headers.tar.gz +f6ddea52f8b13bcece38c965d13f6073bd7980dadcfd903b8c1872f6d8bbacb7 node-v6.7.0-headers.tar.xz +45ffd727bcab41a544ad7862fe985f6beac4fcd96c63e116ca467d1147ba6454 node-v6.7.0-linux-arm64.tar.gz +87f59a19d9a44ff938a553425c5c82a46be1f0cd43bf7c256e1c4fb61833a82a node-v6.7.0-linux-arm64.tar.xz +0f8e0dbaa6bcccd22db75077fed1afb28c2b225b6cdc185913178ae395a68ef9 node-v6.7.0-linux-armv6l.tar.gz +bf07229d718ebe3a8d8bc59cbf06d945b89045285e44f36f516c8e0f65a5302b node-v6.7.0-linux-armv6l.tar.xz +1e7e138ba8c54d7a0fbf5e3f188442a14a70409dc154b74b17635bcff74e4a81 node-v6.7.0-linux-armv7l.tar.gz +18b6d9df3e2aaba2d72e1f4c3cfdd3b963c23faa64d3ad72d5690959bc3dde08 node-v6.7.0-linux-armv7l.tar.xz +de8e4ca71caa8be6eaf80e65b89de2a6d152fa4ce08efcbc90ce7e1bfdf130e7 node-v6.7.0-linux-ppc64le.tar.gz +bc5fdfbe25a8fb0367ea7bf5b639ffb9bfd27ceb15f9d27579d6471ca585ff75 node-v6.7.0-linux-ppc64le.tar.xz +e8ce540b592d337304a10f4eb19bb4efee889c6676c5f188d072bfb2a8089927 node-v6.7.0-linux-ppc64.tar.gz +6ee874b6567f7f06708f6ccb66a27dc7317b4c493b7a6c3bb49c1e53c4bdf31e node-v6.7.0-linux-ppc64.tar.xz +e0f2616b4beb4c2505edb19e3cbedbf3d1c958441517cc9a1e918f6feaa4b95b node-v6.7.0-linux-s390x.tar.gz +647bacc68bd0101b04074d5740492a6511dee69e23a7ff03765674d7a9fa93df node-v6.7.0-linux-s390x.tar.xz +abe81b4150917cdbbeebc6c6b85003b80c972d32c8f5dfd2970d32e52a6877af node-v6.7.0-linux-x64.tar.gz +09263a844c31933c6f31e576e580faf01d3bbb056efb8713388dc8d09674f8c2 node-v6.7.0-linux-x64.tar.xz +fa94c93a4a3600d68e003a399f5cf5e109c2d10505b4d9456373c25953eb9bf5 node-v6.7.0-linux-x86.tar.gz +e89a77020bd579186adbc46f6a668d3524f980c5fc75f63e1d5b5362423bcebb node-v6.7.0-linux-x86.tar.xz +c5d46d0f105ed652c9a353d8411558c9c4610db874f01ef07e57ad613e5d4237 node-v6.7.0.pkg +33f240dac58a1293a08b66ecd01a70849c693e3a9e58a94cb7ee92126a894984 node-v6.7.0-sunos-x64.tar.gz +9df8f3d1048065fccb1c1746cfd1f3a22ef46075399e7dc92d38949e37607de7 node-v6.7.0-sunos-x64.tar.xz +80dacf34a5e17f3eeabe15e212005daeaa189caa424a83a23f302a9fa5996565 node-v6.7.0-sunos-x86.tar.gz +14bdf36ae5510a6565af69e1db651d34e75d2846a363610b6669b8c78e404b2a node-v6.7.0-sunos-x86.tar.xz +02b8ee1719a11b9ab22bef9279519efaaf31dd0d39cba4c3a1176ccda400b8d6 node-v6.7.0.tar.gz +ceb028324aab1ee8c7ea6a62026f036f3ea71f5ef5212593d0f833f999dd3be5 node-v6.7.0.tar.xz +2eb013b15c718ec2b26768e6a325e73571ed1d2028af411307a1bbd549f709ed node-v6.7.0-win-x64.7z +59971f8ea9fb1ac4c55ca36303fe32a0714049cf8a10843dbb5924a5d0624659 node-v6.7.0-win-x64.zip +8b4448e56223aed8c316b67336fdd1d94aeee71033934fb6bc071a358c5c8719 node-v6.7.0-win-x86.7z +d75bebea562a1da0965adc8f94d2c5a38a22cfc57959d37c5c1aeec4ea9f1c83 node-v6.7.0-win-x86.zip +2185a16f8a32087b75708b08d7e482a14597765c41d6b3711a8e6ed3a3358213 node-v6.7.0-x64.msi +0801c283200ac263cc0ca014f5d8e0ee531e1ebec6e99645a0bdd04b996c1605 node-v6.7.0-x86.msi +7ab8714273a9a1fa464ded6b543b52b6fb56c7d2c3d08ebe312b1c1be72a1477 win-x64/node.exe +17c521d3b19886f826f818b9806bb4d2af4615d5bf850c257dcdaef897e8ccaa win-x64/node.lib +fa2f32b9f8ac97d26bb58da59c8a7299de5bd9f25b8879f8787ecd0ffbd36c3b win-x64/node_pdb.7z +815d202704373b9894c5dc113d2a2812be5e73431f8061707e0fd012cbc0b8cc win-x64/node_pdb.zip +a2e58867917250e013a49c4210b36aba04715159a71edcfb510c6225e3dab184 win-x86/node.exe +641503fd3d41c1bc04a95ee38e6dc2ffd9c9e5a35b3f5bfecb25965c963f2d17 win-x86/node.lib +36265c44782a8456b289c4776bf5de5ed648982f2b8dc97e17acd76258e249cf win-x86/node_pdb.7z +2d8a25ba8e212715050ee03e4b0b9f547163ffaeb75288c9508a06e469677ff6 win-x86/node_pdb.zip -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org -iQIcBAEBCgAGBQJX2wmcAAoJEEX17r2BPa6OkcEP/AqvpLT+XmIHd+2S5NguUNqu -iIZIBmw/iNBomfR5X3b92+TU0zMAmiakAWR8KgiHIdausbokITWv3Qia7lWro1ue -IFuXbsP9JcN+AMHi3/JKOekcg5IBqRDrzXxfHACwLokBwY5e+PwyYtEHPBx+Ls55 -QuKcR24Jo70UQ1lkXNSJPSZdn85EcQ1Dw1kdhO3Mi87n4nitTRmWnFLKeJA46Ey2 -ejDRUy+xt0jsy7sDeGEKDFu5ajajIRLnaaGsr21gxpjsbPH7Tg1c0gUUbs9fhrvn -gAc8R+5iXsRi24FrlaaLkfvnhF6/7uTN4YG3fbAexT9bPftd9pn7iwHKkKaTrnw/ -w+n1bgH4Ogs6w8x0SX1DcvHONj5WqoIgRWRLCnju9GpjkfJQ33qNLHBTXx4qqrb2 -J2mJzmvo5T9WyrEV7aWA3Laa8Fwk6MLZe4Cu/mLT9pJ3kNj/5WXCGjpWUS90jSxn -OXWY8XXY8B3e6y0AYT4J26sKd7rIv5ux0PLor/xJT5SYH4XeKbVAn8HfhakIDvR7 -oIZW2UJxd/spfIbHSeODEisS5YqDrWyzAxSJfJzt1R2oI299EEtZRIzmiWXsEEXv -ee31irYPSVg0aF+Qbps+ojeOQzbukp2HMrh2K3orVvf0PzifP1Gh76nrw4BLiKLi -sY3xYr5CG0AIAjpSw0w3 -=xwUE +iQIcBAEBCgAGBQJX7DJDAAoJELY7U1pMIGypeM8QAL3jLz92a++LhnwGQl5FPtaB +XorribOTM8nYLHla3cwyAgdSPLG33wIHKF4pG8rMYIZ4K4wYD4wFh2CWBiLgmcRi +h7uhB6TrH2hSy7rIMNRW8C2atVL78MdaHPxmKwqFcsfKtbu5CD4eh2sbRwbrbSkp +WUg6TNub7ZxQkOjlxb6KZq4C59FjhQuyhciK8Pk9lTbnIOtzQ0GL3bXUgbTVgjji +pdztRUDDqCrNLdnRaY4PK3S0qhXoyIBH2RA5kJtjT4qdIBtecVTfxtlff1SscX8l +zOokRGVsQLPzXE5UuC7UPEYi7pIkFVXRJDwe0f7NTmTngnkKElIIjEeppm13ZYaR +VfaifDaCCjJpdEHJWYmmaopGw3QLkm1jAtU5nR36oYyZvKx3eb4QU8j8OgtChznh +rGqWzOk6AdcXpIdmO5N6aNyvC5dM/nnpTOnNJhKp6EVKzLTLHghst6qNb1XSsW5l +8eZeEKyLl0JaXk4w+FXlKbymrhA8dOa1TaZ27ATtTFhYfzk2hb6zir1vmON4YvI0 +2dMqRy0YcduoO+gz8DeDjyPouOrng4WZ9iF5JevM1lswrBkAL4P2AIcQ0E8Z0I6B +3HZY4YJt0RcEBydFYtlRxEzbYo0hig2BRRP0OqT5o2pt+YK+NjxPvmfS2nlFYpJ6 +ujvlLislHyyZVDUbnvjh +=taAg -----END PGP SIGNATURE----- ++++++ node-v6.6.0.tar.xz -> node-v6.7.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/nodejs/node-v6.6.0.tar.xz /work/SRC/openSUSE:Factory/.nodejs.new/node-v6.7.0.tar.xz differ: char 27, line 1

1 0

commit privoxy for openSUSE:Factory
by root＠hilbert.suse.de 30 Sep '16

30 Sep '16

Hello community, here is the log from the commit of package privoxy for openSUSE:Factory checked in at 2016-09-30 15:34:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/privoxy (Old) and /work/SRC/openSUSE:Factory/.privoxy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "privoxy" Changes: -------- --- /work/SRC/openSUSE:Factory/privoxy/privoxy.changes 2016-01-28 17:22:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.privoxy.new/privoxy.changes 2016-09-30 15:34:54.000000000 +0200 @@ -1,0 +2,26 @@ +Wed Sep 28 17:55:49 UTC 2016 - kieltux(a)gmail.com + +- Update to version 3.0.26 + * Bug fixes: + - Fixed crashes with "listen-addr :8118" (SF Bug #902). + The regression was introduced in 3.0.25 beta and reported + by Marvin Renich in Debian bug #834941. + * General improvements: + - Log when privoxy is toggled on or off via cgi interface. + - Highlight the "Info: Now toggled " on/off log message + in the Windows log viewer. + - Highlight the loading actions/filter file log message + in the Windows log viewer. + - Mention client-specific tags on the toggle page as a + potentionally more appropriate alternative. + * Infrastructure improvements: + - Add perl script to generate an RSS feed for the packages + Submitted by "Unknown". + * Build system improvements: + - strptime.h: fix a compiler warning about ambiguous else. + - configure.in: Check for Docbook goo on the BSDs as well. + - GNUMakefile.in: Let the dok-user target remove + temporary files. +- BuildArch for docs: noarch + +------------------------------------------------------------------- Old: ---- privoxy-3.0.24-stable-src.tar.gz New: ---- privoxy-3.0.26-stable-src.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ privoxy.spec ++++++ --- /var/tmp/diff_new_pack.5cE7Ec/_old 2016-09-30 15:34:56.000000000 +0200 +++ /var/tmp/diff_new_pack.5cE7Ec/_new 2016-09-30 15:34:56.000000000 +0200 @@ -30,7 +30,7 @@ %endif %endif Name: privoxy -Version: 3.0.24 +Version: 3.0.26 Release: 0 Summary: The Internet Junkbuster - HTTP Proxy Server License: GPL-2.0+ @@ -84,6 +84,7 @@ Summary: The documentation of Privoxy Group: Productivity/Networking/Web/Proxy Requires: %{name} = %{version} +BuildArch: noarch %description doc Documentation files for the Privoxy: The Internet Junkbuster - HTTP ++++++ privoxy-3.0.24-stable-src.tar.gz -> privoxy-3.0.26-stable-src.tar.gz ++++++ ++++ 57850 lines of diff (skipped)

1 0

commit retro-gtk for openSUSE:Factory
by root＠hilbert.suse.de 30 Sep '16

30 Sep '16

Hello community, here is the log from the commit of package retro-gtk for openSUSE:Factory checked in at 2016-09-30 15:34:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/retro-gtk (Old) and /work/SRC/openSUSE:Factory/.retro-gtk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "retro-gtk" Changes: -------- --- /work/SRC/openSUSE:Factory/retro-gtk/retro-gtk.changes 2016-09-23 11:39:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.retro-gtk.new/retro-gtk.changes 2016-09-30 15:34:52.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Sep 23 06:32:43 UTC 2016 - jengelh(a)inai.de + +- Improve the description and summary. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ retro-gtk.spec ++++++ --- /var/tmp/diff_new_pack.wgqLiz/_old 2016-09-30 15:34:54.000000000 +0200 +++ /var/tmp/diff_new_pack.wgqLiz/_new 2016-09-30 15:34:54.000000000 +0200 @@ -19,7 +19,7 @@ Name: retro-gtk Version: 0.8.1 Release: 0 -Summary: Toolkit to write Gtk+ 3 based libretro frontends +Summary: Toolkit to write Gtk+3-based frontends to libretro License: GPL-3.0 Group: System/GUI/GNOME Url: https://git.gnome.org/browse/retro-gtk @@ -41,38 +41,49 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -Retro-gtk is a toolkit to write GTK+ 3 based Libretro frontends. +retro-gtk wraps the libretro API for use in Gtk applications such as +GNOME Games. %package -n libretro-gobject0 -Summary: Toolkit to write Gtk+ 3 based libretro frontends +Summary: Toolkit to write Gtk+3-based frontends to libretro Group: System/Libraries %description -n libretro-gobject0 -Retro-gtk is a toolkit to write GTK+ 3 based Libretro frontends. +retro-gtk wraps the libretro API for use in Gtk applications such as +GNOME Games. +(libretro is an API specification implemented by some emulator +libraries like libretro-bsnes.) %package -n libretro-gtk0 -Summary: Toolkit to write Gtk+ 3 based libretro frontends +Summary: Toolkit to write Gtk+3-based frontends to libretro Group: System/Libraries %description -n libretro-gtk0 -Retro-gtk is a toolkit to write GTK+ 3 based Libretro frontends. +retro-gtk wraps the libretro API for use in Gtk applications such as +GNOME Games. +(libretro is an API specification implemented by some emulator +libraries like libretro-bsnes.) %package -n typelib-1_0-Retro-0_8 -Summary: Toolkit to write Gtk+ 3 based libretro frontends +Summary: GObject introspection bindings for libretro-gobject Group: System/Libraries %description -n typelib-1_0-Retro-0_8 -Retro-gtk is a toolkit to write GTK+ 3 based Libretro frontends. +retro-gtk wraps the libretro API for use in Gtk applications. +This subpackage contains the gobject bindings for the +libretro-gobject shared library. %package -n typelib-1_0-RetroGtk-0_8 -Summary: Toolkit to write Gtk+ 3 based libretro frontends +Summary: GObject introspection bindings for libretro-gtk Group: System/Libraries %description -n typelib-1_0-RetroGtk-0_8 -Retro-gtk is a toolkit to write GTK+ 3 based Libretro frontends. +retro-gtk wraps the libretro API for use in Gtk applications. +This subpackage contains the gobject bindings for the +libretro-gtk shared library. %package devel -Summary: Toolkit to write Gtk+ 3 based libretro frontends +Summary: Development files for retro-gtk, a Gtk+3 wrapper for libretro Group: Development/Languages/C and C++ Requires: libretro-gobject0 = %{version} Requires: libretro-gtk0 = %{version} @@ -80,7 +91,9 @@ Requires: typelib-1_0-RetroGtk-0_8 = %{version} %description devel -Retro-gtk is a toolkit to write GTK+ 3 based Libretro frontends. +retro-gtk wraps the libretro API for use in Gtk applications. +This subpackage contains the headers to make use of the libretro-gtk +and libretro-gobject libraries. %prep %setup -q

1 0

commit u-boot for openSUSE:Factory
by root＠hilbert.suse.de 30 Sep '16

30 Sep '16

Hello community, here is the log from the commit of package u-boot for openSUSE:Factory checked in at 2016-09-30 15:33:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/u-boot (Old) and /work/SRC/openSUSE:Factory/.u-boot.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "u-boot" Changes: -------- --- /work/SRC/openSUSE:Factory/u-boot/u-boot-a10-olinuxino-lime.changes 2016-09-12 13:25:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-a10-olinuxino-lime.changes 2016-09-30 15:33:59.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Sep 28 15:18:17 UTC 2016 - afaerber(a)suse.de + +- Fix rpi332b installation path and enable %post scriplet + +------------------------------------------------------------------- +Sun Sep 11 03:44:15 UTC 2016 - afaerber(a)suse.de + +- Add hikey and rpi332b + +------------------------------------------------------------------- u-boot-a13-olinuxino.changes: same change u-boot-a13-olinuxinom.changes: same change u-boot-a20-olinuxino-lime.changes: same change u-boot-a20-olinuxino-lime2.changes: same change u-boot-a20-olinuxinomicro.changes: same change u-boot-am335xboneblack.changes: same change u-boot-am335xevm.changes: same change u-boot-am57xxevm.changes: same change u-boot-am57xxevmnodt.changes: same change u-boot-arndale.changes: same change u-boot-bananapi.changes: same change u-boot-clearfog.changes: same change u-boot-colibrit20.changes: same change u-boot-cubieboard.changes: same change u-boot-cubieboard2.changes: same change u-boot-cubietruck.changes: same change u-boot-dragonboard410c.changes: same change u-boot-firefly-rk3288.changes: same change u-boot-highbank.changes: same change New Changes file: --- /dev/null 2016-09-15 12:42:18.240042505 +0200 +++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-hikey.changes 2016-09-30 15:34:25.000000000 +0200 @@ -0,0 +1,1353 @@ +------------------------------------------------------------------- +Wed Sep 28 15:18:17 UTC 2016 - afaerber(a)suse.de + +- Fix rpi332b installation path and enable %post scriplet + +------------------------------------------------------------------- +Sun Sep 11 03:44:15 UTC 2016 - afaerber(a)suse.de + +- Add hikey and rpi332b + +------------------------------------------------------------------- +Wed Sep 7 09:02:59 UTC 2016 - guillaume(a)opensuse.org + +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed +* Patches added: + 0019-common-env_nand-Ensure-that-we-have.patch + +------------------------------------------------------------------- +Fri Sep 2 23:25:44 UTC 2016 - afaerber(a)suse.de + +- Add post-install script for Raspberry Pi to install to /boot/efi + where needed. (bsc#996064) + +------------------------------------------------------------------- +Fri Aug 12 14:07:49 UTC 2016 - agraf(a)suse.com + +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed +- Update to v3 of the serial detect code (bsc#989511) +* Patches added: + 0010-bcm2835_gpio-Implement-GPIOF_FUNC.patch +* Patches rebased: + 0010-serial-bcm283x_mu-Detect-disabled-s.patch -> 0011-serial-bcm283x_mu-Detect-disabled-s.patch +- Add SMBIOS table on ARM (bsc#989509) +* Patches added: + 0012-x86-Move-table-csum-into-separate-h.patch + 0013-x86-Move-smbios-generation-into-arc.patch + 0014-efi_loader-Expose-efi_install_confi.patch + 0015-smbios-Allow-compilation-on-64bit-s.patch + 0016-smbios-Expose-in-efi_loader-as-tabl.patch + 0017-efi_loader-Fix-efi_install_configur.patch + 0018-smbios-Provide-serial-number.patch + +------------------------------------------------------------------- +Mon Aug 1 18:42:36 UTC 2016 - stefan.bruens(a)rwth-aachen.de + +- Use deterministic build date by setting DATE_SOURCE_EPOCH + +------------------------------------------------------------------- +Fri Jul 29 21:52:37 UTC 2016 - agraf(a)suse.com + +- Add dynamic detection of rpi3 uart (bsc#989511) +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed +* Patches added: + 0010-serial-bcm283x_mu-Detect-disabled-s.patch + +------------------------------------------------------------------- +Sat Jul 16 18:49:35 UTC 2016 - afaerber(a)suse.de + +- Updated to v2016.07 +* Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed +* Patches dropped (upstreamed): + 0004-video-ipu-Fix-build-with-hard-float.patch + 0005-efi_loader-Clean-up-system-table-on.patch + 0006-efi_loader-gop-Don-t-expose-fb-addr.patch + 0009-arm-Introduce-setjmp-longjmp.patch + 0010-efi_loader-Add-exit-support.patch + 0011-efi_loader-Add-DM_VIDEO-support.patch + 0015-arm-Fix-setjmp.patch +* Patches rebased: + 0007-efi_loader-Allow-boards-to-implemen.patch -> 0004-efi_loader-Allow-boards-to-implemen.patch + 0008-ARM-bcm283x-Implement-EFI-RTS-reset.patch -> 0005-ARM-bcm283x-Implement-EFI-RTS-reset.patch + 0012-efi_loader-gop-Expose-fb-when-32bpp.patch -> 0006-efi_loader-gop-Expose-fb-when-32bpp.patch + 0013-bcm2835-video-Map-frame-buffer-as-3.patch -> 0007-bcm2835-video-Map-frame-buffer-as-3.patch + 0014-bcm2835-Reserve-the-spin-table-in-e.patch -> 0008-bcm2835-Reserve-the-spin-table-in-e.patch +- Revert an ARMv8 breakage from v2016.07 (backport from master) + 0009-Revert-armv8-Enable-CPUECTLR.SMPEN-.patch +- Add dragonboard410c, odroid-c2, pine64_plus + +------------------------------------------------------------------- +Mon Jun 27 11:00:33 UTC 2016 - nadvornik(a)suse.com + +- Enable SUNXI_SPL for orangepi_pc + +------------------------------------------------------------------- +Mon Jun 27 06:14:09 UTC 2016 - agraf(a)suse.com + +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed +* Patches added: + 0015-arm-Fix-setjmp.patch +- Add update_git.sh to source file list + +------------------------------------------------------------------- +Mon Jun 6 22:07:59 UTC 2016 - agraf(a)suse.com + +- Add efifb support for RPi +- Fix spin table spill on Rpi +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed +* Patches added: + 0011-efi_loader-Add-DM_VIDEO-support.patch + 0012-efi_loader-gop-Expose-fb-when-32bpp.patch + 0013-bcm2835-video-Map-frame-buffer-as-3.patch + 0014-bcm2835-Reserve-the-spin-table-in-e.patch + +------------------------------------------------------------------- +Mon Jun 6 06:56:34 UTC 2016 - agraf(a)suse.com + +- Add RTS reboot for RPi +- Add EFI exit support +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed +* Patches added: + 0007-efi_loader-Allow-boards-to-implemen.patch + 0008-ARM-bcm283x-Implement-EFI-RTS-reset.patch + 0009-arm-Introduce-setjmp-longjmp.patch + 0010-efi_loader-Add-exit-support.patch + +------------------------------------------------------------------- +Fri Jun 3 11:18:13 UTC 2016 - agraf(a)suse.com + +- Disable EFI GOP fb_addr, so Linux doesn't use it +- Move to git based patch queue workflow +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed +* Patches dropped: + 0001-video-ipu-Fix-build-with-hard-float-ARM-toolchain.-I.patch + 0001-XXX-openSUSE-XXX-Load-dtb-from-partition-2.patch + 0002-XXX-openSUSE-XXX-omap3-Move-to-distro-bootcmd.patch +* Patches added: + 0001-XXX-openSUSE-XXX-Load-dtb-from-part.patch + 0002-XXX-openSUSE-XXX-omap3-Move-to-dist.patch + 0003-Revert-Revert-omap3-Use-raw-SPL-by-.patch + 0004-video-ipu-Fix-build-with-hard-float.patch + 0005-efi_loader-Clean-up-system-table-on.patch + 0006-efi_loader-gop-Don-t-expose-fb-addr.patch + +------------------------------------------------------------------- +Wed May 18 13:07:24 UTC 2016 - afaerber(a)suse.de + +- Fix rpi3 installation location + +------------------------------------------------------------------- +Wed May 18 12:22:31 UTC 2016 - guillaume(a)opensuse.org + +- Add 0001-video-ipu-Fix-build-with-hard-float-ARM-toolchain.-I.patch + to fix build on iMX boards (with hard-float toolchains) + +------------------------------------------------------------------- +Tue May 17 12:53:24 UTC 2016 - guillaume(a)opensuse.org + +- Update to 2016.05 +- Remove upstreamed patch: + * 0003-exynos-Set-CNTFRQ.patch + +------------------------------------------------------------------- +Wed May 4 20:22:57 UTC 2016 - afaerber(a)suse.de + +- Package Marvell SPL for ClearFog +- Tidy package summaries and descriptions +* Fix spelling of U-Boot +* Don't assume ARM + +------------------------------------------------------------------- +Thu Apr 28 15:46:09 UTC 2016 - agraf(a)suse.com + +- Update to 2016.05-rc3 + - Removed patches: + * 0004-iso-Make-little-endian-and-64bit-safe.patch + * 0005-iso-Start-with-partition-1.patch + * 0006-iso-Allow-512-byte-sector-size.patch + * 0007-efi_loader-Split-drive-add-into-function.patch + * 0008-efi_loader-Add-el-torito-support.patch + * 0009-efi_loader-Pass-file-path-to-payload.patch + * 0010-efi_loader-Increase-path-string-to-32-characters.patch + * 0011-distro-Enable-iso-partition-code.patch + * 0012-efi_loader-Use-system-fdt-as-fallback.patch + * 0013-efi_loader-Put-fdt-into-convenient-location.patch + * 0014-efi_loader-Expose-ascending-efi-memory-map.patch + * 0015-efi_loader-Always-flush-in-cache-line-size-granulari.patch + * 0016-efi_loader-Handle-memory-overflows.patch + * 0017-ARM-rpi-fix-64-bit-CONFIG_SYS_TEXT_BASE.patch + +------------------------------------------------------------------- +Fri Apr 15 21:50:37 UTC 2016 - agraf(a)suse.com + +- Add patch to fix RPi3 aarch64 mode with recent firmware + * 0017-ARM-rpi-fix-64-bit-CONFIG_SYS_TEXT_BASE.patch + +------------------------------------------------------------------- +Wed Apr 13 13:55:13 UTC 2016 - agraf(a)suse.com + +- Move patch queue to https://github.com/openSUSE/u-boot.git tumbleweed + - Removed old patches: + * 0001-iso-Make-little-endian-and-64bit-safe.patch + * 0002-iso-Start-with-partition-1.patch + * 0003-iso-Allow-512-byte-sector-size.patch + * 0004-efi_loader-Split-drive-add-into-function.patch + * 0005-efi_loader-Add-el-torito-support.patch + * 0006-efi_loader-Pass-file-path-to-payload.patch + * 0007-efi_loader-Increase-path-string-to-32-characters.patch ++++ 1156 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-hikey.changes --- /work/SRC/openSUSE:Factory/u-boot/u-boot-hyundaia7hd.changes 2016-09-12 13:25:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-hyundaia7hd.changes 2016-09-30 15:34:25.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Sep 28 15:18:17 UTC 2016 - afaerber(a)suse.de + +- Fix rpi332b installation path and enable %post scriplet + +------------------------------------------------------------------- +Sun Sep 11 03:44:15 UTC 2016 - afaerber(a)suse.de + +- Add hikey and rpi332b + +------------------------------------------------------------------- u-boot-jetson-tk1.changes: same change u-boot-melea1000.changes: same change u-boot-merriia80optimus.changes: same change u-boot-mx53loco.changes: same change u-boot-mx6cuboxi.changes: same change u-boot-mx6qsabrelite.changes: same change u-boot-odroid-c2.changes: same change u-boot-odroid-xu3.changes: same change u-boot-odroid.changes: same change u-boot-omap3beagle.changes: same change u-boot-omap4panda.changes: same change u-boot-orangepipc.changes: same change u-boot-p2371-2180.changes: same change u-boot-paz00.changes: same change u-boot-pcm051rev3.changes: same change u-boot-pine64plus.changes: same change u-boot-qemu-ppce500.changes: same change u-boot-rpi.changes: same change u-boot-rpi2.changes: same change u-boot-rpi3.changes: same change New Changes file: --- /dev/null 2016-09-15 12:42:18.240042505 +0200 +++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-rpi332b.changes 2016-09-30 15:34:26.000000000 +0200 @@ -0,0 +1,1353 @@ +------------------------------------------------------------------- +Wed Sep 28 15:18:17 UTC 2016 - afaerber(a)suse.de + +- Fix rpi332b installation path and enable %post scriplet + +------------------------------------------------------------------- +Sun Sep 11 03:44:15 UTC 2016 - afaerber(a)suse.de + +- Add hikey and rpi332b + +------------------------------------------------------------------- +Wed Sep 7 09:02:59 UTC 2016 - guillaume(a)opensuse.org + +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed +* Patches added: + 0019-common-env_nand-Ensure-that-we-have.patch + +------------------------------------------------------------------- +Fri Sep 2 23:25:44 UTC 2016 - afaerber(a)suse.de + +- Add post-install script for Raspberry Pi to install to /boot/efi + where needed. (bsc#996064) + +------------------------------------------------------------------- +Fri Aug 12 14:07:49 UTC 2016 - agraf(a)suse.com + +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed +- Update to v3 of the serial detect code (bsc#989511) +* Patches added: + 0010-bcm2835_gpio-Implement-GPIOF_FUNC.patch +* Patches rebased: + 0010-serial-bcm283x_mu-Detect-disabled-s.patch -> 0011-serial-bcm283x_mu-Detect-disabled-s.patch +- Add SMBIOS table on ARM (bsc#989509) +* Patches added: + 0012-x86-Move-table-csum-into-separate-h.patch + 0013-x86-Move-smbios-generation-into-arc.patch + 0014-efi_loader-Expose-efi_install_confi.patch + 0015-smbios-Allow-compilation-on-64bit-s.patch + 0016-smbios-Expose-in-efi_loader-as-tabl.patch + 0017-efi_loader-Fix-efi_install_configur.patch + 0018-smbios-Provide-serial-number.patch + +------------------------------------------------------------------- +Mon Aug 1 18:42:36 UTC 2016 - stefan.bruens(a)rwth-aachen.de + +- Use deterministic build date by setting DATE_SOURCE_EPOCH + +------------------------------------------------------------------- +Fri Jul 29 21:52:37 UTC 2016 - agraf(a)suse.com + +- Add dynamic detection of rpi3 uart (bsc#989511) +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed +* Patches added: + 0010-serial-bcm283x_mu-Detect-disabled-s.patch + +------------------------------------------------------------------- +Sat Jul 16 18:49:35 UTC 2016 - afaerber(a)suse.de + +- Updated to v2016.07 +* Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed +* Patches dropped (upstreamed): + 0004-video-ipu-Fix-build-with-hard-float.patch + 0005-efi_loader-Clean-up-system-table-on.patch + 0006-efi_loader-gop-Don-t-expose-fb-addr.patch + 0009-arm-Introduce-setjmp-longjmp.patch + 0010-efi_loader-Add-exit-support.patch + 0011-efi_loader-Add-DM_VIDEO-support.patch + 0015-arm-Fix-setjmp.patch +* Patches rebased: + 0007-efi_loader-Allow-boards-to-implemen.patch -> 0004-efi_loader-Allow-boards-to-implemen.patch + 0008-ARM-bcm283x-Implement-EFI-RTS-reset.patch -> 0005-ARM-bcm283x-Implement-EFI-RTS-reset.patch + 0012-efi_loader-gop-Expose-fb-when-32bpp.patch -> 0006-efi_loader-gop-Expose-fb-when-32bpp.patch + 0013-bcm2835-video-Map-frame-buffer-as-3.patch -> 0007-bcm2835-video-Map-frame-buffer-as-3.patch + 0014-bcm2835-Reserve-the-spin-table-in-e.patch -> 0008-bcm2835-Reserve-the-spin-table-in-e.patch +- Revert an ARMv8 breakage from v2016.07 (backport from master) + 0009-Revert-armv8-Enable-CPUECTLR.SMPEN-.patch +- Add dragonboard410c, odroid-c2, pine64_plus + +------------------------------------------------------------------- +Mon Jun 27 11:00:33 UTC 2016 - nadvornik(a)suse.com + +- Enable SUNXI_SPL for orangepi_pc + +------------------------------------------------------------------- +Mon Jun 27 06:14:09 UTC 2016 - agraf(a)suse.com + +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed +* Patches added: + 0015-arm-Fix-setjmp.patch +- Add update_git.sh to source file list + +------------------------------------------------------------------- +Mon Jun 6 22:07:59 UTC 2016 - agraf(a)suse.com + +- Add efifb support for RPi +- Fix spin table spill on Rpi +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed +* Patches added: + 0011-efi_loader-Add-DM_VIDEO-support.patch + 0012-efi_loader-gop-Expose-fb-when-32bpp.patch + 0013-bcm2835-video-Map-frame-buffer-as-3.patch + 0014-bcm2835-Reserve-the-spin-table-in-e.patch + +------------------------------------------------------------------- +Mon Jun 6 06:56:34 UTC 2016 - agraf(a)suse.com + +- Add RTS reboot for RPi +- Add EFI exit support +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed +* Patches added: + 0007-efi_loader-Allow-boards-to-implemen.patch + 0008-ARM-bcm283x-Implement-EFI-RTS-reset.patch + 0009-arm-Introduce-setjmp-longjmp.patch + 0010-efi_loader-Add-exit-support.patch + +------------------------------------------------------------------- +Fri Jun 3 11:18:13 UTC 2016 - agraf(a)suse.com + +- Disable EFI GOP fb_addr, so Linux doesn't use it +- Move to git based patch queue workflow +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed +* Patches dropped: + 0001-video-ipu-Fix-build-with-hard-float-ARM-toolchain.-I.patch + 0001-XXX-openSUSE-XXX-Load-dtb-from-partition-2.patch + 0002-XXX-openSUSE-XXX-omap3-Move-to-distro-bootcmd.patch +* Patches added: + 0001-XXX-openSUSE-XXX-Load-dtb-from-part.patch + 0002-XXX-openSUSE-XXX-omap3-Move-to-dist.patch + 0003-Revert-Revert-omap3-Use-raw-SPL-by-.patch + 0004-video-ipu-Fix-build-with-hard-float.patch + 0005-efi_loader-Clean-up-system-table-on.patch + 0006-efi_loader-gop-Don-t-expose-fb-addr.patch + +------------------------------------------------------------------- +Wed May 18 13:07:24 UTC 2016 - afaerber(a)suse.de + +- Fix rpi3 installation location + +------------------------------------------------------------------- +Wed May 18 12:22:31 UTC 2016 - guillaume(a)opensuse.org + +- Add 0001-video-ipu-Fix-build-with-hard-float-ARM-toolchain.-I.patch + to fix build on iMX boards (with hard-float toolchains) + +------------------------------------------------------------------- +Tue May 17 12:53:24 UTC 2016 - guillaume(a)opensuse.org + +- Update to 2016.05 +- Remove upstreamed patch: + * 0003-exynos-Set-CNTFRQ.patch + +------------------------------------------------------------------- +Wed May 4 20:22:57 UTC 2016 - afaerber(a)suse.de + +- Package Marvell SPL for ClearFog +- Tidy package summaries and descriptions +* Fix spelling of U-Boot +* Don't assume ARM + +------------------------------------------------------------------- +Thu Apr 28 15:46:09 UTC 2016 - agraf(a)suse.com + +- Update to 2016.05-rc3 + - Removed patches: + * 0004-iso-Make-little-endian-and-64bit-safe.patch + * 0005-iso-Start-with-partition-1.patch + * 0006-iso-Allow-512-byte-sector-size.patch + * 0007-efi_loader-Split-drive-add-into-function.patch + * 0008-efi_loader-Add-el-torito-support.patch + * 0009-efi_loader-Pass-file-path-to-payload.patch + * 0010-efi_loader-Increase-path-string-to-32-characters.patch + * 0011-distro-Enable-iso-partition-code.patch + * 0012-efi_loader-Use-system-fdt-as-fallback.patch + * 0013-efi_loader-Put-fdt-into-convenient-location.patch + * 0014-efi_loader-Expose-ascending-efi-memory-map.patch + * 0015-efi_loader-Always-flush-in-cache-line-size-granulari.patch + * 0016-efi_loader-Handle-memory-overflows.patch + * 0017-ARM-rpi-fix-64-bit-CONFIG_SYS_TEXT_BASE.patch + +------------------------------------------------------------------- +Fri Apr 15 21:50:37 UTC 2016 - agraf(a)suse.com + +- Add patch to fix RPi3 aarch64 mode with recent firmware + * 0017-ARM-rpi-fix-64-bit-CONFIG_SYS_TEXT_BASE.patch + +------------------------------------------------------------------- +Wed Apr 13 13:55:13 UTC 2016 - agraf(a)suse.com + +- Move patch queue to https://github.com/openSUSE/u-boot.git tumbleweed + - Removed old patches: + * 0001-iso-Make-little-endian-and-64bit-safe.patch + * 0002-iso-Start-with-partition-1.patch + * 0003-iso-Allow-512-byte-sector-size.patch + * 0004-efi_loader-Split-drive-add-into-function.patch + * 0005-efi_loader-Add-el-torito-support.patch + * 0006-efi_loader-Pass-file-path-to-payload.patch + * 0007-efi_loader-Increase-path-string-to-32-characters.patch ++++ 1156 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-rpi332b.changes --- /work/SRC/openSUSE:Factory/u-boot/u-boot-snow.changes 2016-09-12 13:25:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-snow.changes 2016-09-30 15:34:26.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Sep 28 15:18:17 UTC 2016 - afaerber(a)suse.de + +- Fix rpi332b installation path and enable %post scriplet + +------------------------------------------------------------------- +Sun Sep 11 03:44:15 UTC 2016 - afaerber(a)suse.de + +- Add hikey and rpi332b + +------------------------------------------------------------------- u-boot-spring.changes: same change u-boot-udoo.changes: same change u-boot.changes: same change New: ---- u-boot-hikey.changes u-boot-hikey.spec u-boot-rpi332b.changes u-boot-rpi332b.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ u-boot-a10-olinuxino-lime.spec ++++++ --- /var/tmp/diff_new_pack.lCpkJL/_old 2016-09-30 15:34:37.000000000 +0200 +++ /var/tmp/diff_new_pack.lCpkJL/_new 2016-09-30 15:34:37.000000000 +0200 @@ -69,7 +69,7 @@ BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware # For mountpoint @@ -118,7 +118,7 @@ %patch0019 -p1 %build -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" A10-OLinuXino-Lime_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -133,11 +133,11 @@ %endif %install -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %define uboot_dir /boot/vc %endif %if "%{name}" == "u-boot-qemu-ppce500" @@ -192,7 +192,7 @@ install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %post # On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. # It needs to be on the first FAT partition, wherever we mounted it. ++++++ u-boot-a13-olinuxino.spec ++++++ --- /var/tmp/diff_new_pack.lCpkJL/_old 2016-09-30 15:34:37.000000000 +0200 +++ /var/tmp/diff_new_pack.lCpkJL/_new 2016-09-30 15:34:37.000000000 +0200 @@ -69,7 +69,7 @@ BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware # For mountpoint @@ -118,7 +118,7 @@ %patch0019 -p1 %build -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" A13-OLinuXino_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -133,11 +133,11 @@ %endif %install -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %define uboot_dir /boot/vc %endif %if "%{name}" == "u-boot-qemu-ppce500" @@ -192,7 +192,7 @@ install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %post # On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. # It needs to be on the first FAT partition, wherever we mounted it. ++++++ u-boot-a13-olinuxinom.spec ++++++ --- /var/tmp/diff_new_pack.lCpkJL/_old 2016-09-30 15:34:38.000000000 +0200 +++ /var/tmp/diff_new_pack.lCpkJL/_new 2016-09-30 15:34:38.000000000 +0200 @@ -69,7 +69,7 @@ BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware # For mountpoint @@ -118,7 +118,7 @@ %patch0019 -p1 %build -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" A13-OLinuXinoM_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -133,11 +133,11 @@ %endif %install -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %define uboot_dir /boot/vc %endif %if "%{name}" == "u-boot-qemu-ppce500" @@ -192,7 +192,7 @@ install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %post # On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. # It needs to be on the first FAT partition, wherever we mounted it. ++++++ u-boot-a20-olinuxino-lime.spec ++++++ --- /var/tmp/diff_new_pack.lCpkJL/_old 2016-09-30 15:34:38.000000000 +0200 +++ /var/tmp/diff_new_pack.lCpkJL/_new 2016-09-30 15:34:38.000000000 +0200 @@ -69,7 +69,7 @@ BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware # For mountpoint @@ -118,7 +118,7 @@ %patch0019 -p1 %build -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" A20-OLinuXino-Lime_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -133,11 +133,11 @@ %endif %install -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %define uboot_dir /boot/vc %endif %if "%{name}" == "u-boot-qemu-ppce500" @@ -192,7 +192,7 @@ install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %post # On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. # It needs to be on the first FAT partition, wherever we mounted it. ++++++ u-boot-a20-olinuxino-lime2.spec ++++++ --- /var/tmp/diff_new_pack.lCpkJL/_old 2016-09-30 15:34:38.000000000 +0200 +++ /var/tmp/diff_new_pack.lCpkJL/_new 2016-09-30 15:34:38.000000000 +0200 @@ -69,7 +69,7 @@ BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware # For mountpoint @@ -118,7 +118,7 @@ %patch0019 -p1 %build -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" A20-OLinuXino-Lime2_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -133,11 +133,11 @@ %endif %install -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %define uboot_dir /boot/vc %endif %if "%{name}" == "u-boot-qemu-ppce500" @@ -192,7 +192,7 @@ install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %post # On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. # It needs to be on the first FAT partition, wherever we mounted it. ++++++ u-boot-a20-olinuxinomicro.spec ++++++ --- /var/tmp/diff_new_pack.lCpkJL/_old 2016-09-30 15:34:38.000000000 +0200 +++ /var/tmp/diff_new_pack.lCpkJL/_new 2016-09-30 15:34:38.000000000 +0200 @@ -69,7 +69,7 @@ BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware # For mountpoint @@ -118,7 +118,7 @@ %patch0019 -p1 %build -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" A20-OLinuXino_MICRO_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -133,11 +133,11 @@ %endif %install -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %define uboot_dir /boot/vc %endif %if "%{name}" == "u-boot-qemu-ppce500" @@ -192,7 +192,7 @@ install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %post # On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. # It needs to be on the first FAT partition, wherever we mounted it. ++++++ u-boot-am335xboneblack.spec ++++++ --- /var/tmp/diff_new_pack.lCpkJL/_old 2016-09-30 15:34:38.000000000 +0200 +++ /var/tmp/diff_new_pack.lCpkJL/_new 2016-09-30 15:34:38.000000000 +0200 @@ -69,7 +69,7 @@ BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware # For mountpoint @@ -118,7 +118,7 @@ %patch0019 -p1 %build -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" am335x_boneblack_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -133,11 +133,11 @@ %endif %install -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %define uboot_dir /boot/vc %endif %if "%{name}" == "u-boot-qemu-ppce500" @@ -192,7 +192,7 @@ install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %post # On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. # It needs to be on the first FAT partition, wherever we mounted it. ++++++ u-boot-am335xevm.spec ++++++ --- /var/tmp/diff_new_pack.lCpkJL/_old 2016-09-30 15:34:38.000000000 +0200 +++ /var/tmp/diff_new_pack.lCpkJL/_new 2016-09-30 15:34:38.000000000 +0200 @@ -69,7 +69,7 @@ BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware # For mountpoint @@ -118,7 +118,7 @@ %patch0019 -p1 %build -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" am335x_evm_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -133,11 +133,11 @@ %endif %install -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %define uboot_dir /boot/vc %endif %if "%{name}" == "u-boot-qemu-ppce500" @@ -192,7 +192,7 @@ install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %post # On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. # It needs to be on the first FAT partition, wherever we mounted it. ++++++ u-boot-am57xxevm.spec ++++++ --- /var/tmp/diff_new_pack.lCpkJL/_old 2016-09-30 15:34:38.000000000 +0200 +++ /var/tmp/diff_new_pack.lCpkJL/_new 2016-09-30 15:34:38.000000000 +0200 @@ -69,7 +69,7 @@ BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware # For mountpoint @@ -118,7 +118,7 @@ %patch0019 -p1 %build -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" am57xx_evm_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -133,11 +133,11 @@ %endif %install -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %define uboot_dir /boot/vc %endif %if "%{name}" == "u-boot-qemu-ppce500" @@ -192,7 +192,7 @@ install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %post # On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. # It needs to be on the first FAT partition, wherever we mounted it. ++++++ u-boot-am57xxevmnodt.spec ++++++ --- /var/tmp/diff_new_pack.lCpkJL/_old 2016-09-30 15:34:38.000000000 +0200 +++ /var/tmp/diff_new_pack.lCpkJL/_new 2016-09-30 15:34:38.000000000 +0200 @@ -69,7 +69,7 @@ BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware # For mountpoint @@ -118,7 +118,7 @@ %patch0019 -p1 %build -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" am57xx_evm_nodt_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -133,11 +133,11 @@ %endif %install -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %define uboot_dir /boot/vc %endif %if "%{name}" == "u-boot-qemu-ppce500" @@ -192,7 +192,7 @@ install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %post # On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. # It needs to be on the first FAT partition, wherever we mounted it. ++++++ u-boot-arndale.spec ++++++ --- /var/tmp/diff_new_pack.lCpkJL/_old 2016-09-30 15:34:38.000000000 +0200 +++ /var/tmp/diff_new_pack.lCpkJL/_new 2016-09-30 15:34:38.000000000 +0200 @@ -69,7 +69,7 @@ BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware # For mountpoint @@ -118,7 +118,7 @@ %patch0019 -p1 %build -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" arndale_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -133,11 +133,11 @@ %endif %install -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %define uboot_dir /boot/vc %endif %if "%{name}" == "u-boot-qemu-ppce500" @@ -192,7 +192,7 @@ install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %post # On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. # It needs to be on the first FAT partition, wherever we mounted it. ++++++ u-boot-bananapi.spec ++++++ --- /var/tmp/diff_new_pack.lCpkJL/_old 2016-09-30 15:34:38.000000000 +0200 +++ /var/tmp/diff_new_pack.lCpkJL/_new 2016-09-30 15:34:38.000000000 +0200 @@ -69,7 +69,7 @@ BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware # For mountpoint @@ -118,7 +118,7 @@ %patch0019 -p1 %build -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" Bananapi_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -133,11 +133,11 @@ %endif %install -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %define uboot_dir /boot/vc %endif %if "%{name}" == "u-boot-qemu-ppce500" @@ -192,7 +192,7 @@ install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %post # On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. # It needs to be on the first FAT partition, wherever we mounted it. ++++++ u-boot-clearfog.spec ++++++ --- /var/tmp/diff_new_pack.lCpkJL/_old 2016-09-30 15:34:38.000000000 +0200 +++ /var/tmp/diff_new_pack.lCpkJL/_new 2016-09-30 15:34:38.000000000 +0200 @@ -69,7 +69,7 @@ BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware # For mountpoint @@ -118,7 +118,7 @@ %patch0019 -p1 %build -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" clearfog_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -133,11 +133,11 @@ %endif %install -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %define uboot_dir /boot/vc %endif %if "%{name}" == "u-boot-qemu-ppce500" @@ -192,7 +192,7 @@ install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %post # On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. # It needs to be on the first FAT partition, wherever we mounted it. ++++++ u-boot-colibrit20.spec ++++++ --- /var/tmp/diff_new_pack.lCpkJL/_old 2016-09-30 15:34:39.000000000 +0200 +++ /var/tmp/diff_new_pack.lCpkJL/_new 2016-09-30 15:34:39.000000000 +0200 @@ -69,7 +69,7 @@ BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware # For mountpoint @@ -118,7 +118,7 @@ %patch0019 -p1 %build -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" colibri_t20_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -133,11 +133,11 @@ %endif %install -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %define uboot_dir /boot/vc %endif %if "%{name}" == "u-boot-qemu-ppce500" @@ -192,7 +192,7 @@ install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %post # On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. # It needs to be on the first FAT partition, wherever we mounted it. ++++++ u-boot-cubieboard.spec ++++++ --- /var/tmp/diff_new_pack.lCpkJL/_old 2016-09-30 15:34:39.000000000 +0200 +++ /var/tmp/diff_new_pack.lCpkJL/_new 2016-09-30 15:34:39.000000000 +0200 @@ -69,7 +69,7 @@ BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware # For mountpoint @@ -118,7 +118,7 @@ %patch0019 -p1 %build -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" Cubieboard_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -133,11 +133,11 @@ %endif %install -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %define uboot_dir /boot/vc %endif %if "%{name}" == "u-boot-qemu-ppce500" @@ -192,7 +192,7 @@ install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %post # On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. # It needs to be on the first FAT partition, wherever we mounted it. ++++++ u-boot-cubieboard2.spec ++++++ --- /var/tmp/diff_new_pack.lCpkJL/_old 2016-09-30 15:34:39.000000000 +0200 +++ /var/tmp/diff_new_pack.lCpkJL/_new 2016-09-30 15:34:39.000000000 +0200 @@ -69,7 +69,7 @@ BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware # For mountpoint @@ -118,7 +118,7 @@ %patch0019 -p1 %build -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" Cubieboard2_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -133,11 +133,11 @@ %endif %install -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %define uboot_dir /boot/vc %endif %if "%{name}" == "u-boot-qemu-ppce500" @@ -192,7 +192,7 @@ install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %post # On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. # It needs to be on the first FAT partition, wherever we mounted it. ++++++ u-boot-cubietruck.spec ++++++ --- /var/tmp/diff_new_pack.lCpkJL/_old 2016-09-30 15:34:39.000000000 +0200 +++ /var/tmp/diff_new_pack.lCpkJL/_new 2016-09-30 15:34:39.000000000 +0200 @@ -69,7 +69,7 @@ BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware # For mountpoint @@ -118,7 +118,7 @@ %patch0019 -p1 %build -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" Cubietruck_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -133,11 +133,11 @@ %endif %install -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %define uboot_dir /boot/vc %endif %if "%{name}" == "u-boot-qemu-ppce500" @@ -192,7 +192,7 @@ install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %post # On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. # It needs to be on the first FAT partition, wherever we mounted it. ++++++ u-boot-dragonboard410c.spec ++++++ --- /var/tmp/diff_new_pack.lCpkJL/_old 2016-09-30 15:34:39.000000000 +0200 +++ /var/tmp/diff_new_pack.lCpkJL/_new 2016-09-30 15:34:39.000000000 +0200 @@ -69,7 +69,7 @@ BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware # For mountpoint @@ -118,7 +118,7 @@ %patch0019 -p1 %build -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" dragonboard410c_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -133,11 +133,11 @@ %endif %install -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %define uboot_dir /boot/vc %endif %if "%{name}" == "u-boot-qemu-ppce500" @@ -192,7 +192,7 @@ install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %post # On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. # It needs to be on the first FAT partition, wherever we mounted it. ++++++ u-boot-firefly-rk3288.spec ++++++ --- /var/tmp/diff_new_pack.lCpkJL/_old 2016-09-30 15:34:39.000000000 +0200 +++ /var/tmp/diff_new_pack.lCpkJL/_new 2016-09-30 15:34:39.000000000 +0200 @@ -69,7 +69,7 @@ BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware # For mountpoint @@ -118,7 +118,7 @@ %patch0019 -p1 %build -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" firefly-rk3288_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -133,11 +133,11 @@ %endif %install -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %define uboot_dir /boot/vc %endif %if "%{name}" == "u-boot-qemu-ppce500" @@ -192,7 +192,7 @@ install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %post # On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. # It needs to be on the first FAT partition, wherever we mounted it. ++++++ u-boot-highbank.spec ++++++ --- /var/tmp/diff_new_pack.lCpkJL/_old 2016-09-30 15:34:39.000000000 +0200 +++ /var/tmp/diff_new_pack.lCpkJL/_new 2016-09-30 15:34:39.000000000 +0200 @@ -69,7 +69,7 @@ BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware # For mountpoint @@ -118,7 +118,7 @@ %patch0019 -p1 %build -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" highbank_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -133,11 +133,11 @@ %endif %install -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %define uboot_dir /boot/vc %endif %if "%{name}" == "u-boot-qemu-ppce500" @@ -192,7 +192,7 @@ install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %post # On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. # It needs to be on the first FAT partition, wherever we mounted it. ++++++ u-boot-hikey.spec ++++++ # # spec file for package u-boot-hikey # # Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2010 Texas Instruments Inc by Nishanth Menon # Copyright (c) 2007-2010 by Silvan Calarco <silvan.calarco(a)mambasoft.it> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define mvebu_spl 0 %define x_loader 0 %define rockchip_spl 0 %define sunxi_spl 0 %define arndale_spl 0 %define cuboxi_spl 0 %define origen_spl 0 %define udoo_spl 0 # archive_version differs from version for RC version only %define archive_version 2016.07 Name: u-boot-hikey Version: 2016.07 Release: 0 Summary: The U-Boot firmware for the hikey platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{archive_version}.tar.bz2 Source2: arndale-bl1.img Source3: update_git.sh Source300: u-boot-rpmlintrc Patch0001: 0001-XXX-openSUSE-XXX-Load-dtb-from-part.patch Patch0002: 0002-XXX-openSUSE-XXX-omap3-Move-to-dist.patch Patch0003: 0003-Revert-Revert-omap3-Use-raw-SPL-by-.patch Patch0004: 0004-efi_loader-Allow-boards-to-implemen.patch Patch0005: 0005-ARM-bcm283x-Implement-EFI-RTS-reset.patch Patch0006: 0006-efi_loader-gop-Expose-fb-when-32bpp.patch Patch0007: 0007-bcm2835-video-Map-frame-buffer-as-3.patch Patch0008: 0008-bcm2835-Reserve-the-spin-table-in-e.patch Patch0009: 0009-Revert-armv8-Enable-CPUECTLR.SMPEN-.patch Patch0010: 0010-bcm2835_gpio-Implement-GPIOF_FUNC.patch Patch0011: 0011-serial-bcm283x_mu-Detect-disabled-s.patch Patch0012: 0012-x86-Move-table-csum-into-separate-h.patch Patch0013: 0013-x86-Move-smbios-generation-into-arc.patch Patch0014: 0014-efi_loader-Expose-efi_install_confi.patch Patch0015: 0015-smbios-Allow-compilation-on-64bit-s.patch Patch0016: 0016-smbios-Expose-in-efi_loader-as-tabl.patch Patch0017: 0017-efi_loader-Fix-efi_install_configur.patch Patch0018: 0018-smbios-Provide-serial-number.patch Patch0019: 0019-common-env_nand-Ensure-that-we-have.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 BuildRequires: bc BuildRequires: dtc >= 1.4.0 %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) %if %x_loader == 1 Obsoletes: x-loader-hikey Provides: x-loader-hikey %endif ExclusiveArch: aarch64 %description Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded PowerPC, ARM, MIPS and x86 processors. This package contains the firmware for the hikey platform. %package doc Summary: Documentation for the U-Boot Firmware Group: Documentation/Other %description doc Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded PowerPC, ARM, MIPS and x86 processors. This package contains documentation for U-Boot firmware. %prep %setup -q -n u-boot-%{archive_version} %patch0001 -p1 %patch0002 -p1 %patch0003 -p1 %patch0004 -p1 %patch0005 -p1 %patch0006 -p1 %patch0007 -p1 %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 %patch0011 -p1 %patch0012 -p1 %patch0013 -p1 %patch0014 -p1 %patch0015 -p1 %patch0016 -p1 %patch0017 -p1 %patch0018 -p1 %patch0019 -p1 %build export SOURCE_DATE_EPOCH=1475075897 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" hikey_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" # Chromebook ARM (snow) and HP Chromebook 11 (spring) need a uImage format export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) ./tools/mkimage -A arm -O linux -T kernel -C none -a $TEXT_START -e $TEXT_START -n uboot -d u-boot-dtb.bin u-boot.img %endif %if %rockchip_spl == 1 for t in ; do ./tools/mkimage -n -d spl/u-boot-spl-dtb.bin -T $t u-boot-spl.$t done %endif %install export SOURCE_DATE_EPOCH=1475075897 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %define uboot_dir /boot/vc %endif %if "%{name}" == "u-boot-qemu-ppce500" %define uboot_dir %{_datadir}/qemu %endif %if "%{name}" == "u-boot-jetson-tk1" # tegra-uboot-flasher needs several intermediate files, under their original name. for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin spl/u-boot-spl; do install -D -m 0644 $f %{buildroot}/boot/$f done %else # Some times u-boot needs a dtb to configure itself appended to the binary. # In that case prefer the one with a working dtb already appended. if [ -f u-boot-dtb-tegra.bin ]; then install -D -m 0644 u-boot-dtb-tegra.bin %{buildroot}%{uboot_dir}/u-boot.bin elif [ -f u-boot-dtb.bin ]; then install -D -m 0644 u-boot-dtb.bin %{buildroot}%{uboot_dir}/u-boot.bin else install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin fi %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500 %endif %endif %if %x_loader == 1 install -D -m 0755 MLO %{buildroot}/boot/MLO %endif %if %origen_spl == 1 install -D -m 0755 spl/origen-spl.bin %{buildroot}/boot/origen-spl.bin %endif %if %arndale_spl == 1 install -D -m 0755 spl/arndale-spl.bin %{buildroot}/boot/arndale-spl.bin install -D -m 0755 %{SOURCE2} %{buildroot}/boot/arndale-bl1.img %endif %if %mvebu_spl == 1 install -D -m 0755 u-boot-spl.kwb %{buildroot}%{uboot_dir}/u-boot-spl.kwb %endif %if %rockchip_spl == 1 install -D -m 0644 spl/u-boot-spl-dtb.bin %{buildroot}%{uboot_dir}/u-boot-spl-dtb.bin for t in ; do install -D -m 0644 u-boot-spl.$t %{buildroot}%{uboot_dir}/u-boot-spl.$t done %endif %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin install -D -m 0755 u-boot-sunxi-with-spl.bin %{buildroot}/boot/u-boot-sunxi-with-spl.bin %endif %if %cuboxi_spl == 1 install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin %endif %if %udoo_spl == 1 install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %post # On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. # It needs to be on the first FAT partition, wherever we mounted it. # a) Unmounted, then do nothing. # b) Mounted as /boot/vc, then they're in the right place already. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ fi %endif %files %defattr(-,root,root) %{uboot_dir}/* %doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) # Generic documents %doc doc/README.JFFS2 doc/README.JFFS2_NAND doc/README.commands %doc doc/README.autoboot doc/README.commands doc/README.console doc/README.dns %doc doc/README.hwconfig doc/README.nand doc/README.NetConsole doc/README.serial_multi %doc doc/README.SNTP doc/README.standalone doc/README.update doc/README.usb %doc doc/README.video doc/README.VLAN doc/README.silent doc/README.POST # Copy some useful kermit scripts as well %doc tools/kermit/dot.kermrc tools/kermit/flash_param tools/kermit/send_cmd tools/kermit/send_image # Now any h/w dependent Documentation %doc doc/README.ARM-memory-map %changelog ++++++ u-boot-hyundaia7hd.spec ++++++ --- /var/tmp/diff_new_pack.lCpkJL/_old 2016-09-30 15:34:39.000000000 +0200 +++ /var/tmp/diff_new_pack.lCpkJL/_new 2016-09-30 15:34:39.000000000 +0200 @@ -69,7 +69,7 @@ BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware # For mountpoint @@ -118,7 +118,7 @@ %patch0019 -p1 %build -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" Hyundai_A7HD_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -133,11 +133,11 @@ %endif %install -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %define uboot_dir /boot/vc %endif %if "%{name}" == "u-boot-qemu-ppce500" @@ -192,7 +192,7 @@ install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %post # On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. # It needs to be on the first FAT partition, wherever we mounted it. ++++++ u-boot-jetson-tk1.spec ++++++ --- /var/tmp/diff_new_pack.lCpkJL/_old 2016-09-30 15:34:39.000000000 +0200 +++ /var/tmp/diff_new_pack.lCpkJL/_new 2016-09-30 15:34:39.000000000 +0200 @@ -69,7 +69,7 @@ BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware # For mountpoint @@ -118,7 +118,7 @@ %patch0019 -p1 %build -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" jetson-tk1_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -133,11 +133,11 @@ %endif %install -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %define uboot_dir /boot/vc %endif %if "%{name}" == "u-boot-qemu-ppce500" @@ -192,7 +192,7 @@ install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %post # On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. # It needs to be on the first FAT partition, wherever we mounted it. ++++++ u-boot-melea1000.spec ++++++ --- /var/tmp/diff_new_pack.lCpkJL/_old 2016-09-30 15:34:39.000000000 +0200 +++ /var/tmp/diff_new_pack.lCpkJL/_new 2016-09-30 15:34:39.000000000 +0200 @@ -69,7 +69,7 @@ BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware # For mountpoint @@ -118,7 +118,7 @@ %patch0019 -p1 %build -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" Mele_A1000_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -133,11 +133,11 @@ %endif %install -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %define uboot_dir /boot/vc %endif %if "%{name}" == "u-boot-qemu-ppce500" @@ -192,7 +192,7 @@ install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %post # On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. # It needs to be on the first FAT partition, wherever we mounted it. ++++++ u-boot-merriia80optimus.spec ++++++ --- /var/tmp/diff_new_pack.lCpkJL/_old 2016-09-30 15:34:40.000000000 +0200 +++ /var/tmp/diff_new_pack.lCpkJL/_new 2016-09-30 15:34:40.000000000 +0200 @@ -69,7 +69,7 @@ BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware # For mountpoint @@ -118,7 +118,7 @@ %patch0019 -p1 %build -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" Merrii_A80_Optimus_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -133,11 +133,11 @@ %endif %install -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %define uboot_dir /boot/vc %endif %if "%{name}" == "u-boot-qemu-ppce500" @@ -192,7 +192,7 @@ install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %post # On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. # It needs to be on the first FAT partition, wherever we mounted it. ++++++ u-boot-mx53loco.spec ++++++ --- /var/tmp/diff_new_pack.lCpkJL/_old 2016-09-30 15:34:40.000000000 +0200 +++ /var/tmp/diff_new_pack.lCpkJL/_new 2016-09-30 15:34:40.000000000 +0200 @@ -69,7 +69,7 @@ BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware # For mountpoint @@ -118,7 +118,7 @@ %patch0019 -p1 %build -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" mx53loco_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -133,11 +133,11 @@ %endif %install -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %define uboot_dir /boot/vc %endif %if "%{name}" == "u-boot-qemu-ppce500" @@ -192,7 +192,7 @@ install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %post # On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. # It needs to be on the first FAT partition, wherever we mounted it. ++++++ u-boot-mx6cuboxi.spec ++++++ --- /var/tmp/diff_new_pack.lCpkJL/_old 2016-09-30 15:34:40.000000000 +0200 +++ /var/tmp/diff_new_pack.lCpkJL/_new 2016-09-30 15:34:40.000000000 +0200 @@ -69,7 +69,7 @@ BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware # For mountpoint @@ -118,7 +118,7 @@ %patch0019 -p1 %build -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" mx6cuboxi_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -133,11 +133,11 @@ %endif %install -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %define uboot_dir /boot/vc %endif %if "%{name}" == "u-boot-qemu-ppce500" @@ -192,7 +192,7 @@ install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %post # On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. # It needs to be on the first FAT partition, wherever we mounted it. ++++++ u-boot-mx6qsabrelite.spec ++++++ --- /var/tmp/diff_new_pack.lCpkJL/_old 2016-09-30 15:34:40.000000000 +0200 +++ /var/tmp/diff_new_pack.lCpkJL/_new 2016-09-30 15:34:40.000000000 +0200 @@ -69,7 +69,7 @@ BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware # For mountpoint @@ -118,7 +118,7 @@ %patch0019 -p1 %build -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" mx6qsabrelite_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -133,11 +133,11 @@ %endif %install -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %define uboot_dir /boot/vc %endif %if "%{name}" == "u-boot-qemu-ppce500" @@ -192,7 +192,7 @@ install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %post # On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. # It needs to be on the first FAT partition, wherever we mounted it. ++++++ u-boot-odroid-c2.spec ++++++ --- /var/tmp/diff_new_pack.lCpkJL/_old 2016-09-30 15:34:40.000000000 +0200 +++ /var/tmp/diff_new_pack.lCpkJL/_new 2016-09-30 15:34:40.000000000 +0200 @@ -69,7 +69,7 @@ BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware # For mountpoint @@ -118,7 +118,7 @@ %patch0019 -p1 %build -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" odroid-c2_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -133,11 +133,11 @@ %endif %install -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %define uboot_dir /boot/vc %endif %if "%{name}" == "u-boot-qemu-ppce500" @@ -192,7 +192,7 @@ install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %post # On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. # It needs to be on the first FAT partition, wherever we mounted it. ++++++ u-boot-odroid-xu3.spec ++++++ --- /var/tmp/diff_new_pack.lCpkJL/_old 2016-09-30 15:34:40.000000000 +0200 +++ /var/tmp/diff_new_pack.lCpkJL/_new 2016-09-30 15:34:40.000000000 +0200 @@ -69,7 +69,7 @@ BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware # For mountpoint @@ -118,7 +118,7 @@ %patch0019 -p1 %build -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" odroid-xu3_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -133,11 +133,11 @@ %endif %install -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %define uboot_dir /boot/vc %endif %if "%{name}" == "u-boot-qemu-ppce500" @@ -192,7 +192,7 @@ install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %post # On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. # It needs to be on the first FAT partition, wherever we mounted it. ++++++ u-boot-odroid.spec ++++++ --- /var/tmp/diff_new_pack.lCpkJL/_old 2016-09-30 15:34:40.000000000 +0200 +++ /var/tmp/diff_new_pack.lCpkJL/_new 2016-09-30 15:34:40.000000000 +0200 @@ -69,7 +69,7 @@ BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware # For mountpoint @@ -118,7 +118,7 @@ %patch0019 -p1 %build -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" odroid_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -133,11 +133,11 @@ %endif %install -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %define uboot_dir /boot/vc %endif %if "%{name}" == "u-boot-qemu-ppce500" @@ -192,7 +192,7 @@ install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %post # On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. # It needs to be on the first FAT partition, wherever we mounted it. ++++++ u-boot-omap3beagle.spec ++++++ --- /var/tmp/diff_new_pack.lCpkJL/_old 2016-09-30 15:34:40.000000000 +0200 +++ /var/tmp/diff_new_pack.lCpkJL/_new 2016-09-30 15:34:40.000000000 +0200 @@ -69,7 +69,7 @@ BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware # For mountpoint @@ -118,7 +118,7 @@ %patch0019 -p1 %build -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" omap3_beagle_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -133,11 +133,11 @@ %endif %install -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %define uboot_dir /boot/vc %endif %if "%{name}" == "u-boot-qemu-ppce500" @@ -192,7 +192,7 @@ install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %post # On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. # It needs to be on the first FAT partition, wherever we mounted it. ++++++ u-boot-omap4panda.spec ++++++ --- /var/tmp/diff_new_pack.lCpkJL/_old 2016-09-30 15:34:40.000000000 +0200 +++ /var/tmp/diff_new_pack.lCpkJL/_new 2016-09-30 15:34:40.000000000 +0200 @@ -69,7 +69,7 @@ BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware # For mountpoint @@ -118,7 +118,7 @@ %patch0019 -p1 %build -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" omap4_panda_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -133,11 +133,11 @@ %endif %install -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %define uboot_dir /boot/vc %endif %if "%{name}" == "u-boot-qemu-ppce500" @@ -192,7 +192,7 @@ install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %post # On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. # It needs to be on the first FAT partition, wherever we mounted it. ++++++ u-boot-orangepipc.spec ++++++ --- /var/tmp/diff_new_pack.lCpkJL/_old 2016-09-30 15:34:40.000000000 +0200 +++ /var/tmp/diff_new_pack.lCpkJL/_new 2016-09-30 15:34:40.000000000 +0200 @@ -69,7 +69,7 @@ BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware # For mountpoint @@ -118,7 +118,7 @@ %patch0019 -p1 %build -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" orangepi_pc_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -133,11 +133,11 @@ %endif %install -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %define uboot_dir /boot/vc %endif %if "%{name}" == "u-boot-qemu-ppce500" @@ -192,7 +192,7 @@ install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %post # On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. # It needs to be on the first FAT partition, wherever we mounted it. ++++++ u-boot-p2371-2180.spec ++++++ --- /var/tmp/diff_new_pack.lCpkJL/_old 2016-09-30 15:34:40.000000000 +0200 +++ /var/tmp/diff_new_pack.lCpkJL/_new 2016-09-30 15:34:40.000000000 +0200 @@ -69,7 +69,7 @@ BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware # For mountpoint @@ -118,7 +118,7 @@ %patch0019 -p1 %build -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" p2371-2180_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -133,11 +133,11 @@ %endif %install -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %define uboot_dir /boot/vc %endif %if "%{name}" == "u-boot-qemu-ppce500" @@ -192,7 +192,7 @@ install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %post # On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. # It needs to be on the first FAT partition, wherever we mounted it. ++++++ u-boot-paz00.spec ++++++ --- /var/tmp/diff_new_pack.lCpkJL/_old 2016-09-30 15:34:40.000000000 +0200 +++ /var/tmp/diff_new_pack.lCpkJL/_new 2016-09-30 15:34:40.000000000 +0200 @@ -69,7 +69,7 @@ BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware # For mountpoint @@ -118,7 +118,7 @@ %patch0019 -p1 %build -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" paz00_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -133,11 +133,11 @@ %endif %install -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %define uboot_dir /boot/vc %endif %if "%{name}" == "u-boot-qemu-ppce500" @@ -192,7 +192,7 @@ install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %post # On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. # It needs to be on the first FAT partition, wherever we mounted it. ++++++ u-boot-pcm051rev3.spec ++++++ --- /var/tmp/diff_new_pack.lCpkJL/_old 2016-09-30 15:34:40.000000000 +0200 +++ /var/tmp/diff_new_pack.lCpkJL/_new 2016-09-30 15:34:40.000000000 +0200 @@ -69,7 +69,7 @@ BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware # For mountpoint @@ -118,7 +118,7 @@ %patch0019 -p1 %build -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" pcm051_rev3_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -133,11 +133,11 @@ %endif %install -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %define uboot_dir /boot/vc %endif %if "%{name}" == "u-boot-qemu-ppce500" @@ -192,7 +192,7 @@ install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %post # On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. # It needs to be on the first FAT partition, wherever we mounted it. ++++++ u-boot-pine64plus.spec ++++++ --- /var/tmp/diff_new_pack.lCpkJL/_old 2016-09-30 15:34:41.000000000 +0200 +++ /var/tmp/diff_new_pack.lCpkJL/_new 2016-09-30 15:34:41.000000000 +0200 @@ -69,7 +69,7 @@ BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware # For mountpoint @@ -118,7 +118,7 @@ %patch0019 -p1 %build -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" pine64_plus_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -133,11 +133,11 @@ %endif %install -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %define uboot_dir /boot/vc %endif %if "%{name}" == "u-boot-qemu-ppce500" @@ -192,7 +192,7 @@ install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %post # On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. # It needs to be on the first FAT partition, wherever we mounted it. ++++++ u-boot-qemu-ppce500.spec ++++++ --- /var/tmp/diff_new_pack.lCpkJL/_old 2016-09-30 15:34:41.000000000 +0200 +++ /var/tmp/diff_new_pack.lCpkJL/_new 2016-09-30 15:34:41.000000000 +0200 @@ -69,7 +69,7 @@ BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware # For mountpoint @@ -118,7 +118,7 @@ %patch0019 -p1 %build -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" qemu-ppce500_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -133,11 +133,11 @@ %endif %install -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %define uboot_dir /boot/vc %endif %if "%{name}" == "u-boot-qemu-ppce500" @@ -192,7 +192,7 @@ install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %post # On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. # It needs to be on the first FAT partition, wherever we mounted it. ++++++ u-boot-rpi.spec ++++++ --- /var/tmp/diff_new_pack.lCpkJL/_old 2016-09-30 15:34:41.000000000 +0200 +++ /var/tmp/diff_new_pack.lCpkJL/_new 2016-09-30 15:34:41.000000000 +0200 @@ -69,7 +69,7 @@ BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware # For mountpoint @@ -118,7 +118,7 @@ %patch0019 -p1 %build -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" rpi_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -133,11 +133,11 @@ %endif %install -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %define uboot_dir /boot/vc %endif %if "%{name}" == "u-boot-qemu-ppce500" @@ -192,7 +192,7 @@ install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %post # On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. # It needs to be on the first FAT partition, wherever we mounted it. ++++++ u-boot-rpi2.spec ++++++ --- /var/tmp/diff_new_pack.lCpkJL/_old 2016-09-30 15:34:41.000000000 +0200 +++ /var/tmp/diff_new_pack.lCpkJL/_new 2016-09-30 15:34:41.000000000 +0200 @@ -69,7 +69,7 @@ BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware # For mountpoint @@ -118,7 +118,7 @@ %patch0019 -p1 %build -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" rpi_2_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -133,11 +133,11 @@ %endif %install -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %define uboot_dir /boot/vc %endif %if "%{name}" == "u-boot-qemu-ppce500" @@ -192,7 +192,7 @@ install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %post # On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. # It needs to be on the first FAT partition, wherever we mounted it. ++++++ u-boot-rpi3.spec ++++++ --- /var/tmp/diff_new_pack.lCpkJL/_old 2016-09-30 15:34:41.000000000 +0200 +++ /var/tmp/diff_new_pack.lCpkJL/_new 2016-09-30 15:34:41.000000000 +0200 @@ -69,7 +69,7 @@ BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware # For mountpoint @@ -118,7 +118,7 @@ %patch0019 -p1 %build -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" rpi_3_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -133,11 +133,11 @@ %endif %install -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %define uboot_dir /boot/vc %endif %if "%{name}" == "u-boot-qemu-ppce500" @@ -192,7 +192,7 @@ install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %post # On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. # It needs to be on the first FAT partition, wherever we mounted it. ++++++ u-boot-rpi332b.spec ++++++ # # spec file for package u-boot-rpi332b # # Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2010 Texas Instruments Inc by Nishanth Menon # Copyright (c) 2007-2010 by Silvan Calarco <silvan.calarco(a)mambasoft.it> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define mvebu_spl 0 %define x_loader 0 %define rockchip_spl 0 %define sunxi_spl 0 %define arndale_spl 0 %define cuboxi_spl 0 %define origen_spl 0 %define udoo_spl 0 # archive_version differs from version for RC version only %define archive_version 2016.07 Name: u-boot-rpi332b Version: 2016.07 Release: 0 Summary: The U-Boot firmware for the rpi332b platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{archive_version}.tar.bz2 Source2: arndale-bl1.img Source3: update_git.sh Source300: u-boot-rpmlintrc Patch0001: 0001-XXX-openSUSE-XXX-Load-dtb-from-part.patch Patch0002: 0002-XXX-openSUSE-XXX-omap3-Move-to-dist.patch Patch0003: 0003-Revert-Revert-omap3-Use-raw-SPL-by-.patch Patch0004: 0004-efi_loader-Allow-boards-to-implemen.patch Patch0005: 0005-ARM-bcm283x-Implement-EFI-RTS-reset.patch Patch0006: 0006-efi_loader-gop-Expose-fb-when-32bpp.patch Patch0007: 0007-bcm2835-video-Map-frame-buffer-as-3.patch Patch0008: 0008-bcm2835-Reserve-the-spin-table-in-e.patch Patch0009: 0009-Revert-armv8-Enable-CPUECTLR.SMPEN-.patch Patch0010: 0010-bcm2835_gpio-Implement-GPIOF_FUNC.patch Patch0011: 0011-serial-bcm283x_mu-Detect-disabled-s.patch Patch0012: 0012-x86-Move-table-csum-into-separate-h.patch Patch0013: 0013-x86-Move-smbios-generation-into-arc.patch Patch0014: 0014-efi_loader-Expose-efi_install_confi.patch Patch0015: 0015-smbios-Allow-compilation-on-64bit-s.patch Patch0016: 0016-smbios-Expose-in-efi_loader-as-tabl.patch Patch0017: 0017-efi_loader-Fix-efi_install_configur.patch Patch0018: 0018-smbios-Provide-serial-number.patch Patch0019: 0019-common-env_nand-Ensure-that-we-have.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 BuildRequires: bc BuildRequires: dtc >= 1.4.0 %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) %if %x_loader == 1 Obsoletes: x-loader-rpi332b Provides: x-loader-rpi332b %endif ExclusiveArch: armv7l armv7hl %description Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded PowerPC, ARM, MIPS and x86 processors. This package contains the firmware for the rpi332b platform. %package doc Summary: Documentation for the U-Boot Firmware Group: Documentation/Other %description doc Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded PowerPC, ARM, MIPS and x86 processors. This package contains documentation for U-Boot firmware. %prep %setup -q -n u-boot-%{archive_version} %patch0001 -p1 %patch0002 -p1 %patch0003 -p1 %patch0004 -p1 %patch0005 -p1 %patch0006 -p1 %patch0007 -p1 %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 %patch0011 -p1 %patch0012 -p1 %patch0013 -p1 %patch0014 -p1 %patch0015 -p1 %patch0016 -p1 %patch0017 -p1 %patch0018 -p1 %patch0019 -p1 %build export SOURCE_DATE_EPOCH=1475075897 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" rpi_3_32b_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" # Chromebook ARM (snow) and HP Chromebook 11 (spring) need a uImage format export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) ./tools/mkimage -A arm -O linux -T kernel -C none -a $TEXT_START -e $TEXT_START -n uboot -d u-boot-dtb.bin u-boot.img %endif %if %rockchip_spl == 1 for t in ; do ./tools/mkimage -n -d spl/u-boot-spl-dtb.bin -T $t u-boot-spl.$t done %endif %install export SOURCE_DATE_EPOCH=1475075897 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %define uboot_dir /boot/vc %endif %if "%{name}" == "u-boot-qemu-ppce500" %define uboot_dir %{_datadir}/qemu %endif %if "%{name}" == "u-boot-jetson-tk1" # tegra-uboot-flasher needs several intermediate files, under their original name. for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin spl/u-boot-spl; do install -D -m 0644 $f %{buildroot}/boot/$f done %else # Some times u-boot needs a dtb to configure itself appended to the binary. # In that case prefer the one with a working dtb already appended. if [ -f u-boot-dtb-tegra.bin ]; then install -D -m 0644 u-boot-dtb-tegra.bin %{buildroot}%{uboot_dir}/u-boot.bin elif [ -f u-boot-dtb.bin ]; then install -D -m 0644 u-boot-dtb.bin %{buildroot}%{uboot_dir}/u-boot.bin else install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin fi %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500 %endif %endif %if %x_loader == 1 install -D -m 0755 MLO %{buildroot}/boot/MLO %endif %if %origen_spl == 1 install -D -m 0755 spl/origen-spl.bin %{buildroot}/boot/origen-spl.bin %endif %if %arndale_spl == 1 install -D -m 0755 spl/arndale-spl.bin %{buildroot}/boot/arndale-spl.bin install -D -m 0755 %{SOURCE2} %{buildroot}/boot/arndale-bl1.img %endif %if %mvebu_spl == 1 install -D -m 0755 u-boot-spl.kwb %{buildroot}%{uboot_dir}/u-boot-spl.kwb %endif %if %rockchip_spl == 1 install -D -m 0644 spl/u-boot-spl-dtb.bin %{buildroot}%{uboot_dir}/u-boot-spl-dtb.bin for t in ; do install -D -m 0644 u-boot-spl.$t %{buildroot}%{uboot_dir}/u-boot-spl.$t done %endif %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin install -D -m 0755 u-boot-sunxi-with-spl.bin %{buildroot}/boot/u-boot-sunxi-with-spl.bin %endif %if %cuboxi_spl == 1 install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin %endif %if %udoo_spl == 1 install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %post # On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. # It needs to be on the first FAT partition, wherever we mounted it. # a) Unmounted, then do nothing. # b) Mounted as /boot/vc, then they're in the right place already. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ fi %endif %files %defattr(-,root,root) %{uboot_dir}/* %doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) # Generic documents %doc doc/README.JFFS2 doc/README.JFFS2_NAND doc/README.commands %doc doc/README.autoboot doc/README.commands doc/README.console doc/README.dns %doc doc/README.hwconfig doc/README.nand doc/README.NetConsole doc/README.serial_multi %doc doc/README.SNTP doc/README.standalone doc/README.update doc/README.usb %doc doc/README.video doc/README.VLAN doc/README.silent doc/README.POST # Copy some useful kermit scripts as well %doc tools/kermit/dot.kermrc tools/kermit/flash_param tools/kermit/send_cmd tools/kermit/send_image # Now any h/w dependent Documentation %doc doc/README.ARM-memory-map %changelog ++++++ u-boot-snow.spec ++++++ --- /var/tmp/diff_new_pack.lCpkJL/_old 2016-09-30 15:34:41.000000000 +0200 +++ /var/tmp/diff_new_pack.lCpkJL/_new 2016-09-30 15:34:41.000000000 +0200 @@ -69,7 +69,7 @@ BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware # For mountpoint @@ -118,7 +118,7 @@ %patch0019 -p1 %build -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" snow_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -133,11 +133,11 @@ %endif %install -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %define uboot_dir /boot/vc %endif %if "%{name}" == "u-boot-qemu-ppce500" @@ -192,7 +192,7 @@ install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %post # On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. # It needs to be on the first FAT partition, wherever we mounted it. ++++++ u-boot-spring.spec ++++++ --- /var/tmp/diff_new_pack.lCpkJL/_old 2016-09-30 15:34:41.000000000 +0200 +++ /var/tmp/diff_new_pack.lCpkJL/_new 2016-09-30 15:34:41.000000000 +0200 @@ -69,7 +69,7 @@ BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware # For mountpoint @@ -118,7 +118,7 @@ %patch0019 -p1 %build -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" spring_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -133,11 +133,11 @@ %endif %install -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %define uboot_dir /boot/vc %endif %if "%{name}" == "u-boot-qemu-ppce500" @@ -192,7 +192,7 @@ install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %post # On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. # It needs to be on the first FAT partition, wherever we mounted it. ++++++ u-boot-udoo.spec ++++++ --- /var/tmp/diff_new_pack.lCpkJL/_old 2016-09-30 15:34:42.000000000 +0200 +++ /var/tmp/diff_new_pack.lCpkJL/_new 2016-09-30 15:34:42.000000000 +0200 @@ -69,7 +69,7 @@ BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware # For mountpoint @@ -118,7 +118,7 @@ %patch0019 -p1 %build -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" udoo_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -133,11 +133,11 @@ %endif %install -export SOURCE_DATE_EPOCH=1473238979 +export SOURCE_DATE_EPOCH=1475075897 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %define uboot_dir /boot/vc %endif %if "%{name}" == "u-boot-qemu-ppce500" @@ -192,7 +192,7 @@ install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %post # On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. # It needs to be on the first FAT partition, wherever we mounted it. ++++++ pre_checkin.sh ++++++ --- /var/tmp/diff_new_pack.lCpkJL/_old 2016-09-30 15:34:42.000000000 +0200 +++ /var/tmp/diff_new_pack.lCpkJL/_new 2016-09-30 15:34:42.000000000 +0200 @@ -25,7 +25,7 @@ armv7_boards="$armv7_boards A20-OLinuXino-Lime A20-OLinuXino-Lime2 A20-OLinuXino_MICRO" armv7_boards="$armv7_boards orangepi_pc Hyundai_A7HD" # Broadcom -armv7_boards="$armv7_boards rpi_2" +armv7_boards="$armv7_boards rpi_2 rpi_3_32b" # Nvidia armv7_boards="$armv7_boards colibri_t20 paz00 jetson-tk1" # Rockchip @@ -33,7 +33,7 @@ # Marvell armv7_boards="$armv7_boards clearfog" -aarch64_boards="dragonboard410c odroid-c2 p2371-2180 pine64_plus rpi_3" +aarch64_boards="dragonboard410c hikey odroid-c2 p2371-2180 pine64_plus rpi_3" ppc_boards="qemu-ppce500" ++++++ u-boot.spec.in ++++++ --- /var/tmp/diff_new_pack.lCpkJL/_old 2016-09-30 15:34:42.000000000 +0200 +++ /var/tmp/diff_new_pack.lCpkJL/_new 2016-09-30 15:34:42.000000000 +0200 @@ -51,7 +51,7 @@ BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware # For mountpoint @@ -101,7 +101,7 @@ export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %define uboot_dir /boot/vc %endif %if "%{name}" == "u-boot-qemu-ppce500" @@ -156,7 +156,7 @@ install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif -%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi332b" || "%{name}" == "u-boot-rpi3" %post # On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. # It needs to be on the first FAT partition, wherever we mounted it.

1 0