packages: wmint/wmint.spec - use new Makefile

[sparky]

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

---- Files affected:
packages/wmint:
   wmint.spec (1.25 -> 1.26) 

---- Diffs:

================================================================
Index: packages/wmint/wmint.spec
diff -u packages/wmint/wmint.spec:1.25 packages/wmint/wmint.spec:1.26
--- packages/wmint/wmint.spec:1.25	Sun Jan  3 01:32:16 2010
+++ packages/wmint/wmint.spec	Sun Jan  3 03:48:43 2010
@@ -9,7 +9,7 @@
 Source0:	http://team.gcu-squad.org/~slix/wmint/%{name}-%{version}.tar.gz
 # Source0-md5:	fa897484a9e68168526f681939154f85
 Source1:	%{name}.desktop
-Patch0:		%{name}-makefile.patch
+Source2:	%{name}.Makefile
 URL:		http://team.gcu-squad.org/~slix/wmint/
 BuildRequires:	xorg-lib-libXext-devel
 BuildRequires:	xorg-lib-libXpm-devel
@@ -23,23 +23,28 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
-%build
-cd wmint
+awk '/OBJS *=/{p=1} {if(p)print} !/\\$/{p=0}' wmint/Makefile > wmint/Makefile.include
+
+cat << 'EOF' >> wmint/Makefile.include
+NAME = %{name}
+DOCKLETFILE = %{SOURCE1}
+CC = %{__cc}
+OPTCFLAGS = %{rpmcflags}
+LDFLAGS = %{rpmldflags}
+EOF
 
-%{__make} clean
-%{__make} %{name} \
-	CC="%{__cc}" \
-	CFLAGS="%{rpmcflags}" \
-	LDFLAGS="%{rpmldflags}"
+install %{SOURCE2} wmint/Makefile
+
+%build
+%{__make} -C wmint clean
+%{__make} -C wmint
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_desktopdir}/docklets}
 
-install %{name}/%{name} $RPM_BUILD_ROOT%{_bindir}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/docklets
+%{__make} -C wmint install \
+	DESTDIR="$RPM_BUILD_ROOT"
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,6 +61,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2010/01/03 02:48:43  sparky
+- use new Makefile
+
 Revision 1.25  2010/01/03 00:32:16  sparky
 - no need for -I%{_includedir}
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wmint/wmint.spec?r1=1.25&r2=1.26&f=u