- more conflicts between -progs and freetype-demos-2.* resolved; release 10

[packages/freetype1.git] / freetype1.spec

diff --git a/freetype1.spec b/freetype1.spec
index fa301399a7dfa13082d819ce89be3a86827d9383..453d18bc921e4b03dceaf53d4daef9ff61da977c 100644 (file)
--- a/freetype1.spec
+++ b/freetype1.spec
@@ -2,7 +2,7 @@ Summary:        Truetype font rasterizer
 Summary(pl):   Rasteryzer fontów Truetype
 Name:          freetype1
 Version:       1.3.1
-Release:       8
+Release:       10
 License:       BSD-like
 Group:         Libraries
 Source0:       ftp://ftp.freetype.org/freetype/freetype1/freetype-%{version}.tar.gz
@@ -128,6 +128,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %find_lang freetype
 
+# resolve conflict with freetype-demos-2.*
+mv -f $RPM_BUILD_ROOT%{_bindir}/{ftdump,ft1dump}
+mv -f $RPM_BUILD_ROOT%{_bindir}/{ftlint,ft1lint}
+mv -f $RPM_BUILD_ROOT%{_bindir}/{ftview,ft1view}
+mv -f $RPM_BUILD_ROOT%{_bindir}/{fttimer,ft1timer}
+
 %clean
 rm -rf $RPM_BUILD_ROOT