add format-security.patch, drop unneeded -Wl,--as-needed

[packages/libgtkhtml.git] / libgtkhtml.spec

diff --git a/libgtkhtml.spec b/libgtkhtml.spec
index 9d25f03fe204a9bffd179dd5b955290ed32b545e..fc1b983c6425e7e924edd9a830a346ea96e56ca9 100644 (file)
--- a/libgtkhtml.spec
+++ b/libgtkhtml.spec
@@ -1,65 +1,77 @@
 Summary:       GTK HTML widget 2
-Summary(pl):   Widget GTK HTML dla GNOME2
+Summary(pl.UTF-8):     Widget GTK HTML dla GNOME2
 Name:          libgtkhtml
-Version:       2.2.1
-Release:       1
+Version:       2.11.1
+Release:       6
 License:       GPL/LGPL
 Group:         X11/Libraries
-Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.2/%{name}-%{version}.tar.bz2
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/libgtkhtml/2.11/%{name}-%{version}.tar.bz2
+# Source0-md5: a1d1a197dcff8c4571659deef5495e24
+Patch0:                format-security.patch
 URL:           http://gtkhtml2.codefactory.se/
-BuildRequires: gail-devel >= 1.2.0
-BuildRequires: gtk+2-devel >= 2.2.0
-BuildRequires: libxml2-devel >= 2.5.1
-BuildRequires: libgnomecanvas-devel >= 2.2.0
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: gail-devel >= 1.9.0
+BuildRequires: gtk+2-devel >= 2:2.10.0
+BuildRequires: libselinux-devel
+BuildRequires: libtool
+BuildRequires: libxml2-devel >= 1:2.6.26
+BuildRequires: pkgconfig
+BuildRequires: xorg-lib-libSM-devel
+Requires:      gail >= 1.9.0
+Requires:      libxml2 >= 1:2.6.26
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 GTK HTML Widget for the GNOME 2 platform.
 
-%description -l pl
+%description -l pl.UTF-8
 Widget GTK HTML dla platformy GNOME2.
 
 %package devel
 Summary:       Header files for GTK HTML 2
-Summary(pl):   Pliki nag³ówkowe GTK HTML 2
+Summary(pl.UTF-8):     Pliki nagłówkowe GTK HTML 2
 Group:         X11/Development/Libraries
-Requires:      %{name} = %{version}
-Requires:      gail-devel >= 1.1.5
-Requires:      libxml2-devel >= 2.4.23
-Requires:      libgnomecanvas-devel >= 2.1.5
+Requires:      %{name} = %{version}-%{release}
+Requires:      gail-devel >= 1.9.0
+Requires:      libxml2-devel >= 1:2.6.26
 
 %description devel
 Header files for GTK HTML 2.
 
-%description devel -l pl
-Pliki nag³ówkowe dla GTK HTML 2.
+%description devel -l pl.UTF-8
+Pliki nagłówkowe dla GTK HTML 2.
 
 %package static
 Summary:       Static GTK HTML 2 library
-Summary(pl):   Statyczna biblioteka GTK HTML 2
+Summary(pl.UTF-8):     Statyczna biblioteka GTK HTML 2
 Group:         X11/Development/Libraries
-Requires:      %{name}-devel = %{version}
+Requires:      %{name}-devel = %{version}-%{release}
 
 %description static
 Static version of GTK HTML 2 library.
 
-%description static -l pl
+%description static -l pl.UTF-8
 Statyczna wersja biblioteki GTK HTML 2.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-%configure 
-
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__automake}
+%configure
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %{__make} install \
-        DESTDIR=$RPM_BUILD_ROOT \
-       pkgconfigdir=%{_pkgconfigdir} 
+       DESTDIR=$RPM_BUILD_ROOT
+
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libgtkhtml-2.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -70,15 +82,15 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog TODO README NEWS
-%attr(755,root,root) %{_libdir}/*.so.*.*
+%attr(755,root,root) %{_libdir}/libgtkhtml-2.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgtkhtml-2.so.0
 
 %files devel
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libgtkhtml-2.so
 %{_includedir}/gtkhtml-2.0
-%{_libdir}/*.la
-%attr(755,root,root) %{_libdir}/*.so
-%{_pkgconfigdir}/*.pc
+%{_pkgconfigdir}/libgtkhtml-2.0.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/*.a
+%{_libdir}/libgtkhtml-2.a