diff --git a/1001-Use-system-installed-gettext-version.patch b/1001-Use-system-installed-gettext-version.patch deleted file mode 100644 index 322d8d89cc4882d7afc2825dfb7a1cfee44a983b..0000000000000000000000000000000000000000 --- a/1001-Use-system-installed-gettext-version.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- libgtop-2.40.0-orig/configure.ac 2022-05-10 18:26:20.855414751 +0800 -+++ libgtop-2.40.0/configure.ac 2022-05-10 18:31:27.203396491 +0800 -@@ -215,7 +215,9 @@ - AC_FUNC_STRFTIME - AC_CHECK_FUNCS(getcwd gettimeofday getwd putenv strdup strtoul uname) - -+# FIXME: Do not use specified gettext version. - AM_GNU_GETTEXT_VERSION([0.19.4]) -+AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.4]) - AM_GNU_GETTEXT([external]) - - GETTEXT_PACKAGE=libgtop-2.0 diff --git a/libgtop-2.40.0.tar.gz b/libgtop-2.40.0.tar.gz deleted file mode 100644 index c59d45de2a1523f1b567d90c5a35d6c04c7a338d..0000000000000000000000000000000000000000 Binary files a/libgtop-2.40.0.tar.gz and /dev/null differ diff --git a/libgtop-2.41.1.tar.xz b/libgtop-2.41.1.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..5020cd204e8887eb608313c94183deab5636a68c Binary files /dev/null and b/libgtop-2.41.1.tar.xz differ diff --git a/libgtop2.spec b/libgtop2.spec index fba098bc42cd118ce632e22bf59be6ab098e1009..651b61e12cacb7b613de0b1648246fddb127bec9 100644 --- a/libgtop2.spec +++ b/libgtop2.spec @@ -1,61 +1,62 @@ +%define anolis_release 1 Name: libgtop2 -Version: 2.40.0 -Release: 1%{?dist} +Version: 2.41.1 +Release: %{anolis_release}%{?dist} Summary: LibGTop library (version 2) License: GPLv2+ URL: http://download.gnome.org/sources/libgtop -Source0: http://download.gnome.org/sources/libgtop/2.40/libgtop-%{version}.tar.gz +Source0: http://download.gnome.org/sources/libgtop/2.41/libgtop-%{version}.tar.xz -Patch1001: 1001-Use-system-installed-gettext-version.patch - -BuildRequires: pkgconfig(gobject-2.0) +BuildRequires: pkgconfig(glib-2.0) >= 2.6.0 +BuildRequires: pkgconfig(gobject-2.0) >= 2.26.0 BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: gettext -BuildRequires: gettext-devel BuildRequires: make -BuildRequires: gtk-doc -BuildRequires: texinfo +BuildRequires: gtk-doc >= 1.4 %description LibGTop is a library for portably obtaining information about processes, such as their PID, memory usage, etc. + +%package doc +Summary: Documents for %{name} +BuildArch: noarch +Requires: %{name} = %{version}-%{release} + +%description doc +Doc pages for %{name}. %package devel Summary: Libraries and include files for developing with libgtop -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} %description devel This package provides the necessary development libraries and include files to allow you to develop with LibGTop. %prep -%setup -q -n libgtop-%{version} -%patch1001 -p1 +%autosetup -n libgtop-%{version} -p1 %build -./autogen.sh -%configure --disable-gtk-doc --disable-static -make %{?_smp_mflags} +%configure --disable-static --enable-gtk-doc --disable-gtk-doc-pdf +%make_build %install -mkdir -p %{buildroot}/usr/share/gtk-doc -mkdir -p %{buildroot}/usr/share/gtk-doc/html %make_install -find %{buildroot} -name '*.la' -delete - %find_lang libgtop -%ldconfig_scriptlets %files -f libgtop.lang -%doc AUTHORS NEWS README %license COPYING -%{_bindir}/libgtop_daemon2 -%{_bindir}/libgtop_server2 +%{_libexecdir}/libgtop_daemon2 +%{_libexecdir}/libgtop_server2 %{_libdir}/libgtop-2.0.so.11* %dir %{_libdir}/girepository-1.0 %{_libdir}/girepository-1.0/GTop-2.0.typelib + +%files doc +%doc AUTHORS ChangeLog NEWS README %files devel %{_libdir}/libgtop-2.0.so @@ -65,10 +66,12 @@ find %{buildroot} -name '*.la' -delete %{_datadir}/gir-1.0/GTop-2.0.gir %dir %{_datadir}/gtk-doc %dir %{_datadir}/gtk-doc/html -# not worth fooling with -%exclude %{_datadir}/info +%{_datadir}/gtk-doc/html/libgtop +%{_infodir}/libgtop2.info* %changelog +* Mon Jan 16 2023 Funda Wang - 2.41.1-1 +- New version 2.41.1 + * Tue May 10 2022 gaochang - 2.40.0-1 - Init from upstream 2.40.0 -