SPECS: acx100.spec - fix %prep, tabs, cleanups

glen glen at pld-linux.org
Wed Apr 12 13:03:57 CEST 2006


Author: glen                         Date: Wed Apr 12 11:03:57 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix %prep, tabs, cleanups

---- Files affected:
SPECS:
   acx100.spec (1.51 -> 1.52) 

---- Diffs:

================================================================
Index: SPECS/acx100.spec
diff -u SPECS/acx100.spec:1.51 SPECS/acx100.spec:1.52
--- SPECS/acx100.spec:1.51	Wed Apr 12 12:23:32 2006
+++ SPECS/acx100.spec	Wed Apr 12 13:03:52 2006
@@ -60,64 +60,53 @@
 Sterownik dla Linuksa SMP do kart bezprzewodowych na układzie ACX100.
 
 %prep
-#setup -q -n %{name}-%{version}
-cd $RPM_BUILD_DIR
-install -d %{name}-%{version}
-cd %{name}-%{version}
-tar xfj %{SOURCE0}
-/bin/chmod -Rf a+rX,u+w,g-w,o-w .
-
-%define buildconfigs %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}
+%setup -q -c -n %{name}-%{version}
 
 %build
 # kernel module(s)
-cd %{name}-%{version}
-#cd src
 install -d modules/{up,smp}
 for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do
-        if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
-                exit 1
-        fi
-        install -d o/include/linux
-        ln -sf %{_kernelsrcdir}/config-$cfg o/.config
-        ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
-        ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h
+	if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
+		exit 1
+	fi
+	install -d o/include/linux
+	ln -sf %{_kernelsrcdir}/config-$cfg o/.config
+	ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
+	ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h
 %if %{with dist_kernel}
-        %{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts
+	%{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts
 %else
-        install -d o/include/config
-        touch o/include/config/MARKER
-        ln -sf %{_kernelsrcdir}/scripts o/scripts
+	install -d o/include/config
+	touch o/include/config/MARKER
+	ln -sf %{_kernelsrcdir}/scripts o/scripts
 %endif
 #
 #       patching/creating makefile(s) (optional)
 #
-        %{__make} -C %{_kernelsrcdir} clean \
-                RCS_FIND_IGNORE="-name '*.ko' -o" \
-                SYSSRC=%{_kernelsrcdir} \
-                SYSOUT=$PWD/o \
-                M=$PWD O=$PWD/o \
-                %{?with_verbose:V=1}
-        %{__make} -C %{_kernelsrcdir} modules \
-                CC="%{__cc}" CPP="%{__cpp}" \
-                SYSSRC=%{_kernelsrcdir} \
-                SYSOUT=$PWD/o \
-                M=$PWD O=$PWD/o \
-                %{?with_verbose:V=1}
+	%{__make} -C %{_kernelsrcdir} clean \
+		RCS_FIND_IGNORE="-name '*.ko' -o" \
+		SYSSRC=%{_kernelsrcdir} \
+		SYSOUT=$PWD/o \
+		M=$PWD O=$PWD/o \
+		%{?with_verbose:V=1}
+	%{__make} -C %{_kernelsrcdir} modules \
+		CC="%{__cc}" CPP="%{__cpp}" \
+		SYSSRC=%{_kernelsrcdir} \
+		SYSOUT=$PWD/o \
+		M=$PWD O=$PWD/o \
+		%{?with_verbose:V=1}
 
-        mv acx.ko modules/$cfg/
+	mv acx.ko modules/$cfg/
 done
 
 %install
-cd %{name}-%{version}
 rm -rf $RPM_BUILD_ROOT
 
-#Add directory to store firmware
+# Add directory to store firmware
 install -d $RPM_BUILD_ROOT%{_datadir}/acx
-
 install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
 
-for cfg in %{buildconfigs}; do
+for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do
 	cfgdest=''
 	if [ "$cfg" = "smp" ]; then
 		install modules/$cfg/*.ko \
@@ -163,6 +152,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.52  2006/04/12 11:03:52  glen
+- fix %prep, tabs, cleanups
+
 Revision 1.51  2006/04/12 10:23:32  cieciwa
 - _rel 1,
 - ready for 2.6.16.
@@ -179,4 +171,3 @@
 
 Revision 1.47  2006/04/12 09:43:24  cieciwa
 - new version of ACX driver.
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/acx100.spec?r1=1.51&r2=1.52&f=u



More information about the pld-cvs-commit mailing list