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

diff --git a/libwmf.spec b/libwmf.spec
index 0c33795..7b2e7ca 100644
--- a/libwmf.spec
+++ b/libwmf.spec
@@ -1,33 +1,40 @@
+#
+# Conditional build:
+%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.1
-Release:	1
+Version:	0.2.8.4
+Release:	4
 Epoch:		2
 License:	GPL
-Vendor:		Caolan McNamara <Caolan.McNamara@ul.ie>
 Group:		Applications/Text
-Group(de):	Applikationen/Text
-Group(fr):	Utilitaires/Texte
-Group(pl):	Aplikacje/Tekst
-Source0:	ftp://download.sourceforge.net/pub/sourceforge/wvware/%{name}-%{version}.tar.gz
+Source0:	http://dl.sourceforge.net/wvware/%{name}-%{version}.tar.gz
+# Source0-md5:	d1177739bf1ceb07f57421f0cee191e0
 Patch0:		%{name}-fontmap-pld.patch
-Patch1:		%{name}-gd.patch
-Patch2:		%{name}-includes.patch
+Patch1:		%{name}-includes.patch
+Patch2:		%{name}-segv.patch
 URL:		http://wvware.sourceforge.net/
-BuildRequires:	libpng-devel
-BuildRequires:	libjpeg-devel
-BuildRequires:	freetype-devel >= 2.0
-BuildRequires:	XFree86-devel
-BuildRequires:	expat-devel
-BuildRequires:	libplot-devel
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.59-9
 BuildRequires:	automake
-Prereq:		/sbin/ldconfig
-Prereq:		sed
-Prereq:		ghostscript-fonts-std
+BuildRequires:	expat-devel
+BuildRequires:	freetype-devel >= 2.0
+%{?with_gtk:BuildRequires:	gtk+2-devel >= 1:2.1.2}
+BuildRequires:	libjpeg-devel
+BuildRequires:	libpng-devel
+BuildRequires:	libtool >= 1:1.4.2-9
+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
@@ -39,14 +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
-Group(de):	Entwicklung/Libraries
-Group(fr):	Development/Librairies
-Group(pl):	Programowanie/Biblioteki
-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,10 +76,7 @@ Pakiet zawiera pliki nag
 Summary:	libwmf - static libraries
 Summary(pl):	libwmf - biblioteki statyczne
 Group:		Development/Libraries
-Group(de):	Entwicklung/Libraries
-Group(fr):	Development/Librairies
-Group(pl):	Programowanie/Biblioteki
-Requires:	%{name}-devel = %{version}
+Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
 
 %description static
 This package contains libwmf static libraries.
@@ -69,6 +84,18 @@ This package contains libwmf static libraries.
 %description static -l pl
 Pakiet zawiera statyczn± wersjê biblioteki libwmf.
 
+%package gtk-loader
+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} = %{epoch}:%{version}-%{release}
+
+%description gtk-loader
+WMF loader for gdk_pixbuf 2.x library.
+
+%description gtk-loader -l pl
+Modu³ wczytuj±cy WMF dla biblioteki gdk_pixbuf 2.x
+
 %prep
 %setup -q
 %patch0 -p1
@@ -76,55 +103,73 @@ Pakiet zawiera statyczn
 %patch2 -p1
 
 %build
-libtoolize --copy --force
-aclocal
-automake -a -c
-autoconf
+%{__libtoolize}
+%{__aclocal}
+%{__autoheader}
+%{__autoconf}
+%{__automake}
 %configure \
-	--with-plot
+	%{!?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
-gzip -9nf CREDITS ChangeLog README TODO
+
+# 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)
-%doc *.gz
+%doc CREDITS ChangeLog README TODO
 %attr(755,root,root) %{_bindir}/libwmf-fontmap
 %attr(755,root,root) %{_bindir}/wmf2eps
 %attr(755,root,root) %{_bindir}/wmf2fig
 %attr(755,root,root) %{_bindir}/wmf2gd
-%attr(755,root,root) %{_bindir}/wmf2magick
-%attr(755,root,root) %{_bindir}/wmf2plot
 %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
 %attr(755,root,root) %{_bindir}/libwmf-config
 %attr(755,root,root) %{_libdir}/*.so
-%attr(755,root,root) %{_libdir}/*.la
+%{_libdir}/*.la
 %{_includedir}/*
 
+%if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/*.a
+%endif
+
+%if %{with gtk}
+%files gtk-loader
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/gtk-2*/*/loaders/*.so
+%endif