]> git.pld-linux.org Git - packages/freetype.git/blobdiff - freetype.spec
- rel 2; apply ft2demos patch in a way that won't require patch updates
[packages/freetype.git] / freetype.spec
index 860ef8e313fb29d95665f81a95bdeb6701c7a43f..e30ac36f4126d7ad0dea6f83069d380a6c718159 100644 (file)
@@ -1,5 +1,3 @@
-# TODO:
-# - demos seem to use installed headers instead of these coming from new tarball (therefore buildconflicts)
 #
 # Conditional build:
 %bcond_without lcd             # without LCD subpixel color filtering (Microsoft patents in USA)
@@ -15,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.6
-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: 5682890cb0267f6671dd3de6eabd3e69
+# Source0-md5: 0037b25a8c090bc8a1218e867b32beb1
 Source1:       http://download.savannah.gnu.org/releases/freetype/%{name}-doc-%{version}.tar.bz2
-# Source1-md5: f456b7ead3c351c7c218bb3afd45803c
+# Source1-md5: ec2629b81f80decdae04a4b528097b81
 Source2:       http://download.savannah.gnu.org/releases/freetype/ft2demos-%{version}.tar.bz2
-# Source2-md5: c6c209b37f10621d6ff100620b8292b4
+# 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
@@ -42,7 +42,6 @@ BuildRequires:        sed >= 4.0
 %{?with_x11:BuildRequires:     xorg-lib-libX11-devel}
 %endif
 BuildRequires: zlib-devel
-BuildConflicts:        %{name}-devel < %{version}
 Obsoletes:     freetype2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -146,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.
@@ -200,6 +202,9 @@ 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
@@ -234,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
This page took 0.032142 seconds and 4 git commands to generate.