SHA256
1
0
forked from pool/freetype2

Reverting the harfbuzz-related changes since they create a huge mess

OBS-URL: https://build.opensuse.org/package/show/M17N/freetype2?expand=0&rev=102
This commit is contained in:
Fridrich Strba 2015-05-19 06:47:10 +00:00 committed by Git OBS Bridge
parent 1374afeaba
commit af0a819369
7 changed files with 1 additions and 1567 deletions

View File

@ -1 +0,0 @@
addFilter('shlib-policy-name-error')

File diff suppressed because it is too large Load Diff

View File

@ -1,168 +0,0 @@
#
# spec file for package freetype2-bootstrap
#
# 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
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
#
%global build_bootstrap 1
%define doc_version 2.5.5
Name: freetype2-bootstrap
Version: 2.5.5
Release: 0
Summary: A TrueType Font Library
License: SUSE-Freetype or GPL-2.0+
Group: System/Libraries
Url: http://www.freetype.org
Source0: http://download.savannah.gnu.org/releases/freetype/freetype-%{version}.tar.bz2
Source1: http://download.savannah.gnu.org/releases/freetype/freetype-doc-%{doc_version}.tar.bz2
Source3: baselibs.conf
Patch1: freetype2-bitmap-foundry.patch
Patch200: freetype2-subpixel.patch
# PATCH-FIX-OPENSUSE don-t-mark-libpng-as-required-library.patch -- it is private in .pc
Patch202: don-t-mark-libpng-as-required-library.patch
Patch308961: bugzilla-308961-cmex-workaround.patch
BuildRequires: gawk
BuildRequires: libbz2-devel
BuildRequires: libpng-devel
BuildRequires: pkg-config
BuildRequires: zlib-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# bug437293
%ifarch ppc64
Obsoletes: freetype2-64bit
%endif
%if %{build_bootstrap}
Source1000: freetype2-bootstrap-rpmlintrc
Requires: this-is-only-for-build-envs
%else
#!BuildIgnore: libfreetype6
BuildRequires: freetype2-bootstrap
BuildRequires: harfbuzz-devel
%endif
%description
This library features TrueType fonts for open source projects. This
version also contains an autohinter for producing improved output.
%if ! %{build_bootstrap}
%package -n libfreetype6
Summary: A TrueType Font Library
Group: System/Libraries
Obsoletes: freetype2 < %{version}
Obsoletes: freetype2-bootstrap
Provides: freetype2 = %{version}
%description -n libfreetype6
This library features TrueType fonts for open source projects. This
version also contains an autohinter for producing improved output.
%endif
%package devel
Summary: Development environment for the freetype2 TrueType font library
Group: Development/Libraries/C and C++
Requires: zlib-devel
# there is no freetype-devel on suse:
Provides: freetype-devel
# Static library provides:
Provides: libfreetype6-devel-static
%if %{build_bootstrap}
Requires: %{name} = %{version}
Conflicts: freetype2-devel
%else
Requires: libfreetype6 = %{version}
%endif
# bug437293
%ifarch ppc64
Obsoletes: freetype2-devel-64bit
%endif
%description devel
This package contains all necessary include files, libraries and
documentation needed to develop applications that require the freetype2
TrueType font library.
It also contains a small tutorial for using that library.
%prep
%define enable_subpixel_rendering 0
%setup -q -n freetype-%{version} -a 1
%patch1 -p1
%patch308961 -p 1
%patch202 -p1
%if %{enable_subpixel_rendering}
%patch200 -p1
%endif
%build
export CFLAGS="%{optflags} -std=gnu99 -D_GNU_SOURCE $(getconf LFS_CFLAGS)"
%configure \
--with-bzip2 \
%if 0%{?suse_version} > 1320
%if %{build_bootstrap}
--without-harfbuzz \
%else
--with-harfbuzz \
%endif
%endif
--with-png \
--with-zlib \
--disable-static
make %{?_smp_mflags}
%install
make DESTDIR=%{buildroot} install %{?_smp_mflags}
# remove documentation that does not belong in an rpm
rm docs/INSTALL*
%if %{build_bootstrap}
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%else
%post -n libfreetype6 -p /sbin/ldconfig
%postun -n libfreetype6 -p /sbin/ldconfig
%endif
%if %{build_bootstrap}
%files
%defattr(-,root,root)
%else
%files -n libfreetype6
%defattr(-,root,root)
%endif
%{_libdir}/libfreetype.so.*
%doc ChangeLog README
%doc docs/{CHANGES,CUSTOMIZE,DEBUG,MAKEPP,PROBLEMS,TODO,*.txt}
%files devel
%defattr(-,root,root)
%doc docs/reference/*
%{_includedir}/*
%if 0%{?suse_version} >= 1140
%exclude %{_libdir}/libfreetype.*a
%else
%{_libdir}/libfreetype.*a
%endif
%{_libdir}/libfreetype.so
%{_libdir}/pkgconfig/freetype2.pc
%{_bindir}/*
%{_datadir}/aclocal
%{_mandir}/man1/freetype-config*
%changelog

View File

@ -1,34 +1,3 @@
-------------------------------------------------------------------
Wed May 6 08:06:12 UTC 2015 - fstrba@suse.com
- Add this-is-only-for-build-envs requires to the -bootstrap
package: This ensures that OBS can use it, but the users will
not install it on their systems.
-------------------------------------------------------------------
Tue May 5 08:03:48 UTC 2015 - fstrba@suse.com
- Create a freetype2-bootstrap package in order to be able to build
properly a harfbuzz-enabled freetype2.
-------------------------------------------------------------------
Tue Apr 28 05:09:54 UTC 2015 - coolo@suse.com
- reenable harfbuzz
-------------------------------------------------------------------
Wed Apr 22 08:15:19 UTC 2015 - idonmez@suse.com
- Enable harfbuzz for only suse_version > 1320. Dependency is
not available on older releases.
-------------------------------------------------------------------
Fri Apr 10 09:43:06 UTC 2015 - fstrba@suse.com
- Build freetype2 against harfbuzz library
* Using the harfbuzz-bootstrap-devel in order to avoid cyclic
dependencies
-------------------------------------------------------------------
Fri Apr 10 07:34:20 UTC 2015 - fstrba@suse.com

View File

@ -17,7 +17,6 @@
#
%global build_bootstrap 0
%define doc_version 2.5.5
Name: freetype2
Version: 2.5.5
@ -44,46 +43,30 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
%ifarch ppc64
Obsoletes: freetype2-64bit
%endif
%if %{build_bootstrap}
Source1000: freetype2-bootstrap-rpmlintrc
Requires: this-is-only-for-build-envs
%else
#!BuildIgnore: libfreetype6
BuildRequires: freetype2-bootstrap
BuildRequires: harfbuzz-devel
%endif
%description
This library features TrueType fonts for open source projects. This
version also contains an autohinter for producing improved output.
%if ! %{build_bootstrap}
%package -n libfreetype6
Summary: A TrueType Font Library
Group: System/Libraries
Obsoletes: freetype2 < %{version}
Obsoletes: freetype2-bootstrap
Provides: freetype2 = %{version}
%description -n libfreetype6
This library features TrueType fonts for open source projects. This
version also contains an autohinter for producing improved output.
%endif
%package devel
Summary: Development environment for the freetype2 TrueType font library
Group: Development/Libraries/C and C++
Requires: libfreetype6 = %{version}
Requires: zlib-devel
# there is no freetype-devel on suse:
Provides: freetype-devel
# Static library provides:
Provides: libfreetype6-devel-static
%if %{build_bootstrap}
Requires: %{name} = %{version}
Conflicts: freetype2-devel
%else
Requires: libfreetype6 = %{version}
%endif
# bug437293
%ifarch ppc64
Obsoletes: freetype2-devel-64bit
@ -111,13 +94,6 @@ It also contains a small tutorial for using that library.
export CFLAGS="%{optflags} -std=gnu99 -D_GNU_SOURCE $(getconf LFS_CFLAGS)"
%configure \
--with-bzip2 \
%if 0%{?suse_version} > 1320
%if %{build_bootstrap}
--without-harfbuzz \
%else
--with-harfbuzz \
%endif
%endif
--with-png \
--with-zlib \
--disable-static
@ -129,23 +105,12 @@ make DESTDIR=%{buildroot} install %{?_smp_mflags}
# remove documentation that does not belong in an rpm
rm docs/INSTALL*
%if %{build_bootstrap}
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%else
%post -n libfreetype6 -p /sbin/ldconfig
%postun -n libfreetype6 -p /sbin/ldconfig
%endif
%if %{build_bootstrap}
%files
%defattr(-,root,root)
%else
%files -n libfreetype6
%defattr(-,root,root)
%endif
%{_libdir}/libfreetype.so.*
%doc ChangeLog README
%doc docs/{CHANGES,CUSTOMIZE,DEBUG,MAKEPP,PROBLEMS,TODO,*.txt}

View File

@ -1,10 +1,3 @@
-------------------------------------------------------------------
Fri Apr 10 09:43:06 UTC 2015 - fstrba@suse.com
- Build freetype2 against harfbuzz library
* Using the harfbuzz-bootstrap-devel in order to avoid cyclic
dependencies
-------------------------------------------------------------------
Fri Apr 10 07:34:20 UTC 2015 - fstrba@suse.com

View File

@ -1,5 +0,0 @@
#! /bin/sh
sed -e 's,^Name:.*,Name: freetype2-bootstrap,; s,build_bootstrap 0,build_bootstrap 1,' freetype2.spec > freetype2-bootstrap.spec
cp freetype2.changes freetype2-bootstrap.changes