diff --git a/AppStream-0.12.11.tar.xz b/AppStream-0.12.11.tar.xz deleted file mode 100644 index 21c2024..0000000 Binary files a/AppStream-0.12.11.tar.xz and /dev/null differ diff --git a/appstream.spec b/appstream.spec index eaa2006..7386e35 100644 --- a/appstream.spec +++ b/appstream.spec @@ -1,45 +1,35 @@ - # 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: 0.12.11 +Version: 0.15.2 Release: 1 - -# lib LGPLv2+, tools GPLv2+ +Summary: Utilities to generate, maintain and access the AppStream database License: GPLv2+ and LGPLv2+ -#URL: http://www.freedesktop.org/wiki/Distributions/AppStream URL: https://github.com/ximion/appstream -Source0: AppStream-%{version}.tar.xz +Source0: https://github.com/ximion/appstream/archive/refs/tags/v%{version}.tar.gz -## upstream patches (lookaside cache) - -## upstreamable patches - -# needed for cmake auto-provides -BuildRequires: cmake -BuildRequires: meson -BuildRequires: gettext -BuildRequires: gperf -BuildRequires: gtk-doc -BuildRequires: intltool -BuildRequires: itstool -BuildRequires: libstemmer-devel +BuildRequires: cmake meson gettext gperf gtk-doc intltool itstool +BuildRequires: libstemmer-devel sed BuildRequires: pkgconfig(gio-2.0) pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(libsoup-2.4) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(lmdb) BuildRequires: pkgconfig(packagekit-glib2) -BuildRequires: pkgconfig(protobuf-lite) +BuildRequires: protobuf-lite-devel BuildRequires: pkgconfig(Qt5Core) -# lrelease BuildRequires: qt5-linguist BuildRequires: pkgconfig(yaml-0.1) BuildRequires: vala BuildRequires: xmlto - -Requires: appstream-data +BuildRequires: pkgconfig(cairo) +BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(fontconfig) +BuildRequires: pkgconfig(gdk-pixbuf-2.0) +BuildRequires: pkgconfig(libcurl) +BuildRequires: pkgconfig(librsvg-2.0) +BuildRequires: pkgconfig(pango) +BuildRequires: pkgconfig(xmlb) %description AppStream makes it easy to access application information from the @@ -48,10 +38,22 @@ AppStream database over a nice GObject-based interface. %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -# -vala subpackage removed in F30 Obsoletes: appstream-vala < 0.12.4-3 -Provides: appstream-vala = %{version}-%{release} %description devel +Provides: appstream-vala = %{version}-%{release} +%{summary}. + +%package compose +Summary: Library for generating AppStream data +Requires: %{name}%{?_isa} = %{version}-%{release} +%description compose +%{summary}. + +%package compose-devel +Summary: Development files for %{name}-compose library +Requires: %{name}-compose%{?_isa} = %{version}-%{release} +Requires: %{name}-devel%{?_isa} = %{version}-%{release} +%description compose-devel %{summary}. %package qt @@ -67,15 +69,15 @@ Requires: pkgconfig(Qt5Core) %description qt-devel %{summary}. - %prep -%autosetup -n AppStream-%{version} -p1 +%autosetup -n appstream-%{version} -p1 -sed -i -e "s|0.12.2|%{version}|" meson.build -sed -i '/-Wno-error=deprecated-copy/ s/^/#/g' meson.build +#sed -i -e "s|0.15.2|%{version}|" meson.build +#sed -i '/-Wno-error=deprecated-copy/ s/^/#/g' meson.build %build %{meson} \ + -Dcompose=true \ -Dqt=true \ -Dvapi=%{?vala:true}%{!?vala:false} @@ -101,7 +103,6 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ %check %{meson_test} ||: - #%ldconfig_scriptlets %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -109,25 +110,15 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ %posttrans %{_bindir}/appstreamcli refresh --force >& /dev/null ||: -## use file triggers instead of static pkg names -## other repos can provide appdata too -%if 0%{?fedora} > 25 -## not sure how smart appstreamcli is about cache validation -## to judge if --force is really needed here or not -- rex %transfiletriggerin -- %{_datadir}/app-info/xmls %{_bindir}/appstreamcli refresh --force >& /dev/null ||: %transfiletriggerpostun -- %{_datadir}/app-info/xmls -%{_bindir}/appstreamcli refresh >& /dev/null ||: -%else -%triggerun -- appstream-data -%{_bindir}/appstreamcli refresh >& /dev/null ||: -%endif +%{_bindir}/appstreamcli refresh --force >& /dev/null ||: %files -f appstream.lang %doc AUTHORS -%license LICENSE.GPLv2 -%license LICENSE.LGPLv2.1 +%license COPYING %{_bindir}/appstreamcli %{_mandir}/man1/appstreamcli.1* %config(noreplace) %{_sysconfdir}/appstream.conf @@ -160,6 +151,23 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ ## symlink pointing to ^^, but need to take care, since rpm has ## trouble replacing dirs with symlinks, omit it for now -- rex %exclude %{_datadir}/gtk-doc/html/appstream +%{_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}/girepository-1.0/AppStreamCompose-1.0.typelib +%{_metainfodir}/org.freedesktop.appstream.compose.metainfo.xml + +%files compose-devel +%{_includedir}/appstream-compose/ +%{_libdir}/libappstream-compose.so +%{_libdir}/pkgconfig/appstream-compose.pc +%{_datadir}/gir-1.0/AppStreamCompose-1.0.gir %ldconfig_scriptlets qt @@ -172,7 +180,10 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \ %{_libdir}/cmake/AppStreamQt/ %{_libdir}/libAppStreamQt.so - %changelog +* Fri Apr 15 2022 lin zhang - 0.15.2-1 +- Update to 0.15.2 +- Add appstream.yaml + * Fri Aug 7 2020 weidong - 0.12.11-1 - Initial release for OpenEuler diff --git a/appstream.yaml b/appstream.yaml new file mode 100644 index 0000000..9ccf10a --- /dev/null +++ b/appstream.yaml @@ -0,0 +1,4 @@ +version_control: github +src_repo: appstream +tag_prefix: ^v +separator: . diff --git a/v0.15.2.tar.gz b/v0.15.2.tar.gz new file mode 100644 index 0000000..39a595b Binary files /dev/null and b/v0.15.2.tar.gz differ