packages: wmWeather/wmWeather.spec - use new Makefile

[sparky]

Author: sparky                       Date: Sun Jan  3 02:45:09 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use new Makefile

---- Files affected:
packages/wmWeather:
   wmWeather.spec (1.38 -> 1.39) 

---- Diffs:

================================================================
Index: packages/wmWeather/wmWeather.spec
diff -u packages/wmWeather/wmWeather.spec:1.38 packages/wmWeather/wmWeather.spec:1.39
--- packages/wmWeather/wmWeather.spec:1.38	Sun Jan  3 01:51:46 2010
+++ packages/wmWeather/wmWeather.spec	Sun Jan  3 03:45:03 2010
@@ -9,7 +9,7 @@
 Source0:	http://nis-www.lanl.gov/~mgh/WindowMaker/%{name}-%{version}.tar.gz
 # Source0-md5:	f04693aa86d22099162cff3d0b5c9275
 Source1:	%{name}.desktop
-Patch0:		%{name}-Makefile.patch
+Source2:	%{name}.Makefile
 URL:		http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml
 BuildRequires:	xorg-lib-libXext-devel
 BuildRequires:	xorg-lib-libXpm-devel
@@ -28,23 +28,31 @@
 
 %prep
 %setup -q
-%patch0 -p1
+
+awk '/OBJS *=/{p=1} {if(p)print} !/\\$/{p=0}' Src/Makefile > Src/Makefile.include
+
+cat << 'EOF' >> Src/Makefile.include
+NAME = %{name}
+EXTRABIN = GrabWeather
+MAN1FILE = %{name}.1
+DOCKLETFILE = %{SOURCE1}
+CC = %{__cc}
+OPTCFLAGS = %{rpmcflags}
+LDFLAGS = %{rpmldflags}
+EOF
+
+install %{SOURCE2} Src/Makefile
 
 %build
-%{__make} -C Src \
-	CC="%{__cc}" \
-	CFLAGS="%{rpmcflags} -Wall" \
-	LDFLAGS="%{rpmldflags}"
+%{__make} -C Src clean
+%{__make} -C Src
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_desktopdir}/docklets
 
 %{__make} -C Src install \
 	DESTDIR="$RPM_BUILD_ROOT"
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/docklets
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -53,7 +61,7 @@
 %doc HINTS BUGS CHANGES
 %attr(755,root,root) %{_bindir}/%{name}
 %attr(755,root,root) %{_bindir}/GrabWeather
-%{_mandir}/man1/*
+%{_mandir}/man1/%{name}.1*
 %{_desktopdir}/docklets/wmWeather.desktop
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -62,6 +70,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.39  2010/01/03 02:45:03  sparky
+- use new Makefile
+
 Revision 1.38  2010/01/03 00:51:46  sparky
 - added Makefile patch
 - use __cc and rpmldflags
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wmWeather/wmWeather.spec?r1=1.38&r2=1.39&f=u