diff --git a/0001-Center-new-windows.patch b/0001-Center-new-windows.patch index d6e432eb7d2b263846d3a080ac1464bc27a60c80..e971c3daf01e0ed057a744724bb048a44a80e194 100644 --- a/0001-Center-new-windows.patch +++ b/0001-Center-new-windows.patch @@ -9,16 +9,18 @@ left corner. src/yelp-application.c | 1 + 1 file changed, 1 insertion(+) - diff --git a/src/yelp-application.c b/src/yelp-application.c -index b284757..b6ed9d7 100644 +index 2d004c2..e669661 100644 --- a/src/yelp-application.c +++ b/src/yelp-application.c -@@ -486,6 +486,7 @@ application_uri_resolved (YelpUri *uri, +@@ -444,6 +444,7 @@ application_uri_resolved (YelpUri *uri, g_settings_get (settings, "geometry", "(ii)", &width, &height); window = yelp_window_new (data->app); -+ gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER); ++ gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER); gtk_window_set_default_size (GTK_WINDOW (window), width, height); g_signal_connect (window, "resized", G_CALLBACK (window_resized), data->app); priv->windows = g_slist_prepend (priv->windows, window); +-- +1.7.12.1 + diff --git a/yelp-3.38.3.tar.xz b/yelp-3.38.3.tar.xz deleted file mode 100644 index 289226f31e46b07504d8036fb0fb67e74cb9c3ee..0000000000000000000000000000000000000000 Binary files a/yelp-3.38.3.tar.xz and /dev/null differ diff --git a/yelp-42.1.tar.xz b/yelp-42.1.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..2ae894c06308ac8d0053d03820e016019189fa93 Binary files /dev/null and b/yelp-42.1.tar.xz differ diff --git a/yelp.spec b/yelp.spec index f70cba38797e4c4f83903b777d23fe6dca498abb..85cf48d4baacf70c368a6bd1d3afeb312e7485bf 100644 --- a/yelp.spec +++ b/yelp.spec @@ -1,19 +1,25 @@ +%global libhandy_version 1.5.0 + Name: yelp Epoch: 2 -Version: 3.38.3 +Version: 42.1 Release: 1 Summary: Help browser for the GNOME desktop License: LGPLv2+ and ASL 2.0 and GPLv2+ URL: https://wiki.gnome.org/Apps/Yelp -Source: https://download.gnome.org/sources/%{name}/3.38/%{name}-%{version}.tar.xz +Source: https://download.gnome.org/sources/%{name}/42/%{name}-%{version}.tar.xz # https://bugzilla.gnome.org/show_bug.cgi?id=687960 Patch1: 0001-Center-new-windows.patch -BuildRequires: gcc gtk3-devel xz-devel libxml2-devel libxslt-devel -BuildRequires: sqlite-devel webkit2gtk3-devel yelp-xsl-devel -BuildRequires: desktop-file-utils bzip2-devel gettext-devel intltool itstool +BuildRequires: gcc make bzip2-devel gettext-devel gtk3-devel xz-devel +BuildRequires: libxml2-devel libxslt-devel sqlite-devel yelp-xsl-devel +BuildRequires: intltool itstool desktop-file-utils +BuildRequires: pkgconfig(webkit2gtk-4.0) +BuildRequires: pkgconfig(libhandy-1) >= %{libhandy_version} + Requires: yelp-xsl +Requires: libhandy%{?_isa} >= %{libhandy_version} Provides: %{name}-libs = %{epoch}:%{version}-%{release} Obsoletes: %{name}-libs < %{epoch}:%{version}-%{release} @@ -24,8 +30,6 @@ It can locate documents according to the freedesktop.org help system specificati Yelp development has led to the development of various tools, and the Mallard and DocBook transformations live in standalone XSLT module. All of these are under the umbrella name Yelp. - - %package devel Summary: Development files for %{name} Requires: %{name} = %{epoch}:%{version}-%{release} @@ -33,32 +37,29 @@ Requires: %{name} = %{epoch}:%{version}-%{release} %description devel The %{name}-devel package contains libraries and header files for %{name}. -%package_help - %prep %autosetup -n %{name}-%{version} -p1 %build -%configure - -sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' \ - -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool - - +%configure --disable-static --with-webkit2gtk-4-0 %make_build V=1 %install + %make_install -%delete_la +%delete_la_and_a + +%find_lang %{name} %check desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop %ldconfig_scriptlets -%files -%defattr(-,root,root) -%doc AUTHORS + + +%files -f %{name}.lang +%doc AUTHORS NEWS README %license COPYING %{_bindir}/* %{_libdir}/libyelp.so.* @@ -73,18 +74,13 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop %{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Yelp-symbolic.svg %files devel -%defattr(-,root,root) %{_libdir}/libyelp.so -%{_libdir}/libyelp.a -%{_libdir}/yelp/web-extensions/libyelpwebextension.a %{_includedir}/libyelp -%files help -%defattr(-,root,root) -%doc NEWS README -%{_datadir}/gtk-doc - %changelog +* Wed Apr 20 2022 dillon chen - 2:42.1-1 +- Update to 42.1 + * Tue Jun 22 2021 weijin deng - 2:3.38.3-1 - Upgrade to 2:3.38.3