|
@@ -6,7 +6,7 @@
|
|
|
Summary: Font configuration and customization library
|
|
|
Summary(ja): フォント設定/カスタマイズライブラリ
|
|
|
Name: fontconfig
|
|
|
-Version: 2.14.2
|
|
|
+Version: 2.16.0
|
|
|
Release: 1%{?_dist_release}
|
|
|
Group: system
|
|
|
Vendor: Project Vine
|
|
@@ -24,6 +24,9 @@ Source100: ChangeLog.fedora
|
|
|
Patch0: %{name}-sleep-less.patch
|
|
|
Patch4: %{name}-drop-lang-from-pkgkit-format.patch
|
|
|
Patch5: %{name}-disable-network-required-test.patch
|
|
|
+#Patch6: %{name}-lower-nonlatin-conf.patch
|
|
|
+Patch7: %{name}-meson-cachedir.patch
|
|
|
+Patch8: %{name}-meson-endianness.patch
|
|
|
|
|
|
# vine
|
|
|
Patch10000: fontconfig-2.3.2-subst-ja-font.patch
|
|
@@ -32,12 +35,12 @@ Patch10001: fontconfig-2.13.1-vine.patch
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
BuildRequires: gawk
|
|
|
-BuildRequires: expat-devel
|
|
|
BuildRequires: freetype2-devel >= %{freetype_version}
|
|
|
BuildRequires: perl
|
|
|
-#BuildRequires: itstool
|
|
|
-BuildRequires: libuuid-devel
|
|
|
+BuildRequires: gettext
|
|
|
BuildRequires: gperf
|
|
|
+BuildRequires: libxml2-devel
|
|
|
+BuildRequires: meson
|
|
|
|
|
|
Requires(pre): freetype2 >= %{freetype_version}, coreutils
|
|
|
Conflicts: XOrg-libs <= 6.9.0
|
|
@@ -124,45 +127,58 @@ fontconfig-devel パッケージには fontconfig を使ったソフトウエア
|
|
|
# We don't want to rebuild the docs, but we want to install the included ones.
|
|
|
export HASDOCBOOK=no
|
|
|
|
|
|
-%configure \
|
|
|
- --with-add-fonts=/usr/share/fonts,/usr/share/X11/fonts/Type1,/usr/share/X11/fonts/TTF,/usr/local/share/fonts
|
|
|
+%meson \
|
|
|
+ -Ddoc=disabled \
|
|
|
+ -Dcache-build=disabled \
|
|
|
+ -Dxml-backend=libxml2 \
|
|
|
+ -Dadditional-fonts-dirs=/usr/share/fonts,/usr/share/X11/fonts/Type1,/usr/share/X11/fonts/TTF,/usr/local/share/fonts \
|
|
|
+ -Dcache-dir=/var/cache/fontconfig \
|
|
|
+ --default-library=shared
|
|
|
|
|
|
-%__make %{?_smp_mflags}
|
|
|
+%meson_build
|
|
|
|
|
|
|
|
|
%install
|
|
|
-rm -rf $RPM_BUILD_ROOT
|
|
|
+%meson_install
|
|
|
|
|
|
-%__make install DESTDIR=$RPM_BUILD_ROOT
|
|
|
-
|
|
|
-ln -s %{_datadir}/fontconfig/conf.avail/25-unhint-nonlatin.conf $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
|
|
|
+ln -s %{_datadir}/fontconfig/conf.avail/25-unhint-nonlatin.conf $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d/
|
|
|
install -m664 %{SOURCE10} %{SOURCE11} $RPM_BUILD_ROOT/%{_datadir}/fontconfig/conf.avail/
|
|
|
for i in 70-prefer-ja-font.conf 59-morisawa-font-alias.conf
|
|
|
do
|
|
|
ln -sf %{_datadir}/fontconfig/conf.avail/$i $RPM_BUILD_ROOT/%{_sysconfdir}/fonts/conf.d/
|
|
|
done
|
|
|
|
|
|
-# move installed doc files back to build directory to package themm
|
|
|
-# in the right place
|
|
|
-mv $RPM_BUILD_ROOT%{_docdir}/fontconfig/* .
|
|
|
-rmdir $RPM_BUILD_ROOT%{_docdir}/fontconfig/
|
|
|
+# Install docs manually
|
|
|
+install -d $RPM_BUILD_ROOT%{_mandir}/man1
|
|
|
+install -d $RPM_BUILD_ROOT%{_mandir}/man3
|
|
|
+install -d $RPM_BUILD_ROOT%{_mandir}/man5
|
|
|
+for f in doc/*.1; do
|
|
|
+ install -p -m 0644 $f $RPM_BUILD_ROOT%{_mandir}/man1
|
|
|
+done
|
|
|
+for f in doc/*.3; do
|
|
|
+ install -p -m 0644 $f $RPM_BUILD_ROOT%{_mandir}/man3
|
|
|
+done
|
|
|
+for f in doc/*.5; do
|
|
|
+ install -p -m 0644 $f $RPM_BUILD_ROOT%{_mandir}/man5
|
|
|
+done
|
|
|
+for f in doc/*.txt doc/*.pdf doc/*.html; do
|
|
|
+ install -p -m 0644 $f .
|
|
|
+done
|
|
|
+
|
|
|
+# adjust the timestamp to avoid conflicts for multilib
|
|
|
+touch -r doc/fontconfig-user.sgml fontconfig-user.txt
|
|
|
+touch -r doc/fontconfig-user.sgml fontconfig-user.html
|
|
|
+touch -r doc/fontconfig-devel.sgml fontconfig-devel.txt
|
|
|
+touch -r doc/fontconfig-devel.sgml fontconfig-devel.html
|
|
|
|
|
|
# All font packages depend on this package, so we create
|
|
|
# and own /usr/share/fonts
|
|
|
mkdir -p $RPM_BUILD_ROOT%{_datadir}/fonts
|
|
|
|
|
|
-# Remove unpackaged files
|
|
|
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
|
|
|
-find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} \;
|
|
|
-
|
|
|
# remove locales (zh only)
|
|
|
rm -rf %{buildroot}%{_datadir}/locale
|
|
|
|
|
|
|
|
|
-%clean
|
|
|
-rm -rf $RPM_BUILD_ROOT
|
|
|
-
|
|
|
-
|
|
|
%transfiletriggerin -- /usr/share/fonts /usr/share/X11/fonts/Type1 /usr/share/X11/fonts/TTF /usr/local/share/fonts
|
|
|
HOME=/root /usr/bin/fc-cache -s
|
|
|
|
|
@@ -170,17 +186,28 @@ HOME=/root /usr/bin/fc-cache -s
|
|
|
HOME=/root /usr/bin/fc-cache -s
|
|
|
|
|
|
|
|
|
+%postun
|
|
|
+if [ $1 == 0 ] && [ -e %{_sysconfdir}/xml/catalog ]; then
|
|
|
+ %{_bindir}/xmlcatalog --noout --del "urn:fontconfig:fonts.dtd" %{_sysconfdir}/xml/catalog
|
|
|
+fi
|
|
|
+
|
|
|
%posttrans
|
|
|
umask 0022
|
|
|
# Remove stale caches
|
|
|
rm -f %{_localstatedir}/cache/fontconfig/????????????????????????????????-*.cache-2
|
|
|
HOME=/root /usr/bin/fc-cache -f -s >& /dev/null
|
|
|
|
|
|
+if [ -e %{_sysconfdir}/xml/catalog ]; then
|
|
|
+ %{_bindir}/xmlcatalog --noout --add system \
|
|
|
+ "urn:fontconfig:fonts.dtd" \
|
|
|
+ "file://%{_datadir}/xml/fontconfig/fonts.dtd" \
|
|
|
+ %{_sysconfdir}/xml/catalog
|
|
|
+fi
|
|
|
+
|
|
|
|
|
|
%files
|
|
|
-%defattr(-, root, root)
|
|
|
%license COPYING
|
|
|
-%doc README AUTHORS
|
|
|
+%doc README.md AUTHORS
|
|
|
%doc fontconfig-user.txt fontconfig-user.html
|
|
|
%doc %{_sysconfdir}/fonts/conf.d/README
|
|
|
%{_libdir}/libfontconfig.so.*
|
|
@@ -204,8 +231,7 @@ HOME=/root /usr/bin/fc-cache -f -s >& /dev/null
|
|
|
%{_mandir}/man5/*
|
|
|
|
|
|
%files devel
|
|
|
-%defattr(-, root, root)
|
|
|
-%doc fontconfig-devel.txt fontconfig-devel
|
|
|
+%doc fontconfig-devel.txt fontconfig-devel.html
|
|
|
%{_libdir}/libfontconfig.so
|
|
|
%dir %{_datadir}/gettext
|
|
|
%dir %{_datadir}/gettext/its
|
|
@@ -217,16 +243,17 @@ HOME=/root /usr/bin/fc-cache -f -s >& /dev/null
|
|
|
# compat32
|
|
|
%if %{build_compat32}
|
|
|
%files -n compat32-%{name}
|
|
|
-%defattr(-, root, root)
|
|
|
%{_libdir}/libfontconfig.so.*
|
|
|
|
|
|
%files -n compat32-%{name}-devel
|
|
|
-%defattr(-, root, root)
|
|
|
%{_libdir}/libfontconfig.so
|
|
|
%endif
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Mon Mar 3 2025 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.16.0-1
|
|
|
+- new upstream release.
|
|
|
+
|
|
|
* Tue Oct 03 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.14.2-1
|
|
|
- new upstream release.
|
|
|
|