Accepting request 138211 from M17N:fonts
Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/138211 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fontpackages?expand=0&rev=2
This commit is contained in:
Stephan Kulow
Git OBS Bridge
commit
a3820f1cbd
@ -1,3 +1,45 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 8 12:39:33 UTC 2012 - pgajdos@suse.com
|
||||
|
||||
- introduced new rpm macro: %files_fontsconf_availdir
|
||||
to be included in %files section of package which ships own
|
||||
fontconfig files; expands in
|
||||
/usr/share/%{name}
|
||||
/usr/share/%{name}/conf.avail
|
||||
- introduced new rpm macro: %files_fontsconf_file
|
||||
to be included in %files section of package which ships own
|
||||
fontconfig file;
|
||||
|
||||
%files_fontsconf_file -l name.conf
|
||||
|
||||
expands in
|
||||
/usr/share/%{name}/conf.avail/name.conf
|
||||
%config /etc/fonts/conf.d/name.conf
|
||||
|
||||
when -l switch isn't supplied, only
|
||||
/usr/share/%{name}/conf.avail/name.conf
|
||||
is packaged
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 2 15:34:14 UTC 2012 - pgajdos@suse.com
|
||||
|
||||
- introduced new rpm macro: %install_fontsconf
|
||||
for given file (path/to/01-font.conf), it
|
||||
1. creates %{_fontsconfavaildir}
|
||||
2. copies path/to/01-font.conf to %{_fontsconfavaildir}
|
||||
uses %link_avail_to_system_fontsconf to
|
||||
3. create %{_fontsconfddir}
|
||||
4. link %{_fontsavaildir}/01-fonts.conf %{_fontsconfddir}
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 2 11:33:46 UTC 2012 - pgajdos@suse.com
|
||||
|
||||
- modified %_fontsconfavaildir to from
|
||||
/etc/fonts/conf.avail to /usr/share/%{name}/conf.avail as
|
||||
fontconfig 2.10 ship its avail conf in /usr/share/fontconfig/conf.avail
|
||||
- added %link_avail_to_system_fontsconf, which creates symlink pointing
|
||||
from /etc/fonts/conf.d to ../../../usr/share/%{name}/conf.avail
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 3 13:02:24 UTC 2012 - pgajdos@suse.com
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package fontpackage
|
||||
# spec file for package fontpackages
|
||||
#
|
||||
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
@ -19,8 +19,8 @@
|
||||
Name: fontpackages
|
||||
Version: 0.1
|
||||
Release: 0
|
||||
License: BSD-3-Clause
|
||||
Summary: Commons for Font Packages
|
||||
License: BSD-3-Clause
|
||||
Group: System/Base
|
||||
Source0: rpm-macros.fonts-config
|
||||
Source100: COPYING
|
||||
@ -53,4 +53,3 @@ cp -a %{SOURCE0} %{buildroot}%{_sysconfdir}/rpm/macros.fonts-config
|
||||
%config %{_sysconfdir}/rpm/macros.fonts-config
|
||||
|
||||
%changelog
|
||||
|
||||
|
||||
@ -4,9 +4,66 @@
|
||||
%_miscfontsdir %{_fontsdir}/misc
|
||||
%_fontsconfdir %{_sysconfdir}/fonts
|
||||
%_fontsconfddir %{_fontsconfdir}/conf.d
|
||||
%_fontsconfavaildir %{_fontsconfdir}/conf.avail
|
||||
%_fontsconfavaildir %{_datadir}/%{name}/conf.avail
|
||||
|
||||
# package build macros
|
||||
# macro: link_avail_to_system_fontsconf name
|
||||
# (takes exactly one argument, name of configuration file)
|
||||
# creates symlink pointing from /etc/fonts/conf.d/name to
|
||||
# ../../../usr/share/%{name}/conf.avail/name
|
||||
%link_avail_to_system_fontsconf() \
|
||||
if test "x%1" == "x%%1"; then \
|
||||
echo "Missing argument in call to %%link_avail_to_system_fontsconf: name of configuration file." \
|
||||
false \
|
||||
fi \
|
||||
echo "Linking available configuration in %{_fontsconfavaildir}/%1 to %{_fontsconfddir}/%1" \
|
||||
mkdir -p "%{buildroot}%{_fontsconfddir}" \
|
||||
ln -s "../../..%{_fontsconfavaildir}/%1" "%{buildroot}%{_fontsconfddir}" \
|
||||
%nil
|
||||
|
||||
# macro: install_fontsconf
|
||||
# takes exactly one argument; for given file (path/to/01-font.conf), it
|
||||
# 1. creates %{_fontsconfavaildir}
|
||||
# 2. copies path/to/01-font.conf to %{_fontsconfavaildir}
|
||||
# uses %link_avail_to_system_fontsconf to
|
||||
# 3. create %{_fontsconfddir}
|
||||
# 4. link %{_fontsavaildir}/01-fonts.conf %{_fontsconfddir}
|
||||
|
||||
%install_fontsconf() \
|
||||
if test "x%1" == "x%%1"; then \
|
||||
echo "Missing argument in call to %%install_fontsconf: path and name of configuration file." \
|
||||
false \
|
||||
fi \
|
||||
mkdir -p "%{buildroot}%{_fontsconfavaildir}" \
|
||||
install -m 644 -p "%1" "%{buildroot}%{_fontsconfavaildir}" \
|
||||
conffile=`basename %1` \
|
||||
%link_avail_to_system_fontsconf $conffile \
|
||||
%nil
|
||||
|
||||
# macro: files_fontsconf_availdir
|
||||
# packages /usr/share/%{name}/conf.avail directory,
|
||||
# which is intended for fontconfig files shipped by the
|
||||
# (font) package
|
||||
|
||||
%files_fontsconf_availdir() \
|
||||
%dir %{_datadir}/%{name} \
|
||||
%dir %{_fontsconfavaildir} \
|
||||
%nil
|
||||
|
||||
# macro: files_fontsconf_file
|
||||
# takes exactly one argument; for given fontconfig file
|
||||
# (01-fontconfig.conf) macro expands in correct %%files entry
|
||||
#
|
||||
# -l option also packages %%{_fontsconfddir}/01-fontconfig.conf link
|
||||
|
||||
%files_fontsconf_file(l) \
|
||||
%{_fontsconfavaildir}/%1 \
|
||||
%{-l: \
|
||||
%config %{_fontsconfddir}/%1 \
|
||||
} \
|
||||
%nil
|
||||
|
||||
# macro: reconfigure_fonts_prereq
|
||||
# adds requires for fonts-config
|
||||
%reconfigure_fonts_prereq \
|
||||
Requires(pre): perl aaa_base \
|
||||
%nil
|
||||
|
||||
Loading…
Reference in New Issue
Block a user