diff --git a/.gitignore b/.gitignore index 1c7569c..c8aa20a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/gexiv2-0.10.8.tar.xz +gexiv2-0.14.3.tar.xz diff --git a/.libgexiv2.metadata b/.libgexiv2.metadata deleted file mode 100644 index feeae92..0000000 --- a/.libgexiv2.metadata +++ /dev/null @@ -1 +0,0 @@ -8caafc5557a9acda3fcc023ee0e55d342b167cff SOURCES/gexiv2-0.10.8.tar.xz diff --git a/SOURCES/libgexiv2-build-against-exiv-027.patch b/SOURCES/libgexiv2-build-against-exiv-027.patch deleted file mode 100644 index 7f09f15..0000000 --- a/SOURCES/libgexiv2-build-against-exiv-027.patch +++ /dev/null @@ -1,163 +0,0 @@ -diff --git a/gexiv2/gexiv2-metadata-exif.cpp b/gexiv2/gexiv2-metadata-exif.cpp -index c87a460..f931b95 100644 ---- a/gexiv2/gexiv2-metadata-exif.cpp -+++ b/gexiv2/gexiv2-metadata-exif.cpp -@@ -12,7 +12,7 @@ - #include "gexiv2-metadata-private.h" - #include - #include --#include -+#include - - G_BEGIN_DECLS - -diff --git a/gexiv2/gexiv2-metadata-gps.cpp b/gexiv2/gexiv2-metadata-gps.cpp -index d49d97c..47592ec 100644 ---- a/gexiv2/gexiv2-metadata-gps.cpp -+++ b/gexiv2/gexiv2-metadata-gps.cpp -@@ -15,7 +15,7 @@ - #include - #include - #include --#include -+#include - - #include - -diff --git a/gexiv2/gexiv2-metadata-iptc.cpp b/gexiv2/gexiv2-metadata-iptc.cpp -index 2371708..aeac1c7 100644 ---- a/gexiv2/gexiv2-metadata-iptc.cpp -+++ b/gexiv2/gexiv2-metadata-iptc.cpp -@@ -12,7 +12,7 @@ - #include "gexiv2-metadata-private.h" - #include - #include --#include -+#include - - G_BEGIN_DECLS - -diff --git a/gexiv2/gexiv2-metadata-private.h b/gexiv2/gexiv2-metadata-private.h -index d85453c..8818c22 100644 ---- a/gexiv2/gexiv2-metadata-private.h -+++ b/gexiv2/gexiv2-metadata-private.h -@@ -11,11 +11,7 @@ - #define GEXIV2_METADATA_PRIVATE_H - - #include --#include --#include --#include --#include --#include -+#include - - G_BEGIN_DECLS - -diff --git a/gexiv2/gexiv2-metadata-xmp.cpp b/gexiv2/gexiv2-metadata-xmp.cpp -index e4900f2..6f60cd0 100644 ---- a/gexiv2/gexiv2-metadata-xmp.cpp -+++ b/gexiv2/gexiv2-metadata-xmp.cpp -@@ -12,7 +12,7 @@ - #include "gexiv2-metadata-private.h" - #include - #include --#include -+#include - - G_BEGIN_DECLS - -diff --git a/gexiv2/gexiv2-metadata.cpp b/gexiv2/gexiv2-metadata.cpp -index 3a78084..51aeaed 100644 ---- a/gexiv2/gexiv2-metadata.cpp -+++ b/gexiv2/gexiv2-metadata.cpp -@@ -22,13 +22,8 @@ - #include - #include - #include --#include --#include --#include --#include --#include --#include --#include -+ -+#include - - - G_BEGIN_DECLS -diff --git a/gexiv2/gexiv2-preview-image-private.h b/gexiv2/gexiv2-preview-image-private.h -index 810304c..b52a84f 100644 ---- a/gexiv2/gexiv2-preview-image-private.h -+++ b/gexiv2/gexiv2-preview-image-private.h -@@ -11,7 +11,7 @@ - #define GEXIV2_PREVIEW_IMAGE_PRIVATE_H - - #include --#include -+#include - - G_BEGIN_DECLS - -diff --git a/gexiv2/gexiv2-preview-properties-private.h b/gexiv2/gexiv2-preview-properties-private.h -index bacb392..b057604 100644 ---- a/gexiv2/gexiv2-preview-properties-private.h -+++ b/gexiv2/gexiv2-preview-properties-private.h -@@ -11,7 +11,7 @@ - #define GEXIV2_PREVIEW_PROPERTIES_PRIVATE_H - - #include --#include -+#include - - G_BEGIN_DECLS - -diff --git a/gexiv2/gexiv2-startup.cpp b/gexiv2/gexiv2-startup.cpp -index 179b6c7..de438de 100644 ---- a/gexiv2/gexiv2-startup.cpp -+++ b/gexiv2/gexiv2-startup.cpp -@@ -7,7 +7,7 @@ - * This is free software. See COPYING for details. - */ - --#include -+#include - #include "gexiv2-startup.h" - #include "gexiv2-version.h" - -diff --git a/gexiv2/gexiv2-stream-io.cpp b/gexiv2/gexiv2-stream-io.cpp -index abfb843..c83a672 100644 ---- a/gexiv2/gexiv2-stream-io.cpp -+++ b/gexiv2/gexiv2-stream-io.cpp -@@ -13,7 +13,7 @@ - #include "gexiv2-stream-io.h" - #include "gexiv2-managed-stream.h" - --#include -+#include - #include - #include - #include -diff --git a/gexiv2/gexiv2-stream-io.h b/gexiv2/gexiv2-stream-io.h -index a26f4e6..bb4cf2d 100644 ---- a/gexiv2/gexiv2-stream-io.h -+++ b/gexiv2/gexiv2-stream-io.h -@@ -16,7 +16,7 @@ - #define GEXIV2_STREAM_IO_H - - #include --#include -+#include - #include - - -@@ -25,7 +25,7 @@ public: - - StreamIo (ManagedStreamCallbacks* cb); - --#if EXIV2_TEST_VERSION(0,26,0) -+#if EXIV2_MAJOR_VERSION >= 1 || (EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION >= 26) - typedef size_t size_type; - #else - typedef long size_type; diff --git a/SPECS/libgexiv2.spec b/libgexiv2.spec similarity index 63% rename from SPECS/libgexiv2.spec rename to libgexiv2.spec index c5d74c3..47d7942 100644 --- a/SPECS/libgexiv2.spec +++ b/libgexiv2.spec @@ -1,33 +1,18 @@ -%if 0%{?rhel} > 7 -# Disable python2 build by default -%bcond_with python2 -%else -%bcond_without python2 -%endif - Name: libgexiv2 -Version: 0.10.8 -Release: 4%{?dist} +Version: 0.14.3 +Release: 3%{?dist} Summary: Gexiv2 is a GObject-based wrapper around the Exiv2 library -License: GPLv2+ +License: GPL-2.0-or-later URL: https://wiki.gnome.org/Projects/gexiv2 -Source0: https://download.gnome.org/sources/gexiv2/0.10/gexiv2-%{version}.tar.xz +Source0: https://download.gnome.org/sources/gexiv2/0.14/gexiv2-%{version}.tar.xz -Patch0: libgexiv2-build-against-exiv-027.patch - -BuildRequires: exiv2-devel +BuildRequires: pkgconfig(exiv2) +BuildRequires: gcc-c++ +BuildRequires: gtk-doc BuildRequires: gobject-introspection-devel -BuildRequires: libtool -%if %{with python2} -BuildRequires: python2-devel -BuildRequires: python2-gobject-base -%endif # with python2 +BuildRequires: meson BuildRequires: vala -%if 0%{?fedora} || 0%{?rhel} > 7 -BuildRequires: python3-devel -BuildRequires: python3-gobject-base -%endif %description libgexiv2 is a GObject-based wrapper around the Exiv2 library. @@ -41,90 +26,170 @@ Requires: %{name}%{?_isa} = %{version}-%{release} The %{name}-devel package contains libraries and header files for developing applications that use %{name}. -%if %{with python2} -%package -n python2-gexiv2 -Summary: Python2 bindings for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: python-gobject-base%{?_isa} -# For upgrade path from F24 -Provides: libgexiv2-python2 = %{name}-%{version} -Obsoletes: libgexiv2-python2 < 0.10.4 - -%description -n python2-gexiv2 -This package contains the python2 bindings for %{name} -%endif # with python2 - -%if 0%{?fedora} || 0%{?rhel} > 7 -%package -n python3-gexiv2 -Summary: Python3 bindings for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: python3-gobject-base%{?_isa} -# For upgrade path from F24 -Provides: libgexiv2-python3 = %{name}-%{version} -Obsoletes: libgexiv2-python3 < 0.10.4 - -%description -n python3-gexiv2 -This package contains the python3 bindings for %{name} -%endif - %prep -%setup -q -n gexiv2-%{version} - -%patch0 -p1 -b .build-against-exiv-027 +%autosetup -p1 -n gexiv2-%{version} %build -%configure --enable-introspection --enable-static=no --enable-shared=yes -%make_build +%meson \ + -Dgtk_doc=true \ + -Dpython3=false \ + -Dtests=true \ + %{nil} +%meson_build %install -%make_install -find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' +%meson_install %check -make check - -%ldconfig_scriptlets +%meson_test %files %license COPYING -%doc AUTHORS THANKS README +%doc AUTHORS NEWS README.md THANKS %{_libdir}/libgexiv2.so.2* +%dir %{_libdir}/girepository-1.0 %{_libdir}/girepository-1.0/GExiv2-0.10.typelib %files devel %{_includedir}/gexiv2/ -%{_datadir}/gir-1.0/GExiv2-0.10.gir %{_libdir}/libgexiv2.so %{_libdir}/pkgconfig/gexiv2.pc +%dir %{_datadir}/gir-1.0 +%{_datadir}/gir-1.0/GExiv2-0.10.gir %dir %{_datadir}/gtk-doc %dir %{_datadir}/gtk-doc/html %{_datadir}/gtk-doc/html/gexiv2/ %dir %{_datadir}/vala %dir %{_datadir}/vala/vapi +%{_datadir}/vala/vapi/gexiv2.deps %{_datadir}/vala/vapi/gexiv2.vapi -%if %{with python2} -%files -n python2-gexiv2 -%{python2_sitearch}/gi/overrides/GExiv2.py* -%endif # with python2 - -%if 0%{?fedora} || 0%{?rhel} > 7 -%files -n python3-gexiv2 -%{python3_sitearch}/gi/overrides/GExiv2.py -%{python3_sitearch}/gi/overrides/__pycache__/GExiv2* -%endif - %changelog -* Tue Oct 29 2019 Tomas Pelka - 0.10.8-4 -- Rebuild again to correctly trigger side-tag gating (exiv2) - Resolves: bz#1757444 +* Tue Oct 29 2024 Troy Dawson - 0.14.3-3 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 -* Tue Oct 15 2019 Jan Grulich - 0.10.8-3 +* Tue Aug 06 2024 Jan Grulich - 0.14.3-2 - Rebuild (exiv2) - Resolves: bz#1757444 +Resolves: RHEL-52972 -* Thu Jun 07 2018 Charalampos Stratakis - 0.10.8-2 -- Conditionalize the python2 subpackage +* Tue Jul 09 2024 Debarshi Ray - 0.14.3-1 +- Update to 0.14.3 +Resolves: RHEL-46522 + +* Tue Jul 09 2024 Debarshi Ray - 0.14.2-5 +- Drop the python3 sub-package +Resolves: RHEL-45529 + +* Mon Jun 24 2024 Troy Dawson - 0.14.2-4 +- Bump release for June 2024 mass rebuild + +* Thu Jan 25 2024 Fedora Release Engineering - 0.14.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 0.14.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jul 24 2023 Kalev Lember - 0.14.2-1 +- Update to 0.14.2 + +* Thu Jul 20 2023 Fedora Release Engineering - 0.14.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jun 15 2023 Python Maint - 0.14.1-2 +- Rebuilt for Python 3.12 + +* Tue May 09 2023 David King - 0.14.1-1 +- Update to 0.14.1 + +* Thu Jan 19 2023 Fedora Release Engineering - 0.14.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 0.14.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 13 2022 Python Maint - 0.14.0-3 +- Rebuilt for Python 3.11 + +* Thu Jan 20 2022 Fedora Release Engineering - 0.14.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Sat Sep 18 2021 Kalev Lember - 0.14.0-1 +- Update to 0.14.0 + +* Mon Aug 16 2021 Kalev Lember - 0.13.0-1 +- Update to 0.13.0 + +* Thu Jul 22 2021 Fedora Release Engineering - 0.12.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 04 2021 Python Maint - 0.12.2-3 +- Rebuilt for Python 3.10 + +* Sat Feb 20 2021 Kalev Lember - 0.12.2-2 +- Remove no longer needed ldconfig_scriptlets macro call +- Remove explicit byte compilation as the automatic works for flatpak builds now + +* Sat Feb 20 2021 Kalev Lember - 0.12.2-1 +- Update to 0.12.2 + +* Tue Jan 26 2021 Fedora Release Engineering - 0.12.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 0.12.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue May 26 2020 Miro Hrončok - 0.12.1-2 +- Rebuilt for Python 3.9 + +* Mon May 25 2020 Kalev Lember - 0.12.1-1 +- Update to 0.12.1 + +* Wed Jan 29 2020 Fedora Release Engineering - 0.12.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Oct 03 2019 Miro Hrončok - 0.12.0-4 +- Rebuilt for Python 3.8.0rc1 (#1748018) + +* Mon Aug 19 2019 Miro Hrončok - 0.12.0-3 +- Rebuilt for Python 3.8 + +* Thu Jul 25 2019 Fedora Release Engineering - 0.12.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Mon Mar 11 2019 Kalev Lember - 0.12.0-1 +- Update to 0.12.0 + +* Fri Feb 01 2019 Fedora Release Engineering - 0.11.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Wed Jan 30 2019 Rex Dieter - 0.11.0-3 +- rebuild (exiv2) + +* Tue Jan 15 2019 Miro Hrončok - 0.11.0-2 +- Subpackage python2-gexiv2 has been removed + See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal + +* Tue Jan 08 2019 Kalev Lember - 0.11.0-1 +- Update to 0.11.0 + +* Tue Jan 01 2019 Kalev Lember - 0.10.10-1 +- Update to 0.10.10 +- Co-own gir directories + +* Sun Nov 18 2018 Kalev Lember - 0.10.9-1 +- Update to 0.10.9 +- Switch to the meson build system + +* Fri Jul 13 2018 Fedora Release Engineering - 0.10.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jun 19 2018 Miro Hrončok - 0.10.8-3 +- Rebuilt for Python 3.7 + +* Tue Feb 20 2018 Iryna Shcherbina - 0.10.8-2 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) * Tue Feb 06 2018 Kalev Lember - 0.10.8-1 - Update to 0.10.8 diff --git a/sources b/sources new file mode 100644 index 0000000..a4cfcee --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (gexiv2-0.14.3.tar.xz) = 24c97fa09b9ee32cb98da4637ea78eb72ae7e2d1792f9ebb31d63e305b3e0e1f6935b8647589c76c39ba631a15c1d8d2f3879c7dff81433786e9533b6348b6a0