- cosmetics

[packages/wmMoonClock.git] / wmMoonClock.spec

diff --git a/wmMoonClock.spec b/wmMoonClock.spec
index 8f14d195664322d4b729e078f44977b51c0a8aef..1667862d8e87889a688daa4a9a7f9c4f92705bdf 100644 (file)
--- a/wmMoonClock.spec
+++ b/wmMoonClock.spec
@@ -1,80 +1,54 @@
-Name:          wmMoonClock
 Summary:       Moon phases info for Window Maker/AfterStep
 Summary(pl):   Informacja o fazach ksiê¿yca dla WindowMakera/AfterStepa
-Version:       1.1
-Release:       3
+Name:          wmMoonClock
+Version:       1.27
+Release:       1
 Group:         X11/Window Managers/Tools
+Group(de):     X11/Fenstermanager/Werkzeuge
 Group(pl):     X11/Zarz±dcy Okien/Narzêdzia
-Copyright:     GPL
-Source0:       ftp://leadbelly.lanl.gov/pub/mgh/%{name}-%{version}.tar.gz
-Source1:       wmMoonClock.wmconfig
-Patch0:                wmMoonClock-man.patch
-Icon:          wmMoonClock.gif
-BuildPrereq:   XFree86-devel
-BuildRoot:     /tmp/%{name}-%{version}-root
+License:       GPL
+Source0:       http://nis-www.lanl.gov/~mgh/WindowMaker/%{name}-%{version}.tar.gz
+Source1:       %{name}.desktop
+Icon:          wmMoonClock.gif
+URL:           http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml
+BuildRequires: XFree86-devel
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%define        _prefix         /usr/X11R6
+%define        _mandir         %{_prefix}/man
 
 %description
-wmMoonClock displays the current phase of the moon.  
-Window Maker and AfterStep dockable but not necessary.
+wmMoonClock displays the current phase of the moon. Window Maker and
+AfterStep dockable but not necessary.
 
 %description -l pl
-wmMoonClock wy¶wietla aktualn± fazê ksiê¿yca. 
-Dokowalny w WindowMakerze i AfterStepie, lecz nie jest to koniecznie.
+wmMoonClock wy¶wietla aktualn± fazê ksiê¿yca. Dokowalny w
+WindowMakerze i AfterStepie, lecz nie jest to koniecznie.
 
 %prep
 %setup -q 
-%patch0 -p1
 
 %build
-make -C wmMoonClock clean
-make -C wmMoonClock \
-       COPTS="$RPM_OPT_FLAGS -Wall"
+%{__make} -C Src \
+       CFLAGS="%{rpmcflags} -I%{_includedir}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT/{etc/X11/wmconfig,usr/X11R6/{bin,man/man1}}
-make -C wmMoonClock install DESTDIR=$RPM_BUILD_ROOT/usr/X11R6/
-
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/X11/wmconfig/wmMoonClock
-
-gzip -9nf $RPM_BUILD_ROOT/usr/X11R6/man/man1/wmMoonClock.1
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1} \
+        $RPM_BUILD_ROOT%{_applnkdir}/DockApplets
 
-%files
-%defattr(644,root,root,755)
-%attr(755,root,root) /usr/X11R6/bin/wmMoonClock
-/usr/X11R6/man/man1/wmMoonClock.1.gz
+install Src/%{name} $RPM_BUILD_ROOT%{_bindir}
+install Src/%{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
-%config(missingok) /etc/X11/wmconfig/wmMoonClock
+install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/DockApplets
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%changelog
-* Tue Apr 20 1999 Piotr Czerwiñski <pius@pld.org.pl>
-  [1.1-3]
-- added BuildPrereq: XFree86-devel,
-- recompiled on rpm 3,
-- cosmetics.
-
-* Fri Mar 26 1999 Piotr Czerwiñski <pius@pld.org.pl>
-  [1.1-2]
-- added wmMoonClock-man.patch,
-- added make clean before make by Artur Frysiak <wiget@pld.org.pl>,
-- fixed passing $RPM_OPT_FLAGS by Tomasz K³oczko <kloczek@rudy.mif.pg.gda.pl>,
-- minor changes.
+%files
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/%{name}
+%{_mandir}/man1/*
 
-* Mon Mar 23 1999 Piotr Czerwiñski <pius@pld.org.pl>
-- changed Group to X11/Window Managers/Tools,
-- added Buildroot,
-- added -q %setup parameter,
-- added using $RPM_OPT_FLAGS during compile,
-- fixed %build and %install,
-- added gzipping man pages,
-- added full %defattr description,
-- changes in %files,
-- moved %changelog at the end of spec,
-- major changes.
- 
-* Thu Dec 31 1998 Yeechang Lee <ylee@columbia.edu>
-- Added wmconfig file.
+%{_applnkdir}/DockApplets/wmMoonClock.desktop