SPECS: slim.spec - override cflags/ldflags - zlib-devel required b...

[adamg]

Author: adamg                        Date: Fri Dec 22 18:58:20 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- override cflags/ldflags
- zlib-devel required by freetype-devel
- pass cc/cxx

---- Files affected:
SPECS:
   slim.spec (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: SPECS/slim.spec
diff -u SPECS/slim.spec:1.13 SPECS/slim.spec:1.14
--- SPECS/slim.spec:1.13	Fri Dec 22 19:05:52 2006
+++ SPECS/slim.spec	Fri Dec 22 19:58:15 2006
@@ -11,6 +11,7 @@
 Source1:	%{name}.pamd
 Source2:	%{name}.init
 Source3:	%{name}.sysconfig
+Patch0:		%{name}-Makefile.patch
 URL:		http://slim.berlios.de/
 BuildRequires:	freetype-devel
 BuildRequires:	libjpeg-devel
@@ -21,7 +22,6 @@
 BuildRequires:	xorg-lib-libXft-devel
 BuildRequires:	xorg-lib-libXmu-devel
 BuildRequires:	xorg-lib-libXrender-devel
-BuildRequires:	zlib-devel
 Requires(post,preun):	/sbin/chkconfig
 Requires:	mktemp
 Requires:	pam >= 0.79.0
@@ -72,9 +72,14 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__make} \
+	CC="%{__cc}" \
+	CXX="%{__cxx}" \
+	CFLAGS="%{rpmcflags}" \
+	LDFLAGS="%{rpmldflags} -L/usr/X11R6/%{_lib}" \
 	CFGDIR=%{_sysconfdir}/X11/slim
 
 %install
@@ -128,6 +133,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2006/12/22 18:58:15  adamg
+- override cflags/ldflags
+- zlib-devel required by freetype-devel
+- pass cc/cxx
+
 Revision 1.13  2006/12/22 18:05:52  adamg
 - typo...
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/slim.spec?r1=1.13&r2=1.14&f=u