SPECS: svgalib.spec - don't build -helper twice

shadzik shadzik at pld-linux.org
Thu Apr 5 00:01:03 CEST 2007


Author: shadzik                      Date: Wed Apr  4 22:01:03 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- don't build -helper twice

---- Files affected:
SPECS:
   svgalib.spec (1.172 -> 1.173) 

---- Diffs:

================================================================
Index: SPECS/svgalib.spec
diff -u SPECS/svgalib.spec:1.172 SPECS/svgalib.spec:1.173
--- SPECS/svgalib.spec:1.172	Wed Apr  4 23:32:14 2007
+++ SPECS/svgalib.spec	Thu Apr  5 00:00:58 2007
@@ -326,33 +326,6 @@
 	 kernel/svgalib_helper-dist.ko
 rm -f kernel/svgalib_helper/*.*o
 
-%if %{with dist_kernel}
-cd kernel/svgalib_helper
-install -d o/include/linux
-ln -sf %{_kernelsrcdir}/config-dist o/.config
-ln -sf %{_kernelsrcdir}/include/linux/autoconf-dist.h o/include/linux/autoconf.h
-ln -sf %{_kernelsrcdir}/Module.symvers-dist o/Module.symvers
-%{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts
-%ifarch ppc ppc64
-# no longer exists in 2.6.14.x
-touch o/include/asm/segment.h
-%endif
-%{__make} -C %{_kernelsrcdir} modules \
-	CLASS_CFLAGS="$CLF" \
-	SUBDIRS=`pwd` \
-	O=`pwd`/o \
-	V=1
-cd -
-%else
-%{__make} -C kernel/svgalib_helper -f Makefile.alt \
-	CC="%{kgcc}" \
-%ifarch sparc64
-	LD="ld -m elf64_sparc" \
-%endif
-	COPT="%{rpmcflags}" \
-	INCLUDEDIR=%{_kernelsrcdir}/include
-%endif
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -432,6 +405,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.173  2007/04/04 22:00:58  shadzik
+- don't build -helper twice
+
 Revision 1.172  2007/04/04 21:32:14  shadzik
 - use new kernel macros
 - remove smp stuff
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/svgalib.spec?r1=1.172&r2=1.173&f=u



More information about the pld-cvs-commit mailing list