diff --git a/10-lcdfilter-lcddefault.conf b/10-lcdfilter-lcddefault.conf deleted file mode 100644 index ebec6df..0000000 --- a/10-lcdfilter-lcddefault.conf +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - lcddefault - - - diff --git a/fontconfig.changes b/fontconfig.changes index 3774791..91627d8 100644 --- a/fontconfig.changes +++ b/fontconfig.changes @@ -1,18 +1,3 @@ -------------------------------------------------------------------- -Tue Aug 31 14:29:08 CEST 2010 - pgajdos@suse.cz - -- add AvantGarde, NewCenturySchoolbook, ZapfChancery and - ZapfDingbats aliases into 30-urw-aliases.conf as - workaround to [bnc#434676] - --> added urw-aliases-whitespaces.patch -- see http://bugs.freedesktop.org/show_bug.cgi?id=19128 - -------------------------------------------------------------------- -Fri Jul 23 08:39:25 UTC 2010 - mxwu@novell.com - -- add 10-lcdfilter-lcddefault.conf. - * enable lcdfilter. - ------------------------------------------------------------------- Fri Jun 4 11:51:55 UTC 2010 - coolo@novell.com diff --git a/fontconfig.spec b/fontconfig.spec index f727170..deffa95 100644 --- a/fontconfig.spec +++ b/fontconfig.spec @@ -59,7 +59,6 @@ Source14: suse-bitmaps.conf Source15: suse-font-dirs.conf Source20: local.conf.instsys Source30: 29-liberation-aliases.conf -Source31: 10-lcdfilter-lcddefault.conf # http://www.kde.gr.jp/~akito/patch/ # http://www.kde.gr.jp/~akito/patch/fontconfig/fontconfig-2.2.1/fontconfig-2.2.1-AppleRoman-DynaFont.patch Patch5: AppleRoman-DynaFont.patch @@ -69,7 +68,6 @@ Patch30: bugzilla-179457-fix-font-file-names-for-wine.patch Patch31: bugzilla-246783-do-not-crash-when-config-files-contain-broken-stuff.patch Patch32: usr-share-doc-packages.patch Patch33: bnc438855-make-FcInitReinitialize-work-again.patch -Patch34: urw-aliases-whitespaces.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -115,7 +113,6 @@ accepts font patterns and returns the nearest matching font. %patch31 -p1 %patch32 -p1 %patch33 -p1 -%patch34 -p1 %build %configure --with-pic \ @@ -165,12 +162,10 @@ 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 $RPM_SOURCE_DIR/local.conf.instsys $RPM_BUILD_ROOT/etc/fonts/ install -m 644 $RPM_SOURCE_DIR/29-liberation-aliases.conf $RPM_BUILD_ROOT/etc/fonts/conf.avail -install -m 644 $RPM_SOURCE_DIR/10-lcdfilter-lcddefault.conf $RPM_BUILD_ROOT/etc/fonts/conf.avail # tune links in conf.d: pushd $RPM_BUILD_ROOT/etc/fonts/conf.d ln -s ../suse-font-dirs.conf 05-suse-font-dirs.conf ln -s ../conf.avail/29-liberation-aliases.conf 29-liberation-aliases.conf - ln -s ../conf.avail/10-lcdfilter-lcddefault.conf 10-lcdfilter-lcddefault.conf rm -f 50-user.conf rm -f 51-local.conf ln -s ../suse-pre-user.conf 50-suse-pre-user.conf diff --git a/urw-aliases-whitespaces.patch b/urw-aliases-whitespaces.patch deleted file mode 100644 index 81fdc6a..0000000 --- a/urw-aliases-whitespaces.patch +++ /dev/null @@ -1,44 +0,0 @@ -Index: fontconfig-2.8.0/conf.d/30-urw-aliases.conf -=================================================================== ---- fontconfig-2.8.0.orig/conf.d/30-urw-aliases.conf -+++ fontconfig-2.8.0/conf.d/30-urw-aliases.conf -@@ -9,6 +9,10 @@ - Avant Garde - URW Gothic L - -+ -+ AvantGarde -+ URW Gothic L -+ - - Bookman - URW Bookman L -@@ -17,6 +21,10 @@ - New Century Schoolbook - Century Schoolbook L - -+ -+ NewCenturySchoolbook -+ Century Schoolbook L -+ - - Palatino - URW Palladio L -@@ -26,9 +34,17 @@ - URW Chancery L - - -+ ZapfChancery -+ URW Chancery L -+ -+ - Zapf Dingbats - Dingbats - -+ -+ ZapfDingbats -+ Dingbats -+ - - - Symbol