Accepting request 665323 from home:jengelh:branches:M17N

- Implement shared library packaging guideline remove invisible trailing whitespace OBS-URL: https://build.opensuse.org/request/show/665323 OBS-URL: https://build.opensuse.org/package/show/M17N/fontconfig?expand=0&rev=157
2019-01-15 06:31:36 +00:00 · 2019-01-15 06:31:36 +00:00 · 55c60455f8
commit 55c60455f8
parent f476157a8a
3 changed files with 100 additions and 66 deletions
--- a/baselibs.conf
+++ b/baselibs.conf
@ -3,4 +3,8 @@ fontconfig
  +/usr/bin/fc-cat -> /usr/bin/fc-cat<extension>
  +/usr/bin/fc-list -> /usr/bin/fc-list<extension>
  +/usr/bin/fc-match -> /usr/bin/fc-match<extension>
 libfontconfig1
 	requires "fontconfig"
 fontconfig-devel
 	requires -libfontconfig-<targettype>
 	requires "libfontconfig1-<targettype> = <version>"
--- a/fontconfig.changes
+++ b/fontconfig.changes
@ -1,3 +1,9 @@
 Sat Jan 12 12:07:28 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
 - Implement shared library packaging guideline
 - Split documentation to soothe rpmlint's
  "W: package-with-huge-docs 86%"
 -------------------------------------------------------------------
 Sat Jan 12 11:50:46 UTC 2019 - ecsos@opensuse.org
@ -91,7 +97,7 @@ Mon Jun  5 11:33:07 UTC 2017 - pgajdos@suse.com
 Sun Feb 26 01:44:16 UTC 2017 - qantas94heavy@gmail.com
 - Add patch fontconfig-glibc-2.25.patch
-  * Fixes build with glibc 2.25. 
+  * Fixes build with glibc 2.25.
 -------------------------------------------------------------------
 Thu Aug 11 11:50:05 UTC 2016 - pgajdos@suse.com
@ -225,11 +231,11 @@ Fri Dec  6 13:33:14 UTC 2013 - fcrozat@suse.com
 Fri Oct 11 14:27:15 UTC 2013 - hrvoje.senjan@gmail.com
 - Update to final 2.11.0
