openSUSE Commits
Threads by month
- ----- 2025 -----
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
November 2015
- 1 participants
- 1310 discussions
Hello community,
here is the log from the commit of package calibre for openSUSE:Factory checked in at 2015-11-28 15:19:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/calibre (Old)
and /work/SRC/openSUSE:Factory/.calibre.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "calibre"
Changes:
--------
--- /work/SRC/openSUSE:Factory/calibre/calibre.changes 2015-11-08 11:27:56.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.calibre.new/calibre.changes 2015-11-28 19:51:49.000000000 +0100
@@ -1,0 +2,7 @@
+Sat Nov 28 00:02:09 UTC 2015 - cornelis(a)solcon.nl
+
+- Update to 2.45.0:
+ * Improved handling of covers.
+ * And more, for details see: http://calibre-ebook.com/whats-new
+
+-------------------------------------------------------------------
Old:
----
calibre-2.43.0.tar.xz
New:
----
calibre-2.45.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ calibre.spec ++++++
--- /var/tmp/diff_new_pack.QrSVsx/_old 2015-11-28 19:51:52.000000000 +0100
+++ /var/tmp/diff_new_pack.QrSVsx/_new 2015-11-28 19:51:52.000000000 +0100
@@ -20,7 +20,7 @@
License: GPL-3.0
Group: Productivity/Other
Name: calibre
-Version: 2.43.0
+Version: 2.45.0
Release: 0
Url: http://calibre-ebook.com
Source0: http://download.calibre-ebook.com/%{version}/calibre-%{version}.tar.xz
++++++ calibre-2.43.0.tar.xz -> calibre-2.45.0.tar.xz ++++++
/work/SRC/openSUSE:Factory/calibre/calibre-2.43.0.tar.xz /work/SRC/openSUSE:Factory/.calibre.new/calibre-2.45.0.tar.xz differ: char 26, line 1
1
0
Hello community,
here is the log from the commit of package hawk2 for openSUSE:Factory checked in at 2015-11-28 15:19:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/hawk2 (Old)
and /work/SRC/openSUSE:Factory/.hawk2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hawk2"
Changes:
--------
--- /work/SRC/openSUSE:Factory/hawk2/hawk2.changes 2015-11-26 17:01:24.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.hawk2.new/hawk2.changes 2015-11-28 15:19:36.000000000 +0100
@@ -1,0 +2,15 @@
+Wed Nov 25 12:30:36 UTC 2015 - kgronlund(a)suse.com
+
+- Update to version 1.0.1+git.1448454104.9e71083:
+ + Model: Require Invoker properly (bsc#956446)
+ + Fix 'illegal argument Symbol to Attribute constructor' error (bsc#956446)
+ + Location: Fix constraint bug after error (bsc#953847)
+ + Show name of currently logged in user
+ + Clean up command log entries
+ + ACL: Fix ACL enabled check
+ + Dashboard: Update epoch tracking correctly
+ + Colocation: Don't crash on missing node-attr
+ + Model: Fix removal of last item in attrlist
+ + Cib: Support optional mini query parameter
+
+-------------------------------------------------------------------
Old:
----
hawk2-1.0.1+git.1447941962.3d88e5f.tar.bz2
New:
----
hawk2-1.0.1+git.1448454104.9e71083.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hawk2.spec ++++++
--- /var/tmp/diff_new_pack.05yDhq/_old 2015-11-28 15:19:37.000000000 +0100
+++ /var/tmp/diff_new_pack.05yDhq/_new 2015-11-28 15:19:37.000000000 +0100
@@ -39,7 +39,7 @@
Summary: HA Web Konsole
License: GPL-2.0
Group: %{pkg_group}
-Version: 1.0.1+git.1447941962.3d88e5f
+Version: 1.0.1+git.1448454104.9e71083
Release: 0
Url: http://www.clusterlabs.org/wiki/Hawk
Source: %{name}-%{version}.tar.bz2
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.05yDhq/_old 2015-11-28 15:19:37.000000000 +0100
+++ /var/tmp/diff_new_pack.05yDhq/_new 2015-11-28 15:19:37.000000000 +0100
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">git://github.com/ClusterLabs/hawk.git</param>
- <param name="changesrevision">3d88e5fd858a390d89c724c0e57e914f30ad74da</param></service></servicedata>
\ No newline at end of file
+ <param name="changesrevision">9e7108330a3a921f04e8c2b50474860dd8a29614</param></service></servicedata>
\ No newline at end of file
++++++ hawk2-1.0.1+git.1447941962.3d88e5f.tar.bz2 -> hawk2-1.0.1+git.1448454104.9e71083.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/assets/javascripts/dashboard.js new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/assets/javascripts/dashboard.js
--- old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/assets/javascripts/dashboard.js 2015-11-19 15:08:09.000000000 +0100
+++ new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/assets/javascripts/dashboard.js 2015-11-25 13:30:28.000000000 +0100
@@ -305,12 +305,15 @@
function clusterRefresh(clusterId, clusterInfo) {
indicator(clusterId, "refresh");
+ //console.log("request cib", $("#" + clusterId).data('epoch'), (new Date()).getTime());
ajaxQuery({ url: baseUrl(clusterInfo) + "/cib/mini.json",
type: "GET",
data: { _method: 'show' },
crossDomain: clusterInfo.host != null,
success: function(data) {
displayClusterStatus(clusterId, data);
+ //console.log("response cib", data.meta.epoch, (new Date()).getTime());
+ $("#" + clusterId).data('epoch', data.meta.epoch);
clusterUpdate(clusterId, clusterInfo);
},
error: function(xhr, status, error) {
@@ -323,14 +326,15 @@
function clusterUpdate(clusterId, clusterInfo) {
var current_epoch = $("#" + clusterId).data('epoch');
+ //console.log("request monitor", current_epoch, (new Date()).getTime());
ajaxQuery({ url: baseUrl(clusterInfo) + "/monitor.json",
type: "GET",
data: current_epoch,
timeout: 90000,
crossDomain: clusterInfo.host != null,
success: function(data) {
+ //console.log("response monitor", data.epoch, current_epoch, (new Date()).getTime());
if (data.epoch != current_epoch) {
- $("#" + clusterId).data('epoch', data.epoch);
clusterRefresh(clusterId, clusterInfo);
} else {
clusterUpdate(clusterId, clusterInfo);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/controllers/cib_controller.rb new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/controllers/cib_controller.rb
--- old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/controllers/cib_controller.rb 2015-11-19 15:08:09.000000000 +0100
+++ new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/controllers/cib_controller.rb 2015-11-25 13:30:28.000000000 +0100
@@ -8,7 +8,7 @@
def show
respond_to do |format|
format.json do
- render json: current_cib.status(params[:id] == "mini")
+ render json: current_cib.status(params[:id] == "mini" || params[:mini] == "true")
end
end
rescue ArgumentError => e
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/controllers/locations_controller.rb new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/controllers/locations_controller.rb
--- old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/controllers/locations_controller.rb 2015-11-19 15:08:09.000000000 +0100
+++ new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/controllers/locations_controller.rb 2015-11-25 13:30:28.000000000 +0100
@@ -168,19 +168,21 @@
end
end
- def post_process_for!(record)
+ def post_process_for!(_record)
end
def normalize_params!(current)
- if params[:location][:rules].nil?
- params[:location][:rules] = []
+ if current[:rules].nil?
+ current[:rules] = []
else
- params[:location][:rules] = params[:location][:rules].values
+ current[:rules] = current[:rules].values
end
- params[:location][:rules].each_with_index do |rule, index|
- if params[:location][:rules][index][:expressions]
- params[:location][:rules][index][:expressions] = params[:location][:rules][index][:expressions].values
+ current[:rules].each_with_index do |_, index|
+ if current[:rules][index][:expressions]
+ current[:rules][index][:expressions] = current[:rules][index][:expressions].values
+ else
+ current[:rules][index][:expressions] = []
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/controllers/monitor_controller.rb new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/controllers/monitor_controller.rb
--- old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/controllers/monitor_controller.rb 2015-11-19 15:08:09.000000000 +0100
+++ new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/controllers/monitor_controller.rb 2015-11-25 13:30:28.000000000 +0100
@@ -37,5 +37,4 @@
ensure
response.stream.close
end
-
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/controllers/roles_controller.rb new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/controllers/roles_controller.rb
--- old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/controllers/roles_controller.rb 2015-11-19 15:08:09.000000000 +0100
+++ new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/controllers/roles_controller.rb 2015-11-25 13:30:28.000000000 +0100
@@ -154,12 +154,10 @@
end
def check_support
- unless Util.has_feature? :acl_enabled
- flash.now[:warning] = view_context.link_to(
- _("To enable ACLs, set \"enable-acl\" in the Cluster Configuration ('Manage > Configuration')"),
- edit_cib_crm_config_path(cib_id: @cib.id)
- )
- end
+ flash.now[:warning] = view_context.link_to(
+ _("To enable ACLs, set \"enable-acl\" in the Cluster Configuration ('Manage > Configuration')"),
+ edit_cib_crm_config_path(cib_id: @cib.id)
+ ) unless Util.acl_enabled?
cibadmin = Util.safe_x(
"/usr/sbin/cibadmin",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/controllers/users_controller.rb new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/controllers/users_controller.rb
--- old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/controllers/users_controller.rb 2015-11-19 15:08:09.000000000 +0100
+++ new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/controllers/users_controller.rb 2015-11-25 13:30:28.000000000 +0100
@@ -156,12 +156,10 @@
end
def check_support
- unless Util.acl_enabled?
- flash.now[:warning] = view_context.link_to(
- _("To enable ACLs, set \"enable-acl\" in the Cluster Configuration ('Manage > Configuration')"),
- edit_cib_crm_config_path(cib_id: @cib.id)
- )
- end
+ flash.now[:warning] = view_context.link_to(
+ _("To enable ACLs, set \"enable-acl\" in the Cluster Configuration ('Manage > Configuration')"),
+ edit_cib_crm_config_path(cib_id: @cib.id)
+ ) unless Util.acl_enabled?
end
def post_process_for!(record)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/helpers/application_helper.rb new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/helpers/application_helper.rb
--- old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/helpers/application_helper.rb 2015-11-19 15:08:09.000000000 +0100
+++ new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/helpers/application_helper.rb 2015-11-25 13:30:28.000000000 +0100
@@ -33,6 +33,10 @@
end
end
+ def profile_title
+ current_user || _("Profile")
+ end
+
def body_attrs
{
id: controller_name,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/models/clone.rb new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/models/clone.rb
--- old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/models/clone.rb 2015-11-19 15:08:09.000000000 +0100
+++ new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/models/clone.rb 2015-11-25 13:30:28.000000000 +0100
@@ -1,5 +1,6 @@
# Copyright (c) 2009-2015 Tim Serong <tserong(a)suse.com>
# See COPYING for license.
+require 'invoker'
class Clone < Resource
attribute :id, String
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/models/colocation.rb new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/models/colocation.rb
--- old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/models/colocation.rb 2015-11-19 15:08:09.000000000 +0100
+++ new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/models/colocation.rb 2015-11-25 13:30:28.000000000 +0100
@@ -104,21 +104,21 @@
if collapsed.length == 1 && collapsed[0][:resources].length == 2
# simple constraint (it's already in reverse order so
# don't flip around the other way like we do below)
- set = collapsed[0]
- set[:resources].each do |r|
- cmd.push r + (set[:action] ? ":#{set[:action]}" : "")
+ simpleset = collapsed[0]
+ simpleset[:resources].each do |r|
+ cmd.push r + (simpleset[:action] ? ":#{simpleset[:action]}" : "")
end
else
- collapsed.each do |set|
- cmd.push " ( " unless set[:sequential]
- set[:resources].reverse.each do |r|
- cmd.push r + (set[:action] ? ":#{set[:action]}" : "")
+ collapsed.each do |set2|
+ cmd.push " ( " unless set2[:sequential]
+ set2[:resources].reverse.each do |r|
+ cmd.push r + (set2[:action] ? ":#{set2[:action]}" : "")
end
- cmd.push " )" unless set[:sequential]
+ cmd.push " )" unless set2[:sequential]
end
end
- unless node_attr.empty?
+ unless node_attr.blank?
cmd.push "node-attribute=#{node_attr}"
end
end.join(" ")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/models/group.rb new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/models/group.rb
--- old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/models/group.rb 2015-11-19 15:08:09.000000000 +0100
+++ new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/models/group.rb 2015-11-25 13:30:28.000000000 +0100
@@ -1,5 +1,6 @@
# Copyright (c) 2009-2015 Tim Serong <tserong(a)suse.com>
# See COPYING for license.
+require 'invoker'
class Group < Resource
attribute :id, String
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/models/master.rb new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/models/master.rb
--- old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/models/master.rb 2015-11-19 15:08:09.000000000 +0100
+++ new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/models/master.rb 2015-11-25 13:30:28.000000000 +0100
@@ -1,5 +1,6 @@
# Copyright (c) 2009-2015 Tim Serong <tserong(a)suse.com>
# See COPYING for license.
+require 'invoker'
class Master < Resource
attribute :id, String
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/models/node.rb new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/models/node.rb
--- old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/models/node.rb 2015-11-19 15:08:09.000000000 +0100
+++ new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/models/node.rb 2015-11-25 13:30:28.000000000 +0100
@@ -1,5 +1,6 @@
# Copyright (c) 2009-2015 Tim Serong <tserong(a)suse.com>
# See COPYING for license.
+require 'invoker'
class Node < Tableless
class CommandError < StandardError
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/models/primitive.rb new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/models/primitive.rb
--- old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/models/primitive.rb 2015-11-19 15:08:09.000000000 +0100
+++ new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/models/primitive.rb 2015-11-25 13:30:28.000000000 +0100
@@ -1,5 +1,6 @@
# Copyright (c) 2009-2015 Tim Serong <tserong(a)suse.com>
# See COPYING for license.
+require 'invoker'
class Primitive < Template
attribute :template, String
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/models/record.rb new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/models/record.rb
--- old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/models/record.rb 2015-11-19 15:08:09.000000000 +0100
+++ new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/models/record.rb 2015-11-25 13:30:28.000000000 +0100
@@ -148,10 +148,7 @@
unless op.elements['instance_attributes']
op.add_element(
'instance_attributes',
- {
- 'id' => "#{op.attributes['id']}-instance_attributes"
- }
- )
+ 'id' => "#{op.attributes['id']}-instance_attributes")
end
nvp = op.elements['instance_attributes/nvpair[@name="OCF_CHECK_LEVEL"]']
@@ -161,12 +158,9 @@
else
op.elements['instance_attributes'].add_element(
'nvpair',
- {
- 'id' => "#{op.attributes['id']}-instance_attributes-OCF_CHECK_LEVEL",
- 'name' => 'OCF_CHECK_LEVEL',
- 'value' => v
- }
- )
+ 'id' => "#{op.attributes['id']}-instance_attributes-OCF_CHECK_LEVEL",
+ 'name' => 'OCF_CHECK_LEVEL',
+ 'value' => v)
end
end
@@ -196,9 +190,10 @@
op = xml.elements["operations/op[@name=\"#{op_name}\" and @interval=\"#{attrlist["interval"]}\"]"]
unless op
- op = xml.elements['operations'].add_element('op',
- id: "#{xml.attributes["id"]}-#{op_name}-#{attrlist["interval"]}",
- name: op_name)
+ op = xml.elements['operations'].add_element(
+ "op",
+ "id" => "#{xml.attributes["id"]}-#{op_name}-#{attrlist["interval"]}",
+ "name" => op_name)
end
merge_ocf_check_level(op, attrlist.delete("OCF_CHECK_LEVEL"))
@@ -232,9 +227,9 @@
el.remove unless attrs.keys.include? el.attributes['name']
end
else
- xml.add_element(list, {
- "id" => "#{xml.attributes["id"]}-#{list}"
- })
+ xml.add_element(
+ list,
+ "id" => "#{xml.attributes["id"]}-#{list}")
end
# Write new attributes or update existing ones
@@ -244,11 +239,11 @@
if nvp
nvp.attributes["value"] = v
else
- xml.elements[list].add_element("nvpair", {
+ xml.elements[list].add_element(
+ "nvpair",
"id" => "#{xml.elements[list].attributes['id']}-#{n}",
"name" => n,
- "value" => v
- })
+ "value" => v)
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/models/tableless.rb new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/models/tableless.rb
--- old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/models/tableless.rb 2015-11-19 15:08:09.000000000 +0100
+++ new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/models/tableless.rb 2015-11-25 13:30:28.000000000 +0100
@@ -46,7 +46,12 @@
end
def update_attributes(attrs = nil)
- self.attributes = attrs unless attrs.nil?
+ unless attrs.nil?
+ ["meta", "params"].each do |key|
+ attrs[key] = {} if self.respond_to?(key.to_sym) && !attrs.key?(key)
+ end
+ self.attributes = attrs
+ end
self.save
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/models/tag.rb new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/models/tag.rb
--- old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/models/tag.rb 2015-11-19 15:08:09.000000000 +0100
+++ new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/models/tag.rb 2015-11-25 13:30:28.000000000 +0100
@@ -1,5 +1,6 @@
# Copyright (c) 2009-2015 Tim Serong <tserong(a)suse.com>
# See COPYING for license.
+require 'invoker'
class Tag < Resource
attribute :id, String
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/models/template.rb new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/models/template.rb
--- old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/models/template.rb 2015-11-19 15:08:09.000000000 +0100
+++ new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/models/template.rb 2015-11-25 13:30:28.000000000 +0100
@@ -1,5 +1,6 @@
# Copyright (c) 2009-2015 Tim Serong <tserong(a)suse.com>
# See COPYING for license.
+require 'invoker'
class Template < Resource
attribute :id, String
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/views/shared/_usernav.html.haml new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/views/shared/_usernav.html.haml
--- old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/views/shared/_usernav.html.haml 2015-11-19 15:08:09.000000000 +0100
+++ new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/views/shared/_usernav.html.haml 2015-11-25 13:30:28.000000000 +0100
@@ -8,7 +8,7 @@
= link_to navbar_item(_("Disable Simulator"), "toggle-on"), cib_state_path(cib_id: "live"), class: "production", title: _("Disable the simulation mode")
%li
- = link_to navbar_item(_("Profile"), "user"), edit_cib_profile_path(cib_id: current_cib.id), class: "profile"
+ = link_to navbar_item(profile_title, "user"), edit_cib_profile_path(cib_id: current_cib.id), class: "profile"
- unless installed_docs.empty?
%li
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/config/routes.rb new/hawk2-1.0.1+git.1448454104.9e71083/hawk/config/routes.rb
--- old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/config/routes.rb 2015-11-19 15:08:09.000000000 +0100
+++ new/hawk2-1.0.1+git.1448454104.9e71083/hawk/config/routes.rb 2015-11-25 13:30:28.000000000 +0100
@@ -125,7 +125,7 @@
get "commands" => "pages#commands", :as => :commands
- match "monitor" => "monitor#monitor", :as => :monitor, via: [:get, :options], :as => :monitor
+ match "monitor" => "monitor#monitor", :as => :monitor, via: [:get, :options]
get "help" => "pages#help", :as => :help
get "logout" => "sessions#destroy", :as => :logout
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/lib/invoker.rb new/hawk2-1.0.1+git.1448454104.9e71083/hawk/lib/invoker.rb
--- old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/lib/invoker.rb 2015-11-19 15:08:09.000000000 +0100
+++ new/hawk2-1.0.1+git.1448454104.9e71083/hawk/lib/invoker.rb 2015-11-25 13:30:28.000000000 +0100
@@ -65,7 +65,7 @@
# good for testing when running as root), or some other alternative
# with piping data to crm?
File.chmod(0666, f.path)
- CrmEvents.instance.push "cat > #{f.path} <<EOF\n#{cmd}\nEOF"
+ CrmEvents.instance.push "crm configure\n#{cmd}\n"
result = crm '-F', 'configure', 'load', 'update', f.path
ensure
f.unlink
@@ -103,10 +103,20 @@
private
+ def ignore_command(input, cmd)
+ return true if cmd[0] == 'cluster'
+ if cmd[0] == 'configure'
+ return true if input == 'show'
+ return true if cmd[1] == 'graph'
+ end
+ return true if cmd[0..3] == ['-F', 'configure', 'load', 'update']
+ false
+ end
+
# Returns [out, err, exitstatus]
def invoke_crm(input, *cmd)
# don't log certain calls to crmevents
- unless cmd[0] == 'cluster' || (cmd[0] == 'configure' && cmd[1] == 'graph')
+ unless ignore_command(input, cmd)
if input
CrmEvents.instance.push "crm #{cmd.join(' ')}\n#{input}"
else
1
0
Hello community,
here is the log from the commit of package libxspf for openSUSE:Factory checked in at 2015-11-28 15:19:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libxspf (Old)
and /work/SRC/openSUSE:Factory/.libxspf.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libxspf"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libxspf/libxspf.changes 2013-03-08 09:22:10.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libxspf.new/libxspf.changes 2015-11-28 15:19:34.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Nov 26 14:30:29 UTC 2015 - mpluskal(a)suse.com
+
+- Cleanup spec file with spec-cleaner
+- Update dependencies
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libxspf.spec ++++++
--- /var/tmp/diff_new_pack.AG5AMO/_old 2015-11-28 15:19:35.000000000 +0100
+++ /var/tmp/diff_new_pack.AG5AMO/_new 2015-11-28 15:19:35.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libxspf
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,23 +17,25 @@
Name: libxspf
-Url: http://libspiff.sourceforge.net/
Version: 1.2.0
Release: 0
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: gcc-c++
-BuildRequires: libexpat-devel
-BuildRequires: libtool
-BuildRequires: liburiparser-devel >= 0.7.5
-BuildRequires: pkg-config
# doxygen
Summary: Provides XSPF playlist reading and writing support
License: BSD-3-Clause and LGPL-2.1+
Group: Development/Libraries/C and C++
+Url: http://libspiff.sourceforge.net/
Source: http://downloads.xiph.org/releases/xspf/%{name}-%{version}.tar.bz2
Patch0: libxspf-1.1.0-gcc44.patch
Patch1: libxspf-gcc47.patch
Patch2: libxspf-automake.diff
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: gcc-c++
+BuildRequires: libexpat-devel
+BuildRequires: libtool
+BuildRequires: liburiparser-devel >= 0.7.5
+BuildRequires: pkg-config
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
libxspf the replacement for libSpiff brings XSPF playlist reading and
@@ -52,11 +54,6 @@
* Uses unit testing
* Liberal license: New BSD license
-Authors:
---------
- Sebastian Pipping, sping(a)xiph.org
- Ed Schouten, ed(a)fxq.nl
-
%package -n libxspf4
Summary: Provides XSPF playlist reading and writing support
Group: Development/Libraries/C and C++
@@ -77,11 +74,6 @@
* Uses unit testing
* Liberal license: New BSD license
-Authors:
---------
- Sebastian Pipping, sping(a)xiph.org
- Ed Schouten, ed(a)fxq.nl
-
%package -n libxspf-devel
Summary: Brings XSPF playlist read and write support to C++ apps
Group: Development/Libraries/C and C++
@@ -115,20 +107,18 @@
* Liberal license: New BSD license
-
-
-Authors:
---------
- Sebastian Pipping, sping(a)xiph.org
- Ed Schouten, ed(a)fxq.nl
-
%prep
%setup -q
-%patch -P 0 -P 1 -P 2 -p1
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
%build
autoreconf -fiv
-%configure --disable-test --enable-static=no --with-pic
+%configure \
+ --disable-test \
+ --enable-static=no \
+ --with-pic
# --enable-doc
make %{?_smp_mflags}
@@ -137,8 +127,8 @@
# make %{?_smp_mflags} check
%install
-%makeinstall
-%{__rm} -f %{buildroot}%{_libdir}/*.la
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
+find %{buildroot} -type f -name "*.la" -delete -print
%post -n libxspf4 -p /sbin/ldconfig
1
0
Hello community,
here is the log from the commit of package compiz for openSUSE:Factory checked in at 2015-11-28 15:19:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/compiz (Old)
and /work/SRC/openSUSE:Factory/.compiz.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "compiz"
Changes:
--------
--- /work/SRC/openSUSE:Factory/compiz/compiz.changes 2015-11-26 17:03:57.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.compiz.new/compiz.changes 2015-11-28 15:19:33.000000000 +0100
@@ -1,0 +2,18 @@
+Thu Nov 25 07:52:46 UTC 2015 - sor.alexei(a)meowr.ru
+
+- Rename compiz-default-settings.diff to
+ compiz-suse-defaults.patch.
+- Rename mate-window-decorator to gnome-window-decorator to point
+ out it's not DE-centric.
+- Adjust gnome-window-decorator so it will start accepting custom
+ options properly (transparently as gtk-window-decorator does).
+- Remove compiz-decorator: automatical decorator detection lost its
+ meaning with the KDE decorator loss.
+- Set gnome-window-decorator as a default decorator in
+ compiz-suse-defaults.patch.
+- Modify compiz-suse-defaults.patch to center windows by default.
+- Do not default Expo plugin: can be annoying.
+- Drop compiz-unmanaged-window-position.patch: was fixed upstream,
+ reverse applying is a mistake.
+
+-------------------------------------------------------------------
Old:
----
compiz-decorator.sh
compiz-default-settings.diff
compiz-unmanaged-window-position.patch
mate-window-decorator.py
New:
----
compiz-suse-defaults.patch
gnome-window-decorator.py
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ compiz.spec ++++++
--- /var/tmp/diff_new_pack.oRkGTJ/_old 2015-11-28 15:19:34.000000000 +0100
+++ /var/tmp/diff_new_pack.oRkGTJ/_new 2015-11-28 15:19:34.000000000 +0100
@@ -27,27 +27,24 @@
Source: https://github.com/raveit65/%{name}/archive/v%{version}.tar.gz#/%{name}-%{v…
Source1: opensuse.png
Source2: sle.png
-Source3: mate-window-decorator.py
-Source4: %{name}-decorator.sh
-Source5: %{name}.desktop
-Source6: baselibs.conf
+Source3: gnome-window-decorator.py
+Source4: %{name}.desktop
+Source5: baselibs.conf
+# PATCH-FEATURE-OPENSUSE compiz-suse-defaults.patch dimstar(a)opensuse.org -- Compiz default settings for openSUSE.
+Patch0: %{name}-suse-defaults.patch
# PATCH-FIX-UPSTREAM compiz-java-config-notify.diff dreveman(a)novell.com -- Java config notify workaround.
-Patch0: %{name}-java-config-notify.diff
-# PATCH-FEATURE-OPENSUSE compiz-default-settings.diff dimstar(a)opensuse.org -- Compiz default settings for openSUSE.
-Patch1: %{name}-default-settings.diff
+Patch1: %{name}-java-config-notify.diff
# PATCH-FIX-UPSTREAM boo#449168 dreveman(a)novell.com -- Avoid independent output painting.
Patch2: bug-449168-avoid-independent-output-painting.diff
# PATCH-FIX-UPSTREAM boo#474862 dreveman(a)novell.com -- Allow moving focus to fs window.
Patch3: bug-474862-allow-moving-focus-to-fs-window.diff
-# PATCH-FIX-UPSTREAM compiz-unmanaged-window-position.patch dimstar(a)opensuse.org -- Fix gravity of unmanaged windows (clock applet for example).
-Patch4: %{name}-unmanaged-window-position.patch
-# PATCH-FEATURE-OPENSUSE compiz-add-manager-checks.patch amaranth(a)ubuntu.com -- Add all relevant checks from compiz-manager.
-Patch5: %{name}-add-manager-checks.patch
+# PATCH-FEATURE-OPENSUSE compiz-add-manager-checks.patch -- Add all relevant checks from compiz-manager.
+Patch4: %{name}-add-manager-checks.patch
BuildRequires: hicolor-icon-theme
BuildRequires: libjpeg-devel
BuildRequires: libxslt-tools
BuildRequires: mate-common
-# To get keybindings.
+# To get GNOME Control Centre keybindings.
BuildRequires: metacity
BuildRequires: pkg-config
BuildRequires: update-desktop-files
@@ -87,7 +84,7 @@
Obsoletes: %{name}-kde4 < %{version}
ExclusiveArch: %ix86 x86_64 %arm aarch64 ppc ppc64 ia64
%if 0%{?suse_version} > 1310
-# To get keybindings.
+# To get MATE Control Centre keybindings.
BuildRequires: marco
BuildRequires: pkgconfig(libmarco-private)
%endif
@@ -240,13 +237,11 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1 -R
-%patch5 -p1
+%patch4 -p1
cp -f %{SOURCE1} opensuse.png
cp -f %{SOURCE2} sle.png
-cp -f %{SOURCE3} mate-window-decorator
-cp -f %{SOURCE4} %{name}-decorator
-cp -f %{SOURCE5} %{name}.desktop
+cp -f %{SOURCE3} gnome-window-decorator
+cp -f %{SOURCE4} %{name}.desktop
# Do not install helper scripts, we already have one.
sed -i 's/^\(SUBDIRS =.* \)scripts\(.*\)$/\1\2/' Makefile.am
@@ -255,7 +250,7 @@
NOCONFIGURE=1 mate-autogen
%configure \
--disable-static \
- --with-default-plugins=core,ccp,commands,matecompat,minimize,place,png,regex,resize,mousepoll,neg,session,vpswitch,workarounds,decoration,wall,expo,ezoom,snap,fade,move,switcher
+ --with-default-plugins=core,ccp,decoration,commands,ezoom,fade,minimize,mousepoll,move,neg,place,png,regex,resize,session,snap,switcher,vpswitch,wall,workarounds,matecompat
make %{?_smp_mflags}
%install
@@ -263,8 +258,7 @@
install -Dm 0644 opensuse.png %{buildroot}%{_datadir}/%{name}/opensuse.png
install -Dm 0644 sle.png %{buildroot}%{_datadir}/%{name}/sle.png
-install -Dm 0755 %{name}-decorator %{buildroot}%{_bindir}/%{name}-decorator
-install -Dm 0755 mate-window-decorator %{buildroot}%{_bindir}/mate-window-decorator
+install -Dm 0755 gnome-window-decorator %{buildroot}%{_bindir}/gnome-window-decorator
install -Dm 0644 %{name}.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop
install -Dm 0644 %{name}.desktop %{buildroot}%{_datadir}/mate/wm-properties/%{name}.desktop
@@ -334,7 +328,6 @@
%defattr(-,root,root)
%doc COPYING*
%{_bindir}/%{name}
-%{_bindir}/%{name}-decorator
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/*.*
%dir %{_libdir}/%{name}/
@@ -397,7 +390,7 @@
%files gnome
%defattr(-,root,root)
%{_bindir}/gtk-window-decorator
-%{_bindir}/mate-window-decorator
+%{_bindir}/gnome-window-decorator
%dir %{_datadir}/*-control-center/
%dir %{_datadir}/*-control-center/keybindings/
%{_datadir}/*-control-center/keybindings/*
++++++ compiz-suse-defaults.patch ++++++
--- a/metadata/core.xml.in.in
+++ b/metadata/core.xml.in.in
@@ -16,7 +16,7 @@
<option name="audible_bell" type="bool">
<_short>Audible Bell</_short>
<_long>Audible system beep</_long>
- <default>true</default>
+ <default>false</default>
</option>
<option name="ignore_hints_when_maximized" type="bool">
<_short>Ignore Hints When Maximized</_short>
@@ -50,7 +50,7 @@
<option name="ping_delay" type="int">
<_short>Ping Delay</_short>
<_long>Interval between ping messages</_long>
- <default>5000</default>
+ <default>7500</default>
<min>1000</min>
<max>30000</max>
</option>
@@ -235,7 +235,7 @@
<option name="lighting" type="bool">
<_short>Lighting</_short>
<_long>Use diffuse light when screen is transformed</_long>
- <default>true</default>
+ <default>false</default>
</option>
<option name="detect_refresh_rate" type="bool">
<_short>Detect Refresh Rate</_short>
--- a/metadata/cube.xml.in
+++ b/metadata/cube.xml.in
@@ -110,7 +110,7 @@
<type>string</type>
<hints>file;image;</hints>
<default>
- <value>freedesktop</value>
+ <value>cube-image</value>
</default>
</option>
<option name="adjust_image" type="bool">
@@ -124,7 +124,7 @@
<option name="skydome" type="bool">
<_short>Skydome</_short>
<_long>Render skydome</_long>
- <default>false</default>
+ <default>true</default>
</option>
<option name="skydome_image" type="string">
<_short>Skydome Image</_short>
@@ -140,18 +140,18 @@
<_short>Skydome Gradient Start Color</_short>
<_long>Color to use for the top color-stop of the skydome-fallback gradient</_long>
<default>
- <red>0x0d0d</red>
- <green>0xb1b1</green>
- <blue>0xfdfd</blue>
+ <red>0xafaf</red>
+ <green>0xafaf</green>
+ <blue>0xafaf</blue>
</default>
</option>
<option name="skydome_gradient_end_color" type="color">
<_short>Skydome Gradient End Color</_short>
<_long>Color to use for the bottom color-stop of the skydome-fallback gradient</_long>
<default>
- <red>0xfefe</red>
- <green>0xffff</green>
- <blue>0xc7c7</blue>
+ <red>0x7777</red>
+ <green>0x7777</green>
+ <blue>0x7777</blue>
</default>
</option>
</subgroup>
@@ -161,7 +161,7 @@
<option name="active_opacity" type="float">
<_short>Opacity During Rotation</_short>
<_long>Opacity of desktop window during rotation.</_long>
- <default>70.0</default>
+ <default>40.0</default>
<min>0.0</min>
<max>100.0</max>
<precision>1.0</precision>
@@ -177,7 +177,7 @@
<option name="transparent_manual_only" type="bool">
<_short>Transparency Only on Mouse Rotate</_short>
<_long>Initiates Cube transparency only if rotation is mouse driven.</_long>
- <default>true</default>
+ <default>false</default>
</option>
</group>
</screen>
--- a/metadata/decoration.xml.in
+++ b/metadata/decoration.xml.in
@@ -16,7 +16,7 @@
<option name="shadow_radius" type="float">
<_short>Shadow Radius</_short>
<_long>Drop shadow radius</_long>
- <default>8.0</default>
+ <default>7.0</default>
<min>0.1</min>
<max>18.0</max>
<precision>0.1</precision>
@@ -50,6 +50,7 @@
<option name="command" type="string">
<_short>Command</_short>
<_long>Decorator command line that is executed if no decorator is already running</_long>
+ <default>gnome-window-decorator --replace</default>
</option>
<option name="mipmap" type="bool">
<_short>Mipmap</_short>
--- a/metadata/place.xml.in
+++ b/metadata/place.xml.in
@@ -12,7 +12,7 @@
<option name="mode" type="int">
<_short>Placement Mode</_short>
<_long>Algorithm to use for window placement</_long>
- <default>0</default>
+ <default>1</default>
<min>0</min>
<max>5</max>
<desc>
--- a/metadata/resize.xml.in
+++ b/metadata/resize.xml.in
@@ -40,7 +40,7 @@
<option name="mode" type="int">
<_short>Default Resize Mode</_short>
<_long>Default mode used for window resizing</_long>
- <default>0</default>
+ <default>2</default>
<min>0</min>
<max>3</max>
<desc>
--- a/metadata/scale.xml.in
+++ b/metadata/scale.xml.in
@@ -167,7 +167,7 @@
<_long>Selects where windows are scaled if multiple output devices are used.</_long>
<min>0</min>
<max>1</max>
- <default>0</default>
+ <default>1</default>
<desc>
<value>0</value>
<_name>On current output device</_name>
++++++ gnome-window-decorator.py ++++++
#!/usr/bin/env python3
#
# Copyright (c) 2015 Sorokin Alexei <sor.alexei(a)meowr.ru>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License.
#
global keyValueList, gwdProcess, gwdProcessOld
def which(file):
for path in os.environ["PATH"].split(os.pathsep):
if os.path.exists(os.path.join(path, file)):
return os.path.join(path, file)
return None
def execv_gwd():
os.execv(which("gtk-window-decorator"), sys.argv[:])
def self_killed():
global gwdProcess
gwdProcess.force_exit()
def gwd_killed(proc, result):
global gwdProcess
# Make false alarms impossible to happen.
if (proc == gwdProcess) and (proc != gwdProcessOld):
# Somebody killed decorator, dying as well…
if (proc.get_if_exited()):
sys.exit(proc.get_exit_status())
else:
sys.exit(1)
else:
# Killed process is not the last started, why care?
return 0
def on_gschema_changed(gsettings, key, gschemaSource, init=False):
global keyValueList, gwdProcess, gwdProcessOld
# All tracked keys. Check whether user has overriden them.
keyList = []
if ("--marco-theme" not in sys.argv[1:]):
keyList.append("theme")
if ("--button-layout" not in sys.argv[1:]):
keyList.append("button-layout")
if ("--titlebar-font" not in sys.argv[1:]):
keyList.extend(["titlebar-font", "titlebar-uses-system-font"])
# There is nothing to track at all, hence start gwd and die honourably.
if (keyList == []):
execv_gwd()
# Check all keys at initialisation.
if (init or key == ""):
keys = keyList
else:
keys = [key]
for key in keys:
# Check that key is in list to prevent useless restartings and
# avoid possible crashes by checking that key actually exists.
if (key in keyList and key in gschemaSource.list_keys()):
keyType = gschemaSource.get_key(key).get_value_type().dup_string()
oldValue = keyValueList.get(key)
if (keyType == "s"):
keyValueList[key] = gsettings.get_string(key)
elif (keyType == "b"):
keyValueList[key] = gsettings.get_boolean(key)
else:
print("We got a GSettings key of unexpected type.", file=sys.stderr)
keyValueList[key] = None
# Why bother restarting decorator if nothing actually changed?
if (not init) and (keyValueList.get(key) == oldValue):
return 0
else:
return 1
gwdProcessString = [which("gtk-window-decorator"), "--opacity", "1"]
if ("--marco-theme" not in sys.argv[1:]) and (keyValueList["theme"] != None) and (keyValueList["theme"] != ""):
gwdProcessString.extend(["--marco-theme", keyValueList["theme"]])
if ("--button-layout" not in sys.argv[1:]) and (keyValueList["button-layout"] != None) and \
(keyValueList["button-layout"] != ""):
gwdProcessString.extend(["--button-layout", keyValueList["button-layout"]])
if ("--titlebar-font" not in sys.argv[1:]) and (keyValueList["titlebar-uses-system-font"] == False) and \
(keyValueList["titlebar-font"] != None) and (keyValueList["titlebar-font"] != ""):
gwdProcessString.extend(["--titlebar-font", keyValueList["titlebar-font"]])
# Always at the end as this options can override already set ones.
gwdProcessString.extend(sys.argv[1:])
if (not init):
if ("--replace" not in gwdProcessString):
gwdProcessString.append("--replace")
gwdProcessOld = gwdProcess
gwdProcess = Gio.Subprocess.new(gwdProcessString, Gio.SubprocessFlags.NONE)
gwdProcess.wait_async(None, gwd_killed)
import sys, os, atexit
from gi.repository import GLib, Gio
# Global variables.
keyValueList = {}
gwdProcess = None
gwdProcessOld = None
if (which("gtk-window-decorator") is None):
print("gtk-window-decorator was not found, exiting...", file=sys.stderr)
sys.exit(1)
# Allow --metacity-theme option usage.
while ("--metacity-theme" in sys.argv[1:]):
sys.argv[sys.argv[1:].index("--metacity-theme") + 1] = "--marco-theme"
if ("--disable-marco-theme" in sys.argv[1:]) or ("--disable-metacity-theme" in sys.argv[1:]):
execv_gwd()
gschema=""
gsettings = None
# Looking up for gschema, GNOME's or Marco's.
if ("org.gnome.desktop.wm.preferences" in Gio.Settings.list_schemas()):
gschema = "org.gnome.desktop.wm.preferences"
if (os.environ["XDG_CURRENT_DESKTOP"] == "MATE" or gschema is Null) and \
("org.mate.Marco.general" in Gio.Settings.list_schemas()):
gschema = "org.mate.Marco.general"
if (gschema != ""):
gsettings = Gio.Settings.new(gschema)
if (gsettings is None):
print("No decoration theme was found, falling back to plain gtk-window-decorator.", file=sys.stderr)
execv_gwd()
gschemaSource = Gio.SettingsSchemaSource.get_default().lookup(gschema, False)
# Poking on_gschema_changed() to start gwd.
on_gschema_changed(gsettings, None, gschemaSource, True)
# Kill decorator at exit.
atexit.register(self_killed)
# Checking for gschemas changes.
gsettings.connect("changed", on_gschema_changed, gschemaSource)
# Endless event loop.
GLib.MainLoop().run()
1
0
Hello community,
here is the log from the commit of package rubygem-hiera-eyaml-gpg for openSUSE:Factory checked in at 2015-11-28 15:19:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-hiera-eyaml-gpg (Old)
and /work/SRC/openSUSE:Factory/.rubygem-hiera-eyaml-gpg.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-hiera-eyaml-gpg"
Changes:
--------
--- /work/SRC/openSUSE:Factory/rubygem-hiera-eyaml-gpg/rubygem-hiera-eyaml-gpg.changes 2015-06-02 10:02:20.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.rubygem-hiera-eyaml-gpg.new/rubygem-hiera-eyaml-gpg.changes 2015-11-28 15:19:32.000000000 +0100
@@ -1,0 +2,5 @@
+Thu Nov 19 12:13:23 UTC 2015 - tampakrap(a)opensuse.org
+
+- Version bump 0.6, no upstream changelog
+
+-------------------------------------------------------------------
Old:
----
hiera-eyaml-gpg-0.5.gem
New:
----
hiera-eyaml-gpg-0.6.gem
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rubygem-hiera-eyaml-gpg.spec ++++++
--- /var/tmp/diff_new_pack.rcnvd2/_old 2015-11-28 15:19:33.000000000 +0100
+++ /var/tmp/diff_new_pack.rcnvd2/_new 2015-11-28 15:19:33.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package rubygem-hiera-eyaml-gpg
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,7 +16,7 @@
#
Name: rubygem-hiera-eyaml-gpg
-Version: 0.5
+Version: 0.6
Release: 0
%define mod_name hiera-eyaml-gpg
%define mod_full_name %{mod_name}-%{version}
++++++ hiera-eyaml-gpg-0.5.gem -> hiera-eyaml-gpg-0.6.gem ++++++
Files old/checksums.yaml.gz and new/checksums.yaml.gz differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/hiera/backend/eyaml/encryptors/gpg/version.rb new/lib/hiera/backend/eyaml/encryptors/gpg/version.rb
--- old/lib/hiera/backend/eyaml/encryptors/gpg/version.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/lib/hiera/backend/eyaml/encryptors/gpg/version.rb 1970-01-01 01:00:00.000000000 +0100
@@ -3,7 +3,7 @@
module Eyaml
module Encryptors
module Gpg
- VERSION = "0.5"
+ VERSION = "0.6"
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/hiera/backend/eyaml/encryptors/gpg.rb new/lib/hiera/backend/eyaml/encryptors/gpg.rb
--- old/lib/hiera/backend/eyaml/encryptors/gpg.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/lib/hiera/backend/eyaml/encryptors/gpg.rb 1970-01-01 01:00:00.000000000 +0100
@@ -26,7 +26,7 @@
self.options = {
:gnupghome => { :desc => "Location of your GNUPGHOME directory",
:type => :string,
- :default => "#{ENV[["HOME", "HOMEPATH"].detect { |h| ENV[h] != nil }]}/.gnupg" },
+ :default => "#{["HOME", "HOMEPATH"].reject { |h| ENV[h].nil? }.map { |h| ENV[h]+"/.gnupg" }.first || ""}"},
:always_trust => { :desc => "Assume that used keys are fully trusted",
:type => :boolean,
:default => false },
@@ -57,6 +57,20 @@
end
end
+ def self.gnupghome
+ gnupghome = self.option :gnupghome
+ debug("GNUPGHOME is #{gnupghome}")
+ if gnupghome.nil? || gnupghome.empty?
+ warn("No GPG home directory configured, check gpg_gnupghome configuration value is correct")
+ raise ArgumentError, "No GPG home directory configured, check gpg_gnupghome configuration value is correct"
+ elsif !File.directory?(gnupghome)
+ warn("Configured GPG home directory #{gnupghome} doesn't exist, check gpg_gnupghome configuration value is correct")
+ raise ArgumentError, "Configured GPG home directory #{gnupghome} doesn't exist, check gpg_gnupghome configuration value is correct"
+ else
+ gnupghome
+ end
+ end
+
def self.find_recipients
recipient_option = self.option :recipients
recipients = if !recipient_option.nil?
@@ -86,7 +100,7 @@
selected_file = nil
path.descend{|path| path
potential_file = path.join('hiera-eyaml-gpg.recipients')
- selected_file = potential_file if potential_file.exist?
+ selected_file = potential_file if potential_file.exist?
}
debug("Using file at #{selected_file}")
selected_file
@@ -94,7 +108,9 @@
end
unless recipient_file.nil?
- recipient_file.readlines.map{ |line| line.strip }
+ recipient_file.readlines.map{ |line|
+ line.strip unless line.start_with? '#'
+ }.compact
else
[]
end
@@ -106,9 +122,7 @@
raise RecoverableError, "Encryption is only supported when using the 'gpgme' gem"
end
- gnupghome = self.option :gnupghome
- GPGME::Engine.home_dir = gnupghome
- debug("GNUPGHOME is #{gnupghome}")
+ GPGME::Engine.home_dir = self.gnupghome
ctx = GPGME::Ctx.new
@@ -117,9 +131,9 @@
raise RecoverableError, 'No recipients provided, don\'t know who to encrypt to' if recipients.empty?
- keys = recipients.map {|r|
- key_to_use = ctx.keys(r).first
- if key_to_use.nil?
+ keys = recipients.map {|r|
+ key_to_use = ctx.keys(r).first
+ if key_to_use.nil?
raise RecoverableError, "No key found on keyring for #{r}"
end
key_to_use
@@ -146,8 +160,7 @@
end
def self.decrypt ciphertext
- gnupghome = self.option :gnupghome
- debug("GNUPGHOME is #{gnupghome}")
+ gnupghome = self.gnupghome
unless defined?(GPGME)
RubyGpg.config.homedir = gnupghome if gnupghome
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata
--- old/metadata 1970-01-01 01:00:00.000000000 +0100
+++ new/metadata 1970-01-01 01:00:00.000000000 +0100
@@ -1,14 +1,14 @@
--- !ruby/object:Gem::Specification
name: hiera-eyaml-gpg
version: !ruby/object:Gem::Version
- version: '0.5'
+ version: '0.6'
platform: ruby
authors:
- Simon Hildrew
autorequire:
bindir: bin
cert_chain: []
-date: 2015-03-21 00:00:00.000000000 Z
+date: 2015-09-10 00:00:00.000000000 Z
dependencies:
- !ruby/object:Gem::Dependency
name: hiera-eyaml
1
0
Hello community,
here is the log from the commit of package rubygem-facter for openSUSE:Factory checked in at 2015-11-28 15:19:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-facter (Old)
and /work/SRC/openSUSE:Factory/.rubygem-facter.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-facter"
Changes:
--------
--- /work/SRC/openSUSE:Factory/rubygem-facter/rubygem-facter.changes 2015-08-27 08:57:53.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.rubygem-facter.new/rubygem-facter.changes 2015-11-28 15:19:31.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Nov 19 11:51:17 UTC 2015 - tampakrap(a)opensuse.org
+
+- Version bump 2.4.4, see
+ http://docs.puppetlabs.com/facter/2.4/release_notes.html#facter-244
+
+-------------------------------------------------------------------
Old:
----
facter-2.4.3.gem
New:
----
facter-2.4.4.gem
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rubygem-facter.spec ++++++
--- /var/tmp/diff_new_pack.huIwmN/_old 2015-11-28 15:19:32.000000000 +0100
+++ /var/tmp/diff_new_pack.huIwmN/_new 2015-11-28 15:19:32.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package rubygem-facter
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -24,7 +24,7 @@
#
Name: rubygem-facter
-Version: 2.4.3
+Version: 2.4.4
Release: 0
%define mod_name facter
%define mod_full_name %{mod_name}-%{version}
++++++ facter-2.4.3.gem -> facter-2.4.4.gem ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ext/build_defaults.yaml new/ext/build_defaults.yaml
--- old/ext/build_defaults.yaml 1970-01-01 01:00:00.000000000 +0100
+++ new/ext/build_defaults.yaml 1970-01-01 01:00:00.000000000 +0100
@@ -2,14 +2,14 @@
packaging_url: 'git://github.com/puppetlabs/packaging.git --branch=master'
packaging_repo: 'packaging'
default_cow: 'base-squeeze-i386.cow'
-cows: 'base-lucid-i386.cow base-lucid-amd64.cow base-precise-i386.cow base-precise-amd64.cow base-squeeze-i386.cow base-squeeze-amd64.cow base-stable-i386.cow base-stable-amd64.cow base-testing-i386.cow base-testing-amd64.cow base-trusty-i386.cow base-trusty-amd64.cow base-wheezy-i386.cow base-wheezy-amd64.cow'
+cows: 'base-precise-i386.cow base-precise-amd64.cow base-squeeze-i386.cow base-squeeze-amd64.cow base-trusty-i386.cow base-trusty-amd64.cow base-wheezy-i386.cow base-wheezy-amd64.cow'
pbuild_conf: '/etc/pbuilderrc'
packager: 'puppetlabs'
gpg_name: 'info(a)puppetlabs.com'
gpg_key: '4BD6EC30'
sign_tar: FALSE
# a space separated list of mock configs
-final_mocks: 'pl-el-5-i386 pl-el-5-x86_64 pl-el-6-i386 pl-el-6-x86_64 pl-el-7-x86_64 pl-fedora-19-i386 pl-fedora-19-x86_64 pl-fedora-20-i386 pl-fedora-20-x86_64'
+final_mocks: 'pl-el-5-i386 pl-el-5-x86_64 pl-el-6-i386 pl-el-6-x86_64 pl-el-7-x86_64 pl-fedora-20-i386 pl-fedora-20-x86_64'
yum_host: 'yum.puppetlabs.com'
yum_repo_path: '/opt/repository/yum/'
build_gem: TRUE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/facter/application.rb new/lib/facter/application.rb
--- old/lib/facter/application.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/lib/facter/application.rb 1970-01-01 01:00:00.000000000 +0100
@@ -160,7 +160,9 @@
"Enable timing.") { |v| Facter.timing(1) }
opts.on("-p",
"--puppet",
- "Load the Puppet libraries, thus allowing Facter to load Puppet-specific facts.") { |v| load_puppet }
+ "(Deprecated: use `puppet facts` instead) Load the Puppet libraries, thus allowing Facter to load Puppet-specific facts.") do |v|
+ load_puppet
+ end
opts.on_tail("-v",
"--version",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/facter/dhcp_servers.rb new/lib/facter/dhcp_servers.rb
--- old/lib/facter/dhcp_servers.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/lib/facter/dhcp_servers.rb 1970-01-01 01:00:00.000000000 +0100
@@ -24,7 +24,8 @@
Facter::Core::Execution.which('nmcli')
end
confine do
- Facter::Util::DHCPServers.network_manager_state != 'unknown'
+ s = Facter::Util::DHCPServers.network_manager_state
+ !s.empty? && (s != 'unknown')
end
setcode do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/facter/ldom.rb new/lib/facter/ldom.rb
--- old/lib/facter/ldom.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/lib/facter/ldom.rb 1970-01-01 01:00:00.000000000 +0100
@@ -47,15 +47,5 @@
end
end
end
-
- # When ldom domainrole control = false, the system is a guest, so we mark it
- # as a virtual system:
- Facter.add("virtual") do
- confine :ldom_domainrole_control => 'false'
- has_weight 10
- setcode do
- Facter.value(:ldom_domainrole_impl)
- end
- end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/facter/util/processor.rb new/lib/facter/util/processor.rb
--- old/lib/facter/util/processor.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/lib/facter/util/processor.rb 1970-01-01 01:00:00.000000000 +0100
@@ -232,7 +232,7 @@
end
end
- when "ppc64"
+ when "ppc64", "ppc64le"
File.readlines(cpuinfo).each do |l|
if l =~ /processor\s+:\s+(\d+)/
processor_num = $1.to_i
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/facter/version.rb new/lib/facter/version.rb
--- old/lib/facter/version.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/lib/facter/version.rb 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +1,6 @@
module Facter
if not defined? FACTERVERSION then
- FACTERVERSION = '2.4.3'
+ FACTERVERSION = '2.4.4'
end
# Returns the running version of Facter.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/facter/virtual.rb new/lib/facter/virtual.rb
--- old/lib/facter/virtual.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/lib/facter/virtual.rb 1970-01-01 01:00:00.000000000 +0100
@@ -90,6 +90,17 @@
end
Facter.add("virtual") do
+ confine :kernel => 'SunOS'
+ confine :hardwareisa => 'sparc'
+ confine :ldom_domainrole_control => 'false'
+ has_weight 20 # Weight this before the default solaris implementation
+ setcode do
+ Facter.value(:ldom_domainrole_impl)
+ end
+end
+
+
+Facter.add("virtual") do
confine :kernel => 'HP-UX'
has_weight 10
setcode do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata
--- old/metadata 1970-01-01 01:00:00.000000000 +0100
+++ new/metadata 1970-01-01 01:00:00.000000000 +0100
@@ -1,7 +1,7 @@
--- !ruby/object:Gem::Specification
name: facter
version: !ruby/object:Gem::Version
- version: 2.4.3
+ version: 2.4.4
prerelease:
platform: ruby
authors:
@@ -9,7 +9,7 @@
autorequire:
bindir: bin
cert_chain: []
-date: 2015-04-02 00:00:00.000000000 Z
+date: 2015-05-19 00:00:00.000000000 Z
dependencies: []
description: You can prove anything with facts!
email: info(a)puppetlabs.com
@@ -190,6 +190,7 @@
- spec/fixtures/cpuinfo/amd64tri
- spec/fixtures/cpuinfo/amd64twentyfour-grep
- spec/fixtures/cpuinfo/amd64solo
+- spec/fixtures/cpuinfo/ppc64le
- spec/fixtures/cpuinfo/beaglexm-armel
- spec/fixtures/cpuinfo/amd64twentyfour
- spec/fixtures/cpuinfo/sparc
@@ -537,6 +538,7 @@
- spec/fixtures/cpuinfo/amd64tri
- spec/fixtures/cpuinfo/amd64twentyfour-grep
- spec/fixtures/cpuinfo/amd64solo
+- spec/fixtures/cpuinfo/ppc64le
- spec/fixtures/cpuinfo/beaglexm-armel
- spec/fixtures/cpuinfo/amd64twentyfour
- spec/fixtures/cpuinfo/sparc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/fixtures/cpuinfo/ppc64le new/spec/fixtures/cpuinfo/ppc64le
--- old/spec/fixtures/cpuinfo/ppc64le 1970-01-01 01:00:00.000000000 +0100
+++ new/spec/fixtures/cpuinfo/ppc64le 1970-01-01 01:00:00.000000000 +0100
@@ -0,0 +1,15 @@
+processor : 0
+cpu : POWER8E (raw), altivec supported
+clock : 3690.000000MHz
+revision : 2.1 (pvr 004b 0201)
+
+processor : 1
+cpu : POWER8E (raw), altivec supported
+clock : 3690.000000MHz
+revision : 2.1 (pvr 004b 0201)
+
+timebase : 512000000
+platform : PowerNV
+model : 8247-22L
+machine : PowerNV 8247-22L
+firmware : OPAL v3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/unit/application_spec.rb new/spec/unit/application_spec.rb
--- old/spec/unit/application_spec.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/spec/unit/application_spec.rb 1970-01-01 01:00:00.000000000 +0100
@@ -54,6 +54,15 @@
end
end
+ ['-h', '--help'].each do |option|
+ it "issues a deprecation message for `--puppet`" do
+ Facter::Application.stubs(:exit).with(0)
+ expect do
+ Facter::Application.parse([option])
+ end.to have_printed('Deprecated: use `puppet facts` instead')
+ end
+ end
+
it 'mutates argv so that non-option arguments are left' do
argv = ['-y', '--trace', 'uptime', 'virtual']
Facter::Application.parse(argv)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/unit/dhcp_servers_spec.rb new/spec/unit/dhcp_servers_spec.rb
--- old/spec/unit/dhcp_servers_spec.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/spec/unit/dhcp_servers_spec.rb 1970-01-01 01:00:00.000000000 +0100
@@ -175,6 +175,28 @@
Facter.fact(:dhcp_servers).value.should be_nil
end
end
+ describe 'with nmcli version >= 0.9.9 available but printing an error to STDERR' do
+ before :each do
+ Facter::Core::Execution.stubs(:exec).with('nmcli -t -f STATE g 2>/dev/null').returns("\n")
+ Facter::Core::Execution.stubs(:exec).with('nmcli --version').returns('nmcli tool, version 0.9.9.0')
+ end
+
+ it 'should not produce a dhcp_servers fact' do
+ Facter.fact(:dhcp_servers).value.should be_nil
+ end
+ end
+
+ describe 'with nmcli version <= 0.9.8 available but printing an error to STDERR' do
+ before :each do
+ Facter::Core::Execution.stubs(:exec).with('nmcli -t -f STATE nm 2>/dev/null').returns("\n")
+ Facter::Core::Execution.stubs(:exec).with('nmcli --version').returns('nmcli tool, version 0.9.7.0')
+ end
+
+ it 'should not produce a dhcp_servers fact' do
+ Facter.fact(:dhcp_servers).value.should be_nil
+ end
+ end
+
end
describe "without nmcli available" do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/unit/ldom_spec.rb new/spec/unit/ldom_spec.rb
--- old/spec/unit/ldom_spec.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/spec/unit/ldom_spec.rb 1970-01-01 01:00:00.000000000 +0100
@@ -57,10 +57,6 @@
it "should return correct serial on version 1.0" do
Facter.fact(:ldom_domainchassis).value.should == "0704RB0280"
end
-
- it "should return correct virtual on version 1.0" do
- Facter.fact(:virtual).value.should == "LDoms"
- end
end
describe "when running on non ldom hardware" do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/unit/processors/os_spec.rb new/spec/unit/processors/os_spec.rb
--- old/spec/unit/processors/os_spec.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/spec/unit/processors/os_spec.rb 1970-01-01 01:00:00.000000000 +0100
@@ -40,6 +40,13 @@
expect(count).to eq 2
end
+ it "should be 2 in ppc64le fixture on Linux" do
+ Facter.fact(:architecture).stubs(:value).returns("ppc64le")
+ File.expects(:readlines).with("/proc/cpuinfo").returns(cpuinfo_fixture_readlines("ppc64le"))
+ count = subject.get_processor_count
+ expect(count).to eq 2
+ end
+
it "should be 2 in panda-armel fixture on Linux" do
Facter.fact(:architecture).stubs(:value).returns("arm")
File.expects(:readlines).with("/proc/cpuinfo").returns(cpuinfo_fixture_readlines("panda-armel"))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/unit/virtual_spec.rb new/spec/unit/virtual_spec.rb
--- old/spec/unit/virtual_spec.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/spec/unit/virtual_spec.rb 1970-01-01 01:00:00.000000000 +0100
@@ -31,6 +31,18 @@
Facter.fact(:virtual).value.should == "zone"
end
+ it "should be LDoms on Solaris when an ldom" do
+ ldom_fixture = File.read(fixtures('ldom', 'ldom_v1'))
+ Facter.fact(:kernel).stubs(:value).returns("SunOS")
+ Facter.fact(:operatingsystem).stubs(:value).returns("Solaris")
+ Facter.fact(:hardwareisa).stubs(:value).returns("sparc")
+ Facter::Core::Execution.stubs(:which).with("virtinfo").returns 'virtinfo'
+ Facter::Core::Execution.stubs(:which).with("vmware").returns nil
+ Facter::Core::Execution.stubs(:exec).with("virtinfo -ap").returns(ldom_fixture)
+ Facter.collection.internal_loader.load(:ldom)
+ Facter.fact(:virtual).value.should == "LDoms"
+ end
+
it "should be jail on FreeBSD when a jail in kvm" do
Facter.fact(:kernel).stubs(:value).returns("FreeBSD")
Facter::Util::Virtual.stubs(:jail?).returns(true)
1
0
Hello community,
here is the log from the commit of package urxvt-font-size for openSUSE:Factory checked in at 2015-11-28 15:19:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/urxvt-font-size (Old)
and /work/SRC/openSUSE:Factory/.urxvt-font-size.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "urxvt-font-size"
Changes:
--------
--- /work/SRC/openSUSE:Factory/urxvt-font-size/urxvt-font-size.changes 2014-11-24 11:08:14.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.urxvt-font-size.new/urxvt-font-size.changes 2015-11-28 15:19:29.000000000 +0100
@@ -1,0 +2,9 @@
+Thu Nov 19 16:28:07 UTC 2015 - tampakrap(a)opensuse.org
+
+- Version bump 1.1
+ * Ignore whitespace when splitting font definitions
+ This fixes an issue where multi-line font definitions that were indented
+ with tabs didn't get handled properly. For some reason this only seems
+ to affect definitions in Xdefaults, not Xresources.
+
+-------------------------------------------------------------------
Old:
----
v1.0.tar.gz
New:
----
v1.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ urxvt-font-size.spec ++++++
--- /var/tmp/diff_new_pack.Adv0sH/_old 2015-11-28 15:19:30.000000000 +0100
+++ /var/tmp/diff_new_pack.Adv0sH/_new 2015-11-28 15:19:30.000000000 +0100
@@ -17,7 +17,7 @@
Name: urxvt-font-size
-Version: 1.0
+Version: 1.1
Release: 0
Summary: Extension for rxvt-unicode that allows changing the font size on the fly
License: MIT
++++++ v1.0.tar.gz -> v1.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urxvt-font-size-1.0/font-size new/urxvt-font-size-1.1/font-size
--- old/urxvt-font-size-1.0/font-size 2014-04-26 15:19:54.000000000 +0200
+++ new/urxvt-font-size-1.1/font-size 2014-12-19 04:39:39.000000000 +0100
@@ -121,7 +121,7 @@
$term->scr_add_lines("\r\nWarning: No font configured, trying a default.\r\nPlease set a font with the 'URxvt.font' resource.");
$curres = "fixed";
}
- my @curfonts = split(/,/, $curres);
+ my @curfonts = split(/\s*,\s*/, $curres);
my $basefont = shift(@curfonts);
my ($newbasefont, $newbasesize) = handle_font($term, $basefont, $change, 0);
@@ -168,7 +168,7 @@
if (!$curres) {
return;
}
- my @curfonts = split(/,/, $curres);
+ my @curfonts = split(/\s*,\s*/, $curres);
my @newfonts = ();
foreach my $font (@curfonts) {
1
0
Hello community,
here is the log from the commit of package urxvt-perls for openSUSE:Factory checked in at 2015-11-28 15:19:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/urxvt-perls (Old)
and /work/SRC/openSUSE:Factory/.urxvt-perls.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "urxvt-perls"
Changes:
--------
--- /work/SRC/openSUSE:Factory/urxvt-perls/urxvt-perls.changes 2014-11-15 12:29:40.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.urxvt-perls.new/urxvt-perls.changes 2015-11-28 15:19:30.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Nov 19 16:34:44 UTC 2015 - tampakrap(a)opensuse.org
+
+- Version bump 2.2, no upstream changelog, see:
+ https://github.com/muennich/urxvt-perls/compare/2.1...2.2
+
+-------------------------------------------------------------------
Old:
----
2.1.tar.gz
New:
----
2.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ urxvt-perls.spec ++++++
--- /var/tmp/diff_new_pack.Cs7ny4/_old 2015-11-28 15:19:30.000000000 +0100
+++ /var/tmp/diff_new_pack.Cs7ny4/_new 2015-11-28 15:19:30.000000000 +0100
@@ -17,7 +17,7 @@
Name: urxvt-perls
-Version: 2.1
+Version: 2.2
Release: 0
Summary: Perl extensions for the rxvt-unicode terminal emulator
License: GPL-2.0
++++++ 2.1.tar.gz -> 2.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urxvt-perls-2.1/README.md new/urxvt-perls-2.2/README.md
--- old/urxvt-perls-2.1/README.md 2014-01-21 22:26:25.000000000 +0100
+++ new/urxvt-perls-2.2/README.md 2015-03-28 13:53:30.000000000 +0100
@@ -2,9 +2,10 @@
Installation
------------
-Simply place the scripts you want to install in the /usr/lib/urxvt/perl/ folder
-for system-wide availability. You can also put them in a folder of your
-choice, but then you have to add this line to your .Xdefaults/.Xresources:
+Simply place the scripts you want to install in /usr/lib/urxvt/perl/ for
+system-wide availability or in ~/.urxvt/ext/ for user-only availability.
+You can also put them in a folder of your choice, but then you have to add this
+line to your .Xdefaults/.Xresources:
URxvt.perl-lib: /your/folder/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urxvt-perls-2.1/clipboard new/urxvt-perls-2.2/clipboard
--- old/urxvt-perls-2.1/clipboard 2014-01-21 22:26:25.000000000 +0100
+++ new/urxvt-perls-2.2/clipboard 2015-03-28 13:53:30.000000000 +0100
@@ -86,6 +86,12 @@
()
}
+sub on_action {
+ my ($self, $action) = @_;
+
+ on_user_command($self, "clipboard:" . $action);
+}
+
sub on_user_command {
my ($self, $cmd) = @_;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urxvt-perls-2.1/keyboard-select new/urxvt-perls-2.2/keyboard-select
--- old/urxvt-perls-2.1/keyboard-select 2014-01-21 22:26:25.000000000 +0100
+++ new/urxvt-perls-2.2/keyboard-select 2015-03-28 13:53:30.000000000 +0100
@@ -40,6 +40,13 @@
}
+sub on_action {
+ my ($self, $action) = @_;
+
+ on_user_command($self, "keyboard-select:" . $action);
+}
+
+
sub on_user_command {
my ($self, $cmd) = @_;
@@ -59,7 +66,9 @@
my ($self, $event, $keysym, $char) = @_;
my $key = chr($keysym);
- if ($self->{search}) {
+ if (lc($key) eq 'c' && $event->{state} & urxvt::ControlMask) {
+ deactivate($self);
+ } elsif ($self->{search}) {
if ($keysym == 0xff1b) {
if ($self->{search_mode}) {
deactivate($self);
@@ -83,6 +92,7 @@
delete $self->{pattern};
}
$self->{search} = '';
+ $self->screen_cur($self->{srhcr}, $self->{srhcc});
if (not find_next($self)) {
if ($self->{search_mode}) {
deactivate($self);
@@ -92,6 +102,15 @@
}
} elsif (length($char) > 0) {
$self->{search} .= $self->locale_decode($char);
+ my $txt = substr($self->{search}, 1);
+ if ($txt) {
+ $self->{pattern} = ($txt =~ m/[[:upper:]]/) ? qr/\Q$txt\E/ :
+ qr/\Q$txt\E/i;
+ } elsif ($self->{pattern}) {
+ delete $self->{pattern};
+ }
+ $self->screen_cur($self->{srhcr}, $self->{srhcc});
+ find_next($self);
status_area($self);
}
} elsif ($self->{move_to}) {
@@ -159,6 +178,7 @@
} elsif ($key eq '/' || $key eq '?') {
$self->{search} = $key;
$self->{search_dir} = $key eq '?' ? -1 : 1;
+ ($self->{srhcr}, $self->{srhcc}) = $self->screen_cur();
status_area($self);
} elsif (lc($key) eq 'n') {
find_next($self, $self->{search_dir} * ($key eq 'N' ? -1 : 1));
@@ -420,6 +440,7 @@
}
($self->{oldcr}, $self->{oldcc}) = $self->screen_cur();
+ ($self->{srhcr}, $self->{srhcc}) = $self->screen_cur();
$self->{old_view_start} = $self->view_start();
$self->{old_pty_ev_events} = $self->pty_ev_events(urxvt::EV_NONE);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/urxvt-perls-2.1/url-select new/urxvt-perls-2.2/url-select
--- old/urxvt-perls-2.1/url-select 2014-01-21 22:26:25.000000000 +0100
+++ new/urxvt-perls-2.2/url-select 2015-03-28 13:53:30.000000000 +0100
@@ -27,6 +27,10 @@
use strict;
+# The custom rendition bit to use for marking the cell as being underlined
+# by us so we can unset it again after a line has changed.
+use constant UNDERLINED => 1<<3; # arbitrarily chosen in hope of no collision
+
sub on_start {
my ($self) = @_;
@@ -62,18 +66,25 @@
if ($self->x_resource('matcher.pattern')) {
@{$self->{pattern}} = ($self->x_resource('matcher.pattern'));
- } elsif ($self->x_resource('matcher.pattern.1')) {
- my $current = 1;
+ } elsif ($self->x_resource('matcher.pattern.0')) {
+ my $current = 0;
- while ($self->x_resource("matcher.pattern.$current")) {
- push @{$self->{pattern}}, $self->x_resource("matcher.pattern.$current");
+ while (defined (my $res = $self->x_resource("matcher.pattern.$current"))) {
+ $res = $self->locale_decode($res);
+ utf8::encode $res;
+ push @{$self->{pattern}}, qr($res)x;
$current++;
}
} else {
- @{$self->{pattern}} = qr{(
- (?:https?://|ftp://|news://|git://|mailto:|file://|www\.)
- [\w\-\@;\/?:&=%\$_.+!*\x27(),~#]+[\w\-\@;\/?&=%\$_+!*\x27()~]
- )}x;
+ @{$self->{pattern}} = qr{
+ (?:https?://|ftp://|news://|mailto:|file://|\bwww\.)
+ [\w\-\@;\/?:&=%\$.+!*\x27,~#]*
+ (
+ \([\w\-\@;\/?:&=%\$.+!*\x27,~#]*\) # Allow a pair of matched parentheses
+ | #
+ [\w\-\@;\/?:&=%\$+*~] # exclude some trailing characters (heuristic)
+ )+
+ }x;
}
()
@@ -87,22 +98,39 @@
my $text = $line->t;
my $rend = $line->r;
+ # clear all underlines that were set by us
+ for (@$rend) {
+ if (urxvt::GET_CUSTOM($_) & UNDERLINED) {
+ $_ = urxvt::SET_CUSTOM($_, urxvt::GET_CUSTOM($_) & ~UNDERLINED) &
+ ~urxvt::RS_Uline;
+ }
+ }
+
for my $pattern (@{$self->{pattern}}) {
while ($text =~ /$pattern/g) {
my $url = $&;
- my ($beg, $end) = ($-[1], $+[1] - 1);
- --$end if $url =~ /["')]$/;
+ my ($beg, $end) = ($-[0], $+[0] - 1);
for (@{$rend}[$beg .. $end]) {
- $_ |= urxvt::RS_Uline;
+ unless ($_ & urxvt::RS_Uline) {
+ $_ = urxvt::SET_CUSTOM($_, urxvt::GET_CUSTOM($_) | UNDERLINED);
+ $_ |= urxvt::RS_Uline;
+ }
}
- $line->r($rend);
}
}
+ $line->r($rend);
+
()
}
+sub on_action {
+ my ($self, $action) = @_;
+
+ on_user_command($self, "url-select:" . $action);
+}
+
sub on_user_command {
my ($self, $cmd) = @_;
@@ -122,7 +150,8 @@
my ($self, $event, $keysym) = @_;
my $char = chr($keysym);
- if ($keysym == 0xff1b || lc($char) eq 'q') {
+ if ($keysym == 0xff1b || lc($char) eq 'q' ||
+ (lc($char) eq 'c' && $event->{state} & urxvt::ControlMask)) {
deactivate($self);
} elsif ($keysym == 0xff0d || $char eq 'o') {
$self->exec_async(@{$self->{browser}}, ${$self->{found}[$self->{n}]}[4]);
@@ -160,9 +189,25 @@
urxvt::ShiftMask | urxvt::ControlMask;
if ($event->{button} == $self->{button} && ($event->{state} & $mask) == $self->{state}) {
- $self->{button_pressed} = 1;
- $self->{button_col} = $event->{col};
- $self->{button_row} = $event->{row};
+ my $col = $event->{col};
+ my $row = $event->{row};
+ my $line = $self->line($row);
+ my $text = $line->t;
+
+ for my $pattern (@{$self->{pattern}}) {
+ while ($text =~ /$pattern/g) {
+ my ($url, $beg, $end) = ($&, $-[0], $+[0]);
+ --$end if $url =~ s/["')]$//;
+
+ if ($col >= $beg && $col <= $end) {
+ $self->{button_pressed} = 1;
+ $self->{button_col} = $col;
+ $self->{button_row} = $row;
+ $self->{button_url} = $url;
+ return 1;
+ }
+ }
+ }
}
()
@@ -178,20 +223,8 @@
$self->{button_pressed} = 0;
if ($col == $self->{button_col} && $row == $self->{button_row}) {
- my $line = $self->line($row);
- my $text = $line->t;
-
- for my $pattern (@{$self->{pattern}}) {
- while ($text =~ /$pattern/g) {
- my ($url, $beg, $end) = ($&, $-[0], $+[0]);
- --$end if $url =~ s/["')]$//;
-
- if ($col >= $beg && $col <= $end) {
- $self->exec_async(@{$self->{browser}}, $url);
- return 1;
- }
- }
- }
+ $self->exec_async(@{$self->{browser}}, $self->{button_url});
+ return 1;
}
}
@@ -221,7 +254,7 @@
}
while (($dir < 0 && $row > $self->top_row) ||
- ($dir > 0 && $row < $self->nrow - 1)) {
+ ($dir > 0 && $row < $self->nrow - 1)) {
my $line = $self->line($row);
$row = ($dir < 0 ? $line->beg : $line->end) + $dir;
$line = $self->line($row);
@@ -233,7 +266,6 @@
do {
my ($beg, $end) = ($-[0], $+[0]);
- --$end if $& =~ /['")]$/;
push @{$self->{found}}, [$line->coord_of($beg),
$line->coord_of($end), substr($text, $beg, $end - $beg)];
} while ($text =~ /$pattern/g);
1
0
Hello community,
here is the log from the commit of package nano for openSUSE:Factory checked in at 2015-11-28 15:19:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nano (Old)
and /work/SRC/openSUSE:Factory/.nano.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nano"
Changes:
--------
--- /work/SRC/openSUSE:Factory/nano/nano.changes 2015-07-12 22:53:05.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.nano.new/nano.changes 2015-11-28 15:19:27.000000000 +0100
@@ -1,0 +2,10 @@
+Thu Nov 19 15:34:32 UTC 2015 - astieger(a)suse.com
+
+- GNU nano 2.4.3:
+ * Fix several memory leaks
+ * Fix issues with color syntax higlighting
+ * Fix issues with search/replace
+ * Fix issues with file insertion
+ * Fix help menu bugs
+
+-------------------------------------------------------------------
Old:
----
nano-2.4.2.tar.gz
nano-2.4.2.tar.gz.asc
New:
----
nano-2.4.3.tar.gz
nano-2.4.3.tar.gz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nano.spec ++++++
--- /var/tmp/diff_new_pack.lSZpJh/_old 2015-11-28 15:19:28.000000000 +0100
+++ /var/tmp/diff_new_pack.lSZpJh/_new 2015-11-28 15:19:28.000000000 +0100
@@ -18,7 +18,7 @@
%define _version 2.4
Name: nano
-Version: 2.4.2
+Version: 2.4.3
Release: 0
Summary: Pico editor clone with enhancements
License: GPL-3.0+
++++++ nano-2.4.2.tar.gz -> nano-2.4.3.tar.gz ++++++
++++ 64880 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package blobwars for openSUSE:Factory checked in at 2015-11-28 15:19:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/blobwars (Old)
and /work/SRC/openSUSE:Factory/.blobwars.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "blobwars"
Changes:
--------
--- /work/SRC/openSUSE:Factory/blobwars/blobwars.changes 2015-07-05 18:02:29.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.blobwars.new/blobwars.changes 2015-11-28 15:19:23.000000000 +0100
@@ -1,0 +2,20 @@
+Wed Nov 25 17:17:48 UTC 2015 - nemysis(a)openSUSE.org
+
+- Update to 2.00, announce message:
+
+* Changed to SDL 2.0. This also allows the window to be scaled to an arbitrary
+ size, and doesn't change the desktop resolution anymore when going to
+ fullscreen.
+* The joystick/gamepad can now also be used in the menus and on the hub.
+* Updated credits and copyright notices.
+* Added stereo to the sound effects.
+* Cleaned up some graphics.
+* Fixed the machinegun sound.
+* Fixed the behaviour of grenades.
+* Many small fixes.
+
+- Remove icons blobwars-icons.tar, use supplied
+- Change BuildRequires, changed by Upstream for SDL2
+- Change sed, use Makefile instead of makefile, changed by Upstream
+
+-------------------------------------------------------------------
Old:
----
blobwars-1.19.tar.gz
blobwars-icons.tar
New:
----
blobwars-2.00.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ blobwars.spec ++++++
--- /var/tmp/diff_new_pack.8qJgmL/_old 2015-11-28 15:19:27.000000000 +0100
+++ /var/tmp/diff_new_pack.8qJgmL/_new 2015-11-28 15:19:27.000000000 +0100
@@ -17,15 +17,14 @@
Name: blobwars
-Version: 1.19
+Version: 2.00
Release: 0
Summary: Mission and Objective based 2D Platform Game
License: GPL-2.0+
Group: Amusements/Games/Action/Arcade
Url: http://sourceforge.net/projects/blobwars/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Source1: %{name}-icons.tar
-Source2: %{name}.appdata.xml
+Source1: %{name}.appdata.xml
# PATCH-FIX-OPENSUSE - blobwars-icons_blobwars.desktop.patch -- Add GenericName and Category
Patch0: %{name}-icons_blobwars.desktop.patch
%if 0%{?suse_version}
@@ -36,10 +35,10 @@
BuildRequires: gettext
BuildRequires: pkgconfig
BuildRequires: zlib-devel
-BuildRequires: pkgconfig(SDL_image)
-BuildRequires: pkgconfig(SDL_mixer)
-BuildRequires: pkgconfig(SDL_net)
-BuildRequires: pkgconfig(SDL_ttf)
+BuildRequires: pkgconfig(SDL2_image)
+BuildRequires: pkgconfig(SDL2_mixer)
+BuildRequires: pkgconfig(SDL2_net)
+BuildRequires: pkgconfig(SDL2_ttf)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -55,11 +54,11 @@
%lang_package
%prep
-%setup -q -a 1
+%setup -q
%patch0
# Correct Permissions
-chmod 0644 makefile*
+chmod 0644 Makefile*
# SED-FIX-OPENSUSE -- Fix paths and libraries
sed -i -e 's|USEPAK ?= 0|USEPAK ?= 1|;
@@ -68,8 +67,7 @@
s| -Werror||;
s|$(CXX) $(LIBS) $(GAMEOBJS) -o $(PROG)|$(CXX) $(GAMEOBJS) $(LIBS) -o $(PROG)|;
s|$(CXX) $(LIBS) $(PAKOBJS) -o pak|$(CXX) $(PAKOBJS) $(LIBS) -o pak|;
- s|$(CXX) $(LIBS) $(MAPOBJS) -o mapeditor|$(CXX) $(MAPOBJS) $(LIBS) -o mapeditor|;
- s|64x64|48x48|' makefile
+ s|$(CXX) $(LIBS) $(MAPOBJS) -o mapeditor|$(CXX) $(MAPOBJS) $(LIBS) -o mapeditor|' Makefile
# SED-FIX-OPENSUSE -- Fix pak
sed -i -e 's|gzclose(pak)|gzclose((gzFile)pak)|;
@@ -80,11 +78,12 @@
RELEASE=1 DOCDIR=%{_docdir}/%{name}/
%install
+#make install
%make_install BINDIR=%{_bindir}/ DATADIR=%{_datadir}/%{name}/ DOCDIR=%{_docdir}/%{name}/
# install icons
-for i in 16 22 32 48 ; do
- install -Dm 0644 icons/%{name}_${i}x${i}.png \
+for i in 16 32 48 64; do
+ install -Dm 0644 icons/%{name}${i}x${i}.png \
%{buildroot}/%{_datadir}/icons/hicolor/${i}x${i}/apps/%{name}.png
done
@@ -92,14 +91,14 @@
# Install appdata
mkdir -p %{buildroot}%{_datadir}/appdata
-install -Dm 0644 %{S:2} %{buildroot}%{_datadir}/appdata
+install -Dm 0644 %{S:1} %{buildroot}%{_datadir}/appdata
%if 0%{?suse_version}
%suse_update_desktop_file %{name}
%endif
%files
-%defattr(-,root,root,-)
+%defattr(-,root,root)
%doc doc/*
%{_bindir}/%{name}
%{_datadir}/%{name}
++++++ blobwars-1.19.tar.gz -> blobwars-2.00.tar.gz ++++++
/work/SRC/openSUSE:Factory/blobwars/blobwars-1.19.tar.gz /work/SRC/openSUSE:Factory/.blobwars.new/blobwars-2.00.tar.gz differ: char 4, line 1
1
0