4 changed files with 97 additions and 52 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,8 +1,2 @@
-/colord-gtk-0.1.22.tar.xz
-/colord-gtk-0.1.23.tar.xz
-/colord-gtk-0.1.24.tar.xz
-/colord-gtk-0.1.25.tar.xz
+SOURCES/colord-gtk-0.1.26.tar.xz
 /colord-gtk-0.1.26.tar.xz
-/colord-gtk-0.2.0.tar.xz
-/colord-gtk-0.3.0.tar.xz
-/colord-gtk-0.3.1.tar.xz
--- a/colord-gtk.spec
+++ b/colord-gtk.spec
@ -1,21 +1,20 @@
-Summary:   GTK+ 3 support library for colord
+Summary:   GTK support library for colord
 Name:      colord-gtk
-Version:   0.3.1
-Release:   %autorelease
-License:   LGPL-2.1-or-later
+Version:   0.1.26
+Release:   8%{?dist}
+License:   LGPLv2+
 URL:       http://www.freedesktop.org/software/colord/
 Source0:   http://www.freedesktop.org/software/colord/releases/%{name}-%{version}.tar.xz

-BuildRequires: meson
-BuildRequires: docbook5-style-xsl
-BuildRequires: gettext >= 0.19.8
+BuildRequires: docbook-utils
+BuildRequires: gettext
 BuildRequires: glib2-devel
 BuildRequires: colord-devel >= 0.1.23
+BuildRequires: intltool
 BuildRequires: lcms2-devel >= 2.2
 BuildRequires: gobject-introspection-devel
-BuildRequires: vala
+BuildRequires: vala-tools
 BuildRequires: gtk3-devel
-BuildRequires: gtk4-devel
 BuildRequires: gtk-doc

 %description
@ -29,30 +28,25 @@ 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
-%autosetup -p1
+%setup -q

 %build
-%meson -Ddocs=true -Dgtk2=false -Dman=true -Dtests=false -Dvapi=true
-%meson_build
+%configure \
+        --disable-gtk-doc \
+        --enable-vala \
+        --disable-static \
+        --disable-rpath \
+        --disable-dependency-tracking
+
+make %{?_smp_mflags}

 %install
-%meson_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 {} ';'

 %find_lang %{name}

@ -61,13 +55,10 @@ Files for GTK 4 development with %{name}4.
 %files -f %{name}.lang
 %doc README AUTHORS NEWS COPYING
 %{_bindir}/*
-%{_mandir}/man1/*.1*
+%{_mandir}/man1/*.1.gz
 %{_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
@ -77,17 +68,77 @@ Files for GTK 4 development with %{name}4.
 %{_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
-%{_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.
-
+#%dir %{_datadir}/gtk-doc
+#%dir %{_datadir}/gtk-doc/html

 %changelog
-%autochangelog
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.26-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Sun Feb 04 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.1.26-7
+- Switch to %%ldconfig_scriptlets
+
+* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.26-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.26-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.26-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.26-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.26-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Tue Dec 02 2014 Richard Hughes <richard@hughsie.com> 0.1.26-1
+- New upstream version.
+- Install the cd-convert utility
+- Do not link against the unused gio-unix-2.0
+
+* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.25-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Tue Jul 22 2014 Kalev Lember <kalevlember@gmail.com> - 0.1.25-4
+- Rebuilt for gobject-introspection 1.41.4
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.25-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Tue Jul 30 2013 Richard Hughes <rhughes@redhat.com> - 0.1.25-2
+- Rebuild for colord soname bump
+
+* Tue Mar 19 2013 Richard Hughes <richard@hughsie.com> 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 <rel-eng@lists.fedoraproject.org> - 0.1.24-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Mon Dec 17 2012 Richard Hughes <richard@hughsie.com> 0.1.24-1
+- New upstream version.
+
+* Wed Aug 29 2012 Richard Hughes <richard@hughsie.com> 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 <rel-eng@lists.fedoraproject.org> - 0.1.22-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Wed Jun 27 2012 Richard Hughes <richard@hughsie.com> 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 <richard@hughsie.com> 0.1.22-1
+- New version after Fedora package review.
+
+* Mon Jun 18 2012 Richard Hughes <richard@hughsie.com> 0.1.1-1
+- Initial version for Fedora package review.
--- a/gating.yaml
+++ b/gating.yaml
@ -1,6 +1,6 @@
 --- !Policy
 product_versions:
-  - rhel-10
+  - rhel-8
 decision_context: osci_compose_gate
 rules:
  - !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (colord-gtk-0.3.1.tar.xz) = d8ac4e6f32a0672cd4e87585a03e82ecfc359ae4b99a4a6529ad81025f9beec5a3b479e94dff9a7e49db03e99671099b7f8370f6f87791e5a9fc008da859b238
+SHA512 (colord-gtk-0.1.26.tar.xz) = 14f59110e2bc100c542323a68566102e9fb5ab44b679da21bf29101960dae38e646e926d884e14f1838a5991e6ebe15af72d5338723265868eadd5f026545c3d