rpms/exiv2/EL-5 exiv2.spec,1.10,1.11

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	exiv2.spec 
Log Message:
respin with no -libs subpkg



Index: exiv2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exiv2/EL-5/exiv2.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- exiv2.spec	26 Nov 2007 13:57:37 -0000	1.10
+++ exiv2.spec	26 Nov 2007 18:22:49 -0000	1.11
@@ -1,8 +1,13 @@
 
+%if 0%{?fedora} > 7
+# make -libs subpkg
+%define libs 1
+%endif
+
 Summary: Exif and Iptc metadata manipulation library
 Name:	 exiv2
 Version: 0.15
-Release: 4%{?dist} 
+Release: 4%{?dist}.1
 
 License: GPLv2+
 Group:	 Applications/Multimedia
@@ -18,7 +23,12 @@
 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
 A command line utility to access image metadata, allowing one to:
@@ -40,9 +50,12 @@
 %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}
@@ -50,6 +63,7 @@
 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
@@ -85,19 +99,21 @@
 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
 %{_mandir}/man1/*
 
+%if 0%{?libs}
 %files libs -f exiv2.lang
 %defattr(-,root,root,-)
+%endif
 %{_libdir}/libexiv2.so.*
 
 %files devel
@@ -113,7 +129,7 @@
 - -libs: -Requires: %%name
 
 * Tue Aug 21 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.15-3
-- -libs subpkg to be multilib-friendlier
+- -libs subpkg to be multilib-friendlier (f8+)
 
 * Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.15-2
 - License: GPLv2+