- switch to rpm 3.0.2

[packages/wmSun.git] / wmSun.spec

diff --git a/wmSun.spec b/wmSun.spec
index cdccb62e67a7bdf6709700d90bf317141f481bf8..70ca6e99fb951fd8efe258a328221b3d297c0dd2 100644 (file)
--- a/wmSun.spec
+++ b/wmSun.spec
@@ -2,17 +2,18 @@ Summary:      wmSun displays the current day's Sun Rise and Set Times
 Summary(pl):   wmSun wy¶wietla aktualny czas wschodu i zachodu s³oñca
 Name:          wmSun
 Version:       1.03
-Release:       2
+Release:       3
 Copyright:     GPL
 Group:          X11/Window Managers/Tools
 Group(pl):      X11/Zarz±dcy Okien/Narzêdzia
 Source0:       ftp://leadbelly.lanl.gov/pub/mgh/%{name}-%{version}.tar.gz
-Source1:       wmSun.wmconfig
-BuildPrereq:    XFree86-devel
-BuildPrereq:    xpm-devel
-BuildRoot:      /tmp/%{name}-%{version}-root
+Source1:       wmSun.desktop
+BuildRequires:    XFree86-devel
+BuildRequires:    xpm-devel
+BuildRoot:     /tmp/%{name}-%{version}-root
 
-%define _prefix         /usr/X11R6
+%define _prefix        /usr/X11R6
+%define _mandir %{_prefix}/man
 
 %description
 wmSun displays the current day's Sun Rise and Set Times.
@@ -29,17 +30,18 @@ miejsca, w kt
 %build
 make -C %{name} clean
 make -C %{name} \
-        CFLAGS="$RPM_OPT_FLAGS -Wall"
+        CFLAGS="$RPM_OPT_FLAGS -Wall" \
+       INCDIR="-I/usr/X11R6/include"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1} \
-        $RPM_BUILD_ROOT/etc/X11/wmconfig
+        $RPM_BUILD_ROOT/etc/X11/applnk/DockApplets
 
 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/%{name}
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/X11/applnk/DockApplets
 
 gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man1/* \
        BUGS TODO
@@ -52,13 +54,4 @@ rm -rf $RPM_BUILD_ROOT
 %doc {BUGS,TODO}.gz
 %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>
-  [1.03-2]
-- modified spec file for PLD use,
-- package is now FHS 2.0 compliant.    
-
-* Tue Feb 9 1998 Ian Macdonald <ianmacd@xs4all.nl>
-- first RPM release.
+/etc/X11/applnk/DockApplets/wmSun.desktop