Accepting request 665260 from home:ecsos

- Fix self obsoletion ipa-fonts-config and IPA-fonts-config.
- Fix build error in Leap 42.3.
- Fix location of fontconfig-devel.* doc-files.

OBS-URL: https://build.opensuse.org/request/show/665260
OBS-URL: https://build.opensuse.org/package/show/M17N/fontconfig?expand=0&rev=156
This commit is contained in:
Marguerite Su 2019-01-13 10:47:59 +00:00 committed by Git OBS Bridge
parent 1dad25cc45
commit f476157a8a
2 changed files with 20 additions and 7 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sat Jan 12 11:50:46 UTC 2019 - ecsos@opensuse.org
- Fix self obsoletion ipa-fonts-config and IPA-fonts-config.
- Fix build error in Leap 42.3.
- Fix location of fontconfig-devel.* doc-files.
-------------------------------------------------------------------
Fri Jan 11 13:59:16 UTC 2019 - bjorn.lie@gmail.com

View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@ -34,9 +34,9 @@ BuildRequires: pkgconfig(expat)
BuildRequires: pkgconfig(freetype2)
BuildRequires: pkgconfig(uuid)
Provides: ipa-fonts-config = 003.02
Obsoletes: ipa-fonts-config <= 003.02
Obsoletes: ipa-fonts-config < 003.02
Provides: IPA-fonts-config = 003.02
Obsoletes: IPA-fonts-config <= 003.02
Obsoletes: IPA-fonts-config < 003.02
%description
Fontconfig is a library for configuring and customizing font access. It
@ -113,7 +113,10 @@ mkdir -p %{buildroot}/%{_docdir}/%{name}
%files
%license COPYING
%doc AUTHORS ChangeLog README
%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
@ -130,15 +133,18 @@ mkdir -p %{buildroot}/%{_docdir}/%{name}
%dir %{_datadir}/xml/%{name}
%{_datadir}/xml/%{name}/fonts.dtd
%dir %{_localstatedir}/cache/fontconfig/
%dir %{_docdir}/%{name}
%doc %{_docdir}/%{name}/*.{html,pdf,txt}
%{_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 devel
%doc %{_docdir}/%{name}/%{name}-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*