[packages/gnome-system-tools] - added link patch, updated BRs
qboosh
qboosh at pld-linux.org
Sun Jan 9 17:21:33 CET 2022
commit 4e84e4d3513998ebe5eef374d258fb402f9082cd
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Jan 9 17:22:29 2022 +0100
- added link patch, updated BRs
gnome-system-tools-link.patch | 31 +++++++++++++++++++++++++++++++
gnome-system-tools.spec | 11 ++++++-----
2 files changed, 37 insertions(+), 5 deletions(-)
---
diff --git a/gnome-system-tools.spec b/gnome-system-tools.spec
index 85c84e7..a8b4548 100644
--- a/gnome-system-tools.spec
+++ b/gnome-system-tools.spec
@@ -8,9 +8,8 @@ Group: X11/Applications
Source0: https://download.gnome.org/sources/gnome-system-tools/3.0/%{name}-%{version}.tar.bz2
# Source0-md5: 5dc48086cec964d146c9c446a54a8d39
Patch0: %{name}-desktop.patch
+Patch1: %{name}-link.patch
URL: https://gitlab.gnome.org/Archive/gnome-system-tools
-BuildRequires: GConf2
-BuildRequires: GConf2-devel >= 2.22.0
BuildRequires: autoconf >= 2.59-9
BuildRequires: automake >= 1:1.9
BuildRequires: dbus-devel >= 1.1.2
@@ -27,7 +26,6 @@ BuildRequires: nautilus-devel >= 3.0.0
BuildRequires: pkgconfig
BuildRequires: rpmbuild(find_lang) >= 1.23
BuildRequires: rpmbuild(macros) >= 1.311
-BuildRequires: system-tools-backends >= 2.10.0
BuildRequires: system-tools-backends-devel >= 2.10.0
Requires(post,postun): gtk-update-icon-cache
Requires(post,postun): hicolor-icon-theme
@@ -61,6 +59,7 @@ warunkach Powszechnej Licencji Publicznej GNU.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
install -d m4
@@ -126,6 +125,8 @@ rm -rf $RPM_BUILD_ROOT
%{_desktopdir}/shares.desktop
%{_desktopdir}/time.desktop
%{_desktopdir}/users.desktop
-%{_iconsdir}/hicolor/*/*/*.png
-%{_iconsdir}/hicolor/*/apps/*.svg
+%{_iconsdir}/hicolor/*x*/apps/time-admin.png
+%{_iconsdir}/hicolor/48x48/devices/irda.png
+%{_iconsdir}/hicolor/48x48/devices/plip.png
+%{_iconsdir}/hicolor/scalable/apps/time-admin.svg
%{_pkgconfigdir}/gnome-system-tools.pc
diff --git a/gnome-system-tools-link.patch b/gnome-system-tools-link.patch
new file mode 100644
index 0000000..ca63f82
--- /dev/null
+++ b/gnome-system-tools-link.patch
@@ -0,0 +1,31 @@
+--- gnome-system-tools-3.0.0/configure.in.orig 2011-04-03 19:32:51.000000000 +0200
++++ gnome-system-tools-3.0.0/configure.in 2022-01-09 16:54:58.413641820 +0100
+@@ -89,6 +89,8 @@ PKG_CHECK_MODULES(DBUS,[
+ dbus-1 >= $DBUS_REQUIRED
+ ])
+
++PKG_CHECK_MODULES(GTHREAD, [gthread-2.0 >= $GLIB_REQUIRED])
++
+ DBUS_CFLAGS="$DBUS_CFLAGS -DDBUS_API_SUBJECT_TO_CHANGE"
+ AC_SUBST(DBUS_LIBS)
+ AC_SUBST(DBUS_CFLAGS)
+@@ -232,7 +234,7 @@ GST_DEPRECATED_FLAGS=""
+ GST_LIBS="$GST_DEPENDS_LIBS $POLKIT_LIBS"
+ GST_CFLAGS="$GST_DEPENDS_CFLAGS $POLKIT_CFLAGS $GST_DEPRECATED_FLAGS"
+
+-GST_TOOL_LIBS="\$(top_builddir)/src/common/libsetuptool.a $GST_LIBS"
++GST_TOOL_LIBS="\$(top_builddir)/src/common/libsetuptool.a $GST_LIBS $GTHREAD_LIBS"
+ GST_TOOL_CFLAGS="-I\$(top_srcdir)/src/common $GST_CFLAGS"
+
+ GST_TOOL_CLEANFILES="\$(desktop) \$(desktop).in"
+--- gnome-system-tools-3.0.0/src/time/Makefile.am.orig 2011-01-06 12:17:34.000000000 +0100
++++ gnome-system-tools-3.0.0/src/time/Makefile.am 2022-01-09 16:57:40.069432723 +0100
+@@ -15,7 +15,7 @@ INCLUDES += $(GST_TOOL_CFLAGS) $(DBUS_CF
+ CLEANFILES = $(GST_TOOL_CLEANFILES)
+ EXTRA_DIST = $(GST_TOOL_EXTRA_DIST)
+
+-time_admin_LDADD = ./e-map/libemap.a $(GST_TOOL_LIBS) $(DBUS_LIBS)
++time_admin_LDADD = ./e-map/libemap.a $(GST_TOOL_LIBS) $(DBUS_LIBS) -lm
+ time_admin_DEPENDENCIES = ./e-map/libemap.a $(GST_TOOL_DEPENDENCIES)
+ time_admin_SOURCES = \
+ time-tool.c time-tool.h \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gnome-system-tools.git/commitdiff/4e84e4d3513998ebe5eef374d258fb402f9082cd
More information about the pld-cvs-commit
mailing list