Hello community,
here is the log from the commit of package gkrellm for openSUSE:Factory checked
in at 2013-11-15 13:21:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gkrellm (Old)
and /work/SRC/openSUSE:Factory/.gkrellm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gkrellm"
Changes:
--------
--- /work/SRC/openSUSE:Factory/gkrellm/gkrellm.changes 2013-05-06
09:51:36.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.gkrellm.new/gkrellm.changes 2013-11-15
13:21:10.000000000 +0100
@@ -1,0 +2,7 @@
+Thu Oct 24 08:41:54 UTC 2013 - pgaj...@suse.com
+
+- Install /usr/lib{,64}/gkrellm2/plugins directories (bnc#841818).
+- Add gkrellm-lib64-plugins-dir.patch: Look in
+ /usr/lib64/gkrellm2/plugins on 64bit systems.
+
+-------------------------------------------------------------------
New:
----
gkrellm-lib64-plugins-dir.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gkrellm.spec ++++++
--- /var/tmp/diff_new_pack.SvQyyc/_old 2013-11-15 13:21:11.000000000 +0100
+++ /var/tmp/diff_new_pack.SvQyyc/_new 2013-11-15 13:21:11.000000000 +0100
@@ -29,8 +29,10 @@
Source3: gkrellm-24.png
Source4: gkrellm-32.png
Source5: gkrellm-48.png
-# PATCH-FIX-OPENSUSE -- detect libsensors correctly -- pgaj...@suse.cz
+# PATCH-FIX-OPENSUSE gkrellm-libsensors.patch pgaj...@suse.cz -- detect
libsensors correctly
Patch0: %{name}-libsensors.patch
+# PATCH-FIX-OPENSUSE gkrellm-lib64-plugins-dir.patch pgaj...@suse.cz -- look
also into /usr/lib64/gkrellm2/plugins
+Patch1: %{name}-lib64-plugins-dir.patch
BuildRequires: gtk2-devel
BuildRequires: libsensors4-devel
BuildRequires: openssl-devel
@@ -90,6 +92,7 @@
%prep
%setup -q
%patch0
+%patch1
%build
cd src
@@ -111,6 +114,11 @@
cp %{SOURCE3} %{buildroot}%{_datadir}/icons/hicolor/24x24/apps/gkrellm.png
cp %{SOURCE4} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/gkrellm.png
cp %{SOURCE5} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/gkrellm.png
+# following two directories are searched for plugins and we want to own them
(bnc#841818)
+mkdir -p %{buildroot}/usr/lib/gkrellm2/plugins
+%if "x%{_lib}" == "xlib64"
+mkdir -p %{buildroot}/usr/lib64/gkrellm2/plugins
+%endif
%suse_update_desktop_file -i %name
%find_lang %{name} %{?no_lang_C}
@@ -138,6 +146,12 @@
%{_datadir}/icons/hicolor/*/apps/gkrellm.png
%{_datadir}/applications/gkrellm.desktop
%doc %{_mandir}/man1/*
+%dir /usr/lib/gkrellm2
+%dir /usr/lib/gkrellm2/plugins
+%if "x%{_lib}" == "xlib64"
+%dir /usr/lib64/gkrellm2
+%dir /usr/lib64/gkrellm2/plugins
+%endif
%files devel
%defattr(-,root,root)
++++++ gkrellm-lib64-plugins-dir.patch ++++++
Index: src/gkrellm.h
===================================================================
--- src/gkrellm.h.orig 2010-10-02 18:21:01.000000000 +0200
+++ src/gkrellm.h 2013-11-14 13:33:55.325216840 +0100
@@ -141,6 +141,9 @@
#if !defined(SYSTEM_PLUGINS_DIR)
#define SYSTEM_PLUGINS_DIR "/usr/lib/gkrellm2/plugins"
#endif
+#if !defined(SYSTEM64_PLUGINS_DIR)
+#define SYSTEM64_PLUGINS_DIR "/usr/lib64/gkrellm2/plugins"
+#endif
#else
Index: src/plugins.c
===================================================================
--- src/plugins.c.orig 2010-09-14 18:25:51.000000000 +0200
+++ src/plugins.c 2013-11-14 13:34:34.349703021 +0100
@@ -1293,6 +1293,10 @@
#if defined(SYSTEM_PLUGINS_DIR)
scan_for_plugins(SYSTEM_PLUGINS_DIR);
#endif
+
+#if defined(SYSTEM64_PLUGINS_DIR)
+ scan_for_plugins(SYSTEM64_PLUGINS_DIR);
+#endif
}
#if 0
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
