SPECS (AC-branch): kernel24.spec - check-files cleanup - do not use <= in t...

glen glen at pld-linux.org
Tue May 13 09:11:06 CEST 2008


Author: glen                         Date: Tue May 13 07:11:06 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- check-files cleanup
- do not use <= in triggers

---- Files affected:
SPECS:
   kernel24.spec (1.793.2.16 -> 1.793.2.17) 

---- Diffs:

================================================================
Index: SPECS/kernel24.spec
diff -u SPECS/kernel24.spec:1.793.2.16 SPECS/kernel24.spec:1.793.2.17
--- SPECS/kernel24.spec:1.793.2.16	Tue May 13 00:17:42 2008
+++ SPECS/kernel24.spec	Tue May 13 09:11:00 2008
@@ -28,7 +28,7 @@
 
 %define		basever	2.4.36
 %define		postver	.4
-%define		rel	0.1
+%define		rel	0.2
 Summary:	The Linux kernel (the core of the Linux operating system)
 Summary(de):	Der Linux-Kernel (Kern des Linux-Betriebssystems)
 Summary(es):	Núcleo (Kernel) linux genérico
@@ -1206,8 +1206,10 @@
 		ln -sf %{_prefix}/src/linux-%{version} \
 			$RPM_BUILD_ROOT/lib/modules/%{version}-%{release}$i/build
 	fi
+
+	# just symlinks. we package real modules
+	rm -rf $RPM_BUILD_ROOT/lib/modules/%{version}-%{release}$i/pcmcia
 done
-ln -sf linux-%{version} $RPM_BUILD_ROOT%{_prefix}/src/linux-2.4
 
 sed -i -e 's/EXTRAVERSION =.*/EXTRAVERSION = -%{release}/g' Makefile
 %if %{with source}
@@ -1381,11 +1383,23 @@
 %endif
 %endif
 
+rm -f $RPM_BUILD_ROOT%{_prefix}/src/linux-%{version}/.config.old
+rm -f $RPM_BUILD_ROOT%{_prefix}/src/linux-%{version}/README.openswan-2
+rm -f $RPM_BUILD_ROOT%{_prefix}/src/linux-%{version}/dc395/Makefile
+rm -f $RPM_BUILD_ROOT%{_prefix}/src/linux-%{version}/dc395/Makefile.dc395
+rm -f $RPM_BUILD_ROOT%{_prefix}/src/linux-%{version}/dc395/README.dc395x
+rm -f $RPM_BUILD_ROOT%{_prefix}/src/linux-%{version}/dc395/dc395-integ20.diff
+rm -f $RPM_BUILD_ROOT%{_prefix}/src/linux-%{version}/dc395/dc395-integ22.diff
+rm -f $RPM_BUILD_ROOT%{_prefix}/src/linux-%{version}/dc395/dc395-integ24.diff
+rm -f $RPM_BUILD_ROOT%{_prefix}/src/linux-%{version}/dc395/dc395-integ25.diff
+rm -f $RPM_BUILD_ROOT%{_prefix}/src/linux-%{version}/dc395/dc395x_trm.c
+rm -f $RPM_BUILD_ROOT%{_prefix}/src/linux-%{version}/dc395/dc395x_trm.h
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_DIR/linux-%{version}-installed
 
-%triggerin -- %{name} <= 2.4.27-1.6
+%triggerin -- %{name} < 2.4.27-1.6
 # backward compatibility, same for smp
 mv -f /boot/vmlinuz	/boot/vmlinuz.old	2>/dev/null || :
 mv -f /boot/System.map	/boot/System.map.old	2>/dev/null || :
@@ -1418,7 +1432,7 @@
 %postun
 rm -f /boot/initrd-%{version}-%{release}.gz
 
-%triggerin smp -- %{name}-smp <= 2.4.27-1.6
+%triggerin smp -- %{name}-smp < 2.4.27-1.6
 # backward compatibility, same for up
 mv -f /boot/vmlinuz	/boot/vmlinuz.old	2>/dev/null || :
 mv -f /boot/System.map	/boot/System.map.old	2>/dev/null || :
@@ -1712,6 +1726,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.793.2.17  2008-05-13 07:11:00  glen
+- check-files cleanup
+- do not use <= in triggers
+
 Revision 1.793.2.16  2008-05-12 22:17:42  glen
 - sed typo
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel24.spec?r1=1.793.2.16&r2=1.793.2.17&f=u



More information about the pld-cvs-commit mailing list