Accepting request 58950 from M17N

Accepted submit request 58950 from user coolo

OBS-URL: https://build.opensuse.org/request/show/58950
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fontconfig?expand=0&rev=43

fontconfig-doc-2.8.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1dd089cb6b8c4ed487f8a7c5cfae5b2a81e771128eceab746858fd46da6ed333
+size 82793

fontconfig-doc.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1ad67d378a256540099966e8563c019218712947d117f496d85863f30340c605
-size 52752

fontconfig.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jan 21 10:36:23 UTC 2011 - coolo@novell.com
+
+- regenerate doc tar ball
+
 -------------------------------------------------------------------
 Tue Dec  7 11:41:33 CET 2010 - pgajdos@suse.cz
 

fontconfig.spec

@@ -22,7 +22,7 @@ Name:           fontconfig
 %define build_docs 0
 BuildRequires:  freetype2-devel libexpat-devel pkgconfig
 %if %{build_docs}
-BuildRequires:  docbook-dsssl-stylesheets docbook-utils docbook_3 docbook_4 iso_ent jadetex libpng libxml2 libxml2-devel lynx openjade opensp perl-SGMLS sgml-skel tetex
+BuildRequires:  docbook-dsssl-stylesheets docbook-utils docbook_3 docbook_4 iso_ent jadetex libpng libxml2 libxml2-devel lynx openjade opensp perl-SGMLS sgml-skel
 %endif
 License:        Public Domain, Freeware ; MIT License (or similar)
 Provides:       XFree86:/etc/fonts/fonts.dtd
@@ -47,7 +47,7 @@ Source0:        http://fontconfig.org/release/%name-%version.tar.bz2
 #
 # After building with "build_docs" defined to "1" generate the doc tarball with:
 # tar jcf fontconfig-doc.tar.bz2 fc-*/*.[0-9] doc/*.[0-9] doc/*.html doc/*/*.html doc/*.txt 
-Source1:        %name-doc.tar.bz2
+Source1:        %name-doc-%version.tar.bz2
 Source2:        iso639-1
 Source3:        iso639-2
 Source4:        baselibs.conf
@@ -106,7 +106,7 @@ accepts font patterns and returns the nearest matching font.
 %prep
 %setup -q
 %if %{build_docs} < 1
-   tar xvf $RPM_SOURCE_DIR/%name-doc.tar.bz2
+   tar xvf %{SOURCE1}
 %endif
 %patch5 -p0 -b .dynafont
 %patch10 -p1 -b .fonts.conf

usr-share-doc-packages.patch

@@ -1,20 +1,7 @@
-Index: fontconfig-2.7.0/fc-cache/fc-cache.1
+Index: fontconfig-2.8.0/fc-cache/fc-cache.sgml
 ===================================================================
---- fontconfig-2.7.0.orig/fc-cache/fc-cache.1
+--- fontconfig-2.8.0.orig/fc-cache/fc-cache.sgml	2009-11-16 18:24:52.000000000 +0100
-+++ fontconfig-2.7.0/fc-cache/fc-cache.1
++++ fontconfig-2.8.0/fc-cache/fc-cache.sgml	2011-01-21 11:35:19.672439060 +0100
-@@ -68,7 +68,7 @@ appropriate fonts.
- \fBfc-list\fR (1).
- .PP
- The fontconfig user's guide, in HTML format:
--\fI/usr/share/doc/fontconfig/fontconfig-user.html\fR\&.
-+\fI/usr/share/doc/packages/fontconfig/fontconfig-user.html\fR\&.
- .SH "AUTHOR"
- .PP
- This manual page was written by Keith Packard
-Index: fontconfig-2.7.0/fc-cache/fc-cache.sgml
-===================================================================
---- fontconfig-2.7.0.orig/fc-cache/fc-cache.sgml
-+++ fontconfig-2.7.0/fc-cache/fc-cache.sgml
 @@ -180,7 +180,7 @@ manpage.1: manpage.sgml
      </para>
  
@@ -24,23 +11,10 @@ Index: fontconfig-2.7.0/fc-cache/fc-cache.sgml
  
   </refsect1>
    <refsect1>
-Index: fontconfig-2.7.0/fc-cat/fc-cat.1
+Index: fontconfig-2.8.0/fc-cat/fc-cat.sgml
 ===================================================================
