diff --git a/11-suse-hinting.conf b/11-suse-hinting.conf index 81dfc4a..63d0ec6 100644 --- a/11-suse-hinting.conf +++ b/11-suse-hinting.conf @@ -106,92 +106,305 @@ --> - - TrueType - - - Verdana - MS Gothic - MS PGothic - MS UI Gothic - MS Mincho - MS PMincho - HGPSoeiKakupoptai - HGSGothicE - HGSGothicM - HGKyokashotai - HGSSoeiKakugothicUB - HGPGothicB - HGPGothicE - HGPGothicM - HGSKyokashotai - HGMaruGothicMPRO - HGPSoeiKakugothicUB - HGMinchoL - HGPMinchoL - HGMinchoB - HGPMinchoB - HGSMinchoB - HGMinchoE - HGPMinchoE - HGSMinchoE - HGSoeiKakugothicUB - HGGyoshotai - HGPGyoshotai - HGSGyoshotai - HGSoeiKakupoptai - HGSSoeiPresenceEB - HGPSoeiPresenceEB - HGGothicB - HGGothicE - HGGothicM - HGSoeiPresenceEB - HGPKyokashotai - HGSSoeiKakupoptai - HGSeikaishotaiPRO - TLKyokashotai - TLMincho - TLPMincho - TLPGothic - TLPKyokashotai - TLMarugothicM - TLGyoshotai - TLPGyoshotai - TLSGyoshotai - TLPMarugothicM - TLSMarugothicM - TLSKyokashotai - TLGothic - UnBatangBold - UnBatang - UnBom - UnDinaruBold - UnDinaruLight - UnDinaru - UnDotumBold - UnDotum - UnGraphicBold - UnGraphic - UnGungseo - UnJamoBatang - UnJamoDotum - UnJamoNovel - UnJamoSora - UnPenheulim - UnPen - UnPilgia - UnPilgiBold - UnPilgi - UnShinmun - UnTaza - UnVada - UnYetgul - - - true - + MS Gothic + true + + + MS PGothic + true + + + MS UI Gothic + true + + + MS Mincho + true + + + MS PMincho + true + + + HGPSoeiKakupoptai + true + + + HGSGothicE + true + + + HGSGothicM + true + + + HGKyokashotai + true + + + HGSSoeiKakugothicUB + true + + + HGPGothicB + true + + + HGPGothicE + true + + + HGPGothicM + true + + + HGSKyokashotai + true + + + HGMaruGothicMPRO + true + + + HGPSoeiKakugothicUB + true + + + HGMinchoL + true + + + HGPMinchoL + true + + + HGMinchoB + true + + + HGPMinchoB + true + + + HGSMinchoB + true + + + HGMinchoE + true + + + HGPMinchoE + true + + + HGSMinchoE + true + + + HGSoeiKakugothicUB + true + + + HGGyoshotai + true + + + HGPGyoshotai + true + + + HGSGyoshotai + true + + + HGSoeiKakupoptai + true + + + HGSSoeiPresenceEB + true + + + HGPSoeiPresenceEB + true + + + HGGothicB + true + + + HGGothicE + true + + + HGGothicM + true + + + HGSoeiPresenceEB + true + + + HGPKyokashotai + true + + + HGSSoeiKakupoptai + true + + + HGSeikaishotaiPRO + true + + + TLKyokashotai + true + + + TLMincho + true + + + TLPMincho + true + + + TLPGothic + true + + + TLPKyokashotai + true + + + TLMarugothicM + true + + + TLGyoshotai + true + + + TLPGyoshotai + true + + + TLSGyoshotai + true + + + TLPMarugothicM + true + + + TLSMarugothicM + true + + + TLSKyokashotai + true + + + TLGothic + true + + + UnBatangBold + true + + + UnBatang + true + + + UnBom + true + + + UnDinaruBold + true + + + UnDinaruLight + true + + + UnDinaru + true + + + UnDotumBold + true + + + UnDotum + true + + + UnGraphicBold + true + + + UnGraphic + true + + + UnGungseo + true + + + UnJamoBatang + true + + + UnJamoDotum + true + + + UnJamoNovel + true + + + UnJamoSora + true + + + UnPenheulim + true + + + UnPen + true + + + UnPilgia + true + + + UnPilgiBold + true + + + UnPilgi + true + + + UnShinmun + true + + + UnTaza + true + + + UnVada + true + + + UnYetgul + true - Andale Mono @@ -241,6 +453,7 @@ false + --> - - MingLiU - PMingLiU - - - false - + MingLiU + false + + PMingLiU + false + + diff --git a/16-suse-hintstyle.conf b/16-suse-hintstyle.conf index 63442d8..2b907c1 100644 --- a/16-suse-hintstyle.conf +++ b/16-suse-hintstyle.conf @@ -127,24 +127,56 @@ exceptions: 47 and 48 of referred bug. --> - - IPAexGothic - IPAexMincho - IPAGothic BoldItalic - IPAGothic Bold - IPAGothic Italic - IPAGothic - IPAMincho - IPAPGothic BoldItalic - IPAPGothic Bold - IPAPGothic Italic - IPAPGothic - IPAPMincho - IPAUIGothic - - - hintnone - + IPAexGothic + hintnone + + + IPAexMincho + hintnone + + + IPAGothic BoldItalic + hintnone + + + IPAGothic Bold + hintnone + + + IPAGothic Italic + hintnone + + + IPAGothic + hintnone + + + IPAMincho + hintnone + + + IPAPGothic BoldItalic + hintnone + + + IPAPGothic Bold + hintnone + + + IPAPGothic Italic + hintnone + + + IPAPGothic + hintnone + + + IPAPMincho + hintnone + + + IPAUIGothic + hintnone diff --git a/18-suse-bitmaps-misc.conf b/18-suse-bitmaps-misc.conf index f57146e..98282d8 100644 --- a/18-suse-bitmaps-misc.conf +++ b/18-suse-bitmaps-misc.conf @@ -13,18 +13,32 @@ pixels again. --> - - IPAMincho - IPAGothic - IPAPMincho - IPAPGothic - IPAUIGothic - IPAexMincho - IPAexGothic - - - false - + IPAMincho + false - + + IPAGothic + false + + + IPAPMincho + false + + + IPAPGothic + false + + + IPAUIGothic + false + + + IPAexMincho + false + + + IPAexGothic + false + + diff --git a/suse-pre-user.conf b/50-suse-pre-user.conf similarity index 51% rename from suse-pre-user.conf rename to 50-suse-pre-user.conf index 29bbb25..289351c 100644 --- a/suse-pre-user.conf +++ b/50-suse-pre-user.conf @@ -16,15 +16,15 @@ --> - - Luxi Mono - Nimbus Mono L - - - mono - + Luxi Mono + mono + + Nimbus Mono L + mono + + - - ja - zh - ko - - - dual - - - proportional - - - false - + ja + dual + proportional + false + + zh + dual + proportional + false + + + + ko + dual + proportional + false + + + - - ja - zh - ko - - - false - - - mono - charcell - - - proportional - - - false - + ja + false + mono + proportional + false + + + ja + false + mono + charcell + false + + + zh + false + mono + proportional + false + + + zh + false + mono + charcell + false + + + ko + false + mono + proportional + false + + + ko + false + mono + charcell + false @@ -320,7 +347,227 @@ - /etc/fonts/suse-generic-names.conf + + + Georgia + serif + + + Bell MT + serif + + + Thorndale AMT + serif + + + SUSE Serif + serif + + + FreeSerif + serif + + + DejaVu Serif + serif + + + Droid Serif + serif + + + Liberation Serif + serif + + + HGMinchoL + serif + + + HGPMinchoL + serif + + + HGPMinchoB + serif + + + HGSMinchoB + serif + + + HGMinchoE + serif + + + HGPMinchoE + serif + + + HGSMinchoE + serif + + + IPAMincho + serif + + + IPAPMincho + serif + + + IPAexMincho + serif + + + Sazanami Mincho + serif + + + STIXGeneral + serif + + + Tinos + serif + + + + Trebuchet + sans-serif + + + Segoe + sans-serif + + + Andale Sans + sans-serif + + + Albany AMT + sans-serif + + + SUSE Sans + sans-serif + + + FreeSans + sans-serif + + + DejaVu Sans + sans-serif + + + Droid Sans + sans-serif + + + Liberation Sans + sans-serif + + + Cantarell + sans-serif + + + HGGothicB + sans-serif + + + HGPGothicB + sans-serif + + + HGGothicE + sans-serif + + + HGPGothicE + sans-serif + + + HGSGothicE + sans-serif + + + HGGothicM + sans-serif + + + HGPGothicM + sans-serif + + + HGSGothicM + sans-serif + + + IPAGothic + sans-serif + + + IPAPGothic + sans-serif + + + IPAexGothic + sans-serif + + + Sazanami Gothic + sans-serif + + + Baekmuk Gulim + sans-serif + + + Arimo + sans-serif + + + + Fixed + monospace + + + Cumberland AMT + monospace + + + SUSE Sans Mono + monospace + + + FreeMono + monospace + + + DejaVu Sans Mono + monospace + + + Droid Sans Mono + monospace + + + Liberation Mono + monospace + + + Cousine + monospace + diff --git a/suse-post-user.conf b/58-suse-post-user.conf similarity index 58% rename from suse-post-user.conf rename to 58-suse-post-user.conf index ac7b376..11e5d11 100644 --- a/suse-post-user.conf +++ b/58-suse-post-user.conf @@ -178,37 +178,111 @@ autohinter when anti-aliasing is off). --> - - - Andale Mono - Arial - Comic Sans MS - Georgia - Impact - Trebuchet MS - Verdana - Courier New - Times New Roman - Tahoma - Webdings - Albany AMT - Thorndale AMT - Cumberland AMT - Andale Sans - Andy MT - Bell MT - Monotype Sorts - Lucida Sans Typewriter - Lucida Sans - Lucida Bright - - - false - - - false - - + + Andale Mono + false + false + + + Arial + false + false + + + Comic Sans MS + false + false + + + Georgia + false + false + + + Impact + false + false + + + Trebuchet MS + false + false + + + Verdana + false + false + + + Courier New + false + false + + + Times New Roman + false + false + + + Tahoma + false + false + + + Webdings + false + false + + + Albany AMT + false + false + + + Thorndale AMT + false + false + + + Cumberland AMT + false + false + + + Andale Sans + false + false + + + Andy MT + false + false + + + Bell MT + false + false + + + Monotype Sorts + false + false + + + Lucida Sans Typewriter + false + false + + + Lucida Sans + false + false + + + Lucida Bright + false + false + diff --git a/cloexec.patch b/cloexec.patch index 30a40ff..ca4c9de 100644 --- a/cloexec.patch +++ b/cloexec.patch @@ -1,8 +1,8 @@ -Index: configure.in +Index: configure.ac =================================================================== ---- configure.in.orig -+++ configure.in -@@ -57,7 +57,9 @@ dnl ==================================== +--- configure.ac.orig ++++ configure.ac +@@ -58,7 +58,9 @@ dnl ==================================== AC_CONFIG_HEADERS(config.h) @@ -13,21 +13,21 @@ Index: configure.in AC_PROG_INSTALL AC_PROG_LN_S AC_LIBTOOL_WIN32_DLL -@@ -119,7 +121,7 @@ AC_TYPE_PID_T +@@ -135,7 +137,7 @@ AC_TYPE_PID_T # Checks for library functions. AC_FUNC_VPRINTF AC_FUNC_MMAP --AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp strchr strrchr strtol getopt getopt_long sysconf ftruncate chsize rand random lrand48 random_r rand_r]) -+AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp mkostemp strchr strrchr strtol getopt getopt_long sysconf ftruncate chsize rand random lrand48 random_r rand_r]) +-AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp strchr strrchr strtol getopt getopt_long sysconf ftruncate chsize rand random lrand48 random_r rand_r regcomp regerror regexec regfree posix_fadvise fstatvfs fstatfs]) ++AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp mkostemp strchr strrchr strtol getopt getopt_long sysconf ftruncate chsize rand random lrand48 random_r rand_r regcomp regerror regexec regfree posix_fadvise fstatvfs fstatfs]) # - # Checks for iconv + if test "x$ac_cv_func_fstatvfs" = "xyes"; then Index: src/fcatomic.c =================================================================== --- src/fcatomic.c.orig +++ src/fcatomic.c -@@ -107,10 +107,14 @@ FcAtomicLock (FcAtomic *atomic) - #ifdef HAVE_LINK +@@ -109,10 +109,14 @@ FcAtomicLock (FcAtomic *atomic) + strcpy ((char *) atomic->tmp, (char *) atomic->file); strcat ((char *) atomic->tmp, TMP_NAME); +#ifdef HAVE_MKOSTEMP @@ -46,7 +46,7 @@ Index: src/fccache.c =================================================================== --- src/fccache.c.orig +++ src/fccache.c -@@ -216,7 +216,7 @@ FcDirCacheOpenFile (const FcChar8 *cache +@@ -150,7 +150,7 @@ FcDirCacheOpenFile (const FcChar8 *cache if (FcStat (cache_file, file_stat) < 0) return -1; #endif @@ -55,7 +55,7 @@ Index: src/fccache.c if (fd < 0) return fd; #ifndef _WIN32 -@@ -963,7 +963,7 @@ FcDirCacheWrite (FcCache *cache, FcConfi +@@ -904,7 +904,7 @@ FcDirCacheWrite (FcCache *cache, FcConfi if (!FcAtomicLock (atomic)) goto bail3; diff --git a/fontconfig-2.10.0.tar.bz2 b/fontconfig-2.10.0.tar.bz2 new file mode 100644 index 0000000..6919e60 --- /dev/null +++ b/fontconfig-2.10.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:12c49f2295d2c14eaa2016a96217d88b63ad1923f8702a64d4e62e5df5afe687 +size 1409503 diff --git a/fontconfig-2.9.0.tar.bz2 b/fontconfig-2.9.0.tar.bz2 deleted file mode 100644 index bbf2a45..0000000 --- a/fontconfig-2.9.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9b39e193758e0ade4a93b2e576b1f2e0432f19bfa98d088b8429f9e31534cbe2 -size 1399568 diff --git a/fontconfig-doc-2.10.0.tar.bz2 b/fontconfig-doc-2.10.0.tar.bz2 new file mode 100644 index 0000000..ef28d68 --- /dev/null +++ b/fontconfig-doc-2.10.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b8bc453d969a2ff0dbea32160d62c2088c2b2d861dd7f0a8a2fa11d765b4c0ca +size 97573 diff --git a/fontconfig-doc-2.9.0.tar.bz2 b/fontconfig-doc-2.9.0.tar.bz2 deleted file mode 100644 index 1f7007f..0000000 --- a/fontconfig-doc-2.9.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0b84f9ec432e74a0192c4aaef6130a8302af29d0cb72fbbd8098f11d8b902d7b -size 85466 diff --git a/fontconfig.changes b/fontconfig.changes index 8c97873..be4c8a5 100644 --- a/fontconfig.changes +++ b/fontconfig.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Mon Sep 24 10:03:29 UTC 2012 - pgajdos@suse.com + +- turn off autohinter for Verdana again, which implies using BCI + with hintstyle=3 [bnc#737215], [bnc#781631] + +------------------------------------------------------------------- +Thu Sep 13 15:03:10 UTC 2012 - pgajdos@suse.com + +- updated to 2.10.0: + * /etc/fonts/conf.avail is deprecated and is packaged only + for compatibility reasons; package should install its *.conf + files in its data dir and link it into /etc/fonts/conf.d as + usual + * introduced warning -- should not contain more s + * introduced warning -- should not contain more values + * introduced warning -- reading configurations from ~/.fonts.conf + is deprecated; move ~/.fonts.conf into $XDG_CONFIG_HOME/fontconfig/fonts.conf + (the same for ~/.fonts.conf.d, see + http://freedesktop.org/software/fontconfig/fontconfig-user.html) + ------------------------------------------------------------------- Thu Aug 2 15:09:56 UTC 2012 - pgajdos@suse.com diff --git a/fontconfig.spec b/fontconfig.spec index 015400b..81a784e 100644 --- a/fontconfig.spec +++ b/fontconfig.spec @@ -16,8 +16,9 @@ # -Name: fontconfig %define build_docs 0 + +Name: fontconfig BuildRequires: automake BuildRequires: freetype2-devel BuildRequires: libexpat-devel @@ -39,14 +40,14 @@ BuildRequires: opensp BuildRequires: perl-SGMLS BuildRequires: sgml-skel %endif -Provides: XFree86:/etc/fonts/fonts.dtd +Provides: XFree86:%{_sysconfdir}/fonts/fonts.dtd Url: http://fontconfig.org/ # bug437293 %ifarch ppc64 Obsoletes: fontconfig-64bit %endif Requires: bash -Version: 2.9.0 +Version: 2.10.0 Release: 0 Summary: Library for Font Configuration License: MIT @@ -58,25 +59,22 @@ Source1: %name-doc-%version.tar.bz2 Source2: iso639-1 Source3: iso639-2 Source4: baselibs.conf -Source10: suse-generic-names.conf -Source11: suse-pre-user.conf -Source12: suse-post-user.conf -Source13: 11-suse-hinting.conf -Source14: 16-suse-hintstyle.conf -Source15: 18-suse-bitmaps-misc.conf -Source16: local.conf -Source20: local.conf.instsys -# fixed in next release https://www.libreoffice.org/bugzilla/show_bug.cgi?id=47703 -Patch0: simsun-conf.patch +Source8: local.conf +Source9: local.conf.instsys +Source11: 11-suse-hinting.conf +Source16: 16-suse-hintstyle.conf +Source18: 18-suse-bitmaps-misc.conf +Source50: 50-suse-pre-user.conf +Source58: 58-suse-post-user.conf # suse specific because freetype2-bitmap-foundry.patch # https://www.libreoffice.org/bugzilla/show_bug.cgi?id=47704 -Patch1: make-check.patch +Patch0: make-check.patch # suse specific -Patch2: usr-share-doc-packages.patch +Patch1: usr-share-doc-packages.patch # https://www.libreoffice.org/bugzilla/show_bug.cgi?id=47705 -Patch3: cloexec.patch +Patch2: cloexec.patch # to be upstreamed -Patch4: metric-croscore.patch +Patch3: metric-croscore.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: ipa-fonts-config = 003.02 Obsoletes: ipa-fonts-config <= 003.02 @@ -119,11 +117,10 @@ accepts font patterns and returns the nearest matching font. %if %{build_docs} < 1 tar -xvf %{SOURCE1} %endif -%patch0 -p1 -b .fonts.conf +%patch0 -p1 %patch1 -p1 -%patch2 -p1 +%patch2 %patch3 -%patch4 %build autoreconf -fiv @@ -132,7 +129,7 @@ autoreconf -fiv --with-freetype-lib=%_libdir \ --with-x \ --enable-libxml2=no \ - --with-confdir=/etc/fonts \ + --with-confdir=%{_sysconfdir}/fonts \ --with-docdir=%{_defaultdocdir}/%{name} \ --with-add-fonts=/usr/X11R6/lib/X11/fonts,/opt/kde3/share/fonts,/usr/local/share/fonts \ %if %{build_docs} == 0 @@ -147,46 +144,42 @@ make %{?_smp_mflags} check unset MALLOC_CHECK_ %install -make DESTDIR=$RPM_BUILD_ROOT pkgconfigdir=%{_libdir}/pkgconfig install -mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/fontconfig -mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/fontconfig-devel +make DESTDIR=%{buildroot} pkgconfigdir=%{_libdir}/pkgconfig install +rm -f %{buildroot}%{_libdir}/*.la +# 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 $RPM_SOURCE_DIR/iso639-? \ - $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name} -install -m 644 doc/*.html $RPM_BUILD_ROOT/%{_defaultdocdir}/fontconfig -install -m 644 doc/fontconfig-user.txt $RPM_BUILD_ROOT/%{_defaultdocdir}/fontconfig -install -m 644 doc/fontconfig-devel/* $RPM_BUILD_ROOT/%{_defaultdocdir}/fontconfig-devel -install -m 644 doc/fontconfig-devel.txt $RPM_BUILD_ROOT/%{_defaultdocdir}/fontconfig-devel + %{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 $RPM_BUILD_ROOT/%{_mandir}/man${i}/ + mkdir -p %{buildroot}/%{_mandir}/man${i}/ for j in fc-*/*.${i} doc/*.${i} doc/*/*.${i} do - test -f ${j} && install -m 644 ${j} $RPM_BUILD_ROOT/%{_mandir}/man${i}/ + test -f ${j} && install -m 644 ${j} %{buildroot}/%{_mandir}/man${i}/ done - gzip --best $RPM_BUILD_ROOT/%{_mandir}/man${i}/*.${i} + gzip --best %{buildroot}/%{_mandir}/man${i}/*.${i} done -# install the conf.d README as well, I think it's helpful: -install -m 644 conf.d/README $RPM_BUILD_ROOT/etc/fonts/conf.d -install -m 644 $RPM_SOURCE_DIR/suse*.conf $RPM_BUILD_ROOT/etc/fonts/ +install -m 644 conf.d/README %{buildroot}%{_sysconfdir}/fonts/conf.d +# tune links in conf.d +pushd %{buildroot}%{_sysconfdir}/fonts/conf.d + mv 50-user.conf 56-user.conf + mv 51-local.conf 55-local.conf + rm -f 51-local.conf +popd for i in $RPM_SOURCE_DIR/[0-9]*.conf; do j=${i##*/} - install -m 644 $i $RPM_BUILD_ROOT/etc/fonts/conf.avail/ - ln -s ../conf.avail/$j $RPM_BUILD_ROOT/etc/fonts/conf.d/$j + install -m 644 $i %{buildroot}%{_datadir}/%{name}/conf.avail/ + ln -s ../../..%{_datadir}/%{name}/conf.avail/$j %{buildroot}%{_sysconfdir}/fonts/conf.d/$j done -install -m 644 $RPM_SOURCE_DIR/local.conf $RPM_BUILD_ROOT/etc/fonts -install -m 644 $RPM_SOURCE_DIR/local.conf.instsys $RPM_BUILD_ROOT/etc/fonts/ -# tune links in conf.d: -pushd $RPM_BUILD_ROOT/etc/fonts/conf.d - rm -f 50-user.conf - rm -f 51-local.conf - ln -s ../suse-pre-user.conf 50-suse-pre-user.conf - ln -s ../conf.avail/51-local.conf 55-local.conf - ln -s ../conf.avail/50-user.conf 56-user.conf - ln -s ../suse-post-user.conf 58-suse-post-user.conf -popd -# don't package any files in the cache directory, only the directory itself: -rm -f $RPM_BUILD_ROOT/var/cache/fontconfig/* -rm -f %{buildroot}%{_libdir}/*.la +install -m 644 $RPM_SOURCE_DIR/local.conf %{buildroot}%{_sysconfdir}/fonts +install -m 644 $RPM_SOURCE_DIR/local.conf.instsys %{buildroot}%{_sysconfdir}/fonts/ %post -p /sbin/ldconfig @@ -194,25 +187,26 @@ rm -f %{buildroot}%{_libdir}/*.la %files %defattr(-,root,root) -%doc %{_defaultdocdir}/%{name} -%{_bindir}/* -%dir /etc/fonts -%config /etc/fonts/fonts.dtd -%config /etc/fonts/fonts.conf -%config /etc/fonts/suse-generic-names.conf -%config /etc/fonts/suse-pre-user.conf -%config /etc/fonts/suse-post-user.conf -%dir /etc/fonts/conf.avail/ -/etc/fonts/conf.avail/* -%dir /etc/fonts/conf.d/ -/etc/fonts/conf.d/README -%config(noreplace) /etc/fonts/conf.d/*.conf -%config(noreplace) /etc/fonts/local.conf -%config /etc/fonts/local.conf.instsys %{_libdir}/libfontconfig.so.* +%{_bindir}/* +%dir %{_sysconfdir}/fonts +%dir %{_sysconfdir}/fonts/conf.d +# packaging /etc/fonts/conf.avail for compatibility reasons +%dir %{_sysconfdir}/fonts/conf.avail +%config %{_sysconfdir}/fonts/fonts.conf +%config(noreplace) %{_sysconfdir}/fonts/conf.d/*.conf +%config(noreplace) %{_sysconfdir}/fonts/local.conf +%config %{_sysconfdir}/fonts/local.conf.instsys +%{_sysconfdir}/fonts/conf.d/README +%dir %{_datadir}/%{name} +%dir %{_datadir}/%{name}/conf.avail +%{_datadir}/%{name}/conf.avail/*.conf +%dir %{_datadir}/xml/%{name} +%{_datadir}/xml/%{name}/fonts.dtd +%dir /var/cache/fontconfig/ +%doc %{_docdir}/%{name} %{_mandir}/man5/fonts-conf.5.gz %{_mandir}/man1/* -%dir /var/cache/fontconfig/ %files devel %defattr(-,root,root) diff --git a/metric-croscore.patch b/metric-croscore.patch index 3d379eb..3d97375 100644 --- a/metric-croscore.patch +++ b/metric-croscore.patch @@ -55,27 +55,3 @@ Index: conf.d/30-metric-aliases.conf Cumberland Courier New -@@ -219,6 +244,7 @@ - - Arial - -+ Arimo - Liberation Sans - Albany - Albany AMT -@@ -228,6 +254,7 @@ - - Times New Roman - -+ Tinos - Liberation Serif - Thorndale - Thorndale AMT -@@ -237,6 +264,7 @@ - - Courier New - -+ Cousine - Liberation Mono - Cumberland - Cumberland AMT diff --git a/simsun-conf.patch b/simsun-conf.patch deleted file mode 100644 index 8a9d30e..0000000 --- a/simsun-conf.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: fontconfig-2.9.0/conf.d/40-nonlatin.conf -=================================================================== ---- fontconfig-2.9.0.orig/conf.d/40-nonlatin.conf -+++ fontconfig-2.9.0/conf.d/40-nonlatin.conf -@@ -89,6 +89,10 @@ - FreeSerif - serif - -+ -+ SimSun -+ serif -+ - -@@ -153,10 +157,6 @@ - sans-serif - - -- SimSun -- sans-serif -- -- - MgOpen Modata - sans-serif - diff --git a/suse-generic-names.conf b/suse-generic-names.conf deleted file mode 100644 index 1dc3a5a..0000000 --- a/suse-generic-names.conf +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - Georgia - Bell MT - Thorndale AMT - SUSE Serif - FreeSerif - DejaVu Serif - Droid Serif - Liberation Serif - HGMinchoL - HGPMinchoL - HGPMinchoB - HGSMinchoB - HGMinchoE - HGPMinchoE - HGSMinchoE - IPAMincho - IPAPMincho - IPAexMincho - Sazanami Mincho - STIXGeneral - Tinos - serif - - - - Trebuchet - Segoe - Andale Sans - Albany AMT - SUSE Sans - FreeSans - DejaVu Sans - Droid Sans - Liberation Sans - Cantarell - HGGothicB - HGPGothicB - HGGothicE - HGPGothicE - HGSGothicE - HGGothicM - HGPGothicM - HGSGothicM - IPAGothic - IPAPGothic - IPAexGothic - Sazanami Gothic - Baekmuk Gulim - Arimo - sans-serif - - - - Fixed - Cumberland AMT - SUSE Sans Mono - FreeMono - DejaVu Sans Mono - Droid Sans Mono - Liberation Mono - Cousine - monospace - - - -