remove fontpostinst from wrong package

[packages/t1lib.git] / t1lib.spec

diff --git a/t1lib.spec b/t1lib.spec
index cbed11fa8381b1e313dcd16ae0ce0f6a8fa8f6a5..420e58f9af9b6c19e2b6801764dad336e3af92eb 100644 (file)
--- a/t1lib.spec
+++ b/t1lib.spec
@@ -9,7 +9,7 @@ Summary(ru.UTF-8):      Растеризатор шрифтов Type 1
 Summary(uk.UTF-8):     Растеризатор шрифтів Type 1
 Name:          t1lib
 Version:       5.1.2
-Release:       4
+Release:       9
 License:       GPL v2
 Group:         Libraries
 Source0:       ftp://sunsite.unc.edu/pub/Linux/libs/graphics/%{name}-%{version}.tar.gz
@@ -26,12 +26,18 @@ Patch4:             %{name}-xglyph.patch
 Patch5:                %{name}-aclocal.patch
 Patch6:                %{name}-link.patch
 Patch7:                %{name}-5.1.2-CVE-2010-2642.patch
+Patch8:                format-security.patch
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libtool
+BuildRequires: rpm >= 4.4.9-56
+%if "%{pld_release}" == "ac"
+BuildRequires: XFree86-devel
+%else
 BuildRequires: xorg-lib-libX11-devel
 BuildRequires: xorg-lib-libXaw-devel
 BuildRequires: xorg-lib-libXt-devel
+%endif
 %if %{with doc}
 BuildRequires: tetex-dvips
 BuildRequires: tetex-format-latex
@@ -40,7 +46,7 @@ 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
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -172,6 +178,22 @@ Bibliotecas estáticas para desenvolvimento com t1lib
 %description static -l uk.UTF-8
 Статична бібліотека для програмування з t1lib.
 
+%package doc
+Summary:       Manual for t1lib
+Summary(fr.UTF-8):     Documentation pour t1lib
+Summary(it.UTF-8):     Documentazione di t1lib
+Summary(pl.UTF-8):     Podręcznik dla t1lib
+Group:         Documentation
+
+%description doc
+Documentation for t1lib.
+
+%description doc -l fr.UTF-8
+Documentation pour t1lib.
+
+%description doc -l it.UTF-8
+Documentazione di t1lib.
+
 %package x
 Summary:       libt1x library (X11 XImage interface)
 Summary(pl.UTF-8):     Biblioteka libt1x (interfejs X11 XImage)
@@ -216,6 +238,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
 
@@ -247,6 +270,7 @@ Program testowy dla t1lib z interfejsem X11.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 rm -f ac-tools/aclocal.m4
 
@@ -288,10 +312,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
@@ -305,7 +326,7 @@ fontpostinst Type1
 
 %files
 %defattr(644,root,root,755)
-%doc Changes README.t1* doc/*.{tex,eps,fig} %{?with_doc:doc/*.dvi}
+%doc Changes README.t1*
 %attr(755,root,root) %{_bindir}/type1afm
 %attr(755,root,root) %{_bindir}/t1libconfig
 %attr(755,root,root) %{_libdir}/libt1.so.*.*.*
@@ -328,6 +349,12 @@ fontpostinst Type1
 %defattr(644,root,root,755)
 %{_libdir}/libt1.a
 
+%if %{with doc}
+%files doc
+%defattr(644,root,root,755)
+%doc doc/*.{tex,eps,fig} %{?with_doc:doc/*.dvi}
+%endif
+
 %files x
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libt1x.so.*.*.*