---- fontconfig-2.7.0.orig/fc-cat/fc-cat.1
+--- fontconfig-2.8.0.orig/fc-cat/fc-cat.sgml	2009-11-16 18:24:52.000000000 +0100
-+++ fontconfig-2.7.0/fc-cat/fc-cat.1
++++ fontconfig-2.8.0/fc-cat/fc-cat.sgml	2011-01-21 11:35:19.773439330 +0100
-@@ -31,7 +31,7 @@ Show version of the program and exit.
- \fBfc-cache\fR (1).
- .PP
- The fontconfig user's guide, in HTML format:
--\fI/usr/share/doc/fontconfig/fontconfig-user.html\fR\&.
-+\fI/usr/share/doc/packages/fontconfig/fontconfig-user.html\fR\&.
- .SH "AUTHOR"
- .PP
- This manual page was written by Patrick Lam <plam@mit.edu>\&.
-Index: fontconfig-2.7.0/fc-cat/fc-cat.sgml
-===================================================================
---- fontconfig-2.7.0.orig/fc-cat/fc-cat.sgml
-+++ fontconfig-2.7.0/fc-cat/fc-cat.sgml
 @@ -139,7 +139,7 @@ manpage.1: manpage.sgml
      </para>
  
@@ -50,23 +24,10 @@ Index: fontconfig-2.7.0/fc-cat/fc-cat.sgml
  
   </refsect1>
    <refsect1>
-Index: fontconfig-2.7.0/fc-list/fc-list.1
+Index: fontconfig-2.8.0/fc-list/fc-list.sgml
 ===================================================================
---- fontconfig-2.7.0.orig/fc-list/fc-list.1
+--- fontconfig-2.8.0.orig/fc-list/fc-list.sgml	2009-11-16 18:24:52.000000000 +0100
-+++ fontconfig-2.7.0/fc-list/fc-list.1
++++ fontconfig-2.8.0/fc-list/fc-list.sgml	2011-01-21 11:35:19.957438963 +0100
-@@ -54,7 +54,7 @@ fonts.
- \fBfc-cache\fR (1).
- .PP
- The fontconfig user's guide, in HTML format:
--\fI/usr/share/doc/fontconfig/fontconfig-user.html\fR\&.
-+\fI/usr/share/doc/packages/fontconfig/fontconfig-user.html\fR\&.
- .SH "AUTHOR"
- .PP
- This manual page was written by Keith Packard
-Index: fontconfig-2.7.0/fc-list/fc-list.sgml
-===================================================================
---- fontconfig-2.7.0.orig/fc-list/fc-list.sgml
-+++ fontconfig-2.7.0/fc-list/fc-list.sgml
 @@ -184,7 +184,7 @@ manpage.1: manpage.sgml
      </para>
  
@@ -76,24 +37,11 @@ Index: fontconfig-2.7.0/fc-list/fc-list.sgml
  
   </refsect1>
    <refsect1>
-Index: fontconfig-2.7.0/fc-match/fc-match.1
+Index: fontconfig-2.8.0/fc-match/fc-match.sgml
 ===================================================================
---- fontconfig-2.7.0.orig/fc-match/fc-match.1
+--- fontconfig-2.8.0.orig/fc-match/fc-match.sgml	2009-11-16 18:24:52.000000000 +0100
-+++ fontconfig-2.7.0/fc-match/fc-match.1
++++ fontconfig-2.8.0/fc-match/fc-match.sgml	2011-01-21 11:35:20.116438691 +0100
-@@ -45,7 +45,7 @@ Displays fonts matching
+@@ -187,7 +187,7 @@ output is requested.</para>
- \fBfc-list\fR (1).
- .PP
- The fontconfig user's guide, in HTML format:
--\fI/usr/share/doc/fontconfig/fontconfig-user.html\fR\&.
-+\fI/usr/share/doc/packages/fontconfig/fontconfig-user.html\fR\&.
- .SH "AUTHOR"
- .PP
- This manual page was updated by Patrick Lam <plam@csail.mit.edu>\&.
-Index: fontconfig-2.7.0/fc-match/fc-match.sgml
-===================================================================
---- fontconfig-2.7.0.orig/fc-match/fc-match.sgml
-+++ fontconfig-2.7.0/fc-match/fc-match.sgml
-@@ -186,7 +186,7 @@ output is requested.</para>
      </para>
  
      <para>The fontconfig user's guide, in HTML format: