- use modular xorg, killed PreReq, release 3

[packages/libwmf.git] / libwmf.spec

diff --git a/libwmf.spec b/libwmf.spec
index 05729f7f91ecbbcdb5d376c1e9fc4809b9a6c625..212b66462c3720f47e221730230276e86442f3d2 100644 (file)
--- a/libwmf.spec
+++ b/libwmf.spec
@@ -1,36 +1,40 @@
 #
 # Conditional build:
-# _without_gtk - without gtk-loader package (which requires gtk+2-devel)
+%bcond_without gtk             # without gtk-loader package (which requires gtk+2-devel)
+%bcond_without static_libs     # don't build static version of library
 #
 Summary:       libwmf - library to convert wmf files
 Summary(pl):   libwmf - biblioteka z funkcjami do konwersji plików wmf
 Name:          libwmf
-Version:       0.2.8
-Release:       1
+Version:       0.2.8.4
+Release:       3
 Epoch:         2
 License:       GPL
 Group:         Applications/Text
 Source0:       http://dl.sourceforge.net/wvware/%{name}-%{version}.tar.gz
-# Source0-md5: 269fb225cd44f40cc877fb6c63706112
+# 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
-%{!?_without_gtk:BuildRequires:        gtk+2-devel >= 2.1.2}
+%{?with_gtk:BuildRequires:     gtk+2-devel >= 1:2.1.2}
 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
+
 %description
 libwmf is a library for unix like machines that can convert wmf files
 into other formats, currently it supports fig, eps, a gd binding to
@@ -42,11 +46,24 @@ 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
+
+%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} = %{version}
+Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
+# libwmflite(.la) has no additional deps
+# libwmf(.la) needs freetype-devel, expat-devel, libjpeg-devel, libpng-devel, xorg-lib-libX11-devel
 
 %description devel
 This package contains libwmf header files.
@@ -58,7 +75,7 @@ Pakiet zawiera pliki nag
 Summary:       libwmf - static libraries
 Summary(pl):   libwmf - biblioteki statyczne
 Group:         Development/Libraries
-Requires:      %{name}-devel = %{version}
+Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
 
 %description static
 This package contains libwmf static libraries.
@@ -70,7 +87,7 @@ Pakiet zawiera statyczn
 Summary:       WMF loader for gdk_pixbuf 2.x library
 Summary(pl):   Modu³ wczytuj±cy WMF dla biblioteki gdk_pixbuf 2.x
 Group:         X11/Libraries
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description gtk-loader
 WMF loader for gdk_pixbuf 2.x library.
@@ -85,33 +102,39 @@ Modu
 %patch2 -p1
 
 %build
-rm -f missing
 %{__libtoolize}
 %{__aclocal}
+%{__autoheader}
 %{__autoconf}
 %{__automake}
-%configure
+%configure \
+       %{!?with_static_libs:--disable-static} \
+       --with-sysfontmap=%{_fontsdir}/ghostscript-fonts-std.font \
+       --with-gsfontmap=%{_fontsdir}/Type1/Fontmap \
+       --with-gsfontdir=%{_fontsdir}/Type1
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install DESTDIR=$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
+# no static modules and *.la for GTK+ loaders - shut up check-files
 rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2*/*/loaders/*.{a,la}
 
 %clean
 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)
@@ -122,11 +145,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
@@ -135,11 +161,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.la
 %{_includedir}/*
 
+%if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/*.a
+%endif
 
-%if %{?_without_gtk:0}%{!?_without_gtk:1}
+%if %{with gtk}
 %files gtk-loader
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/gtk-2*/*/loaders/*.so