-  + Do not create a config dir for migration when no config files 
+  + Do not create a config dir for migration when no config files
    nor dirs
  + Fix memory leaks in FcFreeTypeQueryFace
  + Deprecate / remove FC_RASTERIZER (fdo#68955)
-  + Fix a crash when FcPattern is set to null on FcFontSetList() 
+  + Fix a crash when FcPattern is set to null on FcFontSetList()
    and FcFontList()
  + Exit with the error code when FcNameParse() failed
  + Avoid reading config.h twice (fdo#69833)
@ -282,14 +288,14 @@ Tue May 21 17:07:35 UTC 2013 - hrvoje.senjan@gmail.com
  + matching native fonts with even :lang=en (fdo#62980)
  + Ensure closing fp on error
  + Obtain fonts data via FT_Face instead of opening a file directly
-  + Revert the previous change and rework to not export freetype 
+  + Revert the previous change and rework to not export freetype
    API outside fcfreetype.c
  + documented FC_HASH and FC_POSTSCRIPT_NAME
  + make check fails: .. contents:: :depth: 2 (fdo#63329)
  + Use the glob matching for filename
  + conf.d/README outdated (fdo#63452
  + Fix missing OSAtomicCompareAndSwapPtrBarrier() on Mac OS X 10.4
-  + FcFreeTypeQueryFace fails on postscripts fonts loaded 
+  + FcFreeTypeQueryFace fails on postscripts fonts loaded
    from memory (fdo#63922)
  + build-chain, replace INCLUDES directive by AM_CPPFLAGS
 - dropped conf.d-readme-templatedir.patch (upstreamed)
@ -326,7 +332,7 @@ Fri Apr  5 15:32:01 UTC 2013 - hrvoje.senjan@gmail.com
  + support FC_POSTSCRIPT_NAME (fdo#38737)
  + Fix a SIGSEGV on FcPatternGet* with NULL pattern
  + Fix crash with FcConfigSetCurrent(NULL)
-  + Do not copy FC_*LANG_OBJECT even if it's not available on the 
+  + Do not copy FC_*LANG_OBJECT even if it's not available on the
    pattern
  + Added a --sysroot like option to fc-cache (fdo#59456)
  + Add OpenType feature tags support (fdo#50497)
@ -335,7 +341,7 @@ Fri Apr  5 15:32:01 UTC 2013 - hrvoje.senjan@gmail.com
  + Use AM_MISSING_PROG instead of hardcoding missing
  + Add font-file hash (fdo#50733)
  + Add Culmus foundry to the vendor list
-  + Fix broken conf.d/10-autohint.conf and conf.d/10-unhinted.conf 
+  + Fix broken conf.d/10-autohint.conf and conf.d/10-unhinted.conf
    (fdo#60748)
  + Add Liberation Sans Narrow to 30-metric-aliases.conf (fdo#60783)
 - Automake 1.11 is required, so bump the BuildRequires
@ -390,14 +396,14 @@ Thu Sep 13 15:03:10 UTC 2012 - pgajdos@suse.com
 - updated to 2.10.0:
  * /etc/fonts/conf.avail is deprecated and is packaged only
-    for compatibility reasons; package should install its *.conf 
+    for compatibility reasons; package should install its *.conf
-    files in its data dir and link it into /etc/fonts/conf.d as 
+    files in its data dir and link it into /etc/fonts/conf.d as
    usual
-  * introduced warning -- <alias> should not contain more <family>s 
+  * introduced warning -- <alias> should not contain more <family>s
  * introduced warning -- <test> should not contain more values
-  * introduced warning -- reading configurations from ~/.fonts.conf 
+  * introduced warning -- reading configurations from ~/.fonts.conf
    is deprecated; move ~/.fonts.conf into $XDG_CONFIG_HOME/fontconfig/fonts.conf
-    (the same for ~/.fonts.conf.d, see 
+    (the same for ~/.fonts.conf.d, see
     http://freedesktop.org/software/fontconfig/fontconfig-user.html)
 -------------------------------------------------------------------
@ -418,13 +424,13 @@ Thu Jul 26 12:15:37 UTC 2012 - pgajdos@suse.com
 -------------------------------------------------------------------
 Tue Jul  3 11:37:52 UTC 2012 - pgajdos@suse.com
- add <prefer> and <default> aliases for Droid fonts into SUSE-specific 
+- add <prefer> and <default> aliases for Droid fonts into SUSE-specific
-  config; if they are not present and e. g. system with only droid font 
+  config; if they are not present and e. g. system with only droid font
  installed, you get "Droid Sans" instead of "Droid Sans Mono" even if
-  "monospace" requested; that causes e. g. gvim displaying glyphs with 
+  "monospace" requested; that causes e. g. gvim displaying glyphs with
  additional space
 - add also <default> aliases for DejaVu fonts into SUSE-specific config;
-  in case that someone has deinstalled them but gui or document explicitly 
+  in case that someone has deinstalled them but gui or document explicitly
  wants them
 -------------------------------------------------------------------
@ -458,13 +464,13 @@ Sat Jun  2 20:47:53 UTC+8 2012 - hillwood@linuxfans.org
 -------------------------------------------------------------------
 Fri Jun  1 06:54:41 UTC 2012 - pgajdos@suse.com
- don't install 29-liberation-aliases.conf, because 
+- don't install 29-liberation-aliases.conf, because
  30-metric-aliases.conf already contains these bindings
 -------------------------------------------------------------------
 Mon May 28 11:53:08 UTC 2012 - pgajdos@suse.com
- DejaVu Sans, Droid Sans, Liberation Sans: use 
+- DejaVu Sans, Droid Sans, Liberation Sans: use
  hintslight with BCI (instead of hintfull with BCI)
 - DejaVu Serif, Droid Serif, Liberation Serif: use
  hintslight with BCI (instead of hintfull with BCI)
@ -501,7 +507,7 @@ Wed Mar 21 14:59:41 UTC 2012 - pgajdos@suse.com
 -------------------------------------------------------------------
 Sun Jan  1 23:42:27 UTC 2012 - crrodriguez@opensuse.org
- The O_CLOEXEC patch missed one case, in particular the 
+- The O_CLOEXEC patch missed one case, in particular the
  loading of configuration files, this has been fixed.
 -------------------------------------------------------------------
@ -571,7 +577,7 @@ Tue Nov  9 11:52:25 CET 2010 - pgajdos@suse.cz
 Tue Aug 31 14:29:08 CEST 2010 - pgajdos@suse.cz
 - add AvantGarde, NewCenturySchoolbook, ZapfChancery and
-  ZapfDingbats aliases into 30-urw-aliases.conf as 
+  ZapfDingbats aliases into 30-urw-aliases.conf as
  workaround to [bnc#434676]
  --> added urw-aliases-whitespaces.patch
 - see http://bugs.freedesktop.org/show_bug.cgi?id=19128
@ -631,7 +637,7 @@ Thu Jul  9 12:07:15 CEST 2009 - tiwai@suse.de
 -------------------------------------------------------------------
 Mon Feb 23 19:12:01 CET 2009 - crrodriguez@suse.de
- fontconfig leaks memory [bnc#302498] 
+- fontconfig leaks memory [bnc#302498]
 -------------------------------------------------------------------
 Thu Feb 05 13:02:59 CET 2009 - mfabian@suse.de
@ -656,7 +662,7 @@ Tue Feb 03 16:43:16 CET 2009 - mfabian@suse.de
  no font at all preferred for Arabic when the dejavu fonts were
  not installed and even if they were installed there was still no
  preferred Arabic font for serif. This caused a certain
-  randomness in the fonts used by YaST2. 
+  randomness in the fonts used by YaST2.
 -------------------------------------------------------------------
 Mon Jan 26 17:59:34 CET 2009 - mfabian@suse.de
@ -716,7 +722,7 @@ Wed Sep 10 16:55:07 CEST 2008 - mfabian@suse.de
 -------------------------------------------------------------------
 Tue Aug 26 12:14:12 CEST 2008 - crrodriguez@suse.de
- kill "la" files and static libraries 
+- kill "la" files and static libraries
 -------------------------------------------------------------------
 Mon May 26 14:44:48 CEST 2008 - mfabian@suse.de
@ -786,7 +792,7 @@ Fri Mar 23 18:46:17 CET 2007 - mfabian@suse.de
  that even if there are fontconfig rules matching on "font" which
  should override it again). This doesn't cause any problems for
  Cairo/Gnome (see bug #104365) because Cairo/Gnome don't try to
-  change the autohint value anyway. 
+  change the autohint value anyway.
 -------------------------------------------------------------------
 Mon Mar 12 16:01:47 CET 2007 - mfabian@suse.de
@ -852,8 +858,8 @@ Fri Nov 10 16:53:09 CET 2006 - mfabian@suse.de
  It is not necessary anymore to choose fonts which are metric
  compatible to the Adobe fonts as the default, the bug in kpdf
  is apparently fixed (see Bugzilla #129081). The default fonts
-  for all three styles are now Déjà Vu on openSUSE. 
+  for all three styles are now Déjà Vu on openSUSE.
-  
+
 -------------------------------------------------------------------
 Fri Oct 27 12:03:01 CEST 2006 - mfabian@suse.de
@ -990,7 +996,7 @@ Wed Feb 22 11:36:00 CET 2006 - mfabian@suse.de
  + Strip \r and whitespace from input; fixes bug 3454.
  + make fontconfig not crash on pango badness.
  + Remove one more archaic character in ka.orth
-  + Freeze patterns created by configuration file for tiny 
+  + Freeze patterns created by configuration file for tiny
    memory savings (every little bit helps).
 - fix for bugzilla #152453 now included upstream.
@ -1115,7 +1121,7 @@ Mon Feb 06 16:01:26 CET 2006 - mfabian@suse.de
 - fc-loop-scan-fix.diff (by Takashi IWAI <tiwai@suse.de>):
  the endless loop in fc-cache if a subdirectory was a symlink
-  pointing to a directory higher up was already fixed but 
+  pointing to a directory higher up was already fixed but
  there was still an endless loop when using fontconfig
  (e.g. when using "fc-match").
@ -1156,7 +1162,7 @@ Thu Feb  2 20:20:36 CET 2006 - tiwai@suse.de
 Thu Feb  2 17:45:12 CET 2006 - dmueller@suse.de
 - add patch to never open or validate font caches
-  when fc-cache -f is used. 
+  when fc-cache -f is used.
 -------------------------------------------------------------------
 Wed Feb  1 20:21:52 CET 2006 - tiwai@suse.de
@ -1164,7 +1170,7 @@ Wed Feb  1 20:21:52 CET 2006 - tiwai@suse.de
 - Fixes by Dirk Mueller <dmueller@suse.de>:
  fc-verbose.diff, seife-crash.diff
 - print out a warning if the global cache expired
- fix crashes on malformed fonts.cache 
+- fix crashes on malformed fonts.cache
 -------------------------------------------------------------------
 Tue Jan 31 20:27:38 CET 2006 - mfabian@suse.de
@ -1371,7 +1377,7 @@ Fri Dec 30 18:15:24 CET 2005 - mfabian@suse.de
 - apply fcmatch-2.3.93-take2.patch (by Zhe Su <zsu@novell.com>)
  to fix the problem that fonts sometimes could not be matched by
-  their localized names anymore. See also 
+  their localized names anymore. See also
  http://lists.freedesktop.org/archives/fontconfig/2005-December/001843.html
  and the other mails in that thread.
@ -1482,13 +1488,13 @@ Wed Oct 19 14:50:02 CEST 2005 - mfabian@suse.de
  improve support of localized font family and style names by
  sorting them according to the current locale settings.
  With this change, applications which use fontconfig will
-  automatically get the localized font family and style names. 
+  automatically get the localized font family and style names.
 -------------------------------------------------------------------
 Fri Oct 14 16:24:33 CEST 2005 - mfabian@suse.de
 - the return value of fc-cache in directories where
-  fonts.cache-2 doesn't exist was 1. Fix this. 
+  fonts.cache-2 doesn't exist was 1. Fix this.
 -------------------------------------------------------------------
 Thu Oct 13 14:42:51 CEST 2005 - mfabian@suse.de
@ -1543,8 +1549,8 @@ Fri Sep 02 14:37:28 CEST 2005 - mfabian@suse.de
  anti-aliasing and the rules to enable embedded bitmaps from
  suse-pre-user.conf into seperate files and include these
  from suse-pre-user.conf. This makes it easier to edit or replace
-  these rules with SuSEconfig.fonts according to values of 
+  these rules with SuSEconfig.fonts according to values of
-  variables in /etc/sysconfig. 
+  variables in /etc/sysconfig.
 -------------------------------------------------------------------
 Sat Aug 20 10:42:43 CEST 2005 - mfabian@suse.de
@ -1574,7 +1580,7 @@ Tue Aug 16 17:02:35 CEST 2005 - mfabian@suse.de
  something readable. Without that it apparently matches completely
  random and might match a font which doesn't even have ASCII
  glyphs. As a result, nothing at all may be displayed.
-  
+
 -------------------------------------------------------------------
 Fri Jul 29 17:41:39 CEST 2005 - mfabian@suse.de
@ -1609,7 +1615,7 @@ Thu Jul 21 17:31:09 CEST 2005 - mfabian@suse.de
  for some fonts": add a patch to improve the detection of
  monospaced fonts: ignore glyphs with advance=0 when detecting
  monospaced fonts and add a special exception for "Luxi Mono"
-  and "Nimbus Mono L". 
+  and "Nimbus Mono L".
 -------------------------------------------------------------------
 Wed Jul 20 21:55:50 CEST 2005 - mfabian@suse.de
@ -1813,7 +1819,7 @@ Fri Apr 16 12:56:56 CEST 2004 - mfabian@suse.de
  are much better with hintstyle=hintfull than with
  hintstyle=hintnone.
 - fix from upstream CVS: (src/fcfreetype.c):
-  * Fixed bug in using available_sizes[i].height which 
+  * Fixed bug in using available_sizes[i].height which
    is in pixels, not 64ths of a pixel.
 -------------------------------------------------------------------
@ -1892,9 +1898,9 @@ Wed Mar 24 23:50:31 CET 2004 - mfabian@suse.de
 -------------------------------------------------------------------
 Fri Mar 19 15:47:29 CET 2004 - mfabian@suse.de
- Bugzilla 36561#: 
+- Bugzilla 36561#:
  require the Euro sign for languages fr,nl,de,el,es,it,pt,fi,
-  and en. 
+  and en.
 -------------------------------------------------------------------
 Thu Mar 11 13:00:27 CET 2004 - bg@suse.de
@ -1942,7 +1948,7 @@ Tue Dec 23 02:38:47 CET 2003 - mfabian@suse.de
 -------------------------------------------------------------------
 Thu Oct  2 17:56:25 CEST 2003 - mfabian@suse.de
- remove "ed" from "# neededforbuild". 
+- remove "ed" from "# neededforbuild".
 -------------------------------------------------------------------
 Thu Aug 28 11:18:12 CEST 2003 - mfabian@suse.de
@ -2002,4 +2008,3 @@ Sun May 18 22:43:25 CEST 2003 - mfabian@suse.de
 Wed Apr 23 13:00:17 CEST 2003 - sndirsch@suse.de
 - created package
--- a/fontconfig.spec
+++ b/fontconfig.spec
@ -12,11 +12,12 @@
 # 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/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 Name:           fontconfig
 %define lname   libfontconfig1
 Version:        2.13.1
 Release:        0
 Summary:        Library for Font Configuration
@ -46,10 +47,29 @@ which accepts font patterns and returns the nearest matching font.
 %lang_package
 %package -n %{lname}
 Summary:        Library for font configuration
 Group:          System/Libraries
 Requires:       %{name}
 %description -n %{lname}
 Fontconfig is a library for configuring and customizing font access. It
 contains two essential modules: the configuration module, which builds
 an internal configuration from XML files, and the matching module,
 which accepts font patterns and returns the nearest matching font.
 %package doc
 Summary:        Documentation for fontconfig
 Group:          Documentation/Other
 BuildArch:      noarch
 %description doc
 Extended documentation for the fontconfig library.
 %package devel
-Summary:        Include Files and Libraries mandatory for Development
+Summary:        Header files for fontconfig
 Group:          Development/Libraries/C and C++
-Requires:       %{name} = %{version}
+Requires:       %{lname} = %{version}
 Requires:       gettext-devel
 Requires:       glibc-devel
 Requires:       pkgconfig(freetype2)
@ -59,18 +79,19 @@ This package countains all include files, libraries, configuration
 files needed for compiling applications which use the fontconfig
 library.
-In addition, it contains extensive documentation and manual pages for
+%package devel-doc
-developers using the library.
+Summary:        Developer documentation for libfontconfig
 Group:          Documentation/Other
 BuildArch:      noarch
-Fontconfig is a library for configuring and customizing font access. It
+%description devel-doc
-contains two essential modules, the configuration module which builds
+HTML documentation and manual pages for developers using the
-an internal configuration from XML files and the matching module which
+fontconfig library.
 accepts font patterns and returns the nearest matching font.
 %prep
 %setup -q
 # use suse-specific doc path:
-find -name \*.1 -o -name \*.sgml | xargs sed -i -e 's/usr\/share\/doc\/fontconfig/usr\/share\/doc\/packages\/fontconfig/g'
+find -name \*.1 -o -name \*.sgml -exec sed -i -e 's/usr\/share\/doc\/fontconfig/usr\/share\/doc\/packages\/fontconfig/g' {} +
 %build
 # We don't want to rebuild the docs, but we want to install the included ones.
@ -108,16 +129,11 @@ mkdir -p %{buildroot}/%{_docdir}/%{name}
 %find_lang %{name}
 %find_lang %{name}-conf
-%post -p /sbin/ldconfig
+%post   -n %{lname} -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%postun -n %{lname} -p /sbin/ldconfig
 %files
 %license COPYING
 %doc AUTHORS ChangeLog README 
 %doc %{_docdir}/%{name}/fontconfig-user.html 
 %doc %{_docdir}/%{name}/fontconfig-user.pdf 
 %doc %{_docdir}/%{name}/fontconfig-user.txt
 %{_libdir}/libfontconfig.so.*
 %{_bindir}/*
 %dir %{_sysconfdir}/fonts
 %dir %{_sysconfdir}/fonts/conf.d
@ -135,21 +151,30 @@ mkdir -p %{buildroot}/%{_docdir}/%{name}
 %dir %{_localstatedir}/cache/fontconfig/
 %{_mandir}/man5/fonts-conf.5%{ext_man}
 %{_mandir}/man1/*
 %exclude %{_docdir}/%{name}/%{name}-devel/
 %exclude %{_docdir}/%{name}/fontconfig-devel.pdf
 %exclude %{_docdir}/%{name}/fontconfig-devel.txt
 %files lang -f %{name}.lang -f %{name}-conf.lang
 %files doc
 %doc AUTHORS ChangeLog README
 %dir %{_docdir}/%{name}
 %{_docdir}/%{name}/fontconfig-user.html
 %{_docdir}/%{name}/fontconfig-user.pdf
 %{_docdir}/%{name}/fontconfig-user.txt
 %files devel
 %doc %{_docdir}/%{name}/%{name}-devel/
 %doc %{_docdir}/%{name}/fontconfig-devel.pdf
 %doc %{_docdir}/%{name}/fontconfig-devel.txt
 %{_libdir}/pkgconfig/fontconfig.pc
 %{_libdir}/libfontconfig.so
 %{_mandir}/man3/Fc*
 %{_includedir}/fontconfig/
 %dir %{_datadir}/gettext/its/
 %{_datadir}/gettext/its/fontconfig.*
 %files devel-doc
 %{_docdir}/%{name}/%{name}-devel/
 %{_docdir}/%{name}/fontconfig-devel.pdf
 %{_docdir}/%{name}/fontconfig-devel.txt
 %{_mandir}/man3/*
 %files -n %{lname}
 %{_libdir}/libfontconfig.so.*
 %changelog