- updated to 0.25 (note: new soname)

- drop .la file
- added bconds for webready

diff --git a/exiv2.spec b/exiv2.spec
index ae950dd1221ffa921c6ed9b9cf47ced2316c6a7c..17a683ad48202ddeb0af1a0be790431bea9aaa60 100644 (file)
--- a/exiv2.spec
+++ b/exiv2.spec
@@ -1,20 +1,27 @@
+#
+# Conditional build:
+%bcond_with    curl    # enable webready with HTTP support via curl
+%bcond_with    libssh  # enable webready with SSH support via libssh
+
 Summary:       EXIF and IPTC metadata manipulation tools
 Summary(pl.UTF-8):     Narzędzia do obróbki metadanych EXIF i IPTC
 Name:          exiv2
-Version:       0.24
-Release:       3
+Version:       0.25
+Release:       1
 License:       GPL v2+
 Group:         Applications/Graphics
 #Source0Download: http://www.exiv2.org/download.html
 Source0:       http://www.exiv2.org/%{name}-%{version}.tar.gz
-# Source0-md5: b8a23dc56a98ede85c00718a97a8d6fc
+# Source0-md5: 258d4831b30f75a01e0234065c6c2806
 Patch0:                %{name}-mkinstalldirs.patch
 Patch1:                %{name}-png_support.patch
 URL:           http://www.exiv2.org/
 BuildRequires: autoconf >= 2.61
 BuildRequires: automake
+%{?with_curl:BuildRequires:    curl-devel}
 BuildRequires: expat-devel
 BuildRequires: gettext-tools
+%{?with_libssh:BuildRequires:  libssh-devel}
 BuildRequires: libstdc++-devel
 BuildRequires: libtool >= 2:2.0
 BuildRequires: zlib-devel
@@ -43,6 +50,9 @@ Summary:      EXIF and IPTC metadata manipulation library development files
 Summary(pl.UTF-8):     Pliki programistyczne biblioteki do obróbki metadanych EXIF i IPTC
 Group:         Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
+%{?with_curl:Requires: curl-devel}
+Requires:      expat-devel
+%{?with_libssh:Requires:       libssh-devel}
 Requires:      libstdc++-devel
 Requires:      zlib-devel
 
@@ -71,7 +81,7 @@ Statyczna biblioteka do obróbki metadanych EXIF i IPTC.
 
 ln -s config/configure.ac .
 
-# AX_CXX_CHECK_FLAG
+# AX_CXX_CHECK_FLAG from old autoconf-archive, missing in acinclude or separate file
 tail -n +10113 config/aclocal.m4 >> acinclude.m4
 
 %build
@@ -79,7 +89,13 @@ tail -n +10113 config/aclocal.m4 >> acinclude.m4
 %{__aclocal}
 %{__autoconf}
 # don't touch autoheader, config.h.in has been manually modified
-%configure
+%configure \
+       --enable-video \
+%if %{with curl} || %{with libssh}
+       --enable-webready \
+       %{!?with_curl:--without-curl} \
+       %{!?with_libssh:--without-ssh}
+%endif
 
 %{__make} \
        CFLAGS="%{rpmcflags} -Wall" \
@@ -94,6 +110,11 @@ rm -rf $RPM_BUILD_ROOT
        bindir=%{_bindir} \
        DESTDIR=$RPM_BUILD_ROOT
 
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libexiv2.la
+# let rpm autodetect dependencies
+chmod 755 $RPM_BUILD_ROOT%{_libdir}/libexiv2.so*
+
 %find_lang %{name}
 
 %clean
@@ -111,12 +132,11 @@ rm -rf $RPM_BUILD_ROOT
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libexiv2.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libexiv2.so.13
+%attr(755,root,root) %ghost %{_libdir}/libexiv2.so.14
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libexiv2.so
-%{_libdir}/libexiv2.la
 %{_includedir}/%{name}
 %{_pkgconfigdir}/exiv2.pc