From 2f0fc37e92db39c61e4a02f8993add879a34c1118e1b9df96a079e3f5184a665 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 6 Dec 2011 17:10:14 +0000 Subject: [PATCH 1/5] Updating link to change in openSUSE:Factory/freetype2 revision 44.0 OBS-URL: https://build.opensuse.org/package/show/M17N/freetype2?expand=0&rev=12388dbfba0e0fa658ad90fe64269811 --- ft2demos.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ft2demos.spec b/ft2demos.spec index 963b0dc..bc55311 100644 --- a/ft2demos.spec +++ b/ft2demos.spec @@ -20,7 +20,7 @@ Name: ft2demos Version: 2.4.8 Release: 1 -License: GPLv2+ +License: GPL-2.0+ Summary: Freetype2 Utilities and Demo Programs %define freetype_version %{version} Url: http://www.freetype.org From ac875b480065e530ff93348b8f675ecd815d2d0e0660aaab0c66ae5f3ded613c Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 22 Dec 2011 15:57:14 +0000 Subject: [PATCH 2/5] Accepting request 97870 from home:tiwai:branches:M17N - provide libfreetype.la for older distros; otherwise it breaks too many package builds in M17N repo - fix build on FACTORY by owning aclocal dir OBS-URL: https://build.opensuse.org/request/show/97870 OBS-URL: https://build.opensuse.org/package/show/M17N/freetype2?expand=0&rev=56 --- freetype2.changes | 7 +++++++ freetype2.spec | 18 ++++++++++-------- ft2demos.spec | 8 +++----- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/freetype2.changes b/freetype2.changes index c23fa11..301558e 100644 --- a/freetype2.changes +++ b/freetype2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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 diff --git a/freetype2.spec b/freetype2.spec index 5d00bc8..8b7480b 100644 --- a/freetype2.spec +++ b/freetype2.spec @@ -15,11 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - 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 +24,10 @@ Obsoletes: freetype2-64bit %endif # Version: 2.4.8 -Release: 1 +Release: 0 Summary: A TrueType Font Library +License: Freetype License (BSD-like). See http://freetype.sourceforge.net/FTL.TXT +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,8 +44,8 @@ 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 +License: Freetype License (BSD-like). See http://freetype.sourceforge.net/FTL.TXT Group: System/Libraries Obsoletes: freetype2 < 2.3.10 Provides: freetype2 = 2.3.10 @@ -57,8 +55,8 @@ 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 +License: GPL-2.0+ ; Freetype License (BSD-like). See http://freetype.sourceforge.net/FTL.TXT Group: Development/Libraries/C and C++ Requires: libfreetype6 = %{version} Requires: zlib-devel @@ -121,10 +119,14 @@ rm -rf %{buildroot} %defattr(-,root,root) %doc freetype-%{version}/docs/* %{_includedir}/* +%if %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 diff --git a/ft2demos.spec b/ft2demos.spec index bc55311..703b4d9 100644 --- a/ft2demos.spec +++ b/ft2demos.spec @@ -15,16 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - 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 From 61a2452ac7541d828f2288df111a302ff38c755819ffdd6c791de50d15affa77 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 14 Feb 2012 11:23:48 +0000 Subject: [PATCH 3/5] Accepting request 104949 from home:babelworx:ldig:branches:M17N license update: SUSE-Freetype or GPL-2.0+ Use SUSE- proprietary prefix until upstream spdx.org accepts Freetype as official license OBS-URL: https://build.opensuse.org/request/show/104949 OBS-URL: https://build.opensuse.org/package/show/M17N/freetype2?expand=0&rev=57 --- freetype2.changes | 7 +++++++ freetype2.spec | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/freetype2.changes b/freetype2.changes index 301558e..fe35832 100644 --- a/freetype2.changes +++ b/freetype2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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 + ------------------------------------------------------------------- Thu Dec 22 12:39:23 CET 2011 - tiwai@suse.de diff --git a/freetype2.spec b/freetype2.spec index 8b7480b..e6abc82 100644 --- a/freetype2.spec +++ b/freetype2.spec @@ -26,7 +26,7 @@ Obsoletes: freetype2-64bit Version: 2.4.8 Release: 0 Summary: A TrueType Font Library -License: Freetype License (BSD-like). See http://freetype.sourceforge.net/FTL.TXT +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 @@ -45,7 +45,7 @@ version also contains an autohinter for producing improved output. %package -n libfreetype6 Summary: A TrueType Font Library -License: Freetype License (BSD-like). See http://freetype.sourceforge.net/FTL.TXT +License: SUSE-Freetype or GPL-2.0+ Group: System/Libraries Obsoletes: freetype2 < 2.3.10 Provides: freetype2 = 2.3.10 @@ -56,7 +56,7 @@ version also contains an autohinter for producing improved output. %package devel Summary: Development environment for the freetype2 TrueType font library -License: GPL-2.0+ ; Freetype License (BSD-like). See http://freetype.sourceforge.net/FTL.TXT +License: SUSE-Freetype or GPL-2.0+ Group: Development/Libraries/C and C++ Requires: libfreetype6 = %{version} Requires: zlib-devel From 87ad0b41ef5f5be16ab370230c6ab033727f0546c6cdb5f85798b6a3d2c9fee9 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 14 Feb 2012 11:24:14 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/M17N/freetype2?expand=0&rev=58 --- freetype2.spec | 5 ++--- ft2demos.spec | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/freetype2.spec b/freetype2.spec index e6abc82..c194f5d 100644 --- a/freetype2.spec +++ b/freetype2.spec @@ -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 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: freetype2 BuildRequires: pkg-config BuildRequires: zlib-devel @@ -45,7 +46,6 @@ version also contains an autohinter for producing improved output. %package -n libfreetype6 Summary: A TrueType Font Library -License: SUSE-Freetype or GPL-2.0+ Group: System/Libraries Obsoletes: freetype2 < 2.3.10 Provides: freetype2 = 2.3.10 @@ -56,7 +56,6 @@ version also contains an autohinter for producing improved output. %package devel Summary: Development environment for the freetype2 TrueType font library -License: SUSE-Freetype or GPL-2.0+ Group: Development/Libraries/C and C++ Requires: libfreetype6 = %{version} Requires: zlib-devel diff --git a/ft2demos.spec b/ft2demos.spec index 703b4d9..f4c81bd 100644 --- a/ft2demos.spec +++ b/ft2demos.spec @@ -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 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: ft2demos Version: 2.4.8 Release: 0 From 50c1345cf89b5a8e018c9c82b2563a9ba813bd40fe6ba50ee6e99cc99f7df383 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 15 Feb 2012 06:21:00 +0000 Subject: [PATCH 5/5] Accepting request 104995 from home:saschpe:branches:M17N - Ran spec-cleaner - Add devel-static provides to devel package (shared library policy) - Ran spec-cleaner OBS-URL: https://build.opensuse.org/request/show/104995 OBS-URL: https://build.opensuse.org/package/show/M17N/freetype2?expand=0&rev=59 --- freetype2.changes | 6 ++++++ freetype2.spec | 11 +++++------ ft2demos.changes | 5 +++++ ft2demos.spec | 9 ++------- 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/freetype2.changes b/freetype2.changes index fe35832..3060bee 100644 --- a/freetype2.changes +++ b/freetype2.changes @@ -5,6 +5,12 @@ Tue Feb 14 11:17:33 UTC 2012 - cfarrell@suse.com 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 diff --git a/freetype2.spec b/freetype2.spec index c194f5d..f0fc6f5 100644 --- a/freetype2.spec +++ b/freetype2.spec @@ -65,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 @@ -90,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 @@ -101,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 @@ -118,7 +117,7 @@ rm -rf %{buildroot} %defattr(-,root,root) %doc freetype-%{version}/docs/* %{_includedir}/* -%if %suse_version >= 1140 +%if 0%{?suse_version} >= 1140 %exclude %{_libdir}/libfreetype.*a %else %{_libdir}/libfreetype.*a diff --git a/ft2demos.changes b/ft2demos.changes index b854294..5babb64 100644 --- a/ft2demos.changes +++ b/ft2demos.changes @@ -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 diff --git a/ft2demos.spec b/ft2demos.spec index f4c81bd..924b100 100644 --- a/ft2demos.spec +++ b/ft2demos.spec @@ -32,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 @@ -58,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 @@ -79,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*