pool/xorg-x11-fonts
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 587834 from X11:XOrg

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/587834
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-fonts?expand=0&rev=47
This commit is contained in:
Dominique Leuenberger 2018-03-24 15:05:14 +00:00 committed by Git OBS Bridge
commit 0fe4d02ad1
2 changed files with 42 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
xorg-x11-fonts.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Mon Mar 12 22:08:13 UTC 2018 - stefan.bruens@rwth-aachen.de
- Cleanup packaging, see boo#1085143 for details:
* Remove special handling for openSUSE 12.2 and earlier.
* Mark fonts.{dir,scale} and encodings.dir as %ghost files instead
of %config. These files are created by the %posttrans scriptlets
so no need to ship these, also avoids creation of .rpmsave files.
Also track these files consistently for all subdirs.
* add .fonts-config-timestamp as %ghost, ignore if it is missing.
* remove encodings.dir from encodings directories.
-------------------------------------------------------------------
Fri Mar 9 15:05:41 UTC 2018 - stefan.bruens@rwth-aachen.de

60
xorg-x11-fonts.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package xorg-x11-fonts
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2018 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -18,9 +18,7 @@
Name: xorg-x11-fonts
BuildRequires: bdftopcf
%if 0%{?suse_version} > 01220
BuildRequires: fontpackages-devel
%endif
BuildRequires: mkfontdir
BuildRequires: mkfontscale
# ucs2any
@ -138,33 +136,22 @@ for dir in encodings-* $(ls | grep -v -e encodings -e alias) font-alias-* ; do
make -C $dir install DESTDIR=$RPM_BUILD_ROOT "${option}"
done
rm -f $RPM_BUILD_ROOT/usr/share/fonts/*/fonts.cache*
rm -f $RPM_BUILD_ROOT/usr/share/fonts/75dpi/fonts.{dir,scale}
pushd $RPM_BUILD_ROOT
find usr/share/fonts/75dpi -type f | sed 's+^usr+/usr+g' | \
grep -v -e ISO8859 -e fonts.alias >> $RPM_BUILD_DIR/files.%{name}-core
find usr/share/fonts/75dpi -type f -iname \*.pcf.gz | sed 's+^usr+/usr+g' | \
grep -v -e ISO8859 >> $RPM_BUILD_DIR/files.%{name}-core
popd
rm -rf $RPM_BUILD_ROOT/usr/etc
rm -f $RPM_BUILD_ROOT/fonts.{dir,scale}
rm -f $RPM_BUILD_ROOT/usr/share/fonts/encodings/{,large}/encodings.dir
%clean
rm -rf "$RPM_BUILD_ROOT"
%if 0%{?suse_version} > 01220
# %%post scriptlets
%reconfigure_fonts_scriptlets
%reconfigure_fonts_scriptlets -n xorg-x11-fonts-core
%else
%post
%run_suseconfig_fonts
%postun
%run_suseconfig_fonts
%post core
%run_suseconfig_fonts
%postun core
%run_suseconfig_fonts
%endif
%files
%defattr(-,root,root)
@ -172,21 +159,31 @@ rm -rf "$RPM_BUILD_ROOT"
%dir /usr/share/fonts/Type1
%dir /usr/share/fonts/cyrillic
%dir /usr/share/fonts/truetype
%config %verify(not md5 size mtime) /usr/share/fonts/100dpi/fonts.dir
%ghost /usr/share/fonts/100dpi/encodings.dir
%ghost /usr/share/fonts/100dpi/fonts.dir
%ghost /usr/share/fonts/100dpi/fonts.scale
%ghost %verify(not mode) /usr/share/fonts/100dpi/.fonts-config-timestamp
/usr/share/fonts/100dpi/fonts.alias
/usr/share/fonts/100dpi/*.pcf.gz
/usr/share/fonts/75dpi/fonts.alias
/usr/share/fonts/75dpi/*-ISO8859-*.pcf.gz
%config %verify(not md5 size mtime) /usr/share/fonts/Type1/fonts.dir
%config %verify(not md5 size mtime) /usr/share/fonts/Type1/fonts.scale
%ghost /usr/share/fonts/Type1/encodings.dir
%ghost /usr/share/fonts/Type1/fonts.dir
%ghost /usr/share/fonts/Type1/fonts.scale
%ghost %verify(not mode) /usr/share/fonts/Type1/.fonts-config-timestamp
/usr/share/fonts/Type1/*.afm
/usr/share/fonts/Type1/*.pfa
/usr/share/fonts/Type1/*.pfb
%config %verify(not md5 size mtime) /usr/share/fonts/cyrillic/fonts.dir
%ghost /usr/share/fonts/cyrillic/encodings.dir
%ghost /usr/share/fonts/cyrillic/fonts.dir
%ghost /usr/share/fonts/cyrillic/fonts.scale
%ghost %verify(not mode) /usr/share/fonts/cyrillic/.fonts-config-timestamp
/usr/share/fonts/cyrillic/fonts.alias
/usr/share/fonts/cyrillic/*.pcf.gz
%config %verify(not md5 size mtime) /usr/share/fonts/truetype/fonts.dir
%config %verify(not md5 size mtime) /usr/share/fonts/truetype/fonts.scale
%ghost /usr/share/fonts/truetype/encodings.dir
%ghost /usr/share/fonts/truetype/fonts.dir
%ghost /usr/share/fonts/truetype/fonts.scale
%ghost %verify(not mode) /usr/share/fonts/truetype/.fonts-config-timestamp
/usr/share/fonts/truetype/*.otf
/usr/share/fonts/truetype/*.ttf
@ -194,16 +191,19 @@ rm -rf "$RPM_BUILD_ROOT"
%defattr(-,root,root)
%dir /usr/share/fonts/misc
%dir /usr/share/fonts/75dpi
%ghost /usr/share/fonts/75dpi/encodings.dir
%ghost /usr/share/fonts/75dpi/fonts.dir
%ghost /usr/share/fonts/75dpi/fonts.scale
%ghost %verify(not mode) /usr/share/fonts/75dpi/.fonts-config-timestamp
%dir /usr/share/fonts/encodings
%dir /usr/share/fonts/encodings/large
%config %verify(not md5 size mtime) /usr/share/fonts/encodings/encodings.dir
/usr/share/fonts/encodings/*.enc.gz
%config %verify(not md5 size mtime) /usr/share/fonts/encodings/large/encodings.dir
/usr/share/fonts/encodings/large/*.enc.gz
%config %verify(not md5 size mtime) /usr/share/fonts/misc/fonts.dir
%ghost /usr/share/fonts/misc/encodings.dir
%ghost /usr/share/fonts/misc/fonts.dir
%ghost /usr/share/fonts/misc/fonts.scale
%ghost %verify(not mode) /usr/share/fonts/misc/.fonts-config-timestamp
/usr/share/fonts/misc/fonts.alias
/usr/share/fonts/misc/*.pcf.gz
%exclude /fonts.dir
%exclude /fonts.scale
%changelog