diff options
author | Kévin THIERRY <kevin.thierry@open.eurogiciel.org> | 2014-11-07 14:22:50 +0100 |
---|---|---|
committer | Kévin THIERRY <kevin.thierry@open.eurogiciel.org> | 2014-12-16 11:02:53 +0100 |
commit | 64b16af145279293bfd1e9d7b5558f70ff37944f (patch) | |
tree | de2b8c6aeb6dd29c2f7e5744701916711f957784 | |
parent | 0c3ade150c8fbc4e4dc58763a891921d519177e3 (diff) | |
download | fontconfig-tizen_3.0.2015.q1_common.tar.gz fontconfig-tizen_3.0.2015.q1_common.tar.bz2 fontconfig-tizen_3.0.2015.q1_common.zip |
packaging: Bump to version 2.11.1tizen_3.0_ivi_releasesubmit/tizen_wearable/20150128.000000submit/tizen_wearable/20150127.000001submit/tizen_tv/20150320.000001submit/tizen_mobile/20150302.000000submit/tizen_mobile/20150223.000000submit/tizen_mobile/20150213.000000submit/tizen_mobile/20150129.000000submit/tizen_ivi/20141225.222222submit/tizen_common/20141222.094800accepted/tizen/wearable/20150129.005759accepted/tizen/tv/20150324.014508accepted/tizen/mobile/20150304.131052accepted/tizen/ivi/20141225.103512accepted/tizen/common/20141223.083531tizen_3.0_ivitizen_3.0.2015.q2_commontizen_3.0.2015.q1_commontizen_3.0.2014.q4_common
Use upstream git repo instead of pristine-tar.
Change-Id: I777ede3a2d2527dbc478a54a0813806abd1cbdae
Bug-Tizen: TC-1818
Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>
Signed-off-by: Philippe Coval <philippe.coval@open.eurogiciel.org>
-rw-r--r-- | .gbs.conf | 3 | ||||
-rw-r--r-- | packaging/fontconfig.spec | 20 |
2 files changed, 13 insertions, 10 deletions
diff --git a/.gbs.conf b/.gbs.conf new file mode 100644 index 00000000..fa9fdc59 --- /dev/null +++ b/.gbs.conf @@ -0,0 +1,3 @@ +[general] +upstream_branch = upstream +upstream_tag = ${upstreamversion} diff --git a/packaging/fontconfig.spec b/packaging/fontconfig.spec index e34113a5..715ec9ec 100644 --- a/packaging/fontconfig.spec +++ b/packaging/fontconfig.spec @@ -1,19 +1,20 @@ %global freetype_version 2.1.4 Name: fontconfig -Version: 2.10.91 +Version: 2.11.1 Release: 0 License: MIT Summary: Font configuration and customization library Url: http://fontconfig.org -Group: Graphics/Font Management +Group: Graphics & UI Framework/Fonts Source: %{name}-%{version}.tar.bz2 -Source1001: fontconfig.manifest +Source1001: fontconfig.manifest BuildRequires: expat-devel BuildRequires: gawk BuildRequires: perl +BuildRequires: gperf BuildRequires: pkgconfig(freetype2) >= %{freetype_version} -Requires(pre): /usr/bin/fc-cache, /usr/bin/mkdir /usr/bin/rm, /usr/bin/grep +Requires(pre): /usr/bin/fc-cache, /usr/bin/mkdir /usr/bin/rm, /usr/bin/grep %description Fontconfig is designed to locate fonts within the @@ -22,7 +23,7 @@ applications. %package devel Summary: Font configuration and customization library -Group: Development/Libraries +Group: Graphics & UI Framework/Fonts Requires: %{name} = %{version} Requires: fontconfig = %{version} Requires: freetype-devel >= %{freetype_version} @@ -42,8 +43,7 @@ cp %{SOURCE1001} . %build # We don't want to rebuild the docs, but we want to install the included ones. export HASDOCBOOK=no - -%reconfigure --disable-static \ +%autogen --disable-static \ --with-expat=/usr \ --with-expat-include=%{_includedir} \ --with-expat-lib=%{_libdir} \ @@ -54,10 +54,10 @@ export HASDOCBOOK=no --with-templatedir=%{_sysconfdir}/fonts/conf.avail \ --disable-docs -make %{?_smp_mflags} +%__make %{?_smp_mflags} %check -make check +%__make check %install @@ -92,7 +92,7 @@ fi %config %{_sysconfdir}/fonts/conf.avail/*.conf %config(noreplace) %{_sysconfdir}/fonts/conf.d/*.conf %dir %{_localstatedir}/cache/fontconfig -/usr/share/xml/fontconfig/fonts.dtd +%{_datadir}/xml/fontconfig/fonts.dtd %files devel %manifest %{name}.manifest |