From 49c1429ed999b5e544b01e87ff238bf4ee1e575f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20=C5=A0abata?= <contyk@redhat.com>
Date: Fri, 13 Jul 2012 14:31:03 +0200
Subject: [PATCH] 0.6.21 bump

A security bugfixing release (CVE-2012-2812, CVE-2012-2813,
CVE-2012-2814, CVE-2012-2836, CVE-2012-2837, CVE-2012-2840,
CVE-2012-2841 & CVE-2012-2845)
---
 .gitignore   |  1 +
 libexif.spec | 36 +++++++++++++++++++++++-------------
 sources      |  3 +--
 3 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index 31753fb..26f3b19 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ libexif-0.6.19.tar.bz2
 libexif-docs.tar.gz
 /libexif-0.6.20.tar.bz2
 /libexif-doc-0.6.20.tar.bz2
+/libexif-0.6.21.tar.bz2
diff --git a/libexif.spec b/libexif.spec
index 4e71334..ec45b39 100644
--- a/libexif.spec
+++ b/libexif.spec
@@ -1,13 +1,12 @@
 Summary:	Library for extracting extra information from image files
 Name:		libexif
-Version:	0.6.20
-Release:	2%{?dist}
+Version:	0.6.21
+Release:	1%{?dist}
 Group:		System Environment/Libraries
 License:	LGPLv2+
 URL:		http://libexif.sourceforge.net/
 Source0:	%{name}-%{version}.tar.bz2 
-Source1:	%{name}-doc-%{version}.tar.bz2
-BuildRequires: doxygen, pkgconfig
+BuildRequires:	doxygen, pkgconfig
 
 %description
 Most digital cameras produce EXIF files, which are JPEG files with
@@ -17,26 +16,31 @@ allows you to parse an EXIF file and read the data from those tags.
 %package devel
 Summary:	Files needed for libexif application development
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}%{?_isa} = %{version}-%{release}
 Requires:	pkgconfig
 
 %description devel
 The libexif-devel package contains the libraries and header files
 for writing programs that use libexif.
 
+%package doc
+Summary:	The EXIF Library API documentation
+Group:		Development/Libraries
+Requires:	%{name}%{?_isa} = %{version}-%{release}
+
+%description doc
+API Documentation for programmers wishing to use libexif in their programs.
+
 %prep
 %setup -q
-# to avoid multilib conflicts, we toss in pre-generated docs
-# and neuter make all in the docs dir
-tar xjf %{SOURCE1}
 
 %build
-%configure --disable-static --disable-docs
+%configure --disable-static
 make %{?_smp_mflags}
 
 %install
 make DESTDIR=%{buildroot} install
-find %{buildroot} -name "*.la" -exec rm {} \;
+find %{buildroot} -name "*.la" -exec rm -v {} \;
 rm -rf %{buildroot}%{_datadir}/doc/libexif
 cp -R doc/doxygen-output/libexif-api.html .
 iconv -f latin1 -t utf-8 < COPYING > COPYING.utf8; cp COPYING.utf8 COPYING
@@ -48,18 +52,24 @@ iconv -f latin1 -t utf-8 < README > README.utf8; cp README.utf8 README
 %postun -p /sbin/ldconfig
 
 %files -f libexif-12.lang
-%defattr(-,root,root,-)
 %doc COPYING README NEWS
 %{_libdir}/libexif.so.*
 
 %files devel
-%defattr(-,root,root,-)
-%doc libexif-api.html
 %{_includedir}/libexif
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/libexif.pc
 
+%files doc
+%doc libexif-api.html
+
 %changelog
+* Fri Jul 13 2012 Petr Šabata <contyk@redhat.com> - 0.6.21-1
+- 0.6.21 bump
+- A security bugfixing release (CVE-2012-2812, CVE-2012-2813, CVE-2012-2814,
+  CVE-2012-2836, CVE-2012-2837, CVE-2012-2840, CVE-2012-2841 & CVE-2012-2845)
+- Drop the pre-generated docs and introduce a doc subpackage
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.20-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 06bb523..988d00b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-19844ce6b5d075af16f0d45de1e8a6a3  libexif-0.6.20.tar.bz2
-253f03a0e36aea10f30aab8ab410c3d0  libexif-doc-0.6.20.tar.bz2
+27339b89850f28c8f1c237f233e05b27  libexif-0.6.21.tar.bz2