- updated to 0.3.0

- added mux/demux libraries
- tools moved to -progs subpackage (they depend on external libraries)

diff --git a/libwebp.spec b/libwebp.spec
index f2ff3d2ccd8a9c074794968cda84820706bb682f..da59a10b8e2360332cdf74ccdceb286f382860b9 100644 (file)
--- a/libwebp.spec
+++ b/libwebp.spec
@@ -1,20 +1,17 @@
-#
-# Conditional build:
-%bcond_without apidocs         # do not build and package API docs
-
-Summary:       WebP image codec library and tools
-Summary(pl.UTF-8):     Biblioteka i narzędzia do kodeka obrazów WebP
+Summary:       WebP image codec libraries
+Summary(pl.UTF-8):     Biblioteki do kodeka obrazów WebP
 Name:          libwebp
-Version:       0.2.1
+Version:       0.3.0
 Release:       1
 License:       BSD
 Group:         Libraries
 #Source0Download: http://code.google.com/p/webp/downloads/list
 Source0:       http://webp.googlecode.com/files/%{name}-%{version}.tar.gz
-# Source0-md5: dc9b26f16bd5221414dbab95f13d4453
+# Source0-md5: 4183f4f51ada98976f14e7bd51f30938
 URL:           https://developers.google.com/speed/webp/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
+BuildRequires: giflib-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: libtiff-devel
@@ -22,34 +19,46 @@ BuildRequires:      libtool >= 2:2.2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-WebP image codec library and tools.
+WebP image codec libraries.
 
 %description -l pl.UTF-8
-Biblioteka i narzędzia do kodeka obrazów WebP.
+Biblioteki do kodeka obrazów WebP.
 
 %package devel
-Summary:       Header files for WebP library
-Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki WebP
+Summary:       Header files for WebP libraries
+Summary(pl.UTF-8):     Pliki nagłówkowe bibliotek WebP
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 
 %description devel
-Header files for WebP library.
+Header files for WebP libraries.
 
 %description devel -l pl.UTF-8
-Pliki nagłówkowe biblioteki WebP.
+Pliki nagłówkowe bibliotek WebP.
 
 %package static
-Summary:       Static WebP library
-Summary(pl.UTF-8):     Statyczna biblioteka WebP
+Summary:       Static WebP libraries
+Summary(pl.UTF-8):     Statyczne biblioteki WebP
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{version}-%{release}
 
 %description static
-Static WebP library.
+Static WebP libraries.
 
 %description static -l pl.UTF-8
-Statyczna biblioteka WebP.
+Statyczne biblioteki WebP.
+
+%package progs
+Summary:       WebP image codec tools
+Summary(pl.UTF-8):     Narzędzia do kodeka obrazów WebP
+Group:         Applications/Graphics
+Requires:      %{name} = %{version}-%{release}
+
+%description progs
+WebP image codec tools.
+
+%description progs -l pl.UTF-8
+Narzędzia do kodeka obrazów WebP.
 
 %prep
 %setup -q
@@ -60,7 +69,10 @@ Statyczna biblioteka WebP.
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+%configure \
+       --disable-silent-rules \
+       --enable-libwebpdemux \
+       --enable-libwebpmux
 %{__make}
 
 %install
@@ -70,7 +82,7 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT
 
 # obsoleted by pkgconfig
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libwebp.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libwebp*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -81,19 +93,36 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS COPYING ChangeLog NEWS PATENTS README
-%attr(755,root,root) %{_bindir}/cwebp
-%attr(755,root,root) %{_bindir}/dwebp
 %attr(755,root,root) %{_libdir}/libwebp.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libwebp.so.4
-%{_mandir}/man1/cwebp.1*
-%{_mandir}/man1/dwebp.1*
+%attr(755,root,root) %{_libdir}/libwebpdemux.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libwebpdemux.so.0
+%attr(755,root,root) %{_libdir}/libwebpmux.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libwebpmux.so.0
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libwebp.so
+%attr(755,root,root) %{_libdir}/libwebpdemux.so
+%attr(755,root,root) %{_libdir}/libwebpmux.so
 %{_includedir}/webp
 %{_pkgconfigdir}/libwebp.pc
+%{_pkgconfigdir}/libwebpdemux.pc
+%{_pkgconfigdir}/libwebpmux.pc
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libwebp.a
+%{_libdir}/libwebpdemux.a
+%{_libdir}/libwebpmux.a
+
+%files progs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/cwebp
+%attr(755,root,root) %{_bindir}/dwebp
+%attr(755,root,root) %{_bindir}/gif2webp
+%attr(755,root,root) %{_bindir}/webpmux
+%{_mandir}/man1/cwebp.1*
+%{_mandir}/man1/dwebp.1*
+%{_mandir}/man1/gif2webp.1*
+%{_mandir}/man1/webpmux.1*