- rel 2; provide compat symlink, so we don't have to patch every package out there

[packages/freetype.git] / freetype.spec

diff --git a/freetype.spec b/freetype.spec
index c6157db33a3f9fd4837b959ac4d8d0ebdfe7dd8a..e721408f3cfabcfb211c9ea52ccd9ae7f93b5185 100644 (file)
--- a/freetype.spec
+++ b/freetype.spec
@@ -12,18 +12,19 @@ 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.0.1
-Release:       1
+Version:       2.5.1
+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: c72e9010b1d986d556fc0b2b5fcbf31a
-Source1:       http://download.savannah.gnu.org/releases/freetype/%{name}-doc-2.5.0.tar.bz2
-# Source1-md5: 40f3d5cc0b16396b3fb6b98eeaa053b2
-Source2:       http://download.savannah.gnu.org/releases/freetype/ft2demos-2.5.0.tar.bz2
-# Source2-md5: 9bbea1989116715d3544d8439c8d2972
-Patch0:                freetype-2.2.1-enable-valid.patch
+# Source0-md5: 93eba7854094f46d7d98a9a2370af4d6
+Source1:       http://download.savannah.gnu.org/releases/freetype/%{name}-doc-%{version}.tar.bz2
+# Source1-md5: b955678d06318b32337bd7c730daa676
+Source2:       http://download.savannah.gnu.org/releases/freetype/ft2demos-%{version}.tar.bz2
+# Source2-md5: 73742ef4b13ff9f7b1d4ad2199964141
+Patch0:                %{name}-2.2.1-enable-valid.patch
+Patch1:                %{name}-nodebug.patch
 URL:           http://www.freetype.org/
 BuildRequires: automake
 BuildRequires: bzip2-devel
@@ -194,6 +195,7 @@ Programy demonstracyjne do biblioteki FreeType.
 %prep
 %setup -q -a1 -a2
 %patch0 -p1
+%patch1 -p1
 
 # avoid propagating -L%{_libdir} through *.la
 %{__sed} -i -e 's,libpng-config --ldflags,libpng-config --libs,' builds/unix/configure
@@ -224,6 +226,8 @@ 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
@@ -247,7 +251,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libfreetype.so
 %{_libdir}/libfreetype.la
 %{_includedir}/freetype2
-%{_includedir}/ft2build.h
 %{_aclocaldir}/freetype2.m4
 %{_pkgconfigdir}/freetype2.pc