From 73cb310af931f53291becc0b894bdd54db12cc4aacbc5e0ff2156f16fb8e752c Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Sun, 30 Nov 2014 03:19:53 +0000 Subject: [PATCH] Accepting request 263451 from home:bmwiedemann:branches:M17N fix wrong path to documentation (bnc#907685) OBS-URL: https://build.opensuse.org/request/show/263451 OBS-URL: https://build.opensuse.org/package/show/M17N/fontconfig?expand=0&rev=128 --- fontconfig.changes | 5 ++++ fontconfig.spec | 5 ++-- usr-share-doc-packages.patch | 52 ------------------------------------ 3 files changed, 7 insertions(+), 55 deletions(-) delete mode 100644 usr-share-doc-packages.patch diff --git a/fontconfig.changes b/fontconfig.changes index 6763677..49af2eb 100644 --- a/fontconfig.changes +++ b/fontconfig.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Nov 29 20:51:29 UTC 2014 - bwiedemann@suse.com + +- fix wrong path to documentation (bnc#907685) + ------------------------------------------------------------------- Mon Mar 24 19:54:56 UTC 2014 - hrvoje.senjan@gmail.com diff --git a/fontconfig.spec b/fontconfig.spec index 415a5f7..3a6416e 100644 --- a/fontconfig.spec +++ b/fontconfig.spec @@ -64,8 +64,6 @@ Source5: local.conf # suse specific because freetype2-bitmap-foundry.patch # https://www.libreoffice.org/bugzilla/show_bug.cgi?id=47704 Patch0: make-check.patch -# suse specific -Patch1: usr-share-doc-packages.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: ipa-fonts-config = 003.02 Obsoletes: ipa-fonts-config <= 003.02 @@ -109,7 +107,8 @@ accepts font patterns and returns the nearest matching font. tar -xvf %{SOURCE1} %endif %patch0 -p1 -%patch1 -p1 +# use suse-specific doc path: +find -name \*.1 -o -name \*.sgml | xargs sed -i -e 's/usr\/share\/doc\/fontconfig/usr\/share\/doc\/packages\/fontconfig/g' %build # ----- build with automake 1.13 diff --git a/usr-share-doc-packages.patch b/usr-share-doc-packages.patch deleted file mode 100644 index 652168b..0000000 --- a/usr-share-doc-packages.patch +++ /dev/null @@ -1,52 +0,0 @@ -Index: fontconfig-2.8.0/fc-cache/fc-cache.sgml -=================================================================== ---- fontconfig-2.8.0.orig/fc-cache/fc-cache.sgml 2009-11-16 18:24:52.000000000 +0100 -+++ fontconfig-2.8.0/fc-cache/fc-cache.sgml 2011-01-21 11:35:19.672439060 +0100 -@@ -180,7 +180,7 @@ manpage.1: manpage.sgml - - - The fontconfig user's guide, in HTML format: -- /usr/share/doc/fontconfig/fontconfig-user.html. -+ /usr/share/doc/packages/fontconfig/fontconfig-user.html. - - - -Index: fontconfig-2.8.0/fc-cat/fc-cat.sgml -=================================================================== ---- fontconfig-2.8.0.orig/fc-cat/fc-cat.sgml 2009-11-16 18:24:52.000000000 +0100 -+++ fontconfig-2.8.0/fc-cat/fc-cat.sgml 2011-01-21 11:35:19.773439330 +0100 -@@ -139,7 +139,7 @@ manpage.1: manpage.sgml - - - The fontconfig user's guide, in HTML format: -- /usr/share/doc/fontconfig/fontconfig-user.html. -+ /usr/share/doc/packages/fontconfig/fontconfig-user.html. - - - -Index: fontconfig-2.8.0/fc-list/fc-list.sgml -=================================================================== ---- fontconfig-2.8.0.orig/fc-list/fc-list.sgml 2009-11-16 18:24:52.000000000 +0100 -+++ fontconfig-2.8.0/fc-list/fc-list.sgml 2011-01-21 11:35:19.957438963 +0100 -@@ -184,7 +184,7 @@ manpage.1: manpage.sgml - - - The fontconfig user's guide, in HTML format: -- /usr/share/doc/fontconfig/fontconfig-user.html. -+ /usr/share/doc/packages/fontconfig/fontconfig-user.html. - - - -Index: fontconfig-2.8.0/fc-match/fc-match.sgml -=================================================================== ---- fontconfig-2.8.0.orig/fc-match/fc-match.sgml 2009-11-16 18:24:52.000000000 +0100 -+++ fontconfig-2.8.0/fc-match/fc-match.sgml 2011-01-21 11:35:20.116438691 +0100 -@@ -187,7 +187,7 @@ output is requested. - - - The fontconfig user's guide, in HTML format: -- /usr/share/doc/fontconfig/fontconfig-user.html. -+ /usr/share/doc/packages/fontconfig/fontconfig-user.html. - - -