rpms/hotplug/devel hotplug.spec,1.33,1.34

Wed Jul 20 01:02:17 UTC 2005

Author: notting

Update of /cvs/dist/rpms/hotplug/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11487

Modified Files:
	hotplug.spec 
Log Message:
kill more legacy scripts



Index: hotplug.spec
===================================================================
RCS file: /cvs/dist/rpms/hotplug/devel/hotplug.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34

--- hotplug.spec	14 Jul 2005 04:18:28 -0000	1.33
+++ hotplug.spec	20 Jul 2005 01:02:15 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: A helper application which loads modules for USB devices.
 Name: hotplug
 Version: 2004_09_23
-Release: 8
+Release: 9
 Epoch: 3
 Group: System Environment/Kernel
 License: GPL
@@ -10,52 +10,19 @@
 Obsoletes: hotplug-gtk
 Source0: %{name}-%{version}.tar.bz2
 Source4: fxload-2002_04_11.tar.gz
-Source5: dasd-devfs-compat-0.2.tar.bz2
-
-%ifnarch s390 s390x
-%define with_fxload	1
-%define with_dasd_devfs	0
-
-%else
-%define with_fxload	0
-%define with_dasd_devfs	1
-%endif
-
-# We don't want hotplug to initialize the USB core modules, but we
-# want to synthesize boot events
-Patch0: hotplug-2001_04_24-nousbinit.patch
-
-# Add some IDs
-Patch1: hotplug-id.patch
 
 # Call ifdown on interface unregister
-Patch2: hotplug-ifdown.patch
-
-# Don't freak if there are multiple /sys
-Patch3: hotplug-2004_09_23-firmwaresys.patch
-
-# We don't include initscript, don't reference it in the man page
-Patch5: hotplug-2003_08_05-initfile.patch
-
-# load sg modules for appropriate devices
-Patch7: hotplug-sg.patch
-
-# fix remove events for usb (#121511)
-Patch8: hotplug-usb-remove.patch
-
-# Support for osst (#143655)
-Patch9: osst-hp.patch
+Patch1: hotplug-ifdown.patch
 
 # make sure we bring up the right network interface name
-Patch11: hotplug-2002_04_01-hwaddr.patch
-Patch12: hotplug-2004_04_01-optim.patch
+Patch2: hotplug-2002_04_01-hwaddr.patch
 
 # fix path to ifrename, even though there are better ways to do this
-Patch13: hotplug-ifrename.patch
+Patch3: hotplug-ifrename.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prereq:	chkconfig
-Requires: hwdata >= 0.140-1, initscripts >= 8.11-1, udev >= 062
+Requires: hwdata >= 0.140-1, initscripts >= 8.11-1, udev >= 063
 
 %description 
 The term "hotplugging" refers to the dynamic reconfiguration performed
@@ -65,53 +32,30 @@
 device.
 
 %prep
-%setup -q -a 4 -a 5
+%setup -q -a 4
 
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch5 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
 
 rm -f etc/hotplug/*.orig
 
 %build 
-%if %{with_fxload}
 pushd fxload-2002_04_11
 make
 popd
-%endif
 
 %install
 # build directories
 rm -rf $RPM_BUILD_ROOT
 make prefix=${RPM_BUILD_ROOT} install
 
-
-%if %{with_fxload}
 # firmware load utility
 pushd fxload-2002_04_11
 install -m 755 fxload $RPM_BUILD_ROOT/sbin
 install -m 644 fxload.8 $RPM_BUILD_ROOT/%{_mandir}/man8/
 mv README.txt ../README.txt.fxload
 popd
-%endif
-
-%if %{with_dasd_devfs}
-pushd dasd-devfs-compat-0.2
-# install the main hotplug script
-install -m 755 sbin/* $RPM_BUILD_ROOT/sbin/
-
-# install the helper hotplug scripts
-cp -a -r etc/hotplug/* ${RPM_BUILD_ROOT}/etc/hotplug/
-popd
-%endif
 
 mkdir -m 755 -p $RPM_BUILD_ROOT/lib/firmware
 
@@ -126,15 +70,24 @@
 
 rm -rf $RPM_BUILD_ROOT/etc/hotplug/pci*
 
+rm -rf $RPM_BUILD_ROOT/etc/hotplug.d/default/*
+
+rm -rf $RPM_BUILD_ROOT/etc/hotplug/dasd*
+rm -rf $RPM_BUILD_ROOT/etc/hotplug/firmware*
+rm -rf $RPM_BUILD_ROOT/etc/hotplug/ieee1394*
+rm -rf $RPM_BUILD_ROOT/etc/hotplug/pnp*
+rm -rf $RPM_BUILD_ROOT/etc/hotplug/scsi*
+rm -rf $RPM_BUILD_ROOT/etc/hotplug/tape*
+rm -rf $RPM_BUILD_ROOT/sbin/hotplug
+rm -rf $RPM_BUILD_ROOT%{_mandir}/*/hotplug*
+
 %clean
 rm -fr $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
 %doc README ChangeLog
-%if %{with_fxload}
-  %doc README.txt.fxload
-%endif
+%doc README.txt.fxload
 /lib/firmware
 /sbin/*
 %config /etc/hotplug/*
@@ -144,6 +97,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Tue Jul 19 2005 Bill Nottingham <notting at redhat.com> 3:2004_09_23-9
+- move more things to udev - only input.agent, net.agent left
+
 * Thu Jul 14 2005 Bill Nottingham <notting at redhat.com> 3:2004_09_23-8
 - remove pci*, usb* in favor of udev
 


