From df2151b2f58350b718223269590956cc32f4505c Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 20 Nov 2024 13:10:45 +0000 Subject: [PATCH] import RHEL 10 Beta colord-gtk-0.3.1-2.el10 --- .gitignore | 3 +- colord-gtk.spec | 196 ++++++++++++++++++++++++++++++++++++------------ gating.yaml | 6 -- sources | 2 +- 4 files changed, 149 insertions(+), 58 deletions(-) delete mode 100644 gating.yaml diff --git a/.gitignore b/.gitignore index 64c5608..2cd537f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -SOURCES/colord-gtk-0.1.26.tar.xz -/colord-gtk-0.1.26.tar.xz +colord-gtk-0.3.1.tar.xz diff --git a/colord-gtk.spec b/colord-gtk.spec index 6ff7201..cc9a737 100644 --- a/colord-gtk.spec +++ b/colord-gtk.spec @@ -1,20 +1,31 @@ -Summary: GTK support library for colord +## START: Set by rpmautospec +## (rpmautospec version 0.6.1) +## RPMAUTOSPEC: autorelease, autochangelog +%define autorelease(e:s:pb:n) %{?-p:0.}%{lua: + release_number = 2; + base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); + print(release_number + base_release_number - 1); +}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} +## END: Set by rpmautospec + +Summary: GTK+ 3 support library for colord Name: colord-gtk -Version: 0.1.26 -Release: 8%{?dist} -License: LGPLv2+ +Version: 0.3.1 +Release: %autorelease +License: LGPL-2.1-or-later URL: http://www.freedesktop.org/software/colord/ Source0: http://www.freedesktop.org/software/colord/releases/%{name}-%{version}.tar.xz -BuildRequires: docbook-utils -BuildRequires: gettext +BuildRequires: meson +BuildRequires: docbook5-style-xsl +BuildRequires: gettext >= 0.19.8 BuildRequires: glib2-devel BuildRequires: colord-devel >= 0.1.23 -BuildRequires: intltool BuildRequires: lcms2-devel >= 2.2 BuildRequires: gobject-introspection-devel -BuildRequires: vala-tools +BuildRequires: vala BuildRequires: gtk3-devel +BuildRequires: gtk4-devel BuildRequires: gtk-doc %description @@ -28,25 +39,30 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description devel Files for development with %{name}. +%package -n colord-gtk4 +Summary: GTK 4 support library for colord + +%description -n colord-gtk4 +colord-gtk is a support library for colord and provides additional +functionality that requires GTK. This package contains the GTK 4 +build of colord-gtk. + +%package -n colord-gtk4-devel +Summary: Development package for colord-gtk4 +Requires: %{name}-devel%{?_isa} = %{version}-%{release} + +%description -n colord-gtk4-devel +Files for GTK 4 development with %{name}4. + %prep -%setup -q +%autosetup -p1 %build -%configure \ - --disable-gtk-doc \ - --enable-vala \ - --disable-static \ - --disable-rpath \ - --disable-dependency-tracking - -make %{?_smp_mflags} +%meson -Ddocs=true -Dgtk2=false -Dman=true -Dtests=false -Dvapi=true +%meson_build %install -make install DESTDIR=$RPM_BUILD_ROOT - -# Remove static libs and libtool archives. -find %{buildroot} -name '*.la' -exec rm -f {} ';' -find %{buildroot} -name '*.a' -exec rm -f {} ';' +%meson_install %find_lang %{name} @@ -55,10 +71,13 @@ find %{buildroot} -name '*.a' -exec rm -f {} ';' %files -f %{name}.lang %doc README AUTHORS NEWS COPYING %{_bindir}/* -%{_mandir}/man1/*.1.gz +%{_mandir}/man1/*.1* %{_libdir}/libcolord-gtk.so.* %{_libdir}/girepository-1.0/ColordGtk-1.0.typelib +%files -n colord-gtk4 +%{_libdir}/libcolord-gtk4.so.* + %files devel %{_libdir}/libcolord-gtk.so %{_libdir}/pkgconfig/colord-gtk.pc @@ -68,12 +87,92 @@ find %{buildroot} -name '*.a' -exec rm -f {} ';' %{_includedir}/colord-1/colord-gtk/*.h %dir %{_datadir}/gir-1.0 %{_datadir}/gir-1.0/ColordGtk-1.0.gir -#%doc %{_datadir}/gtk-doc/html/colord-gtk +%doc %{_datadir}/gtk-doc/html/colord-gtk %{_datadir}/vala/vapi/colord-gtk.vapi -#%dir %{_datadir}/gtk-doc -#%dir %{_datadir}/gtk-doc/html +%{_datadir}/vala/vapi/colord-gtk.deps +%dir %{_datadir}/gtk-doc +%dir %{_datadir}/gtk-doc/html + +%files -n colord-gtk4-devel +%{_libdir}/libcolord-gtk4.so +%{_libdir}/pkgconfig/colord-gtk4.pc +# Requires the base -devel package for headers. No GTK 4 .gir nor VAPI yet. + %changelog +## START: Generated by rpmautospec +* Mon Jun 24 2024 Troy Dawson - 0.3.1-2 +- Bump release for June 2024 mass rebuild + +* Thu Jan 25 2024 Richard Hughes - 0.3.1-1 +- New upstream version + +* Wed Jan 24 2024 Fedora Release Engineering - 0.3.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 0.3.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Jul 19 2023 Fedora Release Engineering - 0.3.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Feb 22 2023 Richard Hughes - 0.3.0-4 +- migrated to SPDX license + +* Thu Jan 19 2023 Fedora Release Engineering - 0.3.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Jul 20 2022 Fedora Release Engineering - 0.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Feb 16 2022 Richard Hughes - 0.3.0-1 +- New upstream version + +* Wed Feb 16 2022 David King - 0.2.0-12 +- Slim down the gtk4 subpackages + +* Wed Feb 16 2022 Adam Williamson - 0.2.0-11 +- Add the GTK+ 4 build + +* Wed Jan 19 2022 Fedora Release Engineering - 0.2.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Mon Aug 23 2021 Kalev Lember - 0.2.0-9 +- BR vala instead of vala-tools + +* Wed Jul 21 2021 Fedora Release Engineering - 0.2.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 0.2.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 0.2.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 0.2.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jan 28 2020 Fedora Release Engineering - 0.2.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Jul 24 2019 Fedora Release Engineering - 0.2.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Wed Jul 17 2019 Kalev Lember - 0.2.0-2 +- Don't hardcode man page extension + +* Thu Jun 20 2019 Richard Hughes - 0.2.0-1 +- New upstream version + +* Mon Feb 04 2019 Kalev Lember - 0.1.26-11 +- Update BRs for vala packaging changes + +* Thu Jan 31 2019 Fedora Release Engineering - 0.1.26-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jul 12 2018 Fedora Release Engineering - 0.1.26-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 0.1.26-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild @@ -81,7 +180,8 @@ find %{buildroot} -name '*.a' -exec rm -f {} ';' - Switch to %%ldconfig_scriptlets * Wed Aug 02 2017 Fedora Release Engineering - 0.1.26-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild +- Rebuilt for + https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild * Wed Jul 26 2017 Fedora Release Engineering - 0.1.26-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild @@ -89,56 +189,54 @@ find %{buildroot} -name '*.a' -exec rm -f {} ';' * Fri Feb 10 2017 Fedora Release Engineering - 0.1.26-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild -* Wed Feb 03 2016 Fedora Release Engineering - 0.1.26-3 +* Wed Feb 03 2016 Dennis Gilmore - 0.1.26-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild -* Wed Jun 17 2015 Fedora Release Engineering - 0.1.26-2 +* Wed Jun 17 2015 Dennis Gilmore - 0.1.26-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild -* Tue Dec 02 2014 Richard Hughes 0.1.26-1 -- New upstream version. -- Install the cd-convert utility -- Do not link against the unused gio-unix-2.0 +* Tue Dec 02 2014 Richard Hughes - 0.1.26-1 +- New upstream version -* Sat Aug 16 2014 Fedora Release Engineering - 0.1.25-5 +* Sat Aug 16 2014 Peter Robinson - 0.1.25-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild -* Tue Jul 22 2014 Kalev Lember - 0.1.25-4 +* Tue Jul 22 2014 Kalev Lember - 0.1.25-5 - Rebuilt for gobject-introspection 1.41.4 -* Sat Jun 07 2014 Fedora Release Engineering - 0.1.25-3 +* Sat Jun 07 2014 Dennis Gilmore - 0.1.25-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild -* Tue Jul 30 2013 Richard Hughes - 0.1.25-2 +* Tue Jul 30 2013 Richard Hughes - 0.1.25-3 - Rebuild for colord soname bump -* Tue Mar 19 2013 Richard Hughes 0.1.25-1 +* Tue Mar 19 2013 Richard Hughes - 0.1.25-2 +- Actually upload the tarball... + +* Tue Mar 19 2013 Richard Hughes - 0.1.25-1 - New upstream version. - Give the sample widget slightly curved corners and a gray outline - Do not use deprecated functions from libcolord - Fix warnings when building ColordGtk-1.0.gir - Fix up the licence boilerplate for CdSampleWidget -* Wed Feb 13 2013 Fedora Release Engineering - 0.1.24-2 +* Wed Feb 13 2013 Dennis Gilmore - 0.1.24-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild -* Mon Dec 17 2012 Richard Hughes 0.1.24-1 +* Mon Dec 17 2012 Richard Hughes - 0.1.24-1 - New upstream version. -* Wed Aug 29 2012 Richard Hughes 0.1.23-1 +* Wed Aug 29 2012 Richard Hughes - 0.1.23-1 - New upstream version. - Remove upstreamed patch - Add include guards to cd-sample-window.h -* Wed Jul 18 2012 Fedora Release Engineering - 0.1.22-3 +* Wed Jul 18 2012 Dennis Gilmore - 0.1.22-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild -* Wed Jun 27 2012 Richard Hughes 0.1.22-2 +* Wed Jun 27 2012 Richard Hughes - 0.1.22-2 - Backport a patch from git master that fixes an include issue with - projects that want to use colord-gtk.h and colord.h at the same time. -* Tue Jun 26 2012 Richard Hughes 0.1.22-1 -- New version after Fedora package review. - -* Mon Jun 18 2012 Richard Hughes 0.1.1-1 -- Initial version for Fedora package review. +* Wed Jun 27 2012 Richard Hughes - 0.1.22-1 +- Initial package version +## END: Generated by rpmautospec 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/sources b/sources index a9aaab7..b34f953 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (colord-gtk-0.1.26.tar.xz) = 14f59110e2bc100c542323a68566102e9fb5ab44b679da21bf29101960dae38e646e926d884e14f1838a5991e6ebe15af72d5338723265868eadd5f026545c3d +SHA512 (colord-gtk-0.3.1.tar.xz) = d8ac4e6f32a0672cd4e87585a03e82ecfc359ae4b99a4a6529ad81025f9beec5a3b479e94dff9a7e49db03e99671099b7f8370f6f87791e5a9fc008da859b238