Hello community,
here is the log from the commit of package yast2-fonts for openSUSE:Factory
checked in at 2016-09-20 13:27:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-fonts (Old)
and /work/SRC/openSUSE:Factory/.yast2-fonts.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-fonts"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-fonts/yast2-fonts.changes 2015-10-08
08:25:04.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-fonts.new/yast2-fonts.changes
2016-09-20 13:27:51.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Sep 14 16:18:31 UTC 2016 - pgaj...@suse.com
+
+- comma and the rest of family string is ignored [bsc#998300]
+- 3.1.17
+
+-------------------------------------------------------------------
Old:
----
yast2-fonts-3.1.16.tar.bz2
New:
----
yast2-fonts-3.1.17.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-fonts.spec ++++++
--- /var/tmp/diff_new_pack.Hnut7G/_old 2016-09-20 13:27:52.000000000 +0200
+++ /var/tmp/diff_new_pack.Hnut7G/_new 2016-09-20 13:27:52.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package yast2-fonts
#
-# 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
@@ -17,7 +17,7 @@
Name: yast2-fonts
-Version: 3.1.16
+Version: 3.1.17
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-fonts-3.1.16.tar.bz2 -> yast2-fonts-3.1.17.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-fonts-3.1.16/CONTRIBUTING.md
new/yast2-fonts-3.1.17/CONTRIBUTING.md
--- old/yast2-fonts-3.1.16/CONTRIBUTING.md 2015-10-06 13:39:43.000000000
+0200
+++ new/yast2-fonts-3.1.17/CONTRIBUTING.md 2016-09-14 17:42:05.000000000
+0200
@@ -3,7 +3,7 @@
YaST is an open source project and as such it welcomes all kinds of
contributions. If you decide to contribute, please follow these guidelines to
-ensure the process is effective and pleasant both for you and YaST maintainers.
+ensure the process is effective and pleasant both for you and the YaST
maintainers.
There are two main forms of contribution: reporting bugs and performing code
changes.
@@ -17,13 +17,11 @@
registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount.jsp)
if you don't have an account yet.)
-If you find a problem, please report it either using
-[Bugzilla](https://bugzilla.suse.com/) or GitHub issues. We can't guarantee
-that every bug will be fixed, but we'll try.
-
When creating a bug report, please follow our [bug reporting
guidelines](http://en.opensuse.org/openSUSE:Report_a_YaST_bug).
+We can't guarantee that every bug will be fixed, but we'll try.
+
Code Changes
------------
@@ -44,15 +42,22 @@
to the [Ruby style
guide](https://github.com/SUSE/style-guides/blob/master/Ruby.md).
- 4. Make sure your change didn't break anything by building the RPM package
+ 4. Update the package version (in `packages/*.spec`, usually by
+ `rake version:bump`) and add a new entry to the `package/*.changes` file
+ (by `osc vc package`).
+ For bigger changes or changes which need longer discussion it is advised
to
+ add this as a separate last commit so it can be easily updated when
another
+ change is merged in the meantime.
+
+ 5. Make sure your change didn't break anything by building the RPM package
(`rake osc:build`). The build process includes running the full testsuite.
- 5. Publish the branch and create a pull request.
+ 6. Publish the branch and create a pull request.
- 6. YaST developers will review your change and possibly point out issues.
+ 7. YaST developers will review your change and possibly point out issues.
Adapt the code under their guidance until they are all resolved.
- 7. Finally, the pull request will get merged or rejected.
+ 8. Finally, the pull request will get merged or rejected.
See also [GitHub's guide on
contributing](https://help.github.com/articles/fork-a-repo).
@@ -60,9 +65,6 @@
If you want to do multiple unrelated changes, use separate branches and pull
requests.
-Do not change the `VERSION` and `*.changes` files as this could lead to
-conflicts.
-
### Commits
Each commit in the pull request should do only one thing, which is clearly
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-fonts-3.1.16/README.md
new/yast2-fonts-3.1.17/README.md
--- old/yast2-fonts-3.1.16/README.md 2015-10-06 13:39:43.000000000 +0200
+++ new/yast2-fonts-3.1.17/README.md 2016-09-14 18:17:40.000000000 +0200
@@ -15,7 +15,3 @@
The main mission is to bring font rendering options closer
to user. It is intended to weaken term 'default font setting'.
-Note: module is just developed, so it does not live in YaST
-namespace so far. For openSUSE 13.2 or later and Factory, please
-find packages in
[home:pgajdos:font-setting](http://software.opensuse.org/package/yast2-fonts?search_term=yast2-fonts).
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-fonts-3.1.16/package/yast2-fonts.changes
new/yast2-fonts-3.1.17/package/yast2-fonts.changes
--- old/yast2-fonts-3.1.16/package/yast2-fonts.changes 2015-10-06
14:08:07.000000000 +0200
+++ new/yast2-fonts-3.1.17/package/yast2-fonts.changes 2016-09-14
18:18:49.000000000 +0200
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Wed Sep 14 16:18:31 UTC 2016 - pgaj...@suse.com
+
+- comma and the rest of family string is ignored [bsc#998300]
+- 3.1.17
+
+-------------------------------------------------------------------
Tue Oct 6 11:46:19 UTC 2015 - pgaj...@suse.com
- require fileutils before use
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-fonts-3.1.16/package/yast2-fonts.spec
new/yast2-fonts-3.1.17/package/yast2-fonts.spec
--- old/yast2-fonts-3.1.16/package/yast2-fonts.spec 2015-10-06
13:47:21.000000000 +0200
+++ new/yast2-fonts-3.1.17/package/yast2-fonts.spec 2016-09-19
11:25:46.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package yast2-fonts
#
-# 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
@@ -17,35 +17,35 @@
Name: yast2-fonts
-Version: 3.1.16
+Version: 3.1.17
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
+Requires: fontconfig
+Requires: fonts-config >= 20150424
Requires: yast2 >= 3.0.5
Requires: yast2-ruby-bindings >= 1.2.0
-Requires: fonts-config >= 20150424
-Requires: fontconfig
BuildRequires: update-desktop-files
-BuildRequires: yast2-ruby-bindings >= 1.2.0
-BuildRequires: yast2-devtools >= 1.2.0
BuildRequires: yast2 >= 3.0.5
+BuildRequires: yast2-devtools >= 1.2.0
+BuildRequires: yast2-ruby-bindings >= 1.2.0
BuildRequires: rubygem(yast-rake)
# extensions
-BuildRequires: freetype2-devel
-BuildRequires: fontconfig-devel
BuildRequires: font-specimen-devel
+BuildRequires: fontconfig-devel
+BuildRequires: freetype2-devel
BuildRequires: ruby-devel
# for testing
-BuildRequires: rubygem(rspec)
BuildRequires: dejavu-fonts
BuildRequires: fonts-config >= 20150424
+BuildRequires: rubygem(rspec)
Summary: YaST2 - Fonts Configuration
-Group: System/YaST
License: GPL-2.0+
+Group: System/YaST
Url: https://github.com/yast/yast-fonts
%description
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-fonts-3.1.16/src/lib/fonts/fpl-add-dialog.rb
new/yast2-fonts-3.1.17/src/lib/fonts/fpl-add-dialog.rb
--- old/yast2-fonts-3.1.16/src/lib/fonts/fpl-add-dialog.rb 2015-10-06
13:39:43.000000000 +0200
+++ new/yast2-fonts-3.1.17/src/lib/fonts/fpl-add-dialog.rb 2016-09-14
18:12:29.000000000 +0200
@@ -21,8 +21,15 @@
@fcstate = fcstate
@available_families = installed_families(["family", "fontformat"])
- # delete families, that are part of list for some alias
if (@available_families)
+ # bsc#998300
+ # fontconfig can return families with the comma; remove
+ # the redundant part and delete duplicate families: e. g.
+ # Source Sans Pro,Source Sans Pro Black
+ # Source Sans Pro,Source Sans Pro Semibold
+ # => Source Sans Pro
+ @available_families.map!{|family| family.gsub(/,.*/, '')}.uniq!.sort!
+ # delete families, that are part of list for some alias
@fcstate.fpl.keys.each do |key|
@fcstate.fpl[key].each do |family|
if (@available_families.index(family))
@@ -30,6 +37,7 @@
end
end
end
+ # delete blacklisted families
BLACKLIST.each do |black_family|
@available_families.delete_if{|f| f =~ /#{black_family}/}
end
