diff --git a/devhelp.spec b/devhelp.spec index 87053fb..dd77d8b 100644 --- a/devhelp.spec +++ b/devhelp.spec @@ -1,11 +1,12 @@ Name: devhelp Epoch: 1 Version: 41.2 -Release: 1 +Release: 2 Summary: GTK API documentation browser License: GPLv3+ URL: https://wiki.gnome.org/Apps/Devhelp Source0: https://download.gnome.org/sources/%{name}/41/%{name}-%{version}.tar.xz +Patch0: fix-meson-0.61.5-compile-error.patch BuildRequires: chrpath desktop-file-utils gettext gobject-introspection-devel gtk-doc itstool meson BuildRequires: pkgconfig(amtk-5) pkgconfig(gsettings-desktop-schemas) pkgconfig(gtk+-3.0) pkgconfig(webkit2gtk-4.0) @@ -21,8 +22,8 @@ Provides: %{name}-libs(aarch-64) = %{epoch}:%{version}-%{release} %description A browser to show API documentation generated by gtk-doc. -%package devel -Summary: Include development library when using devhelp +%package devel +Summary: Include development library when using devhelp Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} %description devel Development packages contains header files and library that can be used @@ -80,6 +81,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Devhelp* %{_mandir}/man1/devhelp.1* %changelog +* Wed Jun 22 2022 wenlong ding - 1:41.2-2 +- Add fix-meson-0.61.5-compile-error.patch fix compile error + * Tue Apr 26 2022 dillon chen - 1:41.2-1 - Update to 41.2 diff --git a/devhelp.yaml b/devhelp.yaml new file mode 100644 index 0000000..a6f06d0 --- /dev/null +++ b/devhelp.yaml @@ -0,0 +1,4 @@ +version_control: gitlab.gnome +src_repo: devhelp +tag_prefix: ^ +separator: . diff --git a/fix-meson-0.61.5-compile-error.patch b/fix-meson-0.61.5-compile-error.patch new file mode 100644 index 0000000..0dfe170 --- /dev/null +++ b/fix-meson-0.61.5-compile-error.patch @@ -0,0 +1,30 @@ +diff -up devhelp-41.2/data/meson.build.bak devhelp-41.2/data/meson.build +--- devhelp-41.2/data/meson.build.bak 2022-06-22 09:28:43.615000000 +0000 ++++ devhelp-41.2/data/meson.build 2022-06-22 09:29:10.215000000 +0000 +@@ -19,7 +19,6 @@ appdata_conf = configuration_data() + appdata_conf.set('application_id', APPLICATION_ID) + appdata = APPLICATION_ID + '.appdata.xml' + appdata_file = I18N.merge_file( +- appdata, + input: configure_file( + input: 'org.gnome.Devhelp.appdata.xml.in.in', + output: APPLICATION_ID + '.appdata.xml.in', +@@ -45,7 +44,6 @@ desktop_conf = configuration_data() + desktop_conf.set('application_id', APPLICATION_ID) + desktop = APPLICATION_ID + '.desktop' + desktop_file = I18N.merge_file( +- desktop, + type: 'desktop', + input: configure_file( + input: 'org.gnome.Devhelp.desktop.in.in', +diff -up devhelp-41.2/plugins/gedit-plugin/meson.build.bak devhelp-41.2/plugins/gedit-plugin/meson.build +--- devhelp-41.2/plugins/gedit-plugin/meson.build.bak 2022-06-22 09:29:22.208000000 +0000 ++++ devhelp-41.2/plugins/gedit-plugin/meson.build 2022-06-22 09:29:32.582000000 +0000 +@@ -7,7 +7,6 @@ install_data( + + plugin_info_file = 'devhelp.plugin' + I18N.merge_file( +- plugin_info_file, + type: 'desktop', + input: plugin_info_file + '.desktop.in', + output: plugin_info_file,