- no macro in Conflicts for old package

[packages/libwmf.git] / libwmf.spec

diff --git a/libwmf.spec b/libwmf.spec
index f61872f3e61e81bdd7aec7225fa80b9b421edf04..7b2e7cab8a6bc8519165b4bd00afd908d0660884 100644 (file)
--- 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.1
+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,10 +25,12 @@ 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)
 
 %define                specflags_ia32  -fomit-frame-pointer
@@ -45,13 +46,25 @@ wmf na inne formaty. Aktualnie obs
 poprzez bibliotekê gd oraz - poprzez biblioteki X Window - rysowanie w
 okienku oraz format xpm.
 
+%package libs
+Summary:       libwmf - libraries
+Summary(pl):   libwmf - biblioteki
+Group:         Libraries
+Conflicts:     libwmf < 2:0.2.8.4
+
+%description libs
+This package contains libwmf libraries.
+
+%description libs -l pl
+Ten pakiet zawiera biblioteki libwmf.
+
 %package devel
 Summary:       libwmf - header files
 Summary(pl):   libwmf - pliki nag³ówkowe
 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.
@@ -59,13 +72,6 @@ This package contains libwmf header files.
 %description devel -l pl
 Pakiet zawiera pliki nag³ówkowe do biblioteki libwmf.
 
-%package libs
-Summary:       libwmf - libraries
-Group:         Libraries
-
-%description libs
-This package contains libwmf libraries.
-
 %package static
 Summary:       libwmf - static libraries
 Summary(pl):   libwmf - biblioteki statyczne
@@ -116,6 +122,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+rm -rf html-doc
 mv -f $RPM_BUILD_ROOT%{_datadir}/doc ./html-doc
 
 # no static modules and *.la for GTK+ loaders - shut up check-files
@@ -143,6 +150,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/libwmf/fonts
 %ghost %{_datadir}/libwmf/fonts/fontmap
 
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/*.so.*.*
+
 %files devel
 %defattr(644,root,root,755)
 %doc html-doc examples
@@ -151,10 +162,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.la
 %{_includedir}/*
 
-%files libs
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/*.so.*.*
-
 %if %{with static_libs}
 %files static
 %defattr(644,root,root,755)