appstream.spec

@@ -1,39 +1,45 @@
+
 # Vala/Vapi support ( upstream disabled by default, probably explains why it the build breaks often )
 %global vala 1
 
-Name:    appstream
-Version: 0.16.1
-Release: 2
 Summary: Utilities to generate, maintain and access the AppStream database
+Name:    appstream
+Version: 0.12.11
+Release: 1
+
+# lib LGPLv2+, tools GPLv2+
 License: GPLv2+ and LGPLv2+
+#URL:     http://www.freedesktop.org/wiki/Distributions/AppStream
 URL:     https://github.com/ximion/appstream
-Source0: https://github.com/ximion/appstream/archive/refs/tags/v%{version}.tar.gz
+Source0: AppStream-%{version}.tar.xz
 
-# https://github.com/ximion/appstream/pull/546/
+## upstream patches (lookaside cache)
-Patch0:  backport-fix-a-function-declaration-without-prototype-issue.patch
 
-BuildRequires: cmake meson gettext gperf gtk-doc intltool itstool
+## upstreamable patches
-BuildRequires: libstemmer-devel sed
+
+# needed for cmake auto-provides
+BuildRequires: cmake
+BuildRequires: meson
+BuildRequires: gettext
+BuildRequires: gperf
+BuildRequires: gtk-doc
+BuildRequires: intltool
+BuildRequires: itstool
+BuildRequires: libstemmer-devel
 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: protobuf-lite-devel
+BuildRequires: pkgconfig(protobuf-lite)
 BuildRequires: pkgconfig(Qt5Core)
+# lrelease
 BuildRequires: qt5-linguist
 BuildRequires: pkgconfig(yaml-0.1)
 BuildRequires: vala
 BuildRequires: xmlto
-BuildRequires: pkgconfig(cairo)
+
-BuildRequires: pkgconfig(freetype2)
+Requires: appstream-data
-BuildRequires: pkgconfig(fontconfig)
-BuildRequires: pkgconfig(gdk-pixbuf-2.0)
-BuildRequires: pkgconfig(libcurl)
-BuildRequires: pkgconfig(librsvg-2.0)
-BuildRequires: pkgconfig(pango)
-BuildRequires: pkgconfig(xmlb)
-BuildRequires: systemd-devel
 
 %description
 AppStream makes it easy to access application information from the
@@ -42,22 +48,10 @@ 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
-%description devel
 Provides: appstream-vala = %{version}-%{release}
-%{summary}.
+%description devel
-
-%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
@@ -73,15 +67,15 @@ Requires: pkgconfig(Qt5Core)
 %description qt-devel
 %{summary}.
 
-%prep
-%autosetup -n appstream-%{version} -p1
 
-#sed -i -e "s|0.15.2|%{version}|" meson.build
+%prep
-#sed -i '/-Wno-error=deprecated-copy/ s/^/#/g' meson.build
+%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
 
 %build
 %{meson} \
- -Dcompose=true \
  -Dqt=true \
  -Dvapi=%{?vala:true}%{!?vala:false}
 
@@ -107,6 +101,7 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \
 %check
 %{meson_test} ||:
 
+
 #%ldconfig_scriptlets
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -114,15 +109,25 @@ 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 --force >& /dev/null ||:
+%{_bindir}/appstreamcli refresh >& /dev/null ||:
+%else
+%triggerun -- appstream-data
+%{_bindir}/appstreamcli refresh >& /dev/null ||:
+%endif
 
 %files -f appstream.lang
 %doc AUTHORS
-%license COPYING
+%license LICENSE.GPLv2
+%license LICENSE.LGPLv2.1
 %{_bindir}/appstreamcli
 %{_mandir}/man1/appstreamcli.1*
 %config(noreplace) %{_sysconfdir}/appstream.conf
@@ -155,23 +160,6 @@ 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}/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
-%{_datadir}/gtk-doc/html/appstream-compose
 
 %ldconfig_scriptlets qt
 
@@ -184,21 +172,7 @@ mv %{buildroot}%{_datadir}/metainfo/*.xml \
 %{_libdir}/cmake/AppStreamQt/
 %{_libdir}/libAppStreamQt.so
 
+
 %changelog
-* Wed Dec 11 2024 jchzhou <zhoujiacheng@iscas.ac.cn> - 0.16.1-2
-- Backport a patch for fixing a function declaration without prototype issue
-
-* Mon Oct 16 2023 misaka00251 <liuxin@iscas.ac.cn> - 0.16.1-1
-- Upgrade to 0.16.1
-
-* Mon Jun 20 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 0.15.2-2
-- fix build error
-- File listed twice libappstream-compose.so.0.15.2
-- uppackaged /usr/share/gtk-doc/html/appstream-compose
-
-* Fri Apr 15 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 0.15.2-1
-- Update to 0.15.2
-- Add appstream.yaml
-
 * Fri Aug 7 2020 weidong <weidong@uniontech.com> - 0.12.11-1
 - Initial release for OpenEuler

appstream.yaml

@@ -1,4 +0,0 @@
-version_control: github
-src_repo: appstream
-tag_prefix: ^v
-separator: .

backport-fix-a-function-declaration-without-prototype-issue.patch

@@ -1,26 +0,0 @@
-From 82dc772ab6d0beeccf5ae9156016f794ebe26663 Mon Sep 17 00:00:00 2001
-From: Gleb Popov <6yearold@gmail.com>
-Date: Tue, 31 Oct 2023 10:12:22 +0300
-Subject: [PATCH] fix a function declaration without prototype issue
-
-Tested-by: jchzhou <zhoujiacheng@iscas.ac.cn>
----
- compose/asc-globals.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/compose/asc-globals.c b/compose/asc-globals.c
-index 314f75c..0bf221e 100644
---- a/compose/asc-globals.c
-+++ b/compose/asc-globals.c
-@@ -455,7 +455,7 @@ asc_globals_get_hint_tag_details (const gchar *tag)
-  * Returns: (transfer full): A list of valid hint tags. Free with %g_strfreev
-  */
- gchar**
--asc_globals_get_hint_tags ()
-+asc_globals_get_hint_tags (void)
- {
- 	AscGlobalsPrivate *priv = asc_globals_get_priv ();
- 	GHashTableIter iter;
--- 
-2.47.1
-