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

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

[git]

[-- Attachment #1: Type: text/plain, Size: 3863 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  69f50c3067fcadd4db91a39328a4f6e3a36dc9c5 (commit)
       via  7a5553dc6c5f1cb95c194496484058ad17fb0c04 (commit)
       via  bb9a691dffc4cd84fecdf3b02b00edb48f2b4322 (commit)
      from  0c0d399fba8754fcdacdb56c0cb3ac7a4f1a8dd8 (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 69f50c3067fcadd4db91a39328a4f6e3a36dc9c5
Merge: 7a5553d bb9a691
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat May 25 14:50:07 2013 +0200

    Merge remote-tracking branch 'stevee/automake-update'

commit 7a5553dc6c5f1cb95c194496484058ad17fb0c04
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Fri May 24 18:42:25 2013 +0200

    bash: Also install default bash profile files to "/etc/skel".
    
    The default bash profile files for uses have been missed so the could not copied
    to the home directory of a new created user.

commit bb9a691dffc4cd84fecdf3b02b00edb48f2b4322
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Sun May 19 21:47:33 2013 +0200

    automake: Update to 1.13.2.
    
    This is a major update to the latest available release.
    
    Fixes #10276.

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

Summary of changes:
 automake/automake.nm |  2 +-
 bash/bash.nm         | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

Difference in files:
diff --git a/automake/automake.nm b/automake/automake.nm
index e04e0cd..59bf3b0 100644
--- a/automake/automake.nm
+++ b/automake/automake.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = automake
-version    = 1.12.6
+version    = 1.13.2
 release    = 1
 arch       = noarch
 
diff --git a/bash/bash.nm b/bash/bash.nm
index d78fb71..83435de 100644
--- a/bash/bash.nm
+++ b/bash/bash.nm
@@ -5,7 +5,7 @@
 
 name       = bash
 version    = 4.2
-release    = 10
+release    = 11
 
 groups     = System/Tools
 url        = http://www.gnu.org/software/bash/
@@ -13,9 +13,9 @@ license    = GPLv2+
 summary    = Bash is short for born again shell.
 
 description
-	Bash is the shell, or command language interpreter, that will appear in \
-	the GNU operating system. Bash is an sh-compatible shell that incorporates \
-	useful features from the Korn shell (ksh) and C shell (csh). It is intended \
+	Bash is the shell, or command language interpreter, that will appear in
+	the GNU operating system. Bash is an sh-compatible shell that incorporates
+	useful features from the Korn shell (ksh) and C shell (csh). It is intended
 	to conform to the IEEE POSIX P1003.2/ISO 9945.2 Shell and Tools standard.
 end
 
@@ -52,9 +52,14 @@ build
 	#end
 
 	install_cmds
-		mkdir -pv %{BUILDROOT}/{etc/profile.d,root}
+		mkdir -pv %{BUILDROOT}%{sysconfdir}/{profile.d,skel}
+		mkdir -pv %{BUILDROOT}/root
 
 		# Bash startup files
+		cp -vf %{DIR_SOURCE}/dot_bash_logout %{BUILDROOT}%{sysconfdir}/skel/.bash_logout
+		cp -vf %{DIR_SOURCE}/dot_bash_profile %{BUILDROOT}%{sysconfdir}/skel/.bash_profile
+		cp -vf %{DIR_SOURCE}/dot_bashrc %{BUILDROOT}%{sysconfdir}/skel/.bashrc
+
 		cp -vf %{DIR_SOURCE}/dot_bash_logout %{BUILDROOT}/root/.bash_logout
 		cp -vf %{DIR_SOURCE}/dot_bash_profile %{BUILDROOT}/root/.bash_profile
 		cp -vf %{DIR_SOURCE}/dot_bashrc %{BUILDROOT}/root/.bashrc


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