From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 205808000a2de2017507b6f1097384aeb707e848
Date: Sat, 25 Feb 2012 20:40:19 +0100 [thread overview]
Message-ID: <20120225194039.89B7920180@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 9790 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 205808000a2de2017507b6f1097384aeb707e848 (commit)
via 6287a80849e9a073828d9cbe8740232ecdb5fd78 (commit)
via 13d707374fb40f93b9d550cf4d2cfc6170bc6830 (commit)
via 8154cfb6d03ea0bf639514fdbfd256c73603a4e1 (commit)
via 1df93f9dca74c014046a41e23eac65eb54e8dab3 (commit)
via 815db6395d645942167d0ba1583eb3cf0001ce6c (commit)
via 56c5b2e4513dee8176a37fa3e82f631057ff014f (commit)
from 8d6a80f7ad2f09a85410196d48be051507219518 (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 205808000a2de2017507b6f1097384aeb707e848
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Feb 25 20:37:04 2012 +0100
glibc: Package glibc locale in glibc-common package.
commit 6287a80849e9a073828d9cbe8740232ecdb5fd78
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Feb 25 20:36:02 2012 +0100
xorg-x11-server: Make package work on x86_64.
commit 13d707374fb40f93b9d550cf4d2cfc6170bc6830
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Feb 25 20:35:31 2012 +0100
wireless-tools: Make package work on x86_64.
commit 8154cfb6d03ea0bf639514fdbfd256c73603a4e1
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Feb 25 20:34:52 2012 +0100
nfs-utils: Remove two unneeded configure switches.
commit 1df93f9dca74c014046a41e23eac65eb54e8dab3
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Feb 25 20:33:58 2012 +0100
iscsi-initiator-utils: Make package work on x86_64.
commit 815db6395d645942167d0ba1583eb3cf0001ce6c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Feb 25 20:33:19 2012 +0100
initscripts: Change syntax of dependencies.
The old format is deprecated.
commit 56c5b2e4513dee8176a37fa3e82f631057ff014f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Feb 25 20:32:03 2012 +0100
binutils: Package static libs correctly on x86_64.
-----------------------------------------------------------------------
Summary of changes:
binutils/binutils.nm | 2 +-
glibc/glibc.nm | 3 ++-
initscripts/initscripts.nm | 7 +++++--
iscsi-initiator-utils/iscsi-initiator-utils.nm | 17 ++++++++---------
nfs-utils/nfs-utils.nm | 4 +---
wireless-tools/wireless-tools.nm | 17 ++++++++---------
xorg-x11-server/xorg-x11-server.nm | 12 ++++++------
7 files changed, 31 insertions(+), 31 deletions(-)
Difference in files:
diff --git a/binutils/binutils.nm b/binutils/binutils.nm
index 290baf0..e283cc8 100644
--- a/binutils/binutils.nm
+++ b/binutils/binutils.nm
@@ -90,7 +90,7 @@ packages
# Don't package libbfd and libopcodes in the -devel package.
files
/usr/include
- /usr/lib/*.a
+ %{libdir}/*.a
end
end
diff --git a/glibc/glibc.nm b/glibc/glibc.nm
index 1ff72bf..e5a6aa0 100644
--- a/glibc/glibc.nm
+++ b/glibc/glibc.nm
@@ -5,7 +5,7 @@
name = glibc
version = 2.15
-release = 2
+release = 3
thisapp = %{name}-2.15-a316c1f
maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
@@ -255,6 +255,7 @@ packages
/usr/bin
/usr/sbin
/usr/share
+ /usr/lib/locale
!/usr/share/zoneinfo
end
end
diff --git a/initscripts/initscripts.nm b/initscripts/initscripts.nm
index a7bcb8d..3b9e079 100644
--- a/initscripts/initscripts.nm
+++ b/initscripts/initscripts.nm
@@ -6,7 +6,7 @@
name = initscripts
epoch = 1
version = 2.99
-release = 12
+release = 13
groups = System/Boot
url =
@@ -75,7 +75,10 @@ packages
/etc/rc.local
end
- prerequires = coreutils shadow-utils
+ prerequires
+ coreutils
+ shadow-utils
+ end
script prein
groupadd -g 22 -r -f utmp
diff --git a/iscsi-initiator-utils/iscsi-initiator-utils.nm b/iscsi-initiator-utils/iscsi-initiator-utils.nm
index ac1dbd4..21ccd2c 100644
--- a/iscsi-initiator-utils/iscsi-initiator-utils.nm
+++ b/iscsi-initiator-utils/iscsi-initiator-utils.nm
@@ -5,7 +5,7 @@
name = iscsi-initiator-utils
version = 6.2.0.872
-release = 1
+release = 2
groups = Networking/Tools
url = http://bridge.sourceforge.net/
@@ -52,9 +52,9 @@ build
mkdir -pv %{BUILDROOT}/etc/NetworkManager/dispatcher.d
mkdir -pv %{BUILDROOT}/var/lib/iscsi/{nodes,send_targets,static,isns,slp,ifaces}
mkdir -pv %{BUILDROOT}/var/lock/iscsi
- mkdir -pv %{BUILDROOT}/usr/lib
mkdir -pv %{BUILDROOT}/usr/include
- mkdir -pv %{BUILDROOT}/usr/lib/python2.7/site-packages
+ mkdir -pv %{BUILDROOT}%{libdir}
+ mkdir -pv %{BUILDROOT}%{libdir}/python2.7/site-packages
install -p -m 755 usr/iscsid usr/iscsiadm utils/iscsi-iname usr/iscsistart \
%{BUILDROOT}/sbin
@@ -66,24 +66,23 @@ build
install -p -m 755 %{DIR_SOURCE}/04-iscsi %{BUILDROOT}/etc/NetworkManager/dispatcher.d
- install -p -m 755 libiscsi/libiscsi.so.0 %{BUILDROOT}/usr/lib
- ln -svf libiscsi.so.0 %{BUILDROOT}/usr/lib/libiscsi.so
+ install -p -m 755 libiscsi/libiscsi.so.0 %{BUILDROOT}%{libdir}
+ ln -svf libiscsi.so.0 %{BUILDROOT}%{libdir}/libiscsi.so
install -p -m 644 libiscsi/libiscsi.h %{BUILDROOT}/usr/include
install -p -m 755 libiscsi/build/lib.linux-*/libiscsimodule.so \
- %{BUILDROOT}/usr/lib/python2.7/site-packages
+ %{BUILDROOT}%{libdir}/python2.7/site-packages
end
end
packages
package %{name}
- end
package libiscsi
template LIBS
files
- /usr/lib*/libiscsi.so.*
+ %{libdir}/libiscsi.so.*
end
end
@@ -91,7 +90,7 @@ packages
template DEVEL
files
- /usr/lib/libiscsi.so
+ %{libdir}/libiscsi.so
/usr/include
end
end
diff --git a/nfs-utils/nfs-utils.nm b/nfs-utils/nfs-utils.nm
index e75e28a..f40ad2f 100644
--- a/nfs-utils/nfs-utils.nm
+++ b/nfs-utils/nfs-utils.nm
@@ -5,7 +5,7 @@
name = nfs-utils
version = 1.2.2
-release = 1
+release = 2
groups = Networking/Tools
url = http://nfs.sourceforge.net/
@@ -34,8 +34,6 @@ build
end
configure_options += \
- --mandir=/usr/share/man \
- --sysconfdir=/etc \
--without-tcp-wrappers \
--disable-static \
--enable-tirpc=no \
diff --git a/wireless-tools/wireless-tools.nm b/wireless-tools/wireless-tools.nm
index 44a5f73..24387cc 100644
--- a/wireless-tools/wireless-tools.nm
+++ b/wireless-tools/wireless-tools.nm
@@ -3,9 +3,10 @@
# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
###############################################################################
-name = wireless_tools
+name = wireless-tools
version = 29
-release = 1
+release = 2
+thisapp = wireless_tools.%{version}
groups = Networking/Wireless
url = http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html
@@ -19,8 +20,6 @@ description
specific stats for wireless networking equipment.
end
-thisapp = %{name}.%{version}
-
source_dl = http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/
build
@@ -32,13 +31,13 @@ build
make_install_targets += \
PREFIX=%{BUILDROOT}/usr \
INSTALL_DIR=%{BUILDROOT}/sbin \
- INSTALL_LIB=%{BUILDROOT}/lib \
- INSTALL_MAN=%{BUILDROOT}/usr/share/man
+ INSTALL_LIB=%{BUILDROOT}/%{lib} \
+ INSTALL_MAN=%{BUILDROOT}%{mandir}
install_cmds
- rm -vf %{BUILDROOT}/lib/libiw.{a,so}
- mkdir -pv %{BUILDROOT}/usr/lib
- ln -svf ../../lib/libiw.so.%{version} %{BUILDROOT}/usr/lib/libiw.so
+ rm -vf %{BUILDROOT}/%{lib}/libiw.{a,so}
+ mkdir -pv %{BUILDROOT}%{libdir}
+ ln -svf ../../%{lib}/libiw.so.%{version} %{BUILDROOT}%{libdir}/libiw.so
end
end
diff --git a/xorg-x11-server/xorg-x11-server.nm b/xorg-x11-server/xorg-x11-server.nm
index 7ed9a8b..060b4e2 100644
--- a/xorg-x11-server/xorg-x11-server.nm
+++ b/xorg-x11-server/xorg-x11-server.nm
@@ -5,7 +5,7 @@
name = xorg-x11-server
version = 1.8.2
-release = 4
+release = 5
maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
groups = X/Server
@@ -76,8 +76,8 @@ build
--enable-xselinux \
--with-int10=x86emu \
--with-default-font-path="catalogue:/etc/X11/fontpath.d,built-ins" \
- --with-module-dir=/usr/lib/xorg/modules \
- --with-builderstring="Build ID: $(PKG_NAME) $(PKG_VER)-$(PKG_REL)" \
+ --with-module-dir=%{libdir}/xorg/modules \
+ --with-builderstring="Build ID: %{name} %{version}-%{release}" \
--with-os-name="$(hostname -s) $(uname -r)" \
--with-vendor-name="$(DISTRO_NAME) Project" \
--with-vendor-web="http://www.ipfire.org" \
@@ -114,11 +114,11 @@ build
end
make_install_targets += \
- moduledir=/usr/lib/xorg/modules
+ moduledir=%{libdir}/xorg/modules
install_cmds
- rm -vf $(BUILDROOT)/usr/lib/xorg/modules/libxf8_16bpp.so
- rm -vrf $(BUILDROOT)/var/log
+ rm -vf %{BUILDROOT}%{libdir}/xorg/modules/libxf8_16bpp.so
+ rm -vrf %{BUILDROOT}/var/log
mkdir -pv %{BUILDROOT}/etc/X11/xorg.conf.d %{BUILDROOT}/usr/share/xorg
install -m 0444 hw/xfree86/common/{vesa,extra}modes %{BUILDROOT}/usr/share/xorg/
hooks/post-receive
--
IPFire 3.x development tree
reply other threads:[~2012-02-25 19:40 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120225194039.89B7920180@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox