rpms/exiv2/EL-4 exiv2.spec,1.9,1.10

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/exiv2/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17773

Modified Files:
	exiv2.spec 
Log Message:
exiv2-0.15



Index: exiv2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exiv2/EL-4/exiv2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- exiv2.spec	18 Dec 2006 15:24:02 -0000	1.9
+++ exiv2.spec	26 Nov 2007 18:20:49 -0000	1.10
@@ -1,28 +1,37 @@
 
+%if 0%{?fedora} > 7
+# make -libs subpkg
+%define libs 1
+%endif
+
 Summary: Exif and Iptc metadata manipulation library
 Name:	 exiv2
-Version: 0.12
-Release: 1%{?dist} 
+Version: 0.15
+Release: 4%{?dist}.1
 
-License: GPL
+License: GPLv2+
 Group:	 Applications/Multimedia
 URL: 	 http://www.exiv2.org/
 Source0: http://www.exiv2.org/exiv2-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: pkgconfig
 BuildRequires: zlib-devel
+BuildRequires: gettext
+# docs
+BuildRequires: doxygen graphviz libxslt
 
 Patch1: exiv2-0.11-no_rpath.patch
 Patch2: exiv2-0.9.1-deps.patch
 
+%if 0%{?libs}
+Requires: %{name}-libs = %{version}-%{release}
+%else
+Obsoletes: %{name}-libs < %{version}-%{release}
+Provides:  %{name}-libs = %{version}-%{release}
+%endif
 
 %description
-Exiv2 comprises of a C++ library and a command line utility to access image
-metadata. Exiv2 supports full read and write access to the Exif and Iptc
-metadata, Exif MakerNote support, extract and delete methods for Exif
-thumbnails, classes to access Ifd and so on.
-The command line utility allows you to:
+A command line utility to access image metadata, allowing one to:
 * print the Exif metadata of Jpeg images as summary info, interpreted values,
   or the plain data for each tag
 * print the Iptc metadata of Jpeg images
@@ -36,11 +45,26 @@
 %package devel
 Summary: Header files, libraries and development documentation for %{name}
 Group:	 Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
 Requires: pkgconfig
 %description devel
 %{summary}.
 
+%if 0%{?libs}
+%package libs
+Summary: Exif and Iptc metadata manipulation library
+Group: System Environment/Libraries
+# helps multilib upgrades
+# Obsoletes: %{name} < %{version}-%{release}
+# not *strictly* required, but runtime may expect presence of exiv2 binary
+# we'll try removing it, and see... -- Rex
+#Requires: %{name} = %{version}-%{release}
+%description libs
+A C++ library to access image metadata, supporting full read and write access
+to the Exif and Iptc metadata, Exif MakerNote support, extract and delete 
+methods for Exif thumbnails, classes to access Ifd and so on.
+%endif
+
 
 %prep
 %setup -q
@@ -48,60 +72,74 @@
 %patch1 -p1 -b .no_rpath
 %patch2 -p1 -b .deps
 
-# Hack for older pkgconfig that doesn't grok "URL:", like rhel4 -- Rex
-%if "%(pkg-config --version 2>/dev/null ||: )"  < "0.16.0"
-sed -i -e "s|^URL: |#URL: |" config/exiv2.pc.in
-%endif
-
-
+mkdir doc/html
 
 
 %build
 %configure --disable-static 
 
-make -C src %{?_smp_mflags} 
+make %{?_smp_mflags} 
 
 
 %install
 rm -rf $RPM_BUILD_ROOT 
 
-make -C src install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+%find_lang exiv2
 
 # Unpackaged files
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
-# set eXecute bit on installed lib
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/libexiv2-*.so
-
-## FIXME/TODO: patch installed exiv2-config to instead pull values from pkgconfig
+# fix perms on installed lib
+chmod 755 $RPM_BUILD_ROOT%{_libdir}/lib*.so*
 
 
 %clean
 rm -rf $FPM_BUILD_ROOT
 
 
-%post -p /sbin/ldconfig
+%post %{?libs:libs} -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun %{?libs:libs} -p /sbin/ldconfig
 
 
-%files
+%files %{!?libs:-f exiv2.lang} 
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_bindir}/exiv2
-%{_libdir}/libexiv2-*.so
 %{_mandir}/man1/*
 
+%if 0%{?libs}
+%files libs -f exiv2.lang
+%defattr(-,root,root,-)
+%endif
+%{_libdir}/libexiv2.so.*
+
 %files devel
 %defattr(-,root,root,-)
 %doc doc/html
-%{_bindir}/exiv2-config
 %{_includedir}/exiv2/
 %{_libdir}/libexiv2.so
 %{_libdir}/pkgconfig/exiv2.pc
 
 
 %changelog
+* Tue Sep 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.15-4
+- -libs: -Requires: %%name
+
+* Tue Aug 21 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.15-3
+- -libs subpkg to be multilib-friendlier (f8+)
+
+* Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.15-2
+- License: GPLv2+
+
+* Thu Jul 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.15-1
+- exiv2-0.15
+
+* Mon Apr 02 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.14-1
+- exiv2-0.14
+
 * Tue Nov 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.12-1
 - exiv2-0.12