Author: arekm Date: Tue Sep 9 15:59:46 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - start game with version 127
---- Files affected: SPECS: udev.spec (1.246 -> 1.247) ---- Diffs: ================================================================ Index: SPECS/udev.spec diff -u SPECS/udev.spec:1.246 SPECS/udev.spec:1.247 --- SPECS/udev.spec:1.246 Wed Jul 23 07:06:50 2008 +++ SPECS/udev.spec Tue Sep 9 17:59:41 2008 @@ -32,13 +32,13 @@ Summary: Device manager for the Linux 2.6 kernel series Summary(pl.UTF-8): Zarządca urządzeń dla Linuksa 2.6 Name: udev -Version: 125 -Release: 1.1 +Version: 127 +Release: 0.1 Epoch: 1 License: GPL Group: Base Source0: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.bz2 -# Source0-md5: 27832847086383309bb3acbde2486e29 +# Source0-md5: 59ebde702f1ab557be15ae76d645665b # rules Source1: %{name}-alsa.rules Source2: %{name}.rules @@ -48,7 +48,6 @@ Source11: start_udev # misc Source20: %{name}.blacklist -Patch0: %{name}-lib64.patch URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html BuildRequires: device-mapper-devel %{?with_selinux:BuildRequires: libselinux-devel >= 1.17.13} @@ -60,6 +59,7 @@ %{?with_klibc:BuildRequires: linux-libc-headers} %{?with_uClibc:BuildRequires: uClibc-static >= 0.9.28} %endif +BuildRequires: libxslt-progs Requires: %{name}-core = %{epoch}:%{version}-%{release} Provides: dev = 3.0.0 Obsoletes: dev @@ -112,6 +112,30 @@ Implementacja devfs w przestrzeni użytkownika - statyczna binarka dla initrd. +%package devel +Summary: Header files and develpment documentation for udev +Summary(pl.UTF-8): Pliki nagłówkowe i dokumetacja do udev +Group: Development/Libraries +Requires: %{name} = %{epoch}:%{version}-%{release} + +%description devel +Header files and develpment documentation for udev. + +%description devel -l pl.UTF-8 +Pliki nagłówkowe i dokumentacja do udev. + +%package static +Summary: Static udev library +Summary(pl.UTF-8): Biblioteka statyczna udev +Group: Development/Libraries +Requires: %{name}-devel = %{epoch}:%{version}-%{release} + +%description static +Static udev library. + +%description static -l pl.UTF-8 +Biblioteka statyczna udev. + %package -n libvolume_id Summary: libvolume_id library Summary(pl.UTF-8): Biblioteka libvolume_id @@ -150,18 +174,20 @@ %prep %setup -q -%patch0 -p1 - -sed -i -e 's/$(CC) -shared/$(LD) -shared/' extras/volume_id/lib/Makefile -sed -i -e 's#/lib/udev/#/%{_lib}/udev/#g' *.c extras/rule_generator/write_* %build +%configure \ + %{?debug:--enable-debug} \ + --exec-prefix="" \ + --libdir=/%{_lib} \ + --with-libdir-name=%{_lib} \ + --with-udev-prefix="" \ + --enable-shared \ + --enable-static \ + --without-selinux \ + --disable-logging %if %{with initrd} %{__make} \ -%ifarch athlon - ARCH=i386 \ -%endif - udevdir=/dev \ %{?with_uClibc:CC="%{_target_cpu}-uclibc-gcc"} \ %{?with_uClibc:LD="%{_target_cpu}-uclibc-gcc %{rpmldflags} -static"} \ %{?with_dietlibc:CC="%{_target_cpu}-dietlibc-gcc"} \ @@ -169,52 +195,28 @@ %{?with_glibc:CC="%{_target_cpu}-pld-linux-gcc"} \ %{?with_glibc:LD="%{_target_cpu}-pld-linux-gcc %{rpmldflags} -static"} \ %{?with_klibc:KLCC=%{_bindir}/klcc CC="klcc"} \ - %{?with_klibc:LD="klcc %{rpmldflags} -static"} \ - DEBUG=%{!?debug:false}%{?debug:true} \ - STRIP="/bin/true" \ - USE_KLIBC=%{!?with_klibc:false}%{?with_klibc:true} \ - USE_LOG=false \ - USE_SELINUX=false \ - USE_STATIC=true \ - EXTRAS="%{static_extras}" \ - V=1 - -cp -a udevd initrd-udevd -cp -a udevadm initrd-udevadm - -# What is this FIXME business and why is initrd -# broken, if it's fine? -# FIXME, cause I'm broken - your initrd -%if 0 -cp -a extras/ata_id/ata_id initrd-ata_id -cp -a extras/cdrom_id/cdrom_id initrd-cdrom_id -cp -a extras/edd_id/edd_id initrd-edd_id -cp -a extras/scsi_id/scsi_id initrd-scsi_id -cp -a extras/usb_id/usb_id initrd-usb_id -cp -a extras/volume_id/vol_id initrd-vol_id -%endif + %{?with_klibc:LD="klcc %{rpmldflags} -static"} + +%{__make} install + DESTDIR=$(pwd)/udev-initrd %if %{with main} -%{__make} clean \ - EXTRAS="%{static_extras}" \ - V=1 +%{__make} clean %endif %endif %if %{with main} -%{__make} \ - libudevdir=/%{_lib}/udev \ - libdir=/%{_lib} \ - usrlibdir=%{_libdir} \ - udevdir=/dev \ - CC="%{__cc}" \ - LD="%{__cc} %{rpmldflags}" \ - DEBUG=%{!?debug:false}%{?debug:true} \ - OPTFLAGS="%{rpmcflags}" \ - USE_KLIBC=false \ - USE_LOG=true \ - EXTRAS="%{extras}" \ - V=1 +%configure \ + %{?debug:--enable-debug} \ + --exec-prefix="" \ + --libdir=/%{_lib} \ + --with-libdir-name=%{_lib} \ + --with-udev-prefix="" \ + --enable-shared \ + --enable-static \ + --with-selinux \ + --enable-logging +%{__make} %endif %install @@ -222,16 +224,10 @@ %if %{with main} install -d $RPM_BUILD_ROOT%{_sysconfdir}/{modprobe.d,udev/rules.d} \ - $RPM_BUILD_ROOT/%{_lib}/udev/devices + $RPM_BUILD_ROOT/lib/udev/devices %{__make} install \ - DESTDIR=$RPM_BUILD_ROOT \ - initdir=/etc/rc.d/init.d \ - libudevdir=/%{_lib}/udev \ - libdir=/%{_lib} \ - usrlibdir=%{_libdir} \ - udevdir=/dev \ - EXTRAS="%{extras}" + DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_sysconfdir}/udev/udev.rules rm -f $RPM_BUILD_ROOT%{_sysconfdir}/udev/udev.permissions @@ -255,10 +251,8 @@ install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/udev/links.conf # install executables (scripts, helpers, etc.) -install %{SOURCE10} $RPM_BUILD_ROOT/%{_lib}/udev/net_helper +install %{SOURCE10} $RPM_BUILD_ROOT/lib/udev/net_helper install %{SOURCE11} $RPM_BUILD_ROOT%{_sbindir}/start_udev - -install extras/volume_id/lib/*.a $RPM_BUILD_ROOT%{_libdir} %endif # install misc @@ -284,7 +278,10 @@ %triggerpostun core -- udev < 108 sed -i -e 's#IMPORT{program}="/sbin/#IMPORT{program}="#g' /etc/udev/rules.d/*.rules -sed -i -e 's#/lib/udev/#/%{_lib}/udev/#g' /etc/udev/rules.d/*.rules +sed -i -e 's#/lib/udev/#/lib/udev/#g' /etc/udev/rules.d/*.rules + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig %post -n libvolume_id -p /sbin/ldconfig %postun -n libvolume_id -p /sbin/ldconfig @@ -298,36 +295,37 @@ %files core %defattr(644,root,root,755) -%doc ChangeLog FAQ README RELEASE-NOTES TODO -%doc docs/writing_udev_rules +%doc ChangeLog TODO docs/writing_udev_rules -%dir /%{_lib}/udev +%dir /lib/udev -# /%{_lib}/udev/devices is recommended as a directory where packages or +# /lib/udev/devices is recommended as a directory where packages or # the user can place real device nodes, which get copied over to /dev at # every boot. This should replace the various solutions with custom config # files. -%dir /%{_lib}/udev/devices - -%attr(755,root,root) /%{_lib}/udev/create_floppy_devices -%attr(755,root,root) /%{_lib}/udev/firmware.sh +%dir /lib/udev/devices -%attr(755,root,root) /%{_lib}/udev/*_helper - -%attr(755,root,root) /%{_lib}/udev/ata_id -%attr(755,root,root) /%{_lib}/udev/cdrom_id -%attr(755,root,root) /%{_lib}/udev/edd_id -%attr(755,root,root) /%{_lib}/udev/path_id -%attr(755,root,root) /%{_lib}/udev/scsi_id -%attr(755,root,root) /%{_lib}/udev/usb_id -%attr(755,root,root) /%{_lib}/udev/vol_id +%attr(755,root,root) /lib/udev/create_floppy_devices +%attr(755,root,root) /lib/udev/collect +%attr(755,root,root) /lib/udev/firmware.sh +%attr(755,root,root) /lib/udev/fstab_import + +%attr(755,root,root) /lib/udev/*_helper +%attr(755,root,root) /lib/udev/*_rules + +%attr(755,root,root) /lib/udev/ata_id +%attr(755,root,root) /lib/udev/cdrom_id +%attr(755,root,root) /lib/udev/edd_id +%attr(755,root,root) /lib/udev/path_id +%attr(755,root,root) /lib/udev/scsi_id +%attr(755,root,root) /lib/udev/usb_id +%attr(755,root,root) /lib/udev/vol_id %attr(755,root,root) %{_sbindir}/start_udev %attr(755,root,root) %{_sbindir}/udevd %attr(755,root,root) %{_sbindir}/udevadm -%attr(755,root,root) %{_sbindir}/udevsettle -%attr(755,root,root) %{_bindir}/udevinfo +%attr(755,root,root) /%{_lib}/libudev.so.* %dir %{_sysconfdir}/udev %dir %{_sysconfdir}/udev/rules.d @@ -346,19 +344,33 @@ %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/udev.conf # rules below are NOT supposed to be changed by users -%dir /%{_lib}/udev/rules.d -/%{_lib}/udev/rules.d/50-udev-default.rules -/%{_lib}/udev/rules.d/60-cdrom_id.rules -/%{_lib}/udev/rules.d/60-persistent-input.rules -/%{_lib}/udev/rules.d/60-persistent-storage-tape.rules -/%{_lib}/udev/rules.d/60-persistent-storage.rules -/%{_lib}/udev/rules.d/60-persistent-v4l.rules -/%{_lib}/udev/rules.d/61-persistent-storage-edd.rules -/%{_lib}/udev/rules.d/80-drivers.rules -/%{_lib}/udev/rules.d/95-udev-late.rules +/lib/udev/rule_generator.functions +%dir /lib/udev/rules.d +/lib/udev/rules.d/50-udev-default.rules +/lib/udev/rules.d/60-cdrom_id.rules +/lib/udev/rules.d/60-persistent-input.rules +/lib/udev/rules.d/60-persistent-storage-tape.rules +/lib/udev/rules.d/60-persistent-storage.rules +/lib/udev/rules.d/60-persistent-v4l.rules +/lib/udev/rules.d/61-persistent-storage-edd.rules +/lib/udev/rules.d/75-cd-aliases-generator.rules +/lib/udev/rules.d/75-persistent-net-generator.rules +/lib/udev/rules.d/79-fstab_import.rules +/lib/udev/rules.d/80-drivers.rules +/lib/udev/rules.d/95-udev-late.rules %{_mandir}/man7/udev.7* %{_mandir}/man8/* + +%files devel +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libudev.so +%{_pkgconfigdir}/*.pc +%{_includedir}/*.h + +%files static +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libudev.a %endif %if %{with initrd} @@ -371,7 +383,7 @@ %files -n libvolume_id %defattr(644,root,root,755) %attr(755,root,root) /%{_lib}/libvolume_id.so.*.*.* -%attr(755,root,root) %ghost /%{_lib}/libvolume_id.so.0 +%attr(755,root,root) %ghost /%{_lib}/libvolume_id.so.[0-9] %files -n libvolume_id-devel %defattr(644,root,root,755) @@ -389,6 +401,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.247 2008/09/09 15:59:41 arekm +- start game with version 127 + Revision 1.246 2008/07/23 05:06:50 qboosh - Obsoletes: udev-tools @@ -403,787 +418,3 @@ Revision 1.242 2008/07/22 17:17:11 arekm - rel 1.1 to avoid problems; it's not ready - -Revision 1.241 2008/07/22 02:19:30 arekm -- up to 125; udev standard rules moved to /%{_lib}/udev/rules.d/; pld udev.rules commented out - need to apply only pld local modifications, not entire file - -Revision 1.240 2008-06-14 13:27:19 arekm -- rel 2; fix trigger and settle - -Revision 1.239 2008-06-13 21:41:07 arekm -- up to 124 - -Revision 1.238 2008-05-19 12:44:28 baggins -- rel 2 -- put back 05-udev-early.rules (udev/hal freak out on USB disk insertion without it) - -Revision 1.237 2008-04-27 21:05:18 arekm -- up to 120 - -Revision 1.236 2008-03-11 09:53:43 hawk -- blah, reverted initrd-udev{settle,trigger} symlinks, not needed, we can - and even should handle those in geninitrd -- release 3 - -Revision 1.235 2008-03-10 23:28:41 hawk -- restored initrd-udev{settle,trigger}, they may be used by initrd -- release 2 - -Revision 1.234 2008-02-23 22:25:08 glen -- no dep on kernel pkg name - -Revision 1.233 2008-02-22 19:27:35 qboosh -- hotplug obsoletes moved from -core to main: no real package conflict, let user - decide which one to start -- -core R: uname(release) >= 2.6.15 -- ghost soname symlink - -Revision 1.232 2008-02-03 13:38:32 arekm -- rel 1; seems to work fine - -Revision 1.231 2008-02-03 11:47:19 arekm -- up to 118; try approach with separating core part to udev-core (which can be - installed without messing with /dev/ contents) - -Revision 1.230 2007/10/29 13:54:57 arvenil -- removed /etc/udev/scripts dir (not needed anymore by alsa-udev.spec) - -Revision 1.229 2007/10/24 22:06:10 wrobell -- ver. 116 - -Revision 1.228 2007/08/28 11:36:29 tommat -- no uClibc on sparc for now - -Revision 1.227 2007/08/26 11:16:56 arekm -- up to 115 - -Revision 1.226 2007/08/13 12:32:45 wolf -- 114 - -Revision 1.225 2007/07/27 23:40:55 baggins -- rel 2 -- /dev/{cdrom,cdrw,dvd,dvdrw} symlinks are baaaack! - -Revision 1.224 2007/07/12 22:25:20 wolf -- 113 -- fix descriptions - -Revision 1.223 2007/06/13 20:29:29 arekm -- 112 - -Revision 1.222 2007/06/12 06:43:05 arekm -- rel 1 - -Revision 1.221 2007/05/26 13:08:27 cactus -- added missing dir /etc/udev/scripts - -Revision 1.220 2007/05/26 10:43:03 arekm -- up to 111; not tested - -Revision 1.219 2007/04/10 18:10:46 arekm -- trigger for _lib - -Revision 1.218 2007/04/10 18:04:06 arekm -- more fixes - -Revision 1.217 2007/04/10 17:44:59 arekm -- libdir fix - -Revision 1.216 2007/04/10 17:37:17 arekm -- up to 108 - -Revision 1.215 2007/03/09 17:30:17 arekm -- fix trigger I hope - -Revision 1.214 2007/03/09 17:28:41 arekm -- trigger removing full path to udev extras progs - -Revision 1.213 2007/03/09 17:23:26 arekm -- more lib64 fixes - -Revision 1.212 2007/03/09 17:00:13 arekm -- fix for systems using lib64 dir - -Revision 1.211 2007/03/09 16:39:08 arekm -- up to 106 - -Revision 1.210 2007/02/14 19:02:14 arekm -- up to 105 - -Revision 1.209 2007/02/12 22:09:18 glen -- tabs in preamble - -Revision 1.208 2007/02/12 01:06:35 baggins -- converted to UTF-8 - -Revision 1.207 2007/02/04 11:59:50 qboosh -- tabs - -Revision 1.206 2007/02/03 15:57:45 areq -- bconf without selinux - -Revision 1.205 2007/01/27 14:02:26 czarny -- reverted - my bad, new udev doesn't build udev binary - -Revision 1.204 2007/01/27 13:50:05 czarny -- both udev and udevd should be copied to initrd-udev and initrd-udevd, as there is more than one way to start udev in early-userspace and there is no need to limit those possibilities -- by default PLDs geninitrd uses udev (normal program - no daemon), as it is sufficient and doesn't post problems of running a daemon in early-userspace and not killing it after the real boot - -Revision 1.203 2007/01/19 17:54:57 alucard -- typo in initrd subpackage - -Revision 1.202 2007/01/17 10:12:52 qboosh -- pl for -tools - -Revision 1.201 2007/01/16 11:38:52 glen -- do not assume compressed manpages - -Revision 1.200 2007/01/16 11:36:49 alucard -- fix man page symlink - -Revision 1.199 2007/01/15 20:20:53 arekm -- up to 104 - -Revision 1.198 2007/01/15 14:46:59 glen -- separate udev_import_usermap to -tools - -Revision 1.197 2007/01/15 14:41:13 glen -- verbose files - -Revision 1.196 2007/01/15 14:35:02 glen -- adapter - -Revision 1.195 2006/12/14 17:12:00 czarny -- no more klibc -- uClibc 4 all! - -Revision 1.194 2006/12/14 09:59:06 czarny -- rel 4 -- added initrd-udevd, initrd-udevtrigger,initrd-udevsettle -- udevtrigger and udevsettle needed in initrd to make nodes for -staticly linked devices -- udevd is an alternative for running udev and echoing /sbin/udev > /proc/sys/kernel/hotplug -- now either one runns udevd --daemon in initrd or echoes the above and uses udev -- echo version supported in new geninitrd -- udev works now fully in initrd! - -Revision 1.193 2006/10/25 17:02:19 wolf -- 103 - -Revision 1.192 2006/09/26 22:14:40 shadzik -- remove 60-cdrom_id.rules; it breaks nodes permissions and functionality of other rules - -Revision 1.191 2006/09/25 23:41:10 shadzik -- up to udev-100 -- 60-cdrom_id.rules added - -Revision 1.190 2006/08/23 21:08:22 freetz -- add note about klibc support - -Revision 1.189 2006/08/23 20:53:42 freetz -- 098, install device-mapper rules, rel.0.1 for brave ones - -Revision 1.188 2006/08/13 16:00:30 freetz -- 097, added example rules, use more rules from a tarball, rel.1 for main - package, initrd is unusable in current form anyway - -Revision 1.187 2006/08/12 18:19:36 ankry -- formatting - -Revision 1.186 2006/07/30 18:23:30 sparky -- use rpmldflags - -Revision 1.185 2006/07/14 08:13:53 shadzik -- 096 - -Revision 1.184 2006/07/05 23:23:26 shadzik -- up to 095 -- removed patch0, it's already in source - -Revision 1.183 2006/06/21 21:00:19 pluto -- release 0.2. - -Revision 1.182 2006/06/21 17:41:08 sparky -- udev.blacklist renamed to udev_blacklist.conf - -Revision 1.181 2006/06/21 00:21:19 shadzik -- up to 094 - -Revision 1.180 2006/06/05 23:39:02 aredridel -- rel 2 to rebuild with fixed firmware loader path - -Revision 1.179 2006/06/04 15:40:02 shadzik -- up to 093 -- firmware_helper is now known as firmware.sh ;) - -Revision 1.178 2006/05/13 17:56:08 shadzik -- up to 092, dropped unneeded patch1 - -Revision 1.177 2006/05/10 20:02:21 freetz -- dropped persistent rules creation (not really usable with current PLD - udev state), added early.rules, rel.0.3 - -Revision 1.176 2006/05/02 19:02:03 freetz -- rel.0.2 for testing - -Revision 1.175 2006/05/02 16:56:21 pluto -- clean extras for proper libvolume_id.pc rebuild (lib64 issue). - -Revision 1.174 2006/05/01 16:14:58 freetz -- 091, (just updated, work in progress) - -Revision 1.173 2006/04/24 19:22:20 freetz -- removed uevent_listen (same functionality provides included udevmonitor) - -Revision 1.172 2006/04/23 18:53:34 freetz -- added NFY note - I need more time to finish it, stay tunded - -Revision 1.171 2006/04/23 16:05:03 freetz -- create persistent cdrom and network rules, replaced/added scripts for - pesistent rule creation, added udev.blacklist to avoid autoloading - framebuffer drivers, added functions.udev file to hold functions in one - place , dropped eventrecorder (not very useful) - NFY - work in progress! - -Revision 1.170 2006/04/18 20:51:20 freetz -- C: too old kernel - -Revision 1.169 2006/04/18 19:26:43 freetz -- changelog update - -Revision 1.168 2006/04/18 19:25:52 freetz -- added alsa rule -- reorganized SourceXX, order the rules, cleanup - -Revision 1.167 2006/04/16 17:37:50 qboosh -- added ioctl patch (fixes build with klibc) - -Revision 1.166 2006/04/16 17:23:39 qboosh -- libvolume_id packaging fixes (ldconfig, .so link, respect lib64) - -Revision 1.165 2006/04/16 11:00:56 freetz -- 090, updated file list, with_initrd broken, don't send it to builders -- unofficialy rel.1 for without_initrd parts - -Revision 1.164 2006/04/05 20:12:48 glen <<Diff was trimmed, longer than 597 lines>> ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/udev.spec?r1=1.246&r2=1.247&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
