- updated to 0.21.1 (note: new soname)

- removed obsolete gcc44 patch
- configure patch replaced by proper fix

Changed files:
    exiv2-configure.patch -> 1.2
    exiv2.spec -> 1.36
    gcc44.patch -> 1.2

diff --git a/exiv2-configure.patch b/exiv2-configure.patch
deleted file mode 100644 (file)
index 4fd11da..0000000
--- a/exiv2-configure.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- config/configure.ac        2009-06-20 12:55:27.000000000 +0200
-+++ config/configure.ac-new    2009-12-03 20:53:38.492002725 +0100
-@@ -110,8 +110,6 @@
-     [  --disable-visibility    do not use g++ visibility support ],
-     GXX_VISIBILITY=$enableval, GXX_VISIBILITY=yes)
- AC_MSG_RESULT($GXX_VISIBILITY)
--if test "$GXX_VISIBILITY" = "yes"; then
--    AX_CXX_CHECK_FLAG(-fvisibility-inlines-hidden,[],[],[GXX_VISIBILITY=yes],[GXX_VISIBILITY=no])
-     if test "$GXX_VISIBILITY" = "yes"; then
-         CXXFLAGS="${CXXFLAGS} -fvisibility=hidden -fvisibility-inlines-hidden"
-         AC_DEFINE(HAVE_GXXCLASSVISIBILITY,1)
-@@ -119,7 +117,6 @@
-     if test "$enable_shared" = "yes"; then
-         AC_DEFINE(HAVE_DLL)
-     fi
--fi
- 
- AC_MSG_CHECKING([whether to use the lens database for Exif.Nikon3.LensData])
- AC_ARG_ENABLE(lensdata,

diff --git a/exiv2.spec b/exiv2.spec
index 7c88ec77a33bbb67fc44f624836d133fe1791421..11a17d5fe8ec1135a3671fc16c29af87916bc522 100644 (file)
--- a/exiv2.spec
+++ b/exiv2.spec
@@ -1,16 +1,14 @@
 Summary:       EXIF and IPTC metadata manipulation tools
 Summary(pl.UTF-8):     Narzędzia do obróbki metadanych EXIF i IPTC
 Name:          exiv2
-Version:       0.20
+Version:       0.21.1
 Release:       1
 License:       GPL v2+
 Group:         Applications/Graphics
 Source0:       http://www.exiv2.org/%{name}-%{version}.tar.gz
-# Source0-md5: 3173d08a4313dc94b7bd1b7cdbda2093
+# Source0-md5: 5c99bbcaa998f6b200b92f2bf0ac4f9e
 Patch0:                %{name}-mkinstalldirs.patch
 Patch1:                %{name}-png_support.patch
-Patch2:                gcc44.patch
-Patch3:                %{name}-configure.patch
 URL:           http://www.exiv2.org/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake
@@ -69,11 +67,12 @@ Statyczna biblioteka do obróbki metadanych EXIF i IPTC.
 %setup -q
 %patch0 -p0
 %patch1 -p1
-%patch2 -p1
-%patch3 -p0
 
 ln -s config/configure.ac .
 
+# AX_CXX_CHECK_FLAG
+tail -n +10113 config/aclocal.m4 >> acinclude.m4
+
 %build
 %{__libtoolize} --install
 %{__aclocal}
@@ -111,7 +110,7 @@ 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.9
+%attr(755,root,root) %ghost %{_libdir}/libexiv2.so.10
 
 %files devel
 %defattr(644,root,root,755)

diff --git a/gcc44.patch b/gcc44.patch
deleted file mode 100644 (file)
index ca9bdb0..0000000
--- a/gcc44.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- exiv2-0.17.1/src/value.cpp.orig    2009-11-04 17:59:10.221228293 +0100
-+++ exiv2-0.17.1/src/value.cpp 2009-11-04 17:59:20.220541063 +0100
-@@ -42,6 +42,7 @@
- #include <sstream>
- #include <cassert>
- #include <cstring>
-+#include <cstdio>
- #include <ctime>
- #include <cstdlib>
- #include <ctype.h>
---- exiv2-0.17.1/xmpsdk/src/XMPMeta.cpp.orig   2009-11-04 17:57:54.726416880 +0100
-+++ exiv2-0.17.1/xmpsdk/src/XMPMeta.cpp        2009-11-04 17:58:15.225008059 +0100
-@@ -20,6 +20,7 @@
- #include "UnicodeInlines.incl_cpp"
- #include "UnicodeConversions.hpp"
- 
-+#include <cstdio>
- #if XMP_DebugBuild
-       #include <iostream>
- #endif