Accepting request 307900 from M17N

Some cleanup

OBS-URL: https://build.opensuse.org/request/show/307900
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fontconfig?expand=0&rev=80
This commit is contained in:
Dominique Leuenberger 2015-05-20 21:35:52 +00:00 committed by Git OBS Bridge
commit 49c0a62a3a
2 changed files with 36 additions and 32 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue May 19 06:56:57 UTC 2015 - fstrba@suse.com
- Clean the spec file with spec-cleaner
-------------------------------------------------------------------
Sat Nov 29 20:51:29 UTC 2014 - bwiedemann@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package fontconfig
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,13 +17,31 @@
%define build_docs 0
Name: fontconfig
Version: 2.11.1
Release: 0
Summary: Library for Font Configuration
License: MIT
Group: System/Libraries
Url: http://fontconfig.org/
Source0: http://fontconfig.org/release/%{name}-%{version}.tar.bz2
Source4: baselibs.conf
Source5: local.conf
# suse specific because freetype2-bitmap-foundry.patch
# https://www.libreoffice.org/bugzilla/show_bug.cgi?id=47704
Patch0: make-check.patch
BuildRequires: automake >= 1.11
BuildRequires: freetype2-devel
BuildRequires: libexpat-devel
BuildRequires: libtool
BuildRequires: pkgconfig
Requires: bash
Provides: XFree86:%{_sysconfdir}/fonts/fonts.dtd
Provides: ipa-fonts-config = 003.02
Obsoletes: ipa-fonts-config <= 003.02
Provides: IPA-fonts-config = 003.02
Obsoletes: IPA-fonts-config <= 003.02
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %{build_docs}
BuildRequires: docbook-dsssl-stylesheets
BuildRequires: docbook-utils
@ -41,34 +59,15 @@ BuildRequires: sgml-skel
BuildRequires: texlive-dvips
BuildRequires: texlive-jadetex
%endif
Provides: XFree86:%{_sysconfdir}/fonts/fonts.dtd
Url: http://fontconfig.org/
# bug437293
%ifarch ppc64
Obsoletes: fontconfig-64bit
%endif
Requires: bash
Version: 2.11.1
Release: 0
Summary: Library for Font Configuration
License: MIT
Group: System/Libraries
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
# tar jcf fontconfig-doc.tar.bz2 fc-*/*.[0-9] doc/*.[0-9] doc/*.html doc/*/*.html doc/*.txt
%if %{build_docs} < 1
Source1: %name-doc-%version.tar.bz2
Source1: %{name}-doc-%{version}.tar.bz2
%endif
Source4: baselibs.conf
Source5: local.conf
# suse specific because freetype2-bitmap-foundry.patch
# https://www.libreoffice.org/bugzilla/show_bug.cgi?id=47704
Patch0: make-check.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: ipa-fonts-config = 003.02
Obsoletes: ipa-fonts-config <= 003.02
Provides: IPA-fonts-config = 003.02
Obsoletes: IPA-fonts-config <= 003.02
%description
Fontconfig is a library for configuring and customizing font access. It
@ -77,12 +76,12 @@ an internal configuration from XML files, and the matching module,
which accepts font patterns and returns the nearest matching font.
%package devel
Requires: %{name} = %version
Requires: freetype2-devel
Requires: glibc-devel
Provides: XFree86-devel:%_libdir/pkgconfig/fontconfig.pc
Summary: Include Files and Libraries mandatory for Development
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
Requires: freetype2-devel
Requires: glibc-devel
Provides: XFree86-devel:%{_libdir}/pkgconfig/fontconfig.pc
# bug437293
%ifarch ppc64
Obsoletes: fontconfig-devel-64bit
@ -118,14 +117,14 @@ chmod u+x test/run-test.sh
chmod u+x doc/check-missing-doc
# -----
autoreconf -fiv
%configure --with-pic --with-arch=%_host_cpu \
%configure --with-pic --with-arch=%{_host_cpu} \
--disable-static \
--with-freetype-lib=%_libdir \
--with-freetype-lib=%{_libdir} \
--with-x \
--enable-libxml2=no \
--with-confdir=%{_sysconfdir}/fonts \
--with-docdir=%{_defaultdocdir}/%{name} \
--with-add-fonts=/usr/X11R6/lib/X11/fonts,/opt/kde3/share/fonts,/usr/local/share/fonts \
--with-add-fonts=%{_prefix}/X11R6/lib/X11/fonts,/opt/kde3/share/fonts,%{_prefix}/local/share/fonts \
%if %{build_docs} == 0
--disable-docs
%endif
@ -139,7 +138,7 @@ unset MALLOC_CHECK_
%install
make DESTDIR=%{buildroot} pkgconfigdir=%{_libdir}/pkgconfig install
rm -f %{buildroot}%{_libdir}/*.la
find %{buildroot} -type f -name "*.la" -delete -print
# package /etc/fonts/conf.avail for compatibility reasons
mkdir %{buildroot}%{_sysconfdir}/fonts/conf.avail
# documentation
@ -192,7 +191,7 @@ popd
%{_datadir}/%{name}/conf.avail/*.conf
%dir %{_datadir}/xml/%{name}
%{_datadir}/xml/%{name}/fonts.dtd
%dir /var/cache/fontconfig/
%dir %{_localstatedir}/cache/fontconfig/
%doc %{_docdir}/%{name}
%{_mandir}/man5/fonts-conf.5.gz
%{_mandir}/man1/*