From: pius <pius@pld-linux.org>
Date: Sat, 27 Nov 1999 02:59:15 +0000 (+0000)
Subject: - added using more rpm macros
X-Git-Tag: RA-1_0~11
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=1e5644ac8593760c529f68c6ceab51a953bc6a9e;p=packages%2FwmSun.git

- added using more rpm macros
- cosmetics

Changed files:
    wmSun.spec -> 1.15
---

diff --git a/wmSun.spec b/wmSun.spec
index 083b640..0d256a8 100644
--- a/wmSun.spec
+++ b/wmSun.spec
@@ -14,6 +14,7 @@ BuildRoot:	/tmp/%{name}-%{version}-root
 
 %define 	_prefix		/usr/X11R6
 %define 	_mandir 	%{_prefix}/man
+%define		_applnkdir	%{_datadir}/applnk
 
 %description
 wmSun displays the current day's Sun Rise and Set Times.
@@ -36,12 +37,12 @@ make -C %{name} \
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1} \
-        $RPM_BUILD_ROOT/usr/X11R6/share/applnk/DockApplets
+        $RPM_BUILD_ROOT%{_applnkdir}/DockApplets
 
 install -s %{name}/%{name} $RPM_BUILD_ROOT%{_bindir}
 install %{name}/%{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
-install %{SOURCE1} $RPM_BUILD_ROOT/usr/X11R6/share/applnk/DockApplets
+install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/DockApplets
 
 gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man1/* \
 	BUGS TODO
@@ -54,4 +55,4 @@ rm -rf $RPM_BUILD_ROOT
 %doc {BUGS,TODO}.gz
 %attr(755,root,root) %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1.gz
-/usr/X11R6/share/applnk/DockApplets/wmSun.desktop
+%{_applnkdir}/DockApplets/wmSun.desktop