Author: sparky Date: Sun Jan 3 02:42:35 2010 GMT Module: packages Tag: HEAD ---- Log message: - use new Makefile
---- Files affected: packages/wmSpaceWeather: wmSpaceWeather.spec (1.48 -> 1.49) ---- Diffs: ================================================================ Index: packages/wmSpaceWeather/wmSpaceWeather.spec diff -u packages/wmSpaceWeather/wmSpaceWeather.spec:1.48 packages/wmSpaceWeather/wmSpaceWeather.spec:1.49 --- packages/wmSpaceWeather/wmSpaceWeather.spec:1.48 Thu Dec 31 01:33:44 2009 +++ packages/wmSpaceWeather/wmSpaceWeather.spec Sun Jan 3 03:42:30 2010 @@ -9,6 +9,7 @@ Source0: http://nis-www.lanl.gov/~mgh/WindowMaker/%{name}-%{version}.tar.gz # Source0-md5: b91415bc9e234d3e6fcd93d34c7fd680 Source1: %{name}.desktop +Source2: %{name}.Makefile Patch0: %{name}-fix.patch URL: http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml BuildRequires: xorg-lib-libXext-devel @@ -35,23 +36,30 @@ %setup -q %patch0 -p1 +awk '/OBJS *=/{p=1} {if(p)print} !/\\$/{p=0}' wmSpaceWeather/Makefile \ + > wmSpaceWeather/Makefile.include + +cat << 'EOF' >> wmSpaceWeather/Makefile.include +NAME = %{name} +EXTRABIN = GetKp +MAN1FILE = %{name}.1 +DOCKLETFILE = %{SOURCE1} +CC = %{__cc} +OPTCFLAGS = %{rpmcflags} +LDFLAGS = %{rpmldflags} +EOF + +install %{SOURCE2} wmSpaceWeather/Makefile + %build -%{__make} -C %{name} clean -%{__make} -C %{name} \ - CFLAGS="%{rpmcflags} -Wall" \ - INCDIR="-I%{_includedir}" \ - LIBDIR="-L/usr/%{_lib}" +%{__make} -C wmSpaceWeather clean +%{__make} -C wmSpaceWeather %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1} \ - $RPM_BUILD_ROOT%{_desktopdir}/docklets - -install %{name}/%{name} $RPM_BUILD_ROOT%{_bindir} -install %{name}/GetKp $RPM_BUILD_ROOT%{_bindir} -install %{name}/%{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1 -install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/docklets +%{__make} -C wmSpaceWeather install \ + DESTDIR="$RPM_BUILD_ROOT" %clean rm -rf $RPM_BUILD_ROOT @@ -61,7 +69,7 @@ %doc BUGS CHANGES HINTS README %attr(755,root,root) %{_bindir}/%{name} %attr(755,root,root) %{_bindir}/GetKp -%{_mandir}/man1/* +%{_mandir}/man1/%{name}.1* %{_desktopdir}/docklets/wmSpaceWeather.desktop %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -70,6 +78,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.49 2010/01/03 02:42:30 sparky +- use new Makefile + Revision 1.48 2009/12/31 00:33:44 evil - adapterized ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wmSpaceWeather/wmSpaceWeather.spec?r1=1.48&r2=1.49&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
