Accepting request 105049 from M17N
- Ran spec-cleaner - Add devel-static provides to devel package (shared library policy) - Ran spec-cleaner (forwarded request 104995 from saschpe) OBS-URL: https://build.opensuse.org/request/show/105049 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/freetype2?expand=0&rev=45
This commit is contained in:
Stephan Kulow
Git OBS Bridge
commit
851fb77f0c
@ -1,3 +1,23 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 14 11:17:33 UTC 2012 - cfarrell@suse.com
|
||||
|
||||
- license update: SUSE-Freetype or GPL-2.0+
|
||||
Use SUSE- proprietary prefix until upstream spdx.org accepts Freetype as
|
||||
official license
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 14 09:21:58 UTC 2012 - saschpe@suse.de
|
||||
|
||||
- Ran spec-cleaner
|
||||
- Add devel-static provides to devel package (shared library policy)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 22 12:39:23 CET 2011 - tiwai@suse.de
|
||||
|
||||
- provide libfreetype.la for older distros; otherwise it breaks
|
||||
too many package builds in M17N repo
|
||||
- fix build on FACTORY by owning aclocal dir
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 15 08:24:00 UTC 2011 - idonmez@suse.com
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package freetype2
|
||||
#
|
||||
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -16,10 +16,7 @@
|
||||
#
|
||||
|
||||
|
||||
|
||||
Name: freetype2
|
||||
License: Freetype License (BSD-like). See http://freetype.sourceforge.net/FTL.TXT
|
||||
Group: System/Libraries
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: zlib-devel
|
||||
# bug437293
|
||||
@ -28,8 +25,10 @@ Obsoletes: freetype2-64bit
|
||||
%endif
|
||||
#
|
||||
Version: 2.4.8
|
||||
Release: 1
|
||||
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-%{version}.tar.bz2
|
||||
@ -46,7 +45,6 @@ This library features TrueType fonts for open source projects. This
|
||||
version also contains an autohinter for producing improved output.
|
||||
|
||||
%package -n libfreetype6
|
||||
License: Freetype License (BSD-like). See http://freetype.sourceforge.net/FTL.TXT
|
||||
Summary: A TrueType Font Library
|
||||
Group: System/Libraries
|
||||
Obsoletes: freetype2 < 2.3.10
|
||||
@ -57,7 +55,6 @@ This library features TrueType fonts for open source projects. This
|
||||
version also contains an autohinter for producing improved output.
|
||||
|
||||
%package devel
|
||||
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}
|
||||
@ -68,6 +65,8 @@ Obsoletes: freetype2-devel-64bit
|
||||
%endif
|
||||
# there is no freetype-devel on suse:
|
||||
Provides: freetype-devel
|
||||
# Static library provides:
|
||||
Provides: libfreetype6-devel-static
|
||||
|
||||
%description devel
|
||||
This package contains all necessary include files, libraries and
|
||||
@ -93,10 +92,10 @@ export CFLAGS="$CFLAGS -std=gnu99"
|
||||
%endif
|
||||
%configure --without-bzip2 \
|
||||
--disable-static
|
||||
make %{_smp_mflags}
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
%makeinstall
|
||||
%make_install
|
||||
|
||||
# these development documents should go into the freetype2-devel package:
|
||||
mv docs/reference freetype-%{version}/docs
|
||||
@ -104,9 +103,6 @@ mv docs/reference freetype-%{version}/docs
|
||||
# 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
|
||||
@ -121,10 +117,14 @@ rm -rf %{buildroot}
|
||||
%defattr(-,root,root)
|
||||
%doc freetype-%{version}/docs/*
|
||||
%{_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/*
|
||||
%{_datadir}/aclocal
|
||||
|
||||
%changelog
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 14 09:21:51 UTC 2012 - saschpe@suse.de
|
||||
|
||||
- Ran spec-cleaner
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 15 08:24:39 UTC 2011 - idonmez@suse.com
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package ft2demos
|
||||
#
|
||||
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -16,15 +16,14 @@
|
||||
#
|
||||
|
||||
|
||||
|
||||
Name: ft2demos
|
||||
Version: 2.4.8
|
||||
Release: 1
|
||||
License: GPL-2.0+
|
||||
Release: 0
|
||||
Summary: Freetype2 Utilities and Demo Programs
|
||||
License: GPL-2.0+
|
||||
Group: Productivity/Publishing/Other
|
||||
%define freetype_version %{version}
|
||||
Url: http://www.freetype.org
|
||||
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
|
||||
@ -33,13 +32,11 @@ Patch50: ft2demos-build-testname.patch
|
||||
Patch200: freetype2-subpixel.patch
|
||||
BuildRequires: xorg-x11-devel
|
||||
Supplements: fonts-config
|
||||
|
||||
Source1000: bnc628213_test.otf
|
||||
Source1004: bnc629447_sigsegv31.ttf
|
||||
Source1013: bnc633938_badbdf.0
|
||||
Source1015: bug-641580_CVE-2010-3311.cff
|
||||
Source1016: bug-647375_tt2.ttf
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
@ -59,12 +56,11 @@ popd
|
||||
|
||||
%build
|
||||
%configure --without-bzip2
|
||||
make %{_smp_mflags}
|
||||
|
||||
make %{?_smp_mflags}
|
||||
pushd ..
|
||||
ln -s freetype-%{freetype_version} freetype2
|
||||
cd ft2demos-%{version}
|
||||
make %{_smp_mflags}
|
||||
make %{?_smp_mflags}
|
||||
popd
|
||||
|
||||
%install
|
||||
@ -80,8 +76,6 @@ popd
|
||||
%{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
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/ft*
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user