X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=libwmf.spec;h=7b2e7cab8a6bc8519165b4bd00afd908d0660884;hb=71787c9b2c8af1cdd9cb688c5ec9134cb6c65967;hp=f729a7a4b0fc75b17405ce4188689b456ff955df;hpb=7e6ce155b59a25763fe450700827c0761a4e8f8b;p=packages%2Flibwmf.git

diff --git a/libwmf.spec b/libwmf.spec
index f729a7a..7b2e7ca 100644
--- a/libwmf.spec
+++ b/libwmf.spec
@@ -7,7 +7,7 @@ Summary:	libwmf - library to convert wmf files
 Summary(pl):	libwmf - biblioteka z funkcjami do konwersji plików wmf
 Name:		libwmf
 Version:	0.2.8.4
-Release:	1.2
+Release:	4
 Epoch:		2
 License:	GPL
 Group:		Applications/Text
@@ -17,8 +17,7 @@ Patch0:		%{name}-fontmap-pld.patch
 Patch1:		%{name}-includes.patch
 Patch2:		%{name}-segv.patch
 URL:		http://wvware.sourceforge.net/
-BuildRequires:	XFree86-devel
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.59-9
 BuildRequires:	automake
 BuildRequires:	expat-devel
 BuildRequires:	freetype-devel >= 2.0
@@ -26,9 +25,10 @@ BuildRequires:	freetype-devel >= 2.0
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel
 BuildRequires:	libtool >= 1:1.4.2-9
-PreReq:		ghostscript-fonts-std
-Requires(post):	/sbin/ldconfig
+BuildRequires:	xorg-lib-libX11-devel
+Requires(post):	ghostscript-fonts-std
 Requires(post):	sed
+Requires:	ghostscript-fonts-std
 Requires:	sed
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -50,6 +50,7 @@ okienku oraz format xpm.
 Summary:	libwmf - libraries
 Summary(pl):	libwmf - biblioteki
 Group:		Libraries
+Conflicts:	libwmf < 2:0.2.8.4
 
 %description libs
 This package contains libwmf libraries.
@@ -63,7 +64,7 @@ Summary(pl):	libwmf - pliki nag
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 # libwmflite(.la) has no additional deps
-# libwmf(.la) needs freetype-devel, XFree86-devel, expat-devel, libjpeg-devel, libpng-devel
+# libwmf(.la) needs freetype-devel, expat-devel, libjpeg-devel, libpng-devel, xorg-lib-libX11-devel
 
 %description devel
 This package contains libwmf header files.