public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
* [IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. e87a04764f162d83bec9fdfad6a31af429225625
@ 2012-02-18 17:50 git
  0 siblings, 0 replies; only message in thread
From: git @ 2012-02-18 17:50 UTC (permalink / raw)
  To: ipfire-scm

[-- Attachment #1: Type: text/plain, Size: 7772 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  e87a04764f162d83bec9fdfad6a31af429225625 (commit)
       via  d75c0d50110efc190ae7316e6300a3c665d247e1 (commit)
      from  b24088d312b943f082c450227d7231a66d8dc559 (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 e87a04764f162d83bec9fdfad6a31af429225625
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Feb 18 18:47:12 2012 +0100

    ipfire-logos: New package.
    
    This package ships IPFire logos and artwork.

commit d75c0d50110efc190ae7316e6300a3c665d247e1
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Feb 18 18:46:31 2012 +0100

    ipfire-release: Rename the system-release package.

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

Summary of changes:
 pyfire/pyfire.nm => ipfire-logos/ipfire-logos.nm   |   35 ++++++++------------
 .../ipfire-release.nm                              |    0
 2 files changed, 14 insertions(+), 21 deletions(-)
 copy pyfire/pyfire.nm => ipfire-logos/ipfire-logos.nm (52%)
 rename system-release/system-release.nm => ipfire-release/ipfire-release.nm (100%)

Difference in files:
diff --git a/ipfire-logos/ipfire-logos.nm b/ipfire-logos/ipfire-logos.nm
new file mode 100644
index 0000000..9947523
--- /dev/null
+++ b/ipfire-logos/ipfire-logos.nm
@@ -0,0 +1,35 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org>                   #
+###############################################################################
+
+name       = ipfire-logos
+version    = 1
+release    = 1
+arch       = noarch
+
+maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
+groups     = Base System/Base
+url        = http://www.ipfire.org
+license    =
+summary    = IPFire logos and images.
+
+description
+	This package contains several logos, fonts and artwork of the
+	IPFire distribution.
+end
+
+source_dl  = http://source.ipfire.org/releases/%{name}/
+
+build
+	requires
+		ImageMagick
+		ghostscript
+	end
+end
+
+packages
+	package %{name}
+		provides = system-logos
+	end
+end
diff --git a/ipfire-release/ipfire-release.nm b/ipfire-release/ipfire-release.nm
new file mode 100644
index 0000000..afc0609
--- /dev/null
+++ b/ipfire-release/ipfire-release.nm
@@ -0,0 +1,68 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org>                   #
+###############################################################################
+
+# Make the configuration of your distribution right here.
+DISTRO_NAME    = IPFire
+DISTRO_SNAME   = ipfire
+DISTRO_VERSION = 3.0-alpha2
+DISTRO_RELEASE = 3
+DISTRO_SLOGAN  = Gluttony
+DISTRO_COLOR   = 0;31
+
+name       = %{DISTRO_SNAME}-release
+version    = %{DISTRO_VERSION}
+release    = 1
+epoch      = 3
+arch       = noarch
+
+maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
+groups     = Base Build System/Base
+url        = http://www.ipfire.org
+license    =
+summary    = %{DISTRO_NAME} release files.
+
+description
+	%{DISTRO_NAME} release files such as pakfire configs and various /etc/ \
+	files that define the release.
+end
+
+# No tarball.
+sources    =
+
+build
+	prepare = # Do nothing
+	build = # Do nothing
+
+	install
+		mkdir -pv %{BUILDROOT}/etc
+
+		echo "%{DISTRO_NAME} v%{DISTRO_VERSION} for %{DISTRO_ARCH} - %{DISTRO_SLOGAN} (\l)" \
+			> %{BUILDROOT}/etc/issue
+		echo "===============================" >> %{BUILDROOT}/etc/issue
+		echo "\n running on \s \r \m"          >> %{BUILDROOT}/etc/issue
+
+		echo "%{DISTRO_NAME} release %{DISTRO_VERSION} (%{DISTRO_SLOGAN})" \
+			> %{BUILDROOT}/etc/%{DISTRO_SNAME}-release
+		ln -svf %{DISTRO_SNAME}-release %{BUILDROOT}/etc/system-release
+
+		# Set a default hostname that is set until the user customizes that.
+		echo "%{DISTRO_SNAME}.localdomain" > %{BUILDROOT}/etc/hostname
+
+		# Create /etc/os-release.
+		echo "NAME=\"%{DISTRO_NAME}\"" >> %{BUILDROOT}/etc/os-release
+		echo "VERSION=\"%{DISTRO_VERSION}\"" >> %{BUILDROOT}/etc/os-release
+		echo "ID=%{DISTRO_SNAME}" >> %{BUILDROOT}/etc/os-release
+		echo "VERSION_ID=%{DISTRO_RELEASE}" >> %{BUILDROOT}/etc/os-release
+		echo "PRETTY_NAME=\"%{DISTRO_NAME} %{DISTRO_VERSION} (%{DISTRO_SLOGAN})\"" \
+			>> %{BUILDROOT}/etc/os-release
+		echo "ANSI_COLOR=%{DISTRO_COLOR}" >> %{BUILDROOT}/etc/os-release
+	end
+end
+
+packages
+	package %{name}
+		provides = system-release
+	end
+end
diff --git a/system-release/system-release.nm b/system-release/system-release.nm
deleted file mode 100644
index afc0609..0000000
--- a/system-release/system-release.nm
+++ /dev/null
@@ -1,68 +0,0 @@
-###############################################################################
-# IPFire.org    - An Open Source Firewall Solution                            #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org>                   #
-###############################################################################
-
-# Make the configuration of your distribution right here.
-DISTRO_NAME    = IPFire
-DISTRO_SNAME   = ipfire
-DISTRO_VERSION = 3.0-alpha2
-DISTRO_RELEASE = 3
-DISTRO_SLOGAN  = Gluttony
-DISTRO_COLOR   = 0;31
-
-name       = %{DISTRO_SNAME}-release
-version    = %{DISTRO_VERSION}
-release    = 1
-epoch      = 3
-arch       = noarch
-
-maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
-groups     = Base Build System/Base
-url        = http://www.ipfire.org
-license    =
-summary    = %{DISTRO_NAME} release files.
-
-description
-	%{DISTRO_NAME} release files such as pakfire configs and various /etc/ \
-	files that define the release.
-end
-
-# No tarball.
-sources    =
-
-build
-	prepare = # Do nothing
-	build = # Do nothing
-
-	install
-		mkdir -pv %{BUILDROOT}/etc
-
-		echo "%{DISTRO_NAME} v%{DISTRO_VERSION} for %{DISTRO_ARCH} - %{DISTRO_SLOGAN} (\l)" \
-			> %{BUILDROOT}/etc/issue
-		echo "===============================" >> %{BUILDROOT}/etc/issue
-		echo "\n running on \s \r \m"          >> %{BUILDROOT}/etc/issue
-
-		echo "%{DISTRO_NAME} release %{DISTRO_VERSION} (%{DISTRO_SLOGAN})" \
-			> %{BUILDROOT}/etc/%{DISTRO_SNAME}-release
-		ln -svf %{DISTRO_SNAME}-release %{BUILDROOT}/etc/system-release
-
-		# Set a default hostname that is set until the user customizes that.
-		echo "%{DISTRO_SNAME}.localdomain" > %{BUILDROOT}/etc/hostname
-
-		# Create /etc/os-release.
-		echo "NAME=\"%{DISTRO_NAME}\"" >> %{BUILDROOT}/etc/os-release
-		echo "VERSION=\"%{DISTRO_VERSION}\"" >> %{BUILDROOT}/etc/os-release
-		echo "ID=%{DISTRO_SNAME}" >> %{BUILDROOT}/etc/os-release
-		echo "VERSION_ID=%{DISTRO_RELEASE}" >> %{BUILDROOT}/etc/os-release
-		echo "PRETTY_NAME=\"%{DISTRO_NAME} %{DISTRO_VERSION} (%{DISTRO_SLOGAN})\"" \
-			>> %{BUILDROOT}/etc/os-release
-		echo "ANSI_COLOR=%{DISTRO_COLOR}" >> %{BUILDROOT}/etc/os-release
-	end
-end
-
-packages
-	package %{name}
-		provides = system-release
-	end
-end


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

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2012-02-18 17:50 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-02-18 17:50 [IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. e87a04764f162d83bec9fdfad6a31af429225625 git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox