- tabs in preamble

[packages/libwmf.git] / libwmf.spec

diff --git a/libwmf.spec b/libwmf.spec
index f61872f3e61e81bdd7aec7225fa80b9b421edf04..dfc1c2f244b63e4c2c2fdf954f930a79c23b0a4d 100644 (file)
--- a/libwmf.spec
+++ b/libwmf.spec
@@ -1,13 +1,15 @@
 #
+# http://www.securityfocus.com/bid/18751/info
+#
 # 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
+Summary(pl.UTF-8):     libwmf - biblioteka z funkcjami do konwersji plików wmf
 Name:          libwmf
 Version:       0.2.8.4
-Release:       1.1
+Release:       6
 Epoch:         2
 License:       GPL
 Group:         Applications/Text
@@ -16,20 +18,22 @@ Source0:    http://dl.sourceforge.net/wvware/%{name}-%{version}.tar.gz
 Patch0:                %{name}-fontmap-pld.patch
 Patch1:                %{name}-includes.patch
 Patch2:                %{name}-segv.patch
+Patch3:                %{name}-png12.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
-%{?with_gtk:BuildRequires:     gtk+2-devel >= 1:2.1.2}
+%{?with_gtk:BuildRequires:     gtk+2-devel >= 1:2.10.0}
 BuildRequires: libjpeg-devel
-BuildRequires: libpng-devel
+BuildRequires: libpng-devel >= 1.2.12
 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
@@ -39,69 +43,77 @@ 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
 convert to png, and an X one to draw direct to an X window or pixmap.
 
-%description -l pl
-libwmf jest bibliotek± dla systemów uniksowych, która konwertuje pliki
-wmf na inne formaty. Aktualnie obs³uguje formaty fig i eps, format png
-poprzez bibliotekê gd oraz - poprzez biblioteki X Window - rysowanie w
+%description -l pl.UTF-8
+libwmf jest biblioteką dla systemów uniksowych, która konwertuje pliki
+wmf na inne formaty. Aktualnie obsługuje formaty fig i eps, format png
+poprzez bibliotekę gd oraz - poprzez biblioteki X Window - rysowanie w
 okienku oraz format xpm.
 
+%package libs
+Summary:       libwmf - libraries
+Summary(pl.UTF-8):     libwmf - biblioteki
+Group:         Libraries
+Conflicts:     libwmf < 2:0.2.8.4
+
+%description libs
+This package contains libwmf libraries.
+
+%description libs -l pl.UTF-8
+Ten pakiet zawiera biblioteki libwmf.
+
 %package devel
 Summary:       libwmf - header files
-Summary(pl):   libwmf - pliki nag³ówkowe
+Summary(pl.UTF-8):     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.
 
-%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.
+%description devel -l pl.UTF-8
+Pakiet zawiera pliki nagłówkowe do biblioteki libwmf.
 
 %package static
 Summary:       libwmf - static libraries
-Summary(pl):   libwmf - biblioteki statyczne
+Summary(pl.UTF-8):     libwmf - biblioteki statyczne
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
 
 %description static
 This package contains libwmf static libraries.
 
-%description static -l pl
-Pakiet zawiera statyczn± wersjê biblioteki libwmf.
+%description static -l pl.UTF-8
+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
+Summary(pl.UTF-8):     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
+%description gtk-loader -l pl.UTF-8
+Moduł wczytujący WMF dla biblioteki gdk_pixbuf 2.x
 
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
+rm configure.in
 %{__libtoolize}
 %{__aclocal}
 %{__autoheader}
 %{__autoconf}
 %{__automake}
+LDFLAGS="%{rpmldflags} -Wl,--as-needed"
 %configure \
        %{!?with_static_libs:--disable-static} \
        --with-sysfontmap=%{_fontsdir}/ghostscript-fonts-std.font \
@@ -116,6 +128,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 +156,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 +168,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)