* conf.d-readme-templatedir.patch

OBS-URL: https://build.opensuse.org/package/show/M17N/fontconfig?expand=0&rev=108
This commit is contained in:
Petr Gajdos 2013-04-11 14:41:05 +00:00 committed by Git OBS Bridge
parent c341e9fb99
commit 1d8288a933
2 changed files with 12 additions and 25 deletions

View File

@ -1,41 +1,27 @@
diff -Nupr fontconfig-2.10.92/conf.d/Makefile.am fontconfig-2.10.92.new/conf.d/Makefile.am Index: fontconfig-2.10.92/conf.d/Makefile.am
--- fontconfig-2.10.92/conf.d/Makefile.am 2013-01-08 07:26:17.000000000 +0100 ===================================================================
+++ fontconfig-2.10.92.new/conf.d/Makefile.am 2013-04-11 11:17:54.829377948 +0200 --- fontconfig-2.10.92.orig/conf.d/Makefile.am
+++ fontconfig-2.10.92/conf.d/Makefile.am
@@ -78,6 +78,9 @@ template_DATA = \ @@ -78,6 +78,9 @@ template_DATA = \
80-delicious.conf \ 80-delicious.conf \
90-synthetic.conf 90-synthetic.conf
+all: +README: $(srcdir)/README.in
+ cat README.in | sed "s|TEMPLATEDIR|$(templatedir)|" > README + sed "s|\@TEMPLATEDIR\@|$(templatedir)|" <$(srcdir)/README.in >README
+ +
install-data-hook: install-data-hook:
mkdir -p $(DESTDIR)$(configdir) mkdir -p $(DESTDIR)$(configdir)
@(echo cd $(DESTDIR)$(configdir); \ @(echo cd $(DESTDIR)$(configdir); \
diff -Nupr fontconfig-2.10.92/conf.d/README fontconfig-2.10.92.new/conf.d/README Index: fontconfig-2.10.92/conf.d/README.in
--- fontconfig-2.10.92/conf.d/README 2012-02-20 04:49:18.000000000 +0100 ===================================================================
+++ fontconfig-2.10.92.new/conf.d/README 2013-04-11 11:17:03.550038051 +0200 --- /dev/null
@@ -2,9 +2,9 @@ conf.d/README +++ fontconfig-2.10.92/conf.d/README.in
Each file in this directory is a fontconfig configuration file. Fontconfig
scans this directory, loading all files of the form [0-9][0-9]*.conf.
-These files are normally installed in ../conf.avail and then symlinked here,
-allowing them to be easily installed and then enabled/disabled by adjusting
-the symlinks.
+These files are normally installed in /usr/share/fontconfig/conf.avail
+and then symlinked here, allowing them to be easily installed and then
+enabled/disabled by adjusting the symlinks.
The files are loaded in numeric order, the structure of the configuration
has led to the following conventions in usage:
diff -Nupr fontconfig-2.10.92/conf.d/README.in fontconfig-2.10.92.new/conf.d/README.in
--- fontconfig-2.10.92/conf.d/README.in 1970-01-01 01:00:00.000000000 +0100
+++ fontconfig-2.10.92.new/conf.d/README.in 2013-04-11 11:16:09.780681938 +0200
@@ -0,0 +1,23 @@ @@ -0,0 +1,23 @@
+conf.d/README +conf.d/README
+ +
+Each file in this directory is a fontconfig configuration file. Fontconfig +Each file in this directory is a fontconfig configuration file. Fontconfig
+scans this directory, loading all files of the form [0-9][0-9]*.conf. +scans this directory, loading all files of the form [0-9][0-9]*.conf.
+These files are normally installed in TEMPLATEDIR +These files are normally installed in @TEMPLATEDIR@
+and then symlinked here, allowing them to be easily installed and then +and then symlinked here, allowing them to be easily installed and then
+enabled/disabled by adjusting the symlinks. +enabled/disabled by adjusting the symlinks.
+ +

View File

@ -8,6 +8,7 @@ Thu Apr 11 10:24:57 UTC 2013 - pgajdos@suse.com
%config(noreplace) %config(noreplace)
- /etc/fonts/conf.d/README now mentions correct template dir - /etc/fonts/conf.d/README now mentions correct template dir
[bnc#810034] [bnc#810034]
* conf.d-readme-templatedir.patch
- revert the change from Mon May 28 11:53:08 UTC 2012 because - revert the change from Mon May 28 11:53:08 UTC 2012 because
hintslight implies autohinter. Rather render Liberation, DejaVu hintslight implies autohinter. Rather render Liberation, DejaVu
and Droid sans serif and serif fonts with BCI, even if it means and Droid sans serif and serif fonts with BCI, even if it means