From 0d68448180ddaf75197217a00d0d06969e5828e2 Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Tue, 10 Nov 2020 21:06:10 +0100
Subject: [PATCH] - added link patch (library needs to be linked with libX11) -
 adjusted BRs for gdk-pixbuf2-xlib split

---
 alltray-link.patch |  9 +++++++++
 alltray.spec       | 21 ++++++++++++++-------
 2 files changed, 23 insertions(+), 7 deletions(-)
 create mode 100644 alltray-link.patch

diff --git a/alltray-link.patch b/alltray-link.patch
new file mode 100644
index 0000000..094bf0c
--- /dev/null
+++ b/alltray-link.patch
@@ -0,0 +1,9 @@
+--- alltray-0.70/lib/Makefile.am.orig	2006-04-10 19:38:42.000000000 +0200
++++ alltray-0.70/lib/Makefile.am	2020-11-10 21:04:10.053752749 +0100
+@@ -4,5 +4,5 @@
+ 
+ liballtray_la_SOURCES = nomap.c
+ 
+-liballtray_la_LDFLAGS = -version-info 0:0:0 -ldl
++liballtray_la_LDFLAGS = -version-info 0:0:0 -lX11 -ldl
+ liballtray_la_CFLAGS = $(X_CFLAGS)
diff --git a/alltray.spec b/alltray.spec
index 59f7079..a7e9980 100644
--- a/alltray.spec
+++ b/alltray.spec
@@ -5,15 +5,21 @@ Version:	0.70
 Release:	2
 License:	GPL v2+
 Group:		X11/Applications
-Source0:	http://dl.sourceforge.net/alltray/%{name}-%{version}.tar.gz
+#Source0Download: https://github.com/mbt/alltray/releases
+# dev versions:
+#Source0:	https://github.com/mbt/alltray/archive/v%{version}/%{name}-%{version}.tar.gz
+Source0:	http://downloads.sourceforge.net/alltray/%{name}-%{version}.tar.gz
 # Source0-md5:	675a0a60f22fae04da787095ef0bd7d9
-URL:		http://alltray.sourceforge.net/
-BuildRequires:	GConf2-devel
+Patch0:		%{name}-link.patch
+URL:		https://launchpad.net/alltray
+BuildRequires:	GConf2-devel >= 2.0
 BuildRequires:	autoconf
 BuildRequires:	automake
+BuildRequires:	gdk-pixbuf2-xlib-devel >= 2.0
 BuildRequires:	gtk+2-devel >= 2:2.4.0
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
+BuildRequires:	xorg-lib-libX11-devel
 Requires:	gtk+2 >= 2:2.4.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -29,13 +35,14 @@ KDE, Xfce 4, Fluxboksem i WindowMakerem.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__libtoolize}
 %{__aclocal}
-%{__automake}
 %{__autoconf}
-
+%{__autoheader}
+%{__automake}
 %configure \
 	--disable-static
 
@@ -46,7 +53,7 @@ rm -rf $RPM_BUILD_ROOT
 	DESTDIR=$RPM_BUILD_ROOT
 
 # liballtray.so.0.0.0 is explicitly LD_PRELOADed
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.{la,so}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*.{la,so}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -61,5 +68,5 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/liballtray.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/liballtray.so.0
 %{_mandir}/man1/alltray.1*
-%{_desktopdir}/%{name}.desktop
+%{_desktopdir}/alltray.desktop
 %{_pixmapsdir}/alltray.png
-- 
2.43.0