- no macro in Conflicts for old package

[packages/libwmf.git] / libwmf.spec

diff --git a/libwmf.spec b/libwmf.spec
index 4d38c38e5dacd7b896c10b66a16795f6ba8f71de..7b2e7cab8a6bc8519165b4bd00afd908d0660884 100644 (file)
--- a/libwmf.spec
+++ b/libwmf.spec
@@ -6,19 +6,18 @@
 Summary:       libwmf - library to convert wmf files
 Summary(pl):   libwmf - biblioteka z funkcjami do konwersji plików wmf
 Name:          libwmf
-Version:       0.2.8.3
-Release:       2
+Version:       0.2.8.4
+Release:       4
 Epoch:         2
 License:       GPL
 Group:         Applications/Text
 Source0:       http://dl.sourceforge.net/wvware/%{name}-%{version}.tar.gz
-# Source0-md5: 3b058327bb14d2373260a74beb7f3e2f
+# Source0-md5: d1177739bf1ceb07f57421f0cee191e0
 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,8 +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
@@ -43,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} = %{epoch}:%{version}-%{release}
+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.
@@ -107,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
@@ -116,10 +132,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2*/*/loaders/*.{a,la}
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/ldconfig
-%{_bindir}/libwmf-fontmap >/dev/null
+%{_bindir}/libwmf-fontmap > /dev/null
 
-%postun        -p /sbin/ldconfig
+%post  libs -p /sbin/ldconfig
+%postun        libs -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
@@ -130,11 +146,14 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/wmf2gd
 %attr(755,root,root) %{_bindir}/wmf2svg
 %attr(755,root,root) %{_bindir}/wmf2x
-%attr(755,root,root) %{_libdir}/*.so.*.*
 %dir %{_datadir}/libwmf
 %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