Rebase to 1.0.0 git snapshot

This commit is contained in:
Neal Gompa 2023-11-02 21:22:14 -04:00
parent 3afecb931b
commit 51384dca25
3 changed files with 39 additions and 50 deletions

1
.gitignore vendored
View File

@ -10,3 +10,4 @@
/AppStream-0.15.4.tar.xz
/AppStream-0.15.5.tar.xz
/AppStream-0.16.1.tar.xz
/appstream-d88ed03cb5b3b1803bdee3528c9b99d528ceb065.tar.gz

View File

@ -1,19 +1,19 @@
# Enable Qt5 by default
%bcond qt %[%{undefined rhel} || 0%{?rhel} < 10]
# Vala/Vapi support ( upstream disabled by default, probably explains why it the build breaks often )
%global vala 1
%global basever 1.0.0
%global commit d88ed03cb5b3b1803bdee3528c9b99d528ceb065
%global commitdate 20231102
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Summary: Utilities to generate, maintain and access the AppStream database
Name: appstream
Version: 0.16.1
Release: 4%{?dist}
Version: %{basever}%{?commitdate:~git%{commitdate}.%{shortcommit}}
Release: 1%{?dist}
# lib LGPLv2+, tools GPLv2+
License: GPL-2.0-or-later AND LGPL-2.1-or-later
#URL: http://www.freedesktop.org/wiki/Distributions/AppStream
URL: https://github.com/ximion/appstream
Source0: http://www.freedesktop.org/software/appstream/releases/AppStream-%{version}.tar.xz
Source0: %{url}/archive/%{commit}/%{name}-%{commit}.tar.gz
%dnl Source0: http://www.freedesktop.org/software/appstream/releases/AppStream-%{version}.tar.xz
## upstream patches (lookaside cache)
@ -32,6 +32,7 @@ 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)
@ -39,15 +40,11 @@ BuildRequires: pkgconfig(librsvg-2.0)
BuildRequires: pkgconfig(libsystemd)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(pango)
%if %{with qt}
BuildRequires: pkgconfig(Qt5Core)
%endif
BuildRequires: pkgconfig(xmlb)
BuildRequires: pkgconfig(Qt6Core) >= 6.2.4
BuildRequires: pkgconfig(xmlb) >= 0.3.14
BuildRequires: pkgconfig(yaml-0.1)
# lrelease
%if %{with qt}
BuildRequires: qt5-linguist
%endif
BuildRequires: qt6-linguist
BuildRequires: sed
BuildRequires: vala
BuildRequires: xmlto
@ -80,9 +77,8 @@ Requires: %{name}-devel%{?_isa} = %{version}-%{release}
%description compose-devel
%{summary}.
%if %{with qt}
%package qt
Summary: Qt5 bindings for %{name}
Summary: Qt6 bindings for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
%description qt
%{summary}.
@ -90,23 +86,21 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%package qt-devel
Summary: Development files for %{name}-qt bindings
Requires: %{name}-qt%{?_isa} = %{version}-%{release}
Requires: pkgconfig(Qt5Core)
Requires: pkgconfig(Qt6Core) >= 6.2.4
%description qt-devel
%{summary}.
%endif
%prep
%autosetup -n AppStream-%{version} -p1
%autosetup -n %{name}-%{commit} -p1
%dnl %autosetup -n AppStream-%{version} -p1
%build
%{meson} \
-Dcompose=true \
%if %{with qt}
-Dqt=true \
%endif
-Dvapi=%{?vala:true}%{!?vala:false}
-Dvapi=true
%{meson_build}
@ -114,8 +108,8 @@ Requires: pkgconfig(Qt5Core)
%install
%{meson_install}
mkdir -p %{buildroot}/var/cache/app-info/{icons,gv,xmls}
touch %{buildroot}/var/cache/app-info/cache.watch
mkdir -p %{buildroot}/var/cache/swcatalog/{icons,gv,xml}
touch %{buildroot}/var/cache/swcatalog/cache.watch
%find_lang appstream
@ -131,15 +125,14 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \
%{meson_test} ||:
%ldconfig_scriptlets
%posttrans
%{_bindir}/appstreamcli refresh --force >& /dev/null ||:
%transfiletriggerin -- %{_datadir}/app-info/xmls
%dnl %{_datadir}/app-info/xmls will get dropped before 1.0 final
%transfiletriggerin -- %{_datadir}/swcatalog/xml %{_datadir}/app-info/xmls
%{_bindir}/appstreamcli refresh --force >& /dev/null ||:
%transfiletriggerpostun -- %{_datadir}/app-info/xmls
%transfiletriggerpostun -- %{_datadir}/swcatalog/xml %{_datadir}/app-info/xmls
%{_bindir}/appstreamcli refresh --force >& /dev/null ||:
%files -f appstream.lang
@ -147,19 +140,19 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \
%license COPYING
%{_bindir}/appstreamcli
%{_mandir}/man1/appstreamcli.1*
%config(noreplace) %{_sysconfdir}/appstream.conf
%{_datadir}/appstream/
%dir %{_libdir}/girepository-1.0/
%{_libdir}/girepository-1.0/AppStream-1.0.typelib
%{_libdir}/libappstream.so.4*
%{_libdir}/libappstream.so.%{version}
%{_libdir}/libappstream.so.5
%{_libdir}/libappstream.so.%{basever}
%{_metainfodir}/org.freedesktop.appstream.cli.*.xml
# put in -devel? -- rex
%{_datadir}/gettext/its/metainfo.*
%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/
%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/
%files devel
%{_includedir}/appstream/
@ -167,12 +160,10 @@ 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
@ -180,13 +171,11 @@ 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.%{version}
%{_libdir}/libappstream-compose.so.0
%{_libdir}/libappstream-compose.so.%{basever}
%{_libdir}/girepository-1.0/AppStreamCompose-1.0.typelib
%{_metainfodir}/org.freedesktop.appstream.compose.metainfo.xml
@ -199,21 +188,20 @@ 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.2*
%{_libdir}/libAppStreamQt.so.%{version}
%{_libdir}/libAppStreamQt.so.3
%{_libdir}/libAppStreamQt.so.%{basever}
%files qt-devel
%{_includedir}/AppStreamQt/
%{_libdir}/cmake/AppStreamQt/
%{_libdir}/libAppStreamQt.so
%endif
%changelog
* 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

View File

@ -1 +1 @@
SHA512 (AppStream-0.16.1.tar.xz) = 79e139bd0f54534aa37c21d24309c33ee936e737149d6fa5ba0ec50e8ade33c2951d0b1e2ff15729e2a4d274ff1f7ca734bb70efa94539d87a3f949a07fb7d9e
SHA512 (appstream-d88ed03cb5b3b1803bdee3528c9b99d528ceb065.tar.gz) = 5d7ab98fb838a5c20f887852a4d20612d656a1eefc6c420822875a53cabcde1d00deabb7ec0d0ae7a585eec16bcd9c9d64887c8205d6423bc235d2c21af2a5c0