Merge remote-tracking branch 'stevee/blkid-devel'

diff --git a/nano/nano.nm b/nano/nano.nm
index 8a69aad69d0aea86e9a0d09ecc45bf9b82f06459..86dd4131bab90f98ec870675a772d81b659bcb17 100644 (file)
--- a/nano/nano.nm
+++ b/nano/nano.nm
@@ -5,7 +5,7 @@
 
 name       = nano
 version    = 2.3.0
-release    = 2
+release    = 3
 
 groups     = Application/Editors
 url        = http://www.nano-editor.org/
@@ -25,19 +25,26 @@ build
        end
 
        configure_options += \
-               --sysconfdir=/etc/nano \
                --enable-color \
                --enable-multibuffer \
                --enable-nanorc
 
        install_cmds
+               # Disable line wrapping.
+               sed -i doc/nanorc.sample \
+                       -e "s/# set nowrap/set nowrap/"
+
                install -v -m644 -D doc/nanorc.sample \
-                       %{BUILDROOT}/etc/nano/nanorc.sample
+                       %{BUILDROOT}%{sysconfdir}/nanorc
        end
 end
 
 packages
        package %{name}
+               configfiles
+                       %{sysconfdir}/nanorc
+               end
+       end
 
        package %{name}-debuginfo
                template DEBUGINFO

diff --git a/systemd/systemd.nm b/systemd/systemd.nm
index b3575f6f8ae6cce964b79fd54458646cc8e28c79..a6dacb37c1913ddbd48f99282b24f5ba75a8eb82 100644 (file)
--- a/systemd/systemd.nm
+++ b/systemd/systemd.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = systemd
-version    = 187
-release    = 2
+version    = 194
+release    = 1
 
 maintainer = Stefan Schantl <stefan.schantl@ipfire.org>
 groups     = System/Base
@@ -41,8 +41,10 @@ build
                libacl-devel
                libblkid-devel
                libcap-devel
+               libgcrypt-devel
                libselinux-devel
                libtool
+               libuuid-devel
                pam-devel
                pciutils-devel
                usbutils