SPECS (AC-branch): slim.spec - override cflags/ldflags - zlib-deve...

[adamg]

Author: adamg                        Date: Fri Dec 22 19:17:19 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- override cflags/ldflags
- zlib-devel required by freetype-devel
- pass cc/cxx

---- Files affected:
SPECS:
   slim.spec (1.12.2.2 -> 1.12.2.3) 

---- Diffs:

================================================================
Index: SPECS/slim.spec
diff -u SPECS/slim.spec:1.12.2.2 SPECS/slim.spec:1.12.2.3
--- SPECS/slim.spec:1.12.2.2	Fri Dec 22 19:05:29 2006
+++ SPECS/slim.spec	Fri Dec 22 20:17:14 2006
@@ -11,6 +11,7 @@
 Source1:	%{name}.pamd
 Source2:	%{name}.init
 Source3:	%{name}.sysconfig
+Patch0:		%{name}-Makefile.patch
 URL:		http://slim.berlios.de/
 BuildRequires:	XFree86-devel
 BuildRequires:	freetype-devel
@@ -19,7 +20,6 @@
 BuildRequires:	libstdc++-devel
 BuildRequires:	pam-devel
 BuildRequires:	pkgconfig >= 1:0.19
-BuildRequires:	zlib-devel
 Requires(post,preun):	/sbin/chkconfig
 Requires:	mktemp
 Requires:	pam >= 0.79.0
@@ -70,9 +70,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
@@ -126,6 +131,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12.2.3  2006/12/22 19:17:14  adamg
+- override cflags/ldflags
+- zlib-devel required by freetype-devel
+- pass cc/cxx
+
 Revision 1.12.2.2  2006/12/22 18:05:29  adamg
 - typo...
 
================================================================

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