Merge remote-tracking branch 'stevee/gobject-introspection'

diff --git a/cryptsetup-luks/cryptsetup-luks.nm b/cryptsetup-luks/cryptsetup-luks.nm
index d57dea9b6cabbc25361b66a2c0f5c94ec9c8d4e2..d39a75f8fa1e0105d6bbbe2746cabfb4697a0dd8 100644 (file)
--- a/cryptsetup-luks/cryptsetup-luks.nm
+++ b/cryptsetup-luks/cryptsetup-luks.nm
@@ -4,8 +4,10 @@
 ###############################################################################
 
 name       = cryptsetup-luks
-version    = 1.1.0
-release    = 3
+version    = 1.4.2
+release    = 1
+
+compat_version = 1.1.0
 
 groups     = System/Filesystems
 url        = http://cryptsetup.googlecode.com/
@@ -13,12 +15,15 @@ license    = GPLv2+
 summary    = A utility for setting up encrypted filesystems.
 
 description
-       This package contains cryptsetup, a utility for setting up \
+       This package contains cryptsetup, a utility for setting up
        encrypted filesystems using Device Mapper and the dm-crypt target.
 end
 
-source_dl  =
-sources    = cryptsetup-%{version}.tar.bz2
+source_dl  = http://cryptsetup.googlecode.com/files/
+
+sources    = \
+       cryptsetup-%{version}.tar.bz2 \
+       cryptsetup-%{compat_version}.tar.bz2
 
 build
        requires
@@ -33,11 +38,35 @@ build
 
        configure_options += \
                --disable-static
+
+       # Build compat version of libcryptsetup.
+       build_cmds
+               cd %{DIR_SRC}/cryptsetup-%{compat_version}
+               ./configure \
+                       %{configure_options}
+
+               make %{PARALELLISMFLAGS}
+       end
+
+       install_cmds
+               # Install compat version of libcyptsetup.
+               cd %{DIR_SRC}/cryptsetup-%{compat_version}
+               install -m 644 lib/.libs/libcryptsetup.so.1.0.0 %{BUILDROOT}%{libdir}
+               ln -svf libcryptsetup.so.1.0.0 %{BUILDROOT}%{libdir}/libcryptsetup.so.1 
+       end
 end
 
 packages
        package %{name}
 
+       package %{name}-compat
+               summary = Compat libraries of %{thisapp}.
+
+               files
+                       %{libdir}/libcryptsetup.so.1*
+               end
+       end
+
        package %{name}-devel
                template DEVEL
        end

diff --git a/dhcp/dhcp.nm b/dhcp/dhcp.nm
index 246ad17a1ec53f3fe028e8da4591de7729a4455a..f9667b20f9c8460ecdf79ad18519ba341c3d968a 100644 (file)
--- a/dhcp/dhcp.nm
+++ b/dhcp/dhcp.nm
@@ -5,7 +5,7 @@
 
 name       = dhcp
 version    = 4.2.2
-release    = 2
+release    = 3
 
 groups     = Networking/Daemons
 url        = http://isc.org/products/DHCP/

diff --git a/dhcp/systemd/dhclient4@.service b/dhcp/systemd/dhclient4@.service
new file mode 100644 (file)
index 0000000..d7023c8
--- /dev/null
+++ b/dhcp/systemd/dhclient4@.service
@@ -0,0 +1,21 @@
+[Unit]
+Description=DHCP client daemon for IPv4 on %I
+BindTo=dev-%I.device
+After=dev-%I.device
+
+[Service]
+Restart=on-failure
+ExecStartPre=/usr/lib/network/dhclient-helper start %I ipv4
+ExecStart=/usr/sbin/dhclient -d %I -4 \
+       -cf /run/network/dhclient/%I/dhclient4.conf \
+       -lf /var/lib/dhclient/dhclient-%I.leases \
+       -pf /run/network/dhclient/%I/dhclient4.pid
+ExecStop=/usr/lib/network/dhclient-helper stop %I ipv4
+
+# This could be used if you want to release a lease.
+#ExecStop=/usr/sbin/dhclient -d -r %I -4 \
+#      -cf /run/network/dhclient/%I/dhclient4.conf \
+#      -lf /var/lib/dhclient/dhclient-%I.leases \
+#      -pf /run/network/dhclient/%I/dhclient4.pid
+
+UtmpIdentifier=%I

