diff --git a/exempi-2.1.0.tar.bz2 b/exempi-2.1.0.tar.bz2 deleted file mode 100644 index f372ff9..0000000 --- a/exempi-2.1.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:de94b0927ca0d00fbd344788962942cdc542a58761e726939e38418ea7ed73cc -size 3196170 diff --git a/exempi-2.1.1.tar.bz2 b/exempi-2.1.1.tar.bz2 new file mode 100644 index 0000000..b66fb64 --- /dev/null +++ b/exempi-2.1.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bfbdd6183cf55e7da913fd328813012195b8386841a0c0cd08ead19e0ea87c40 +size 3196785 diff --git a/exempi-gcc44.patch b/exempi-gcc44.patch deleted file mode 100644 index 6139e7c..0000000 --- a/exempi-gcc44.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 9c751b6f0f09cf6605af49bb2a6c90e7b7468d65 Mon Sep 17 00:00:00 2001 -From: Michael Biebl -Date: Sun, 28 Dec 2008 23:35:38 +0000 -Subject: fix build failures with GCC 4.4 - -- Add missing includes to fix FTBFS with GCC 4.4. See Debian -Bug#504944 - -Signed-off-by: Hubert Figuiere ---- -diff --git a/exempi/tests/utils.cpp b/exempi/tests/utils.cpp -index 64be1ee..ee1c3a9 100644 ---- a/exempi/tests/utils.cpp -+++ b/exempi/tests/utils.cpp -@@ -34,6 +34,7 @@ - * OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -+#include - - #include - -diff --git a/samples/source/XMPFilesCoverage.cpp b/samples/source/XMPFilesCoverage.cpp -index dc9ce41..007c12b 100644 ---- a/samples/source/XMPFilesCoverage.cpp -+++ b/samples/source/XMPFilesCoverage.cpp -@@ -17,6 +17,7 @@ - #include - #include - #include -+#include - - #define TXMP_STRING_TYPE std::string - #define XMP_INCLUDE_XMPFILES 1 -diff --git a/source/common/XML_Node.cpp b/source/common/XML_Node.cpp -index de3866f..75298a8 100644 ---- a/source/common/XML_Node.cpp -+++ b/source/common/XML_Node.cpp -@@ -11,6 +11,7 @@ - - #include - #include -+#include - #include - - // ! Can't include XMP..._Impl.hpp - used by both Core and Files. diff --git a/exempi-rpmlint.diff b/exempi-rpmlint.diff deleted file mode 100644 index b731500..0000000 --- a/exempi-rpmlint.diff +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/source/XMPFiles/FileHandlers/P2_Handler.cpp b/source/XMPFiles/FileHandlers/P2_Handler.cpp -index d8cd2cd..064942c 100644 ---- a/source/XMPFiles/FileHandlers/P2_Handler.cpp -+++ b/source/XMPFiles/FileHandlers/P2_Handler.cpp -@@ -679,11 +679,11 @@ void P2_MetaHandler::SetStartTimecodeFromLegacyXML ( XML_NodePtr legacyVideoCont - - dmTimeFormat = "50Timecode"; - -- } else if ( p2FrameRate == "59.94p" ) { -+ } else if ( ( p2FrameRate == "59.94p" ) && ( p2DropFrameFlag != 0 ) ) { - -- if ( p2DropFrameFlag == "true" ) { -+ if ( std::strcmp ( p2DropFrameFlag, "true" ) == 0 ) { - dmTimeFormat = "5994DropTimecode"; -- } else if ( p2DropFrameFlag == "false" ) { -+ } else if ( std::strcmp ( p2DropFrameFlag, "false") == 0 ) { - dmTimeFormat = "5994NonDropTimecode"; - } - diff --git a/exempi.changes b/exempi.changes index 07df7ae..9ec7dd5 100644 --- a/exempi.changes +++ b/exempi.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Mon Jul 20 10:42:36 CEST 2009 - vuntz@novell.com + +- Update to version 2.1.1: + + Added shave to the build system for sane output. (build only) + + fdo#16030: if the property is an array or struct allow "" to be + passed as a value. + + fdo#19312: source/XMPFiles/FileHandlers/P2_Handler.cpp was + using an improper string comparison. (made rpmlint unhappy). + + fdo#20554: Missing file on MacOS X. + + fdo#20554: Detect ldflags properly. + + fdo#20622: Catch unhandled exceptions in + xmp_files_can_put_xmp(). + + fdo#21934: Mismatched new [] / delete. + + fdo#22554: Fix a SIGFPE encountered on some invalid files. + (bgo#586720) +- Drop exempi-rpmlint.diff: fixed upstream. +- Drop exempi-gcc44.patch: fixed upstream. + ------------------------------------------------------------------- Tue Apr 28 12:58:10 CEST 2009 - vuntz@novell.com diff --git a/exempi.spec b/exempi.spec index 3359d73..fb3870b 100644 --- a/exempi.spec +++ b/exempi.spec @@ -1,5 +1,5 @@ # -# spec file for package exempi (Version 2.1.0) +# spec file for package exempi (Version 2.1.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,20 +20,16 @@ Name: exempi Url: http://libopenraw.freedesktop.org/wiki/Exempi -Version: 2.1.0 -Release: 2 +Version: 2.1.1 +Release: 1 BuildRequires: boost-devel >= 1.33.0 BuildRequires: gcc-c++ BuildRequires: libexpat-devel BuildRequires: zlib-devel Summary: XMP support library -License: BSD 3-Clause +License: BSD 3-clause (or similar) Group: Development/Libraries/C and C++ Source0: http://libopenraw.freedesktop.org/download/%{name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM -Patch0: exempi-rpmlint.diff -# PATCH-FIX-UPSTREAM exempi-gcc44.patch vuntz@novell.com -- Taken from git -Patch1: exempi-gcc44.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define debug_package_requires libexempi3 = %{version} @@ -50,7 +46,7 @@ Authors: Jason Kivlighn %package -n libexempi3 -License: BSD 3-Clause +License: BSD 3-clause (or similar) Summary: XMP support library Group: Development/Libraries/C and C++ @@ -67,7 +63,7 @@ Authors: Jason Kivlighn %package -n libexempi-devel -License: BSD 3-Clause +License: BSD 3-clause (or similar) Summary: XMP support library Requires: libexempi3 = %{version} glibc-devel Group: Development/Libraries/C and C++ @@ -86,8 +82,6 @@ Authors: %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" @@ -118,49 +112,3 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/*.pc %changelog -* Tue Apr 28 2009 vuntz@novell.com -- Add exempi-gcc44.patch to fix build with gcc 4.4. -- Remove AutoReqProv: it's default now. -* Fri Jan 09 2009 crrodriguez@suse.de -- remove static libraries and "la" files -- correct -devel package deps -* Wed Dec 24 2008 hfiguiere@suse.de -- New upstream version 2.1.0 - + Upgrade XMPCore to Adobe XMP 4.4.2 - + New: NS_PDF namespace for PDF. - + New: API xmp_prefix_namespace_uri() and xmp_namespace_prefix(). fdo#14962. - + Bug: make sure boost >1.35 does not fail test with system(). - + Bug: unit test now use boost/test/minimal.hpp to work with more boost - install. (known boost.test bug) - + Bug: fix a typo in a CHECK_PTR call causing warnings on gcc < 4. - + Bug: no longer define UNIX_ENV in exempi.cpp and let CPPFLAGS do it. - + Bug fdo#16139: the list of exported symbols was too large. - + Bug fdo#18635: fix crasher. -- Added patch exempi-rpmlint.diff to make rpmlint happy. fdo#19312 -- Added zlib-devel as a dependency -- Remove .la and disable static -* Wed Oct 22 2008 maw@suse.de -- Make debug packages require a specific %%{version}-%%{release}. -* Wed Aug 13 2008 hfiguiere@suse.de -- New upstream version 2.0.2 - + Fix bug fdo#16598: TLS detection. - + Better error management - + Bugs fdo#14612 and fdo#14613 -* Wed Aug 06 2008 mauro@suse.de --Update to 2.0.1 - + bgo#14612: no stdbool.h for Sun compilers. - + bgo#14613: check for iconv() const-ness. - + Make the error checking more robust. - + Make error code thread-safe (ie local to the thread). -* Fri Aug 01 2008 ro@suse.de -- fix requires for debuginfo package -* Wed Apr 02 2008 vuntz@suse.de -- New upstream version 2.0.0: - + Bug fdo#14614, Bug fdo#15263: endian detection in configure. - + Bug fdo#14615: missing includes for Solaris. -* Fri Mar 14 2008 hfiguiere@suse.de -- New upstream version 1.99.9 - + Typo fix in API - + Buffer overflow fix in GIF handler (bgo #484105) -* Fri Jan 18 2008 jpr@suse.de -- Initial checkin