- versioned Obsoletes

[packages/t1lib.git] / t1lib.spec

diff --git a/t1lib.spec b/t1lib.spec
index 3ca39228b64572d8b13c9d3f6b6c3cc4a5188f6a..a1c7951b34e5693f03739b8ba1ce85477f6cd5f1 100644 (file)
--- a/t1lib.spec
+++ b/t1lib.spec
@@ -9,10 +9,10 @@ Summary(ru.UTF-8):    Растеризатор шрифтов Type 1
 Summary(uk.UTF-8):     Растеризатор шрифтів Type 1
 Name:          t1lib
 Version:       5.1.2
-Release:       4
+Release:       10
 License:       GPL v2
 Group:         Libraries
-Source0:       ftp://sunsite.unc.edu/pub/Linux/libs/graphics/%{name}-%{version}.tar.gz
+Source0:       http://sunsite.unc.edu/pub/Linux/libs/graphics/%{name}-%{version}.tar.gz
 # Source0-md5: a5629b56b93134377718009df1435f3c
 Source1:       %{name}-fonts.Fontmap
 Source2:       %{name}-fonts.fonts.scale
@@ -25,7 +25,11 @@ Patch3:              %{name}-man.patch
 Patch4:                %{name}-xglyph.patch
 Patch5:                %{name}-aclocal.patch
 Patch6:                %{name}-link.patch
-Patch7:                %{name}-5.1.2-CVE-2010-2642.patch
+Patch7:                format-security.patch
+Patch8:                t1lib-5.1.2-CVE-2010-2642_2011-0433_2011-5244.patch
+Patch9:                t1lib-5.1.2-CVE-2011-0764.patch
+Patch10:       t1lib-5.1.2-CVE-2011-1552_1553_1554.patch
+URL:           http://www.t1lib.org/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libtool
@@ -45,10 +49,9 @@ BuildRequires:       tetex-makeindex
 BuildRequires: tetex-tex-babel
 %endif
 Requires:      findutils
-Requires:      fontpostinst >= 0.1-6
 Requires(post):        /sbin/ldconfig
-Obsoletes:     libt1lib1.3.1
-Obsoletes:     libt1lib1.3.1-progs
+Obsoletes:     libt1lib1.3.1 < 5
+Obsoletes:     libt1lib1.3.1-progs < 5
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _t1fontsdir     %{_fontsdir}/Type1
@@ -139,7 +142,7 @@ Summary(ru.UTF-8):  Растеризатор шрифтов Type 1 - файлы 
 Summary(uk.UTF-8):     Растеризатор шрифтів Type 1 - файли для розробки програм
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Obsoletes:     libt1lib1.3.1-devel
+Obsoletes:     libt1lib1.3.1-devel < 5
 
 %description devel
 The files needed for developing applications using t1lib.
@@ -238,6 +241,7 @@ Statyczna biblioteka libt1x.
 Summary:       Type 1 fonts
 Summary(pl.UTF-8):     Fonty Type 1
 Group:         Fonts
+Requires:      fontpostinst >= 0.1-6
 Requires(post,postun): fontpostinst >= 0.1-6
 Requires:      %{_fontsdir}/Type1
 
@@ -269,6 +273,9 @@ Program testowy dla t1lib z interfejsem X11.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
 
 rm -f ac-tools/aclocal.m4
 
@@ -310,10 +317,7 @@ chmod 755 $RPM_BUILD_ROOT%{_libdir}/lib*.so*
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-/sbin/ldconfig
-fontpostinst Type1
-
+%post  -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %post  x -p /sbin/ldconfig