rpm/freetype2
SHA256
1
0
Fork 0
forked from pool/freetype2
Code Pull Requests Activity

Accepting request 75659 from home:namtrac:branches:M17N

Browse Source 
freetype2:

- Clean spec file
- Disable static libraries
- Drop unneeded use_unix.diff
- Disable newly introduced bzip2 support, it seems to create
  problems with subpixel rendering

ft2demos:

- Cleanup spec file
- Drop unneeded use_unix.diff

OBS-URL: https://build.opensuse.org/request/show/75659
OBS-URL: https://build.opensuse.org/package/show/M17N/freetype2?expand=0&rev=46
This commit is contained in:
Takashi Iwai
2011-07-11 08:45:49 +00:00
committed by Git OBS Bridge
parent eb1caa070e
commit 6bd9273212
5 changed files with 46 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
freetype2.changes
View File

@@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu Jul 7 13:16:05 UTC 2011 - idonmez@novell.com
- Clean spec file
- Disable static libraries
- Drop unneeded use_unix.diff
- Disable newly introduced bzip2 support, it seems to create
problems with subpixel rendering
-------------------------------------------------------------------
Sat Jun 25 08:37:55 UTC 2011 - idonmez@novell.com

40
freetype2.spec
View File

@@ -15,23 +15,22 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: freetype2
BuildRequires: libbz2-devel pkg-config zlib-devel
License: Freetype License (BSD-like). See http://freetype.sourceforge.net/FTL.TXT
Group: System/Libraries
AutoReqProv: on
BuildRequires: pkg-config
BuildRequires: zlib-devel
# bug437293
%ifarch ppc64
Obsoletes: freetype2-64bit
%endif
#
Version: 2.4.5
Release: 9
Url: http://www.freetype.org
Release: 1
Summary: A TrueType Font Library
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-%{version}.tar.bz2
Source3: baselibs.conf
@@ -40,7 +39,6 @@ Patch9: fix-build.patch
Patch10: freetype2-no_rpath.patch
Patch308961: bugzilla-308961-cmex-workaround.patch
Patch200: freetype2-subpixel.patch
Patch201: use_unix.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -62,7 +60,8 @@ version also contains an autohinter for producing improved output.
License: GPLv2+ ; Freetype License (BSD-like). See http://freetype.sourceforge.net/FTL.TXT
Summary: Development environment for the freetype2 TrueType font library
Group: Development/Libraries/C and C++
Requires: libfreetype6 = %{version}, zlib-devel
Requires: libfreetype6 = %{version}
Requires: zlib-devel
# bug437293
%ifarch ppc64
Obsoletes: freetype2-devel-64bit
@@ -87,35 +86,26 @@ It also contains a small tutorial for using that library.
%if %{enable_subpixel_rendering}
%patch200 -p 1 -b .subpixel
%endif
%patch201 -p1
cp /usr/share/automake*/config.{guess,sub} builds/unix
rm docs/reference/.gitignore
%build
%ifarch arm
export CFLAGS="$CFLAGS -std=gnu99"
%endif
ln -s /usr/bin/libtool ./builds/unix/libtool
make setup CFG="--prefix=/usr --libdir=%{_libdir} --with-zlib"
make prefix=/usr libdir=%{_libdir} %{_smp_mflags}
# build the documentation in the references subdirectory:
# (this needs python and we cannot have python in the BuildRequires of
# a basic package like freetype2, therefore we cannot do it here but we have
# to generate this documentation manually)
#make refdoc
%configure --without-bzip2 \
--disable-static
make %{_smp_mflags}
%install
%makeinstall
# these development documents should go into the freetype2-devel package:
mv docs/reference freetype-%{version}/docs
make prefix=$RPM_BUILD_ROOT/usr libdir=$RPM_BUILD_ROOT/%{_libdir} install
# remove documentation that does not belong in an rpm
rm docs/INSTALL*
%clean
rm -rf %{buildroot}
%post -n libfreetype6 -p /sbin/ldconfig
%postun -n libfreetype6 -p /sbin/ldconfig
@@ -129,11 +119,11 @@ rm -rf %{buildroot}
%files devel
%defattr(-,root,root)
%doc freetype-%{version}/docs/*
/usr/include/*
%{_includedir}/*
%exclude %{_libdir}/libfreetype.*a
%{_libdir}/libfreetype.so
%{_libdir}/pkgconfig/freetype2.pc
/usr/bin/*
/usr/share/aclocal/*
%{_bindir}/*
%{_datadir}/aclocal/*
%changelog

6
ft2demos.changes
View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jul 7 13:20:45 UTC 2011 - idonmez@novell.com
- Cleanup spec file
- Drop unneeded use_unix.diff
-------------------------------------------------------------------
Sat Jun 25 08:43:59 UTC 2011 - idonmez@novell.com

44
ft2demos.spec
View File

@@ -15,27 +15,24 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: ft2demos
BuildRequires: xorg-x11-devel
License: GPLv2+
Group: Productivity/Publishing/Other
AutoReqProv: on
Supplements: fonts-config
Version: 2.4.5
Release: 4
License: GPLv2+
Summary: Freetype2 Utilities and Demo Programs
%define freetype_version %{version}
Url: http://www.freetype.org
Summary: Freetype2 Utilities and Demo Programs
Group: Productivity/Publishing/Other
Source0: http://savannah.nongnu.org/download/freetype/freetype-%{version}.tar.bz2
Source1: http://savannah.nongnu.org/download/freetype/ft2demos-%{version}.tar.bz2
Patch9: fix-build.patch
Patch308961: bugzilla-308961-cmex-workaround.patch
Patch50: ft2demos-build-testname.patch
Patch200: freetype2-subpixel.patch
Patch201: use_unix.diff
BuildRequires: xorg-x11-devel
Supplements: fonts-config
Source1000: bnc628213_test.otf
Source1004: bnc629447_sigsegv31.ttf
@@ -59,38 +56,29 @@ popd
%if %{enable_subpixel_rendering}
%patch200 -p 1 -b .subpixel
%endif
%patch201 -p1
cp /usr/share/automake*/config.{guess,sub} builds/unix
%build
ln -s /usr/bin/libtool ./builds/unix/libtool
make setup CFG="--prefix=%{_prefix} --libdir=%{_libdir} --with-zlib"
make prefix=%{_prefix} libdir=%{_libdir} %{_smp_mflags}
# build the documentation in the references subdirectory:
# (this needs python and we cannot have python in the BuildRequires of
# a basic package like freetype2, therefore we cannot do it here but we have
# to generate this documentation manually)
# make refdoc
%configure --without-bzip2
make %{_smp_mflags}
pushd ..
ln -s freetype-%{freetype_version} freetype2
cd ft2demos-%{version}
make prefix=%{_prefix} libdir=%{_libdir}
make %{_smp_mflags}
popd
%install
#make prefix=$RPM_BUILD_ROOT/usr libdir=$RPM_BUILD_ROOT/%{_libdir} install
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p %{buildroot}%{_bindir}
pushd ../ft2demos-%{version}/bin/.libs
install -m 755 ft* $RPM_BUILD_ROOT%{_bindir}
install -m 755 ft* %{buildroot}%{_bindir}
popd
%check
$RPM_BUILD_ROOT/usr/bin/ftbench -c 1 %{S:1000}
$RPM_BUILD_ROOT/usr/bin/ftbench -c 1 %{S:1004} |& grep -v "couldn't load font resource" && echo "should fail"
$RPM_BUILD_ROOT/usr/bin/ftbench -c 1 %{S:1013} |& grep -v "couldn't load font resource" && echo "should fail"
$RPM_BUILD_ROOT/usr/bin/ftbench -c 1 %{S:1015} |& grep -v "couldn't load font resource" && echo "should fail"
$RPM_BUILD_ROOT/usr/bin/ftbench -c 1 %{S:1016}
%{buildroot}%{_bindir}/ftbench -c 1 %{S:1000}
%{buildroot}%{_bindir}/ftbench -c 1 %{S:1004} |& grep -v "couldn't load font resource" && echo "should fail"
%{buildroot}%{_bindir}/ftbench -c 1 %{S:1013} |& grep -v "couldn't load font resource" && echo "should fail"
%{buildroot}%{_bindir}/ftbench -c 1 %{S:1015} |& grep -v "couldn't load font resource" && echo "should fail"
%{buildroot}%{_bindir}/ftbench -c 1 %{S:1016}
%clean

