SPECS (LINUX_2_6_20): kernel.spec - drop uheaders bcond.

pluto pluto at pld-linux.org
Thu Apr 19 22:15:46 CEST 2007


Author: pluto                        Date: Thu Apr 19 20:15:46 2007 GMT
Module: SPECS                         Tag: LINUX_2_6_20
---- Log message:
- drop uheaders bcond.

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1698.2.109 -> 1.441.2.1698.2.110) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1698.2.109 SPECS/kernel.spec:1.441.2.1698.2.110
--- SPECS/kernel.spec:1.441.2.1698.2.109	Wed Apr 18 23:34:56 2007
+++ SPECS/kernel.spec	Thu Apr 19 22:15:40 2007
@@ -28,8 +28,6 @@
 %bcond_without	pcmcia		# don't build pcmcia
 %bcond_without	regparm		# if your blob doesn't work try disable this
 
-%bcond_with	uheaders	# userspace headers
-
 %bcond_with	abi		# build ABI support only ix86 !!
 %bcond_with	verbose		# verbose build (V=1)
 %bcond_with	xen0		# added Xen0 support
@@ -749,26 +747,6 @@
 modules. You could consider replacing this package with
 kernel-misc-usb-rndis-lite.
 
-%package libc-headers
-Summary:	Header files for userspace applications
-Summary(pl.UTF-8):	Pliki nagłówkowe dla aplikacji użytkownika
-Group:		Development
-Provides:	alsa-driver-devel
-Provides:	glibc-kernel-headers = 7:%{version}-%{release}
-Provides:	i2c-devel = 2.8.2
-Provides:	linux-libc-headers = 7:%{version}-%{release}
-Obsoletes:	alsa-driver-devel
-Obsoletes:	glibc-kernel-headers
-Obsoletes:	glibc-kernheaders
-Obsoletes:	linux-libc-headers
-Autoreqprov:	no
-
-%description libc-headers
-These are the C header files for userspace applications.
-
-%description libc-headers -l pl.UTF-8
-Pakiet zawiera pliki nagłówkowe dla aplikacji użytkownika.
-
 %prep
 %setup -q -n linux-%{_basever}%{_rc} %{?with_abi:-a14}
 
@@ -1336,17 +1314,6 @@
 install -d $RPM_BUILD_ROOT%{_kernelsrcdir}
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/%{kernel_release}
 
-%if %{with uheaders}
-%{__make} headers_install \
-	INSTALL_HDR_PATH=$RPM_BUILD_ROOT%{_prefix} \
-%if "%{_target_base_arch}" != "%{_arch}"
-	ARCH=%{_target_base_arch}
-%endif
-
-# glibc-headers
-rm -rf $RPM_BUILD_ROOT%{_includedir}/scsi
-%endif
-
 # test if we can hardlink -- %{_builddir} and $RPM_BUILD_ROOT on same partition
 if cp -al COPYING $RPM_BUILD_ROOT/COPYING 2>/dev/null; then
 	l=l
@@ -1639,12 +1606,6 @@
 %{_kernelsrcdir}/scripts/kconfig/*
 %{_kernelsrcdir}/scripts/mkcompile_h
 
-%if %{with uheaders}
-%files libc-headers
-%defattr(644,root,root,755)
-%{_includedir}/*
-%endif
-
 %files doc
 %defattr(644,root,root,755)
 %{_kernelsrcdir}/Documentation
@@ -1698,6 +1659,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1698.2.110  2007/04/19 20:15:40  pluto
+- drop uheaders bcond.
+
 Revision 1.441.2.1698.2.109  2007/04/18 21:34:56  blues
 - touch modules.dep unconditionally. It does nothing bad and gives at least
   empty modules.dep. Even if depmod fails.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1698.2.109&r2=1.441.2.1698.2.110&f=u



More information about the pld-cvs-commit mailing list