- rel 2; apply ft2demos patch in a way that won't require patch updates

[packages/freetype.git] / freetype.spec

diff --git a/freetype.spec b/freetype.spec
index 80280280a0e96b997238cc343ed8d7a6ce8d6203..e30ac36f4126d7ad0dea6f83069d380a6c718159 100644 (file)
--- a/freetype.spec
+++ b/freetype.spec
@@ -13,23 +13,25 @@ Summary(pt_BR.UTF-8):       Biblioteca de renderização de fontes TrueType
 Summary(ru.UTF-8):     Растеризатор шрифтов TrueType
 Summary(uk.UTF-8):     Растеризатор шрифтів TrueType
 Name:          freetype
-Version:       2.5.3
-Release:       1
+Version:       2.6.3
+Release:       2
 Epoch:         1
 License:       GPL v2 or FTL
 Group:         Libraries
 Source0:       http://download.savannah.gnu.org/releases/freetype/%{name}-%{version}.tar.bz2
-# Source0-md5: d6b60f06bfc046e43ab2a6cbfd171d65
+# Source0-md5: 0037b25a8c090bc8a1218e867b32beb1
 Source1:       http://download.savannah.gnu.org/releases/freetype/%{name}-doc-%{version}.tar.bz2
-# Source1-md5: e192ef88e84ddf10665f34cf418652fb
+# Source1-md5: ec2629b81f80decdae04a4b528097b81
 Source2:       http://download.savannah.gnu.org/releases/freetype/ft2demos-%{version}.tar.bz2
-# Source2-md5: 3d2cd9f572a1a80b9744b9d6b75975ba
+# Source2-md5: f7c6102f29834a80456264fe4edd81d1
 Patch0:                %{name}-2.2.1-enable-valid.patch
+Patch1:                ft2demos-includes.patch
 URL:           http://www.freetype.org/
 BuildRequires: automake
 BuildRequires: bzip2-devel
 %{?with_harfbuzz:BuildRequires:        harfbuzz-devel >= 0.9.19}
 BuildRequires: libpng-devel
+BuildRequires: pkgconfig >= 1:0.24
 BuildRequires: python
 BuildRequires: python-modules
 BuildRequires: rpm >= 4.4.9-56
@@ -143,6 +145,9 @@ rodar aplicações existentes, você não precisa deste pacote.
 Summary:       FreeType API documetation
 Summary(pl.UTF-8):     Dokumentacja API FreeType
 Group:         Documentation
+%if "%{_rpmversion}" >= "5"
+BuildArch:     noarch
+%endif
 
 %description apidocs
 FreeType API documetation.
@@ -197,11 +202,15 @@ Programy demonstracyjne do biblioteki FreeType.
 %prep
 %setup -q -a1 -a2
 %patch0 -p1
+cd ft2demos-%{version}
+%patch1 -p2
+cd ..
 
 # avoid propagating -L%{_libdir} through *.la
 %{__sed} -i -e 's,libpng-config --ldflags,libpng-config --libs,' builds/unix/configure
 
 %build
+CC="%{__cc}" \
 CFLAGS="%{rpmcflags} %{rpmcppflags} \
 %{?with_lcd:-DFT_CONFIG_OPTION_SUBPIXEL_RENDERING} \
 -DTT_CONFIG_OPTION_SUBPIXEL_HINTING \
@@ -210,10 +219,12 @@ CFLAGS="%{rpmcflags} %{rpmcppflags} \
 %{__make} setup unix \
        CFG="--prefix=%{_prefix} --libdir=%{_libdir}"
 
+CC="%{__cc}" \
 %{__make} \
        X11_LIB=%{?_x_libraries}
 
 %if %{with x11}
+CC="%{__cc}" \
 %{__make} -C ft2demos-* \
        TOP_DIR=$(pwd) \
        X11_LIB=%{?_x_libraries}
@@ -228,8 +239,6 @@ install -d $RPM_BUILD_ROOT%{_bindir}
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-ln -s . $RPM_BUILD_ROOT%{_includedir}/freetype2/freetype
-
 %if %{with x11}
 install -p ft2demos-*/bin/.libs/ft* $RPM_BUILD_ROOT%{_bindir}
 %endif