- fixed build on amd64, switched to vfolders; release 5

Changed files:
    wmSun.spec -> 1.33

diff --git a/wmSun.spec b/wmSun.spec
index 9dbd32d9a77ed6657da83d2b247758523e16d21b..32c1832bcaeafc6571d09429f4787b37a5bba92a 100644 (file)
--- a/wmSun.spec
+++ b/wmSun.spec
@@ -2,7 +2,7 @@ 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:       4
+Release:       5
 License:       GPL
 Group:         X11/Window Managers/Tools
 Source0:       http://nis-www.lanl.gov/~mgh/WindowMaker/%{name}-%{version}.tar.gz
@@ -12,15 +12,14 @@ URL:                http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml
 BuildRequires: XFree86-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-
 %description
 wmSun displays the current day's Sun Rise and Set Times. You must
 enter your LAtitude and Longitude correctly for it to work.
 
 %description -l pl
 wmSun wy¶wietla aktualne godziny wschodu i zachodu S³oñca. Aby program
-dzia³a³ poprawnie, musisz podaæ w³a¶ciw± dla miejsca, w którym
-przebywasz, d³ugo¶æ i szeroko¶æ geograficzn±.
+dzia³a³ poprawnie trzeba podaæ d³ugo¶æ i szeroko¶æ geograficzn± dla
+miejsca, w którym przebywamy.
 
 %prep
 %setup -q
@@ -29,17 +28,16 @@ przebywasz, d
 %{__make} -C %{name} clean
 %{__make} -C %{name} \
         CFLAGS="%{rpmcflags} -Wall" \
-       INCDIR="-I%{_includedir}"
+       LIBDIR="-L/usr/X11R6/%{_lib}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1} \
-        $RPM_BUILD_ROOT%{_applnkdir}/DockApplets
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_desktopdir}/docklets}
 
 install %{name}/%{name} $RPM_BUILD_ROOT%{_bindir}
 install %{name}/%{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
-#install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/DockApplets
+install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/docklets
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -49,4 +47,4 @@ rm -rf $RPM_BUILD_ROOT
 %doc BUGS TODO
 %attr(755,root,root) %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1*
-#%%{_applnkdir}/DockApplets/wmSun.desktop
+%{_desktopdir}/docklets/wmSun.desktop