- ups

[packages/t1lib.git] / t1lib.spec

diff --git a/t1lib.spec b/t1lib.spec
index 4476189ee339cd4f63a42862f3d00b90a0dca76a..374c7d7efc9669e9894979101f87efb8b7e4aa75 100644 (file)
--- a/t1lib.spec
+++ b/t1lib.spec
@@ -8,12 +8,12 @@ Summary(pt_BR):       Rasterizador de fontes Type 1
 Summary(ru):   òÁÓÔÅÒÉÚÁÔÏÒ ÛÒÉÆÔÏ× Type 1
 Summary(uk):   òÁÓÔÅÒÉÚÁÔÏÒ ÛÒÉÆÔ¦× Type 1
 Name:          t1lib
-Version:       5.0.0
-Release:       4
+Version:       5.1.0
+Release:       3
 License:       LGPL
 Group:         Libraries
 Source0:       ftp://sunsite.unc.edu/pub/Linux/libs/graphics/%{name}-%{version}.tar.gz
-# Source0-md5: 6b5d79840ec2be72b506c12abb040a60
+# Source0-md5: a05bed4aa63637052e60690ccde70421
 Source1:       %{name}-fonts.Fontmap
 Source2:       %{name}-fonts.fonts.scale
 Source3:       %{name}config
@@ -21,18 +21,22 @@ Source4:    %{name}config.8
 Patch0:                %{name}-DESTDIR.patch
 Patch1:                %{name}-doc.patch
 Patch2:                %{name}-config.patch
-Patch4:                %{name}-KernMapSize.patch
-Patch5:                %{name}-man.patch
-Patch7:                %{name}-xglyph.patch
-BuildRequires: XFree86-devel
+Patch3:                %{name}-KernMapSize.patch
+Patch4:                %{name}-man.patch
+Patch5:                %{name}-xglyph.patch
+Patch6:                %{name}-link.patch
+Patch7:                %{name}-aclocal.patch
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libtool
+BuildRequires: xorg-lib-libX11-devel
+BuildRequires: xorg-lib-libXaw-devel
+BuildRequires: xorg-lib-libXt-devel
 %if %{with doc}
 BuildRequires: tetex-dvips
+BuildRequires: tetex-format-latex
 BuildRequires: tetex-latex
 BuildRequires: tetex-makeindex
-BuildRequires: tetex-format-latex
 BuildRequires: tetex-tex-babel
 %endif
 Requires(post):        fontpostinst >= 0.1-6
@@ -40,11 +44,10 @@ Obsoletes:  libt1lib1.3.1
 Obsoletes:     libt1lib1.3.1-progs
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _xbindir        /usr/X11R6/bin
 %define                _t1fontsdir     %{_fontsdir}/Type1
 %define                _t1afmdir       %{_t1fontsdir}/afm
 %define                _datadir        /etc
-%define                specflags_ia32  "-fomit-frame-pointer"
+%define                specflags_ia32   -fomit-frame-pointer
 
 %description
 t1lib is a library distributed under the GNU General Public Library
@@ -100,7 +103,7 @@ rasteryzera zosta
 - wsparcie dla podkre¶lania, nadkre¶lania, przekre¶lania
 - nowe wektory kodowania mog± byæ wczytane w czasie dzia³ania i fonty
   mog± byæ ponownie zakodowane przy u¿yciu tych wektorów
-- antyaliasing zaimplementowany przy u¿yciu trzech stopni szaaro¶ci
+- antyaliasing zaimplementowany przy u¿yciu trzech stopni szaro¶ci
   pomiêdzy czerni± a biel±
 - interaktywny program testowy xglyph - w osobnym pakiecie (wymaga X).
 
@@ -199,14 +202,17 @@ Program testowy dla t1lib z interfejsem X11.
 %patch0 -p1
 %patch1 -p0
 %patch2 -p0
+%patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 %patch7 -p1
 
+rm -f ac-tools/aclocal.m4
+
 %build
 %{__libtoolize}
-%{__aclocal}
-mv -f aclocal.m4 ac-tools
+%{__aclocal} -I ac-tools
 %{__autoconf}
 %configure
 
@@ -214,12 +220,12 @@ mv -f aclocal.m4 ac-tools
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_libdir},%{_datadir},%{_bindir}} \
-       $RPM_BUILD_ROOT{%{_includedir},%{_xbindir}} \
+install -d $RPM_BUILD_ROOT{%{_libdir},%{_datadir},%{_bindir},%{_includedir}} \
        $RPM_BUILD_ROOT{%{_t1fontsdir},%{_t1afmdir}} \
        $RPM_BUILD_ROOT%{_mandir}/man{1,5,8}
 
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT
 
 cp -a Fonts/enc $RPM_BUILD_ROOT%{_datadir}/%{name}
 install Fonts/afm/*.afm $RPM_BUILD_ROOT%{_t1afmdir}
@@ -236,8 +242,6 @@ for sec in 1 5; do
 done
 install %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/man8
 
-mv -f $RPM_BUILD_ROOT%{_bindir}/xglyph $RPM_BUILD_ROOT%{_xbindir}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -292,5 +296,5 @@ fontpostinst Type1
 
 %files xglyph
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_xbindir}/xglyph
+%attr(755,root,root) %{_bindir}/xglyph
 %{_mandir}/man1/xglyph.1*