Accepting request 511829 from M17N
- Version update to 2.12.4: * Various distcheck errors * FcCharSetHash(): use the 'numbers' values to compute the hash * fc-lang: gracefully handle the case where the last language initial is < 'z' * Fix an off-by-one error in FcLangSetIndex() * Fix erroneous test on language id in FcLangSetPromote() * FcLangSetCompare(): fix bug when two charsets come from different "buckets" * Treat C.UTF-8 and C.utf8 locales as built in the C library - Remove merged upstream fontconfig-locale_c.utf8.patch - Remove fontconfig-doc archive, the generated output is already present in the upstream released tarball - Remove unused configure options (forwarded request 511827 from scarabeus_iv) OBS-URL: https://build.opensuse.org/request/show/511829 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fontconfig?expand=0&rev=87
This commit is contained in:
Yuchen Lin
Git OBS Bridge
commit
2f53253af2
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:bd24bf6602731a11295c025909d918180e98385625182d3b999fd6f1ab34f8bd
|
||||
size 1600509
|
||||
3
fontconfig-2.12.4.tar.bz2
Normal file
3
fontconfig-2.12.4.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:668293fcc4b3c59765cdee5cee05941091c0879edcc24dfec5455ef83912e45c
|
||||
size 1613580
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:81c8d9f1ebd6536eabef34942441903191db6fb8c947c567b14f2eef40b33715
|
||||
size 100510
|
||||
@ -1,13 +0,0 @@
|
||||
Index: fontconfig-2.11.1/src/fclang.c
|
||||
===================================================================
|
||||
--- fontconfig-2.11.1.orig/src/fclang.c
|
||||
+++ fontconfig-2.11.1/src/fclang.c
|
||||
@@ -189,6 +189,8 @@ FcLangNormalize (const FcChar8 *lang)
|
||||
return NULL;
|
||||
|
||||
if (FcStrCmpIgnoreCase (lang, (const FcChar8 *)"C") == 0 ||
|
||||
+ FcStrCmpIgnoreCase (lang, (const FcChar8 *)"C.UTF-8") == 0 ||
|
||||
+ FcStrCmpIgnoreCase (lang, (const FcChar8 *)"C.utf8") == 0 ||
|
||||
FcStrCmpIgnoreCase (lang, (const FcChar8 *)"POSIX") == 0)
|
||||
{
|
||||
result = FcStrCopy ((const FcChar8 *)"en");
|
||||
@ -1,3 +1,19 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 21 11:02:23 UTC 2017 - tchvatal@suse.com
|
||||
|
||||
- Version update to 2.12.4:
|
||||
* Various distcheck errors
|
||||
* FcCharSetHash(): use the 'numbers' values to compute the hash
|
||||
* fc-lang: gracefully handle the case where the last language initial is < 'z'
|
||||
* Fix an off-by-one error in FcLangSetIndex()
|
||||
* Fix erroneous test on language id in FcLangSetPromote()
|
||||
* FcLangSetCompare(): fix bug when two charsets come from different "buckets"
|
||||
* Treat C.UTF-8 and C.utf8 locales as built in the C library
|
||||
- Remove merged upstream fontconfig-locale_c.utf8.patch
|
||||
- Remove fontconfig-doc archive, the generated output is already
|
||||
present in the upstream released tarball
|
||||
- Remove unused configure options
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 11 00:00:52 UTC 2017 - jengelh@inai.de
|
||||
|
||||
|
||||
119
fontconfig.spec
119
fontconfig.spec
@ -16,9 +16,8 @@
|
||||
#
|
||||
|
||||
|
||||
%define build_docs 0
|
||||
Name: fontconfig
|
||||
Version: 2.12.3
|
||||
Version: 2.12.4
|
||||
Release: 0
|
||||
Summary: Library for Font Configuration
|
||||
License: MIT
|
||||
@ -27,54 +26,16 @@ Url: http://fontconfig.org/
|
||||
Source0: http://fontconfig.org/release/%{name}-%{version}.tar.bz2
|
||||
Source4: baselibs.conf
|
||||
Source5: local.conf
|
||||
# suse specific because freetype2-bitmap-foundry.patch
|
||||
# https://www.libreoffice.org/bugzilla/show_bug.cgi?id=47704
|
||||
Patch1: fontconfig-locale_c.utf8.patch
|
||||
BuildRequires: automake >= 1.11
|
||||
BuildRequires: freetype2-devel
|
||||
# -----
|
||||
# (see removal of src/fcobjshash.h in %build)
|
||||
# build 2.12.3 (2.12.1 worked fine); not needed as soon
|
||||
# as following bug is resolved:
|
||||
# https://bugs.freedesktop.org/show_bug.cgi?id=101280
|
||||
BuildRequires: gperf
|
||||
# ---
|
||||
BuildRequires: libexpat-devel
|
||||
BuildRequires: libtool
|
||||
BuildRequires: pkgconfig
|
||||
Requires: bash
|
||||
Provides: XFree86:%{_sysconfdir}/fonts/fonts.dtd
|
||||
BuildRequires: pkgconfig(expat)
|
||||
BuildRequires: pkgconfig(freetype2)
|
||||
Provides: ipa-fonts-config = 003.02
|
||||
Obsoletes: ipa-fonts-config <= 003.02
|
||||
Provides: IPA-fonts-config = 003.02
|
||||
Obsoletes: IPA-fonts-config <= 003.02
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%if %{build_docs}
|
||||
BuildRequires: docbook-dsssl-stylesheets
|
||||
BuildRequires: docbook-utils
|
||||
BuildRequires: docbook_3
|
||||
BuildRequires: docbook_4
|
||||
BuildRequires: iso_ent
|
||||
BuildRequires: libpng
|
||||
BuildRequires: libxml2
|
||||
BuildRequires: libxml2-devel
|
||||
BuildRequires: lynx
|
||||
BuildRequires: openjade
|
||||
BuildRequires: opensp
|
||||
BuildRequires: perl-SGMLS
|
||||
BuildRequires: sgml-skel
|
||||
BuildRequires: texlive-dvips
|
||||
BuildRequires: texlive-jadetex
|
||||
%endif
|
||||
# bug437293
|
||||
%ifarch ppc64
|
||||
Obsoletes: fontconfig-64bit
|
||||
%endif
|
||||
# After building with "build_docs" defined to "1" generate the doc tarball with:
|
||||
# tar jcf fontconfig-doc.tar.bz2 fc-*/*.[0-9] doc/*.[0-9] doc/*.html doc/*/*.html doc/*.txt
|
||||
%if %{build_docs} < 1
|
||||
Source1: %{name}-doc-%{version}.tar.bz2
|
||||
%endif
|
||||
|
||||
%description
|
||||
Fontconfig is a library for configuring and customizing font access. It
|
||||
@ -86,13 +47,8 @@ which accepts font patterns and returns the nearest matching font.
|
||||
Summary: Include Files and Libraries mandatory for Development
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: %{name} = %{version}
|
||||
Requires: freetype2-devel
|
||||
Requires: glibc-devel
|
||||
Provides: XFree86-devel:%{_libdir}/pkgconfig/fontconfig.pc
|
||||
# bug437293
|
||||
%ifarch ppc64
|
||||
Obsoletes: fontconfig-devel-64bit
|
||||
%endif
|
||||
Requires: pkgconfig(freetype2)
|
||||
|
||||
%description devel
|
||||
This package countains all include files, libraries, configuration
|
||||
@ -109,39 +65,20 @@ accepts font patterns and returns the nearest matching font.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%if %{build_docs} < 1
|
||||
tar -xvf %{SOURCE1}
|
||||
%endif
|
||||
%patch1 -p1
|
||||
# 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'
|
||||
|
||||
%build
|
||||
# ----- build with automake 1.13
|
||||
# work around from https://bugs.archlinux.org/task/33406
|
||||
find . -name Makefile.am -exec sed -i "s/\(TESTS_ENVIRONMENT=.*\) sh/\1/" {} \;
|
||||
chmod u+x test/run-test.sh
|
||||
chmod u+x doc/check-missing-doc
|
||||
# -----
|
||||
# build 2.12.3 (2.12.1 worked fine); not needed as soon
|
||||
# as following bug is resolved:
|
||||
# https://bugs.freedesktop.org/show_bug.cgi?id=101280
|
||||
rm src/fcobjshash.h
|
||||
# ---
|
||||
autoreconf -fiv
|
||||
%configure --with-arch=%{_host_cpu} \
|
||||
# We don't want to rebuild the docs, but we want to install the included ones.
|
||||
export HASDOCBOOK=no
|
||||
%configure \
|
||||
--docdir=%{_docdir}/%{name} \
|
||||
--disable-silent-rules \
|
||||
--with-arch=%{_host_cpu} \
|
||||
--disable-static \
|
||||
--with-freetype-lib=%{_libdir} \
|
||||
--with-x \
|
||||
--enable-libxml2=no \
|
||||
--with-confdir=%{_sysconfdir}/fonts \
|
||||
--with-docdir=%{_defaultdocdir}/%{name} \
|
||||
--with-add-fonts=%{_prefix}/X11R6/lib/X11/fonts,/opt/kde3/share/fonts,%{_prefix}/local/share/fonts \
|
||||
%if %{build_docs} == 0
|
||||
--disable-docs
|
||||
%endif
|
||||
#
|
||||
make %{?_smp_mflags} V=1
|
||||
--disable-libxml2 \
|
||||
--with-add-fonts=%{_prefix}/X11R6/lib/X11/fonts,/opt/kde3/share/fonts,%{_prefix}/local/share/fonts
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%check
|
||||
export MALLOC_CHECK_=2
|
||||
@ -149,28 +86,10 @@ make %{?_smp_mflags} check
|
||||
unset MALLOC_CHECK_
|
||||
|
||||
%install
|
||||
make DESTDIR=%{buildroot} pkgconfigdir=%{_libdir}/pkgconfig install
|
||||
%make_install
|
||||
find %{buildroot} -type f -name "*.la" -delete -print
|
||||
# package /etc/fonts/conf.avail for compatibility reasons
|
||||
mkdir %{buildroot}%{_sysconfdir}/fonts/conf.avail
|
||||
# documentation
|
||||
mkdir -p %{buildroot}/%{_defaultdocdir}/fontconfig
|
||||
mkdir -p %{buildroot}/%{_defaultdocdir}/fontconfig-devel
|
||||
install -m 644 AUTHORS COPYING ChangeLog README \
|
||||
%{buildroot}/%{_defaultdocdir}/%{name}
|
||||
install -m 644 doc/*.html %{buildroot}/%{_defaultdocdir}/fontconfig
|
||||
install -m 644 doc/fontconfig-user.txt %{buildroot}/%{_defaultdocdir}/fontconfig
|
||||
install -m 644 doc/fontconfig-devel/* %{buildroot}/%{_defaultdocdir}/fontconfig-devel
|
||||
install -m 644 doc/fontconfig-devel.txt %{buildroot}/%{_defaultdocdir}/fontconfig-devel
|
||||
for i in 1 3 5
|
||||
do
|
||||
mkdir -p %{buildroot}/%{_mandir}/man${i}/
|
||||
for j in fc-*/*.${i} doc/*.${i} doc/*/*.${i}
|
||||
do
|
||||
test -f ${j} && install -m 644 ${j} %{buildroot}/%{_mandir}/man${i}/
|
||||
done
|
||||
gzip --best %{buildroot}/%{_mandir}/man${i}/*.${i}
|
||||
done
|
||||
install -m 644 conf.d/README %{buildroot}%{_sysconfdir}/fonts/conf.d
|
||||
install -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/fonts
|
||||
# tune links in conf.d
|
||||
@ -183,11 +102,9 @@ pushd %{buildroot}%{_sysconfdir}/fonts/conf.d
|
||||
popd
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/libfontconfig.so.*
|
||||
%{_bindir}/*
|
||||
%dir %{_sysconfdir}/fonts
|
||||
@ -204,13 +121,13 @@ popd
|
||||
%dir %{_datadir}/xml/%{name}
|
||||
%{_datadir}/xml/%{name}/fonts.dtd
|
||||
%dir %{_localstatedir}/cache/fontconfig/
|
||||
%doc %{_docdir}/%{name}
|
||||
%{_mandir}/man5/fonts-conf.5.gz
|
||||
%dir %{_docdir}/%{name}
|
||||
%doc %{_docdir}/%{name}/*.{html,pdf,txt}
|
||||
%{_mandir}/man5/fonts-conf.5%{ext_man}
|
||||
%{_mandir}/man1/*
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
%doc %{_defaultdocdir}/%{name}-devel
|
||||
%doc %{_docdir}/%{name}/%{name}-devel
|
||||
%{_libdir}/pkgconfig/fontconfig.pc
|
||||
%{_libdir}/libfontconfig.so
|
||||
%{_mandir}/man3/Fc*
|
||||
|
||||
Loading…
Reference in New Issue
Block a user