X-Git-Url: http://git.pld-linux.org/?p=packages%2Fautotrace.git;a=blobdiff_plain;f=autotrace.spec;h=acdcc4fa4e9b9231f18e8afdcdc7e942af611998;hp=703ad02ec13c2924aff974e3402f0658990e93b3;hb=1c82da1450fb4bca3602247955db2bc51469ecb0;hpb=bdf26f5147e72c1b760633dd0edf84d15c0a3d76

diff --git a/autotrace.spec b/autotrace.spec
index 703ad02..acdcc4f 100644
--- a/autotrace.spec
+++ b/autotrace.spec
@@ -1,18 +1,20 @@
 Summary:	AutoTrace - convert bitmap to vector graphics
-Summary(pl):	AutoTrace - konwerter grafiki rastrowej do wektorowej
+Summary(pl.UTF-8):	AutoTrace - konwerter grafiki rastrowej do wektorowej
 Name:		autotrace
 Version:	0.31.1
-Release:	3
-License:	GPL
-Group:		Applications
-Source0:	http://dl.sourceforge.net/autotrace/%{name}-%{version}.tar.gz
+Release:	8
+License:	GPL v2+
+Group:		Applications/Graphics
+Source0:	http://downloads.sourceforge.net/autotrace/%{name}-%{version}.tar.gz
 # Source0-md5:	54eabbb38d2076ded6d271e1ee4d0783
 Patch0:		%{name}-link.patch
 Patch1:		%{name}-aclocal.patch
 Patch2:		%{name}-am18.patch
 Patch3:		%{name}-magick6.patch
+Patch4:		%{name}-am.patch
+Patch5:		%{name}-libpng.patch
 URL:		http://autotrace.sourceforge.net/
-BuildRequires:	ImageMagick-devel >= 5.2.1
+BuildRequires:	ImageMagick-devel >= 1:6.2.4.0
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	libtool
@@ -26,18 +28,18 @@ AutoTrace is a utility that converts bitmap to vector graphics. It can
 import p[nbgp]m, bmp, tga, png (and many more through ImageMagick)
 files and write to emf, eps, ai, er, fig, svg, sk and swf files.
 
-%description -l pl
-AutoTrace jest narzêdziem do konwersji grafiki rastrowej na wektorow±.
-Mo¿e wczytywaæ pliki p[nbgp]m, bmp, tga, png (i wiele innych przez
-ImageMagick, a zapisywaæ w formacie emf, eps, ai, er, fig, svg, sk
+%description -l pl.UTF-8
+AutoTrace jest narzędziem do konwersji grafiki rastrowej na wektorową.
+Może wczytywać pliki p[nbgp]m, bmp, tga, png (i wiele innych przez
+ImageMagick, a zapisywać w formacie emf, eps, ai, er, fig, svg, sk
 oraz swf.
 
 %package devel
 Summary:	AutoTrace library development files
-Summary(pl):	Pliki dla programistów u¿ywaj±cych biblioteki AutoTrace
+Summary(pl.UTF-8):	Pliki dla programistów używających biblioteki AutoTrace
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	ImageMagick-devel >= 5.2.1
+Requires:	ImageMagick-devel >= 1:6.2.4.0
 Requires:	libpng-devel >= 1.0.6
 Requires:	ming-devel
 Requires:	pstoedit-devel >= 3.33-4
@@ -45,19 +47,19 @@ Requires:	pstoedit-devel >= 3.33-4
 %description devel
 AutoTrace library header files.
 
-%description devel -l pl
-Pliki nag³ówkowe do biblioteki AutoTrace.
+%description devel -l pl.UTF-8
+Pliki nagłówkowe do biblioteki AutoTrace.
 
 %package static
 Summary:	AutoTrace static library
-Summary(pl):	Biblioteka statyczna AutoTrace
+Summary(pl.UTF-8):	Biblioteka statyczna AutoTrace
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
 AutoTrace static library.
 
-%description static -l pl
+%description static -l pl.UTF-8
 Biblioteka statyczna AutoTrace.
 
 %prep
@@ -66,14 +68,16 @@ Biblioteka statyczna AutoTrace.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
-%configure \
-	--enable-shared
+%configure
 
 %{__make}
 
@@ -93,18 +97,19 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS NEWS README THANKS
 %attr(755,root,root) %{_bindir}/autotrace
-%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
-%{_mandir}/man1/*
+%attr(755,root,root) %{_libdir}/libautotrace.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libautotrace.so.3
+%{_mandir}/man1/autotrace.1*
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/autotrace-config
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
+%attr(755,root,root) %{_libdir}/libautotrace.so
+%{_libdir}/libautotrace.la
 %{_includedir}/autotrace
 %{_aclocaldir}/autotrace.m4
-%{_pkgconfigdir}/*
+%{_pkgconfigdir}/autotrace.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libautotrace.a