- added using more rpm macros.

Changed files:
    wmSun.spec -> 1.4

diff --git a/wmSun.spec b/wmSun.spec
index 117fd720210e60f07a469a733463633f247dba11..cdccb62e67a7bdf6709700d90bf317141f481bf8 100644 (file)
--- a/wmSun.spec
+++ b/wmSun.spec
@@ -12,6 +12,8 @@ BuildPrereq:    XFree86-devel
 BuildPrereq:    xpm-devel
 BuildRoot:      /tmp/%{name}-%{version}-root
 
+%define _prefix         /usr/X11R6
+
 %description
 wmSun displays the current day's Sun Rise and Set Times.
 You must enter your LAtitude and Longitude correctly for it to work.
@@ -25,21 +27,21 @@ miejsca, w kt
 %setup -q
 
 %build
-make -C wmSun clean
-make -C wmSun \
+make -C %{name} clean
+make -C %{name} \
         CFLAGS="$RPM_OPT_FLAGS -Wall"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/usr/X11R6/{bin,share/man/man1} \
-       $RPM_BUILD_ROOT/etc/X11/wmconfig
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1} \
+        $RPM_BUILD_ROOT/etc/X11/wmconfig
 
-install -s wmSun/wmSun $RPM_BUILD_ROOT/usr/X11R6/bin
-install wmSun/wmSun.1 $RPM_BUILD_ROOT/usr/X11R6/share/man/man1
+install -s %{name}/%{name} $RPM_BUILD_ROOT%{_bindir}
+install %{name}/%{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/X11/wmconfig/wmSun
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/X11/wmconfig/%{name}
 
-gzip -9nf $RPM_BUILD_ROOT/usr/X11R6/share/man/man1/* \
+gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man1/* \
        BUGS TODO
 
 %clean
@@ -48,9 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc {BUGS,TODO}.gz
-%attr(755,root,root) /usr/X11R6/bin/wmSun
-/usr/X11R6/share/man/man1/wmSun.1.gz
-/etc/X11/wmconfig/wmSun
+%attr(755,root,root) %{_bindir}/%{name}
+%{_mandir}/man1/%{name}.1.gz
+/etc/X11/wmconfig/%{name}
 
 %changelog
 * Sun May 16 1999 Piotr Czerwiñski <pius@pld.org.pl>