Compare commits

..

No commits in common. "rawhide" and "f38" have entirely different histories.

4 changed files with 56 additions and 105 deletions

8
.gitignore vendored
View file

@ -10,11 +10,3 @@
/AppStream-0.15.4.tar.xz
/AppStream-0.15.5.tar.xz
/AppStream-0.16.1.tar.xz
/appstream-d88ed03cb5b3b1803bdee3528c9b99d528ceb065.tar.gz
/AppStream-1.0.0.tar.xz
/AppStream-1.0.1.tar.xz
/AppStream-1.0.2.tar.xz
/AppStream-1.0.4.tar.xz
/AppStream-1.0.5.tar.xz
/AppStream-1.0.6.tar.xz
/AppStream-1.1.0.tar.xz

View file

@ -1,57 +1,62 @@
%bcond stemming %{undefined rhel}
# Enable Qt by default
%bcond qt 1
# Vala/Vapi support ( upstream disabled by default, probably explains why it the build breaks often )
%global vala 1
Summary: Utilities to generate, maintain and access the AppStream database
Name: appstream
Version: 1.1.0
Release: 2%{?dist}
Version: 0.16.1
Release: 1%{?dist}
# lib LGPLv2+, tools GPLv2+
License: GPL-2.0-or-later AND LGPL-2.1-or-later
License: GPLv2+ and LGPLv2+
#URL: http://www.freedesktop.org/wiki/Distributions/AppStream
URL: https://github.com/ximion/appstream
Source0: https://www.freedesktop.org/software/appstream/releases/AppStream-%{version}.tar.xz
Source0: http://www.freedesktop.org/software/appstream/releases/AppStream-%{version}.tar.xz
# upstream patches
# upstreamable patches
## upstream patches (lookaside cache)
## upstreamable patches
# needed for cmake auto-provides
BuildRequires: cmake
BuildRequires: meson >= 0.62
BuildRequires: gettext
BuildRequires: git-core
BuildRequires: gperf
BuildRequires: gtk-doc
BuildRequires: intltool
BuildRequires: itstool
%if %{with stemming}
BuildRequires: libstemmer-devel
%endif
BuildRequires: pkgconfig(cairo)
BuildRequires: pkgconfig(freetype2)
BuildRequires: pkgconfig(fontconfig)
BuildRequires: pkgconfig(gdk-pixbuf-2.0)
BuildRequires: pkgconfig(gi-docgen) >= 2021.1
BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(libfyaml)
BuildRequires: pkgconfig(libsoup-2.4)
BuildRequires: pkgconfig(librsvg-2.0)
BuildRequires: pkgconfig(libsystemd)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(libzstd)
BuildRequires: pkgconfig(lmdb)
BuildRequires: pkgconfig(packagekit-glib2)
BuildRequires: pkgconfig(pango)
BuildRequires: pkgconfig(Qt6Core) >= 6.2.4
BuildRequires: pkgconfig(xmlb) >= 0.3.14
BuildRequires: pkgconfig(protobuf-lite)
%if %{with qt}
BuildRequires: pkgconfig(Qt5Core)
%endif
BuildRequires: pkgconfig(xmlb)
BuildRequires: pkgconfig(yaml-0.1)
# lrelease
BuildRequires: qt6-linguist
%if %{with qt}
BuildRequires: qt5-linguist
%endif
BuildRequires: sed
BuildRequires: vala
BuildRequires: xmlto
Requires: (appstream-data if PackageKit)
Requires: appstream-data
%description
AppStream makes it easy to access application information from the
@ -79,8 +84,9 @@ Requires: %{name}-devel%{?_isa} = %{version}-%{release}
%description compose-devel
%{summary}.
%if %{with qt}
%package qt
Summary: Qt6 bindings for %{name}
Summary: Qt5 bindings for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
%description qt
%{summary}.
@ -88,21 +94,23 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%package qt-devel
Summary: Development files for %{name}-qt bindings
Requires: %{name}-qt%{?_isa} = %{version}-%{release}
Requires: pkgconfig(Qt6Core) >= 6.2.4
Requires: pkgconfig(Qt5Core)
%description qt-devel
%{summary}.
%endif
%prep
%autosetup -n AppStream-%{version} -S git_am
%autosetup -n AppStream-%{version} -p1
%build
%{meson} \
-Dcompose=true \
%if %{with qt}
-Dqt=true \
-Dstemming=%{?with_stemming:true}%{!?with_stemming:false} \
-Dvapi=true
%endif
-Dvapi=%{?vala:true}%{!?vala:false}
%{meson_build}
@ -110,8 +118,8 @@ Requires: pkgconfig(Qt6Core) >= 6.2.4
%install
%{meson_install}
mkdir -p %{buildroot}/var/cache/swcatalog/{icons,gv,xml}
touch %{buildroot}/var/cache/swcatalog/cache.watch
mkdir -p %{buildroot}/var/cache/app-info/{icons,gv,xmls}
touch %{buildroot}/var/cache/app-info/cache.watch
%find_lang appstream
@ -127,13 +135,15 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \
%{meson_test} ||:
%ldconfig_scriptlets
%posttrans
%{_bindir}/appstreamcli refresh --force >& /dev/null ||:
%transfiletriggerin -- %{_datadir}/swcatalog/xml
%transfiletriggerin -- %{_datadir}/app-info/xmls
%{_bindir}/appstreamcli refresh --force >& /dev/null ||:
%transfiletriggerpostun -- %{_datadir}/swcatalog/xml
%transfiletriggerpostun -- %{_datadir}/app-info/xmls
%{_bindir}/appstreamcli refresh --force >& /dev/null ||:
%files -f appstream.lang
@ -141,19 +151,19 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \
%license COPYING
%{_bindir}/appstreamcli
%{_mandir}/man1/appstreamcli.1*
%{_datadir}/appstream/
%config(noreplace) %{_sysconfdir}/appstream.conf
%dir %{_libdir}/girepository-1.0/
%{_libdir}/girepository-1.0/AppStream-1.0.typelib
%{_libdir}/libappstream.so.5
%{_libdir}/libappstream.so.4*
%{_libdir}/libappstream.so.%{version}
%{_metainfodir}/org.freedesktop.appstream.cli.*.xml
# put in -devel? -- rex
%{_datadir}/gettext/its/metainfo.*
%ghost /var/cache/swcatalog/cache.watch
%dir /var/cache/swcatalog/
%dir /var/cache/swcatalog/icons/
%dir /var/cache/swcatalog/gv/
%dir /var/cache/swcatalog/xml/
%ghost /var/cache/app-info/cache.watch
%dir /var/cache/app-info/
%dir /var/cache/app-info/icons/
%dir /var/cache/app-info/gv/
%dir /var/cache/app-info/xmls/
%files devel
%{_includedir}/appstream/
@ -161,10 +171,12 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \
%{_libdir}/pkgconfig/appstream.pc
%dir %{_datadir}/gir-1.0/
%{_datadir}/gir-1.0/AppStream-1.0.gir
%if 0%{?vala}
%dir %{_datadir}/vala
%dir %{_datadir}/vala/vapi
%{_datadir}/vala/vapi/appstream.deps
%{_datadir}/vala/vapi/appstream.vapi
%endif
%{_docdir}/appstream/html/
## symlink pointing to ^^, but need to take care, since rpm has
## trouble replacing dirs with symlinks, omit it for now -- rex
@ -172,10 +184,12 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \
# Maybe this should be split out? -- ngompa
%{_datadir}/installed-tests/appstream/metainfo-validate.test
%ldconfig_scriptlets compose
%files compose
%{_libexecdir}/appstreamcli-compose
%{_mandir}/man1/appstreamcli-compose.1*
%{_libdir}/libappstream-compose.so.0
%{_libdir}/libappstream-compose.so.0*
%{_libdir}/libappstream-compose.so.%{version}
%{_libdir}/girepository-1.0/AppStreamCompose-1.0.typelib
%{_metainfodir}/org.freedesktop.appstream.compose.metainfo.xml
@ -189,76 +203,21 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \
%dir %{_datadir}/gtk-doc/html/
%{_datadir}/gtk-doc/html/appstream-compose
%if %{with qt}
%ldconfig_scriptlets qt
%files qt
%{_libdir}/libAppStreamQt.so.3
%{_libdir}/libAppStreamQt.so.2*
%{_libdir}/libAppStreamQt.so.%{version}
%files qt-devel
%{_includedir}/AppStreamQt/
%{_libdir}/cmake/AppStreamQt/
%{_libdir}/libAppStreamQt.so
%endif
%changelog
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Fri Sep 26 2025 Neal Gompa <ngompa@fedoraproject.org> - 1.1.0-1
- Update to 1.1.0
* Mon Aug 18 2025 Marc-André Lureau <marcandre.lureau@redhat.com> - 1.0.6-1
- rebuilt
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Fri Mar 14 2025 Shawn W. Dunn <sfalken@cloverleaf-linux.org> - 1.0.4-2
- Change appstream-data to a conditional Requires:
* Sun Jan 19 2025 Pavel Solovev <daron439@gmail.com> - 1.0.4-1
- Update to 1.0.4
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Fri Jul 05 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 1.0.2-3
- Disable stemming support on RHEL
* Sat Mar 09 2024 Alessandro Astone <ales.astone@gmail.com> - 1.0.2-2
- Backport patch to fix installing swcatalog
* Sun Feb 25 2024 Neal Gompa <ngompa@fedoraproject.org> - 1.0.2-1
- Update to 1.0.2
- Clean up some pre-1.0 scriptlet cruft
* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Jan 03 2024 Steve Cossette <farchord@gmail.com> - 1.0.1-1
- Update to 1.0.1
* Fri Nov 17 2023 Neal Gompa <ngompa@fedoraproject.org> - 1.0.0-1
- Update to 1.0.0 final
* Thu Nov 02 2023 Neal Gompa <ngompa@fedoraproject.org> - 1.0.0~git20231102.d88ed03-1
- Rebase to 1.0.0 git snapshot
* Mon Aug 21 2023 Parag Nemade <pnemade AT fedoraproject DOT org> - 0.16.1-4
- Migrate to SPDX license expression
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.16.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Mon Jun 19 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 0.16.1-2
- Disable Qt5 in RHEL 10 builds
- Remove obsolete BuildRequires
* Sat Feb 11 2023 Neal Gompa <ngompa@fedoraproject.org> - 0.16.1-1
- Update to 0.16.1

View file

@ -1 +1 @@
SHA512 (AppStream-1.1.0.tar.xz) = d775f3e1ed22cdedcdc12e103a35752f2cbb1700deb03118600a83a3fbf1489f34d62c833f5fc0279f40d9d8066a6cb2e6be358844adc366809777c5061c2342
SHA512 (AppStream-0.16.1.tar.xz) = 79e139bd0f54534aa37c21d24309c33ee936e737149d6fa5ba0ec50e8ade33c2951d0b1e2ff15729e2a4d274ff1f7ca734bb70efa94539d87a3f949a07fb7d9e

View file

@ -35,7 +35,7 @@ class TestAppstream(unittest.TestCase):
'Homepage: https://mike-fabian.github.io/ibus-typing-booster/'
in output_lines)
self.assertTrue(
'Icon: org.freedesktop.ibus.engine.typing_booster.emoji_picker.png'
'Icon: ibus-typing-booster.png'
in output_lines)
# This section not always there, better dont test for this:
# self.assertTrue(