From e8f7d94b048ab4488035e9f8dc9ae9f7ab285e5d Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Tue, 6 Aug 2024 09:20:34 +0200 Subject: [PATCH] 0.28.3 Resolves: RHEL-45267 --- .gitignore | 1 + exiv2.spec | 130 +++++++++++++++++++++++++++++++---------------------- sources | 2 +- 3 files changed, 79 insertions(+), 54 deletions(-) diff --git a/.gitignore b/.gitignore index aee95c7..432455e 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /exiv2-0.27.5-RC3.tar.gz /exiv2-0.27.5-Source.tar.gz /exiv2-0.27.6-Source.tar.gz +/exiv2-0.28.3.tar.gz diff --git a/exiv2.spec b/exiv2.spec index 2f0c90b..abbac06 100644 --- a/exiv2.spec +++ b/exiv2.spec @@ -1,34 +1,39 @@ +Name: exiv2 +Version: 0.28.3 +Release: 1%{?dist} +Summary: Exif and Iptc metadata manipulation library -%undefine __cmake_in_source_build - -Summary: Exif and Iptc metadata manipulation library -Name: exiv2 -Version: 0.27.6 -%global internal_ver %{version} -Release: 8%{?dist} - -License: GPL-2.0-or-later -URL: http://www.exiv2.org/ +# GPL-2.0-or-later: main library +# BSD-3-Clause: xmpsdk/ +# LicenseRef-Fedora-Public-Domain: +# - app/getopt.cpp +# - src/properties.cpp +# - src/tzfile.h +# - xmpsdk/include/MD5.h +# - xmpsdk/src/MD5.cpp +License: GPL-2.0-or-later AND BSD-3-Clause AND LicenseRef-Fedora-Public-Domain +URL: http://www.exiv2.org/ +VCS: https://github.com/Exiv2/exiv2/ %if 0%{?beta:1} -Source0: https://github.com/Exiv2/exiv2/archive/v%{version}-%{beta}/%{name}-%{version}-%{beta}.tar.gz +Source: %{vcs}/archive/v%{version}-%{beta}/%{name}-%{version}-%{beta}.tar.gz %else -Source0: http://exiv2.org/builds/%{name}-%{version}-Source.tar.gz +Source: %{vcs}/archive/v%{version}/%{name}-%{version}.tar.gz %endif -## upstream patches - -## upstreamable patches - -BuildRequires: cmake -BuildRequires: expat-devel -BuildRequires: gcc-c++ -BuildRequires: gettext -BuildRequires: pkgconfig -BuildRequires: zlib-devel +BuildRequires: cmake +BuildRequires: gcc-c++ +BuildRequires: gettext +BuildRequires: pkgconfig +BuildRequires: pkgconfig(expat) +BuildRequires: pkgconfig(INIReader) +BuildRequires: pkgconfig(libbrotlidec) +BuildRequires: pkgconfig(zlib) # docs -BuildRequires: doxygen graphviz libxslt +BuildRequires: doxygen +BuildRequires: graphviz +BuildRequires: libxslt -Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %description A command line utility to access image metadata, allowing one to: @@ -42,87 +47,106 @@ A command line utility to access image metadata, allowing one to: * extract, insert and delete Exif metadata (including thumbnails), Iptc metadata and Jpeg comments -%package devel -Summary: Header files, libraries and development documentation for %{name} -Requires: %{name}-libs%{?_isa} = %{version}-%{release} -%description devel + +%package devel +Summary: Header files, libraries and development documentation for %{name} +Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} + +%description devel %{summary}. -%package libs -Summary: Exif and Iptc metadata manipulation library + +%package libs +Summary: Exif and Iptc metadata manipulation library # not strictly required, but convenient and expected %if 0%{?rhel} && 0%{?rhel} <= 7 -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %else -Recommends: %{name} = %{version}-%{release} +Recommends: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %endif -%description libs + +%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. -%package doc -Summary: Api documentation for %{name} -BuildArch: noarch -%description doc + +%package doc +Summary: API documentation for %{name} +# MIT: +# - clipboard.js +# - cookie.js +# - dynsections.js +# - jquery.js +# - menu.js +# - menudata.js +# - resize.js +# GPL-2.0-only: +# - css and icons from Doxygen +License: MIT AND GPL-2.0-only +BuildArch: noarch + +%description doc %{summary}. +API documentation for %{name}. + %prep -%autosetup -n %{name}-%{version}-%{?beta}%{!?beta:Source} -p1 +%autosetup -n %{name}-%{version}%{?beta:-%{beta}} -p1 %build %cmake \ -DCMAKE_INSTALL_DOCDIR="%{_pkgdocdir}" \ -DEXIV2_BUILD_DOC:BOOL=ON \ - -DEXIV2_ENABLE_NLS:BOOL=ON \ - -DEXIV2_BUILD_SAMPLES:BOOL=OFF - + -DEXIV2_BUILD_SAMPLES:BOOL=OFF \ + -DEXIV2_ENABLE_NLS:BOOL=ON %cmake_build %cmake_build --target doc %install %cmake_install - %find_lang exiv2 --with-man %check export PKG_CONFIG_PATH="%{buildroot}%{_libdir}/pkgconfig${PKG_CONFIG_PATH:+:}${PKG_CONFIG_PATH}" -test "$(pkg-config --modversion exiv2)" = "%{internal_ver}" +test "$(pkg-config --modversion exiv2)" = "%{version}" test "$(pkg-config --variable=libdir exiv2)" = "%{_libdir}" test -x %{buildroot}%{_libdir}/libexiv2.so %files -f exiv2.lang -%license COPYING -%doc doc/ChangeLog -# README is mostly installation instructions -#doc README.md +%license COPYING doc/COPYING-XMPSDK +%doc doc/ChangeLog exiv2.md SECURITY.md %{_bindir}/exiv2 %{_mandir}/man1/exiv2*.1* -%ldconfig_scriptlets libs %files libs -%{_libdir}/libexiv2.so.27* -%{_libdir}/libexiv2.so.%{internal_ver} +%{_libdir}/libexiv2.so.28* +%{_libdir}/libexiv2.so.%{version} + %files devel %{_includedir}/exiv2/ +%{_libdir}/cmake/exiv2/ %{_libdir}/libexiv2.so %{_libdir}/pkgconfig/exiv2.pc -%{_libdir}/cmake/exiv2/ -# todo: -static subpkg? -- rex -%{_libdir}/libexiv2-xmp.a + %files doc %{_pkgdocdir}/ + %changelog +* Tue Aug 06 2024 Jan Grulich - 0.28.3-1 +- 0.28.3 + Resolves: RHEL-45267 + * Mon Jun 24 2024 Troy Dawson - 0.27.6-8 - Bump release for June 2024 mass rebuild diff --git a/sources b/sources index e13621e..f09226d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (exiv2-0.27.6-Source.tar.gz) = 045d7fb391202b53897336094812600680141a292367a9194e9529bccb8ab54465190ea0f0636970114402a38840b33b2fcf2edf7b6c616f3e585fa295a887a4 +SHA512 (exiv2-0.28.3.tar.gz) = c8338a118feefa104d73932890c732247c884ab9ce1d170c43a22ab5884517a0e2a7fd1febde7705b8290fbbbc29e64738610404816e4db2b56a70fc444ca049