diff --git a/.gitignore b/.gitignore index 29c11d6..7b94222 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -SOURCES/libiptcdata-1.0.4.tar.gz -/libiptcdata-1.0.4.tar.gz +libiptcdata-1.0.5.tar.gz diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index ea86f9d..0000000 --- a/gating.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- !Policy -product_versions: - - rhel-8 -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional} diff --git a/libiptcdata.spec b/libiptcdata.spec index fa3446b..21d8c3f 100644 --- a/libiptcdata.spec +++ b/libiptcdata.spec @@ -1,23 +1,30 @@ -%if 0%{?rhel} <= 5 -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} +%global python_support 1 + +%if 0%{?rhel} && 0%{?rhel} >= 10 +%global python_support 0 %endif Name: libiptcdata -Version: 1.0.4 -Release: 21%{?dist} +Version: 1.0.5 +Release: 20%{?dist} Summary: IPTC tag library -Group: Development/Libraries -License: LGPLv2+ -URL: http://libiptcdata.sourceforge.net/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: gettext -BuildRequires: gettext-devel -BuildRequires: libtool -BuildRequires: gtk-doc +License: LGPL-2.0-only +URL: https://github.com/ianw/%{name} +Source0: https://github.com/ianw/%{name}/releases/download/%{name}-%{version}.tar.gz + +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: gcc +BuildRequires: gettext +BuildRequires: gettext-devel +BuildRequires: libtool +BuildRequires: gtk-doc +%if 0%{?python_support} +BuildRequires: python3-devel +BuildRequires: python3-setuptools +%endif + %description libiptcdata is a library for parsing, editing, and saving IPTC data @@ -26,93 +33,151 @@ as captions, titles, locations, etc. in the headers of an image file. libiptcdata also includes a command-line utility for modifying the metadata. -%package devel -Summary: Headers and libraries for libiptcdata application development -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: pkgconfig +%if 0%{?python_support} +%package -n python3-%{name} +Summary: Python bindings for libiptcdata +Requires: %{name}%{?_isa} = %{version}-%{release} +BuildRequires: python3-devel +BuildRequires: make -%description devel -The libiptcdata-devel package contains the libraries and include files -that you can use to develop libiptcdata applications. - -%if 0%{?rhel} <= 7 -%package -n python2-libiptcdata -%{?python_provide:%python_provide python2-libiptcdata} -# Remove before F30 -Provides: %{name}-python = %{version}-%{release} -Provides: %{name}-python%{?_isa} = %{version}-%{release} -Obsoletes: %{name}-python < %{version}-%{release} -Summary: Python bindings for libiptcdata -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -BuildRequires: python-devel - -%description -n python2-libiptcdata +%description -n python3-%{name} The libiptcdata-python package contains a Python module that allows Python applications to use the libiptcdata API for reading and writing IPTC metadata in images. %endif +%package devel +Summary: Headers and libraries for libiptcdata application development +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: pkgconfig + +%description devel +The libiptcdata-devel package contains the libraries and include files +that you can use to develop libiptcdata applications. + + %prep -%setup -q +%autosetup # fix compatibility with gtk-doc 1.26 -for f in libiptcdata/*.{c,h} ; do - iconv -f ISO-8859-1 -t utf8 -o $f.utf8 $f && mv $f.utf8 $f -done gtkdocize autoreconf -fiv + %build -%configure --enable-gtk-doc --disable-static \ -%if 0%{?rhel} <= 7 - --enable-python +%if 0%{?python_support} +export PYTHON_VERSION=%python3_version +%configure --enable-gtk-doc --enable-python --disable-static %else - --disable-python +%configure --enable-gtk-doc --disable-python --disable-static %endif -make %{?_smp_mflags} + +%make_build + %install -rm -rf $RPM_BUILD_ROOT -make DESTDIR=%{buildroot} INSTALL="%{__install} -c -p" install -rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}.la -%if 0%{?rhel} <= 7 -rm -f $RPM_BUILD_ROOT%{python_sitearch}/iptcdata.la -%endif +%make_install +find %{buildroot} -name "*.la" -exec rm -f {} \; %find_lang %{name} --all-name -%clean -rm -rf $RPM_BUILD_ROOT - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig %files -f %{name}.lang -%defattr(-,root,root) -%doc AUTHORS COPYING ChangeLog NEWS README TODO +%doc AUTHORS ChangeLog NEWS README TODO +%license COPYING %{_bindir}/* %{_libdir}/lib*.so.* +%if 0%{?python_support} +%files -n python3-%{name} +%doc python/README +%doc python/examples/* +%{python3_sitearch}/*.so +%endif + %files devel -%defattr(-,root,root) %{_libdir}/lib*.so %{_libdir}/pkgconfig/*.pc %{_includedir}/libiptcdata %{_datadir}/gtk-doc/html/libiptcdata -%if 0%{?rhel} <= 7 -%files -n python2-libiptcdata -%defattr(-,root,root) -%doc python/README -%doc python/examples/* -%{python_sitearch}/*.so -%endif %changelog -* Thu Jun 14 2018 Troy Dawson - 1.0.4-21 -- No python2 in RHEL > 7 (#1580764) -- fix compatibility with gtk-doc 1.26 (#1580764) +* Tue Oct 29 2024 Troy Dawson - 1.0.5-20 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Mon Aug 05 2024 Tomas Popela - 1.0.5-19 +- Disable python support. This package is only in RHEL 10, because + tracker-miners requires it and it doesn't need the Python bits. +- Resolves: RHEL-52843 + +* Mon Jun 24 2024 Troy Dawson - 1.0.5-18 +- Bump release for June 2024 mass rebuild + +* Thu Jan 25 2024 Fedora Release Engineering - 1.0.5-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 1.0.5-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 1.0.5-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jun 14 2023 Python Maint - 1.0.5-14 +- Rebuilt for Python 3.12 + +* Thu Jan 19 2023 Fedora Release Engineering - 1.0.5-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 1.0.5-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 13 2022 Python Maint - 1.0.5-11 +- Rebuilt for Python 3.11 + +* Thu Jan 20 2022 Fedora Release Engineering - 1.0.5-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 1.0.5-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 04 2021 Python Maint - 1.0.5-8 +- Rebuilt for Python 3.10 + +* Tue Jan 26 2021 Fedora Release Engineering - 1.0.5-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 1.0.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue May 26 2020 Miro Hrončok - 1.0.5-5 +- Rebuilt for Python 3.9 + +* Wed Jan 29 2020 Fedora Release Engineering - 1.0.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Aug 19 2019 Miro Hrončok - 1.0.5-3 +- Rebuilt for Python 3.8 + +* Thu Jul 25 2019 Fedora Release Engineering - 1.0.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue Apr 16 2019 Richard Shaw - 1.0.5-1 +- Update to 1.0.5. +- Modernize spec file. +- Enable python3 package. + +* Fri Jan 04 2019 Miro Hrončok - 1.0.4-24 +- Remove the Python 2 subpackage (#1628188) + +* Fri Jul 13 2018 Fedora Release Engineering - 1.0.4-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Mar 26 2018 Iryna Shcherbina - 1.0.4-22 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + +* Wed Feb 07 2018 Fedora Release Engineering - 1.0.4-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild * Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek - 1.0.4-20 - Add Provides for the old name without %%_isa diff --git a/sources b/sources index 6098e2d..c360145 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libiptcdata-1.0.4.tar.gz) = 8656b2febaec133d1a8783252047672bebd58ae9ceab5477c4acfa35bcc381dfda08b655a957b962878af28c69deff77d920e780c84b4debdff2f980b3de94e8 +SHA512 (libiptcdata-1.0.5.tar.gz) = 64ef44b1e639890004f31d5d42844ba25ed558f0a118f1dad9bc3f4dcad2457e51b825a13df849659b0e15afc78f528f330b03be94cdf156bd95b62dc419494a