31
use_unix.diff
View File

@@ -1,31 +0,0 @@
---
builds/toplevel.mk | 2 +-
builds/unix/detect.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Index: freetype-2.4.2/builds/toplevel.mk
===================================================================
--- freetype-2.4.2.orig/builds/toplevel.mk
+++ freetype-2.4.2/builds/toplevel.mk
@@ -120,7 +120,7 @@ ifdef check_platform
#
# Note: This test is duplicated in `builds/unix/detect.mk'.
#
- is_unix := $(strip $(wildcard /sbin/init) \
+ is_unix := $(strip $(wildcard /bin/ls) \
$(wildcard /usr/sbin/init) \
$(wildcard /hurd/auth))
ifneq ($(is_unix),)
Index: freetype-2.4.2/builds/unix/detect.mk
===================================================================
--- freetype-2.4.2.orig/builds/unix/detect.mk
+++ freetype-2.4.2/builds/unix/detect.mk
@@ -18,7 +18,7 @@ ifeq ($(PLATFORM),ansi)
# Note: this test is duplicated in "builds/toplevel.mk".
#
- is_unix := $(strip $(wildcard /sbin/init) \
+ is_unix := $(strip $(wildcard /bin/ls) \
$(wildcard /usr/sbin/init) \
$(wildcard /hurd/auth))
ifneq ($(is_unix),)