packages: wmWeather/wmWeather.spec - added Makefile patch - use __cc and rp...
sparky
sparky at pld-linux.org
Sun Jan 3 01:51:51 CET 2010
Author: sparky Date: Sun Jan 3 00:51:51 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- added Makefile patch
- use __cc and rpmldflags
- make install, because it works now
---- Files affected:
packages/wmWeather:
wmWeather.spec (1.37 -> 1.38)
---- Diffs:
================================================================
Index: packages/wmWeather/wmWeather.spec
diff -u packages/wmWeather/wmWeather.spec:1.37 packages/wmWeather/wmWeather.spec:1.38
--- packages/wmWeather/wmWeather.spec:1.37 Thu Dec 31 01:29:57 2009
+++ packages/wmWeather/wmWeather.spec Sun Jan 3 01:51:46 2010
@@ -9,6 +9,7 @@
Source0: http://nis-www.lanl.gov/~mgh/WindowMaker/%{name}-%{version}.tar.gz
# Source0-md5: f04693aa86d22099162cff3d0b5c9275
Source1: %{name}.desktop
+Patch0: %{name}-Makefile.patch
URL: http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml
BuildRequires: xorg-lib-libXext-devel
BuildRequires: xorg-lib-libXpm-devel
@@ -27,22 +28,22 @@
%prep
%setup -q
+%patch0 -p1
%build
%{__make} -C Src \
+ CC="%{__cc}" \
CFLAGS="%{rpmcflags} -Wall" \
- LIBDIR="-L/usr/%{_lib}"
+ LDFLAGS="%{rpmldflags}"
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1} \
- $RPM_BUILD_ROOT%{_desktopdir}/docklets
+install -d $RPM_BUILD_ROOT%{_desktopdir}/docklets
-install Src/%{name} $RPM_BUILD_ROOT%{_bindir}
-install Src/GrabWeather $RPM_BUILD_ROOT%{_bindir}
-install Src/%{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1
-install %{SOURCE1} $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
@@ -61,6 +62,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.38 2010/01/03 00:51:46 sparky
+- added Makefile patch
+- use __cc and rpmldflags
+- make install, because it works now
+
Revision 1.37 2009/12/31 00:29:57 evil
- migrated from old X11R6 to new xorg 7.x
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wmWeather/wmWeather.spec?r1=1.37&r2=1.38&f=u
More information about the pld-cvs-commit
mailing list