From caa0bca0421c6a234037c6e1f798d2186cc6a74d959d4f7cbda3be96f968ca7b Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sat, 3 Dec 2011 14:25:40 +0000 Subject: [PATCH 1/3] Accepting request 95058 from home:coolo:removeautomake - add libtool as buildrequire to avoid implicit dependency OBS-URL: https://build.opensuse.org/request/show/95058 OBS-URL: https://build.opensuse.org/package/show/M17N/fontconfig?expand=0&rev=46 --- fontconfig.changes | 5 +++++ fontconfig.spec | 29 ++++++++++++++++++++++------- 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/fontconfig.changes b/fontconfig.changes index 422486a..898f6a9 100644 --- a/fontconfig.changes +++ b/fontconfig.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Dec 1 16:50:47 UTC 2011 - coolo@suse.com + +- add libtool as buildrequire to avoid implicit dependency + ------------------------------------------------------------------- Sun Nov 6 16:00:40 UTC 2011 - crrodriguez@opensuse.org diff --git a/fontconfig.spec b/fontconfig.spec index fa3c22e..fccca28 100644 --- a/fontconfig.spec +++ b/fontconfig.spec @@ -15,15 +15,30 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: fontconfig %define build_docs 0 -BuildRequires: freetype2-devel libexpat-devel pkgconfig +BuildRequires: automake +BuildRequires: freetype2-devel +BuildRequires: libexpat-devel +BuildRequires: libtool +BuildRequires: pkgconfig %if %{build_docs} -BuildRequires: docbook-dsssl-stylesheets docbook-utils docbook_3 docbook_4 iso_ent jadetex libpng libxml2 libxml2-devel lynx openjade opensp perl-SGMLS sgml-skel +BuildRequires: docbook-dsssl-stylesheets +BuildRequires: docbook-utils +BuildRequires: docbook_3 +BuildRequires: docbook_4 +BuildRequires: iso_ent +BuildRequires: jadetex +BuildRequires: libpng +BuildRequires: libxml2 +BuildRequires: libxml2-devel +BuildRequires: lynx +BuildRequires: openjade +BuildRequires: opensp +BuildRequires: perl-SGMLS +BuildRequires: sgml-skel %endif -License: Public Domain, Freeware ; MIT License (or similar) +License: MIT ; Public Domain, Freeware Provides: XFree86:/etc/fonts/fonts.dtd Group: System/Libraries Url: http://fontconfig.org/ @@ -33,7 +48,7 @@ Obsoletes: fontconfig-64bit %endif Requires: bash Version: 2.8.0 -Release: 14 +Release: 0 Summary: Library for Font Configuration # CVS can be found here: (CVS is gone, fontconfig uses git now). # $ cvs -d :pserver:anoncvs@pdx.freedesktop.org:/cvs/fontconfig login @@ -80,7 +95,7 @@ an internal configuration from XML files, and the matching module, which accepts font patterns and returns the nearest matching font. %package devel -License: MIT License (or similar) +License: MIT Requires: %{name} = %version Requires: freetype2-devel glibc-devel Provides: XFree86-devel:%_libdir/pkgconfig/fontconfig.pc From 76949b8c917abf2e03a60709d7c599f8e7f30c80a95ea55ee964a4fcdb22d8b9 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 8 Dec 2011 10:24:18 +0000 Subject: [PATCH 2/3] fix license to be in spdx.org format OBS-URL: https://build.opensuse.org/package/show/M17N/fontconfig?expand=0&rev=47 --- fontconfig.changes | 5 +++++ fontconfig.spec | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/fontconfig.changes b/fontconfig.changes index 898f6a9..daf9984 100644 --- a/fontconfig.changes +++ b/fontconfig.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Dec 8 10:24:16 UTC 2011 - coolo@suse.com + +- fix license to be in spdx.org format + ------------------------------------------------------------------- Thu Dec 1 16:50:47 UTC 2011 - coolo@suse.com diff --git a/fontconfig.spec b/fontconfig.spec index fccca28..b008f6e 100644 --- a/fontconfig.spec +++ b/fontconfig.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: fontconfig %define build_docs 0 BuildRequires: automake @@ -38,9 +39,7 @@ BuildRequires: opensp BuildRequires: perl-SGMLS BuildRequires: sgml-skel %endif -License: MIT ; Public Domain, Freeware Provides: XFree86:/etc/fonts/fonts.dtd -Group: System/Libraries Url: http://fontconfig.org/ # bug437293 %ifarch ppc64 @@ -50,6 +49,8 @@ Requires: bash Version: 2.8.0 Release: 0 Summary: Library for Font Configuration +License: MIT ; SUSE-Public-Domain +Group: System/Libraries # CVS can be found here: (CVS is gone, fontconfig uses git now). # $ cvs -d :pserver:anoncvs@pdx.freedesktop.org:/cvs/fontconfig login # CVS password: @@ -95,12 +96,12 @@ an internal configuration from XML files, and the matching module, which accepts font patterns and returns the nearest matching font. %package devel -License: MIT Requires: %{name} = %version Requires: freetype2-devel glibc-devel Provides: XFree86-devel:%_libdir/pkgconfig/fontconfig.pc -Group: Development/Libraries/C and C++ Summary: Include Files and Libraries mandatory for Development +License: MIT +Group: Development/Libraries/C and C++ # bug437293 %ifarch ppc64 Obsoletes: fontconfig-devel-64bit From ae160e103f78ad4d7c9f81cb61b51685b0ab0cc7b45e6a7cfe926c5f49ab3fd1 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 15 Dec 2011 10:27:06 +0000 Subject: [PATCH 3/3] Accepting request 96714 from home:babelworx:ldig:branches:M17N license update: MIT Just list MIT in the spec file - this is not a dual license OBS-URL: https://build.opensuse.org/request/show/96714 OBS-URL: https://build.opensuse.org/package/show/M17N/fontconfig?expand=0&rev=48 --- fontconfig.changes | 6 ++++++ fontconfig.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/fontconfig.changes b/fontconfig.changes index daf9984..3c788f2 100644 --- a/fontconfig.changes +++ b/fontconfig.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Dec 15 09:20:44 UTC 2011 - cfarrell@suse.com + +- license update: MIT + Just list MIT in the spec file - this is not a dual license + ------------------------------------------------------------------- Thu Dec 8 10:24:16 UTC 2011 - coolo@suse.com diff --git a/fontconfig.spec b/fontconfig.spec index b008f6e..f6c3a84 100644 --- a/fontconfig.spec +++ b/fontconfig.spec @@ -49,7 +49,7 @@ Requires: bash Version: 2.8.0 Release: 0 Summary: Library for Font Configuration -License: MIT ; SUSE-Public-Domain +License: MIT Group: System/Libraries # CVS can be found here: (CVS is gone, fontconfig uses git now). # $ cvs -d :pserver:anoncvs@pdx.freedesktop.org:/cvs/fontconfig login