Author: arekm Date: Sat Aug 15 20:06:48 2009 GMT Module: packages Tag: HEAD ---- Log message: - up to 146
---- Files affected: packages/udev: udev.spec (1.299 -> 1.300) , udev-libpath.patch (NONE -> 1.1) (NEW), udev-so.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/udev/udev.spec diff -u packages/udev/udev.spec:1.299 packages/udev/udev.spec:1.300 --- packages/udev/udev.spec:1.299 Sun Aug 2 22:32:14 2009 +++ packages/udev/udev.spec Sat Aug 15 22:06:43 2009 @@ -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: 145 +Version: 146 Release: 1 Epoch: 1 License: GPL Group: Base Source0: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.bz2 -# Source0-md5: b3d3b5f88c7b81e7615700a04db685e1 +# Source0-md5: b2a8acefda4fa8a70d45642035abd718 # rules Source1: %{name}-alsa.rules Source2: %{name}.rules @@ -52,6 +52,8 @@ Source30: %{name}-initramfs-bottom Source31: %{name}-initramfs-hook Source32: %{name}-initramfs-premount +Patch0: %{name}-so.patch +Patch1: %{name}-libpath.patch URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html BuildRequires: ConsoleKit-devel BuildRequires: autoconf @@ -241,6 +243,8 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p0 %build %{__libtoolize} @@ -259,28 +263,33 @@ %{?debug:--enable-debug} \ --libexecdir=/lib/udev \ --with-rootlibdir=/%{_lib} \ - --disable-extras \ --disable-gtk-doc \ --disable-logging \ --disable-shared \ --enable-static \ --with-pci-ids-path=%{_sysconfdir} \ - --with-selinux \ - --with-udev-prefix=/ -%{__make} \ + --with-selinux + +# don't build few things for initrd +cp -a Makefile Makefile.org +sed -i -e 's#extras/usb_id/usb_id$(EXEEXT)##g' \ + -e 's#extras/usb-db/usb-db$(EXEEXT)##g' \ + -e 's#extras/hid2hci/hid2hci$(EXEEXT)##g' \ + -e 's#extras/modem-modeswitch/modem-modeswitch$(EXEEXT)##g' \ + Makefile + +%{__make} -f Makefile \ LDFLAGS="-all-static" DEST=$(pwd)/udev-initrd -for dir in extras udev; do - cd $dir - %{__make} -j 1 install \ - DESTDIR=$DEST - cd .. -done +%{__make} -f Makefile -j 1 install \ + DESTDIR=${DEST} %if %{with main} %{__make} clean %endif + +cp -a Makefile.org Makefile %endif %if %{with main} @@ -296,8 +305,7 @@ --enable-shared \ --enable-static \ --with-pci-ids-path=%{_sysconfdir} \ - --with-selinux \ - --with-udev-prefix=/ + --with-selinux %{__make} %endif @@ -537,6 +545,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.300 2009/08/15 20:06:43 arekm +- up to 146 + Revision 1.299 2009/08/02 20:32:14 arekm - BR gperf (from pefi) ================================================================ Index: packages/udev/udev-libpath.patch diff -u /dev/null packages/udev/udev-libpath.patch:1.1 --- /dev/null Sat Aug 15 22:06:48 2009 +++ packages/udev/udev-libpath.patch Sat Aug 15 22:06:43 2009 @@ -0,0 +1,24 @@ +--- Makefile.am 2009-08-15 22:04:56.536696651 +0200 ++++ /tmp/Makefile.am 2009-08-15 22:04:31.812740885 +0200 +@@ -534,12 +534,13 @@ + + extras/gudev/GUdev-1.0.gir: extras/gudev/libgudev-1.0.la $(G_IR_SCANNER) Makefile.am + $(AM_V_GEN)PKG_CONFIG_PATH=$(top_builddir)/data:$$PKG_CONFIG_PATH \ ++ LD_LIBRARY_PATH=extras/gudev/.libs \ + $(G_IR_SCANNER) -v \ + --namespace GUdev \ + --nsversion=1.0 \ + --include=GObject-2.0 \ + --library=gudev-1.0 \ +- --library-path=extras/gudev \ ++ --library-path=extras/gudev/.libs \ + --output $@ \ + --pkg=glib-2.0 \ + --pkg=gobject-2.0 \ +@@ -556,4 +557,5 @@ + $(top_srcdir)/extras/gudev/gudevdevice.c + + extras/gudev/GUdev-1.0.typelib: extras/gudev/GUdev-1.0.gir $(G_IR_COMPILER) +- $(AM_V_GEN)g-ir-compiler $< -o $@ ++ $(AM_V_GEN)LD_LIBRARY_PATH=extras/gudev/.libs \ ++ g-ir-compiler $< -o $@ ================================================================ Index: packages/udev/udev-so.patch diff -u /dev/null packages/udev/udev-so.patch:1.1 --- /dev/null Sat Aug 15 22:06:48 2009 +++ packages/udev/udev-so.patch Sat Aug 15 22:06:43 2009 @@ -0,0 +1,15 @@ +--- udev-146/Makefile.am~ 2009-08-14 14:14:06.000000000 +0200 ++++ udev-146/Makefile.am 2009-08-15 20:54:31.651285047 +0200 +@@ -485,8 +485,10 @@ + mkdir -p $(DESTDIR)$(rootlib_execdir) && \ + so_img_name=$$(readlink $(DESTDIR)$(libdir)/libudev.so) && \ + so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \ +- ln -sf $$so_img_rel_target_prefix$(rootlib_execdir)/$$so_img_name $(DESTDIR)$(libdir)/libudev.so && \ +- mv $(DESTDIR)$(libdir)/libudev.so.* $(DESTDIR)$(rootlib_execdir); \ ++ if test "x$$so_img_name" != "x"; then \ ++ ln -sf $$so_img_rel_target_prefix$(rootlib_execdir)/$$so_img_name $(DESTDIR)$(libdir)/libudev.so && \ ++ mv $(DESTDIR)$(libdir)/libudev.so.* $(DESTDIR)$(rootlib_execdir); \ ++ fi; true; \ + fi + + libudev-uninstall-move-hook: ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/udev/udev.spec?r1=1.299&r2=1.300&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
