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

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>"

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
 
@@ -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
-

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