[git.ipfire.org] IPFire 3.x development tree branch, master, updated. b1261c83a693bf26e2b9f1fb5059198b722e0057

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 4566 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".

The branch, master has been updated
       via  b1261c83a693bf26e2b9f1fb5059198b722e0057 (commit)
       via  c8b6f77ff38c4f1af2aba62c3ac6b819cca37c44 (commit)
       via  f2ada565d1636a23c07820b033da3d460270c75c (commit)
       via  1191e38358228a833f60b9c707909fe467235764 (commit)
      from  092b90ae70ba2734427536e464fd5ccc777d04ea (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b1261c83a693bf26e2b9f1fb5059198b722e0057
Merge: f2ada56 c8b6f77
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Jan 26 23:07:31 2013 +0100

    Merge remote-tracking branch 'stevee/initscripts-fix'

commit c8b6f77ff38c4f1af2aba62c3ac6b819cca37c44
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Sat Jan 26 22:27:33 2013 +0100

    initscripts: Fix installation of rc.local script.

commit f2ada565d1636a23c07820b033da3d460270c75c
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Sat Jan 26 22:09:27 2013 +0100

    systemd: Add legacy tmpfile for autocreate /run/lock directory.
    
    A lot of services use this directory to put temporary files into it.
    
    Fixes #10291.

commit 1191e38358228a833f60b9c707909fe467235764
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Sat Jan 26 21:30:21 2013 +0100

    systemd: New systemd-libs package.
    
    If a package requires the systemd-units package, every time the whole systemd
    and all its dependencies have to be installed which grows up build environments
    for 160MB. To prevent this and save space on disk and time to download and extract
    those packages I've moved systemd lib into an own package.
    
    Also fixed a small packaging problem on libudev.

-----------------------------------------------------------------------

Summary of changes:
 initscripts/initscripts.nm |  9 +++++----
 systemd/systemd.nm         | 11 +++++++++--
 2 files changed, 14 insertions(+), 6 deletions(-)

Difference in files:
diff --git a/initscripts/initscripts.nm b/initscripts/initscripts.nm
index 0941a42..a8ad505 100644
--- a/initscripts/initscripts.nm
+++ b/initscripts/initscripts.nm
@@ -6,7 +6,7 @@
 name       = initscripts
 epoch      = 1
 version    = 2.99
-release    = 18
+release    = 19
 
 groups     = System/Boot
 url        =
@@ -14,7 +14,7 @@ license    = GPLv3+
 summary    = The set of scripts that initalize the system.
 
 description
-	The initscripts package contains the basic system scripts used to boot \
+	The initscripts package contains the basic system scripts used to boot
 	your system and shut the system down cleanly.
 end
 
@@ -47,7 +47,8 @@ build
 		cd src && make install clean DESTDIR=%{BUILDROOT}
 
 		# Install rc.local
-		install -v -m 755 %{DIR_SOURCE}/rc.local %{BUILDROT}/etc/rc.local
+		mkdir -pv %{BUILDROOT}%{sysconfdir}
+		install -v -m 755 %{DIR_SOURCE}/rc.local %{BUILDROOT}%{sysconfdir}/rc.local
 
 		# Install udev rules
 		mkdir -pv %{BUILDROOT}%{prefix}/lib/udev/rules.d/
@@ -81,7 +82,7 @@ packages
 			filesystem  < 002
 		end
 
-		configfiles
+		datafiles
 			/etc/rc.local
 		end
 
diff --git a/systemd/systemd.nm b/systemd/systemd.nm
index ef11d6e..d93414b 100644
--- a/systemd/systemd.nm
+++ b/systemd/systemd.nm
@@ -5,7 +5,7 @@
 
 name       = systemd
 version    = 196
-release    = 1
+release    = 3
 
 maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
 groups     = System/Base
@@ -117,6 +117,9 @@ build
 			-e "s/^#ForwardToSyslog=.*$/ForwardToSyslog=no/" \
 			-e "s/^#ImportKernel=.*$/ImportKernel=yes/" \
 			-i %{BUILDROOT}/etc/systemd/journald.conf
+
+		# Install legacy tmpfile to autocreate /run/lock on startup.
+		install -v -m 644 %{DIR_APP}/tmpfiles.d/legacy.conf %{BUILDROOT}%{prefix}/lib/tmpfiles.d/
 	end
 end
 
@@ -261,6 +264,10 @@ packages
 		end
 	end
 
+	package %{name}-libs
+		template LIBS
+	end
+
 	package %{name}-devel
 		template DEVEL
 
@@ -280,7 +287,7 @@ packages
 		end
 
 		files
-			%{libdir}/libgudev*.so.*
+			%{libdir}/lib*udev*.so.*
 			%{libidr}/girepository*/
 		end
 	end


hooks/post-receive
--
IPFire 3.x development tree