diff --git a/dhcp/systemd/dhclient@.service b/dhcp/systemd/dhclient@.service
deleted file mode 100644 (file)
index c3afc93..0000000
--- a/dhcp/systemd/dhclient@.service
+++ /dev/null
@@ -1,17 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=dhclient on %I
-BindTo=dev-%I.device
-After=dev-%I.device network.service
-Requires=network.service
-
-[Service]
-ExecStart=/usr/sbin/dhclient %I
-UtmpIdentifier=%I
-KillMode=process

diff --git a/hostapd/hostapd.nm b/hostapd/hostapd.nm
index 507c0ea6467da0f313978ed918e4109e2a084171..a5de902d88e77dd17fe75c33804b405e8a3265eb 100644 (file)
--- a/hostapd/hostapd.nm
+++ b/hostapd/hostapd.nm
@@ -5,7 +5,7 @@
 
 name       = hostapd
 version    = 0.7.3
-release    = 1
+release    = 2
 
 groups     = Networking/Tools
 url        = http://hostap.epitest.fi/hostapd/
@@ -46,7 +46,6 @@ end
 
 packages
        package %{name}
-       end
 
        package %{name}-debuginfo
                template DEBUGINFO

diff --git a/hostapd/systemd/hostapd@.service b/hostapd/systemd/hostapd@.service
index 2cff6d9c758fbfc447bff71c605d4e222b7b985c..748cb0ea51b06782bd91cefacad3db5273489c20 100644 (file)
--- a/hostapd/systemd/hostapd@.service
+++ b/hostapd/systemd/hostapd@.service
@@ -8,8 +8,7 @@
 [Unit]
 Description=WLAN AP on %I
 BindTo=dev-%I.device
-After=dev-%I.device network.service
-Requires=network.service
+After=dev-%I.device
 
 [Service]
 ExecStart=/usr/bin/hostapd -dd -P /run/network/hostapd/%I/pid /run/network/hostapd/%I/config

diff --git a/udev/udev.nm b/udev/udev.nm
index ee4900003235b76015b401b117e01e4403c0db6a..354575641d618d358c91d96b3abe467ea23c4dcb 100644 (file)
--- a/udev/udev.nm
+++ b/udev/udev.nm
@@ -5,7 +5,7 @@
 
 name       = udev
 version    = 182
-release    = 4
+release    = 5
 
 groups     = System/Base
 url        = ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/
@@ -38,7 +38,7 @@ build
                pciutils
                shadow-utils
                systemd-units
-               usbutils-devel >= 1:005
+               usbutils >= 1:005
        end
 
        configure_options += \

diff --git a/usbutils/usbutils.nm b/usbutils/usbutils.nm
index f9c1df4e6958fe2227984b1a2f732691f516cc99..bdfbad785216ea69ddc23b7ef6d205c5ee7e0e0e 100644 (file)
--- a/usbutils/usbutils.nm
+++ b/usbutils/usbutils.nm
@@ -6,7 +6,7 @@
 name       = usbutils
 epoch      = 1
 version    = 005
-release    = 1
+release    = 2
 
 groups     = System/Tools
 url        = http://www.linux-usb.org/
@@ -46,16 +46,6 @@ packages
                end
        end
 
-       package %{name}-libs
-               template LIBS
-       end
-
-       package %{name}-devel
-               template DEVEL
-
-               requires = %{name}-libs = %{epoch}:%{thisver}
-       end
-
        package %{name}-debuginfo
                template DEBUGINFO
        end