X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=alltray.spec;h=59f707946b693b3ba72f86641d44afdd87aa3323;hb=HEAD;hp=ba229ae17dc770486de225e79e51d589d196fefa;hpb=ef65820ee01b6ff2d1c916eaff2d0dd2da78a968;p=packages%2Falltray.git

diff --git a/alltray.spec b/alltray.spec
index ba229ae..a7e9980 100644
--- a/alltray.spec
+++ b/alltray.spec
@@ -1,20 +1,25 @@
 Summary:	AllTray - small program to dock application into the system tray
-Summary(pl.UTF-8):   AllTray - mały program do dokowania aplikacji w tacce systemowej
+Summary(pl.UTF-8):	AllTray - mały program do dokowania aplikacji w tacce systemowej
 Name:		alltray
-Version:	0.66
-Release:	1
-License:	GPL v2
+Version:	0.70
+Release:	2
+License:	GPL v2+
 Group:		X11/Applications
-Source0:	http://dl.sourceforge.net/alltray/%{name}-%{version}.tar.gz
-# Source0-md5:	78b43bd2e19258b0518af99e21123561
-#Patch0:		%{name}-notitlechange_nomenutitle.patch
-URL:		http://alltray.sourceforge.net/
-BuildRequires:	GConf2-devel
+#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
+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)
 
@@ -30,12 +35,14 @@ KDE, Xfce 4, Fluxboksem i WindowMakerem.
 
 %prep
 %setup -q
-#%%patch0 -p1
+%patch0 -p1
 
 %build
+%{__libtoolize}
 %{__aclocal}
-%{__automake}
 %{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
 	--disable-static
 
@@ -45,16 +52,21 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+# liballtray.so.0.0.0 is explicitly LD_PRELOADed
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*.{la,so}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/liballtray*.so.*.*
+%attr(755,root,root) %{_bindir}/alltray
+%attr(755,root,root) %{_libdir}/liballtray.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liballtray.so.0
 %{_mandir}/man1/alltray.1*
-%{_desktopdir}/%{name}.desktop
-%{_pixmapsdir}/*.png
+%{_desktopdir}/alltray.desktop
+%{_pixmapsdir}/alltray.png