[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 6fb1272597398adf618a185018e1041e73c29e5c
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 6fb1272597398adf618a185018e1041e73c29e5c (commit) via 735bb469daa055c252979e93fb21f98cac947fc0 (commit) via a135f599e411ba09814a3bd643de74069c20921b (commit) via b06cf0293b4ac32394e3e85a3306c3241f75a7da (commit) via f1ad8f3cf3fd063c417f77b81789f0976ae17937 (commit) via bba3d79b9150f36295c7176516652363ffd91fdc (commit) via a3f7adb774a5787ccc2f2ea3cd9bdda62b0772c4 (commit) via d0550ef79458ab0b04a68b71fd8acf84ed906beb (commit) from 73bcd93731f8bd21165abbbe5fbf61efe5855205 (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 6fb1272597398adf618a185018e1041e73c29e5c Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Mar 2 15:24:57 2012 +0100
gdb: Remove locale files which are also provided by binutils.
commit 735bb469daa055c252979e93fb21f98cac947fc0 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Mar 2 15:20:07 2012 +0100
ustr: Fix build on x86_64.
Lib location was wrong.
commit a135f599e411ba09814a3bd643de74069c20921b Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Mar 2 15:13:08 2012 +0100
libaio: Fix broken prefix configuration.
Header files were installed to /include/*.h.
commit b06cf0293b4ac32394e3e85a3306c3241f75a7da Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Mar 2 15:07:05 2012 +0100
ppl: Remove unnecessary call of autoreconf.
There were no patches applied which required autoreconf.
commit f1ad8f3cf3fd063c417f77b81789f0976ae17937 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Mar 2 15:03:57 2012 +0100
open-vm-tools: Only build this package for x86.
commit bba3d79b9150f36295c7176516652363ffd91fdc Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Mar 2 15:01:17 2012 +0100
python-pyblock: Sync name field with package filename.
commit a3f7adb774a5787ccc2f2ea3cd9bdda62b0772c4 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Mar 2 14:55:40 2012 +0100
expect: Install lib at the right location and remove RPATH.
commit d0550ef79458ab0b04a68b71fd8acf84ed906beb Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Mar 2 14:41:13 2012 +0100
sg3-utils: Fix name of the package.
The variable MUST equal the name of the .nm file.
-----------------------------------------------------------------------
Summary of changes: expect/expect.nm | 12 +++++++++++- gdb/gdb.nm | 5 ++++- libaio/libaio.nm | 4 ++-- open-vm-tools/open-vm-tools.nm | 4 ++-- ppl/ppl.nm | 8 +------- python-pyblock/python-pyblock.nm | 9 +++++---- sg3-utils/sg3-utils.nm | 5 +++-- ustr/ustr.nm | 16 ++++++---------- 8 files changed, 34 insertions(+), 29 deletions(-)
Difference in files: diff --git a/expect/expect.nm b/expect/expect.nm index 59b4871..0c098a3 100644 --- a/expect/expect.nm +++ b/expect/expect.nm @@ -5,7 +5,7 @@
name = expect version = 5.45 -release = 1 +release = 2 thisapp = %{name}%{version}
groups = Development/Languages @@ -26,6 +26,7 @@ build requires autoconf automake + chrpath tcl-devel end
@@ -48,6 +49,15 @@ build end
install_cmds + # Install lib to right location. + mkdir -pv %{BUILDROOT}%{libdir} + mv -v %{BUILDROOT}/%{libdir}/tcl*/expect%{version}/libexpect%{version}.so \ + %{BUILDROOT}%{libdir} + ln -svf libexpect%{version}.so %{BUILDROOT}%{libdir}/libexpect.so + + # Remove rpath. + chrpath --delete %{BUILDROOT}%{libdir}/libexpect%{version}.so + # remove cryptdir/decryptdir, as Linux has no crypt command rm -f %{BUILDROOT}/usr/bin/{cryptdir,decryptdir} rm -f %{BUILDROOT}/usr/share/man1/{cryptdir,decryptdir}.1* diff --git a/gdb/gdb.nm b/gdb/gdb.nm index 8ad9a5a..00ad491 100644 --- a/gdb/gdb.nm +++ b/gdb/gdb.nm @@ -5,7 +5,7 @@
name = gdb version = 7.3.50.20110722 -release = 1 +release = 2
groups = Development/Debuggers url = http://gnu.org/software/gdb/ @@ -69,6 +69,9 @@ build
mkdir -pv %{BUILDROOT}/etc/gdbinit.d cp -vf %{DIR_SOURCE}/gdbinit %{BUILDROOT}/etc/gdbinit + + # Remove locale data which is provided by binutils. + rm -rf %{BUILDROOT}%{datadir}/locale/ end end
diff --git a/libaio/libaio.nm b/libaio/libaio.nm index ae5f96b..a50f87d 100644 --- a/libaio/libaio.nm +++ b/libaio/libaio.nm @@ -5,7 +5,7 @@
name = libaio version = 0.3.109 -release = 2 +release = 3
groups = System/Libraries url = ftp://ftp.kernel.org/pub/linux/libs/aio/ @@ -34,7 +34,7 @@ build CFLAGS="%{CFLAGS} -I. -fPIC" CC="gcc" end
- make_install_targets += prefix=/ libdir=%{libdir} usrlibdir=%{libdir} + make_install_targets += prefix=%{prefix} libdir=%{libdir} usrlibdir=%{libdir}
install_cmds # Modify links to be relative diff --git a/open-vm-tools/open-vm-tools.nm b/open-vm-tools/open-vm-tools.nm index cc483b2..644452e 100644 --- a/open-vm-tools/open-vm-tools.nm +++ b/open-vm-tools/open-vm-tools.nm @@ -5,7 +5,8 @@
name = open-vm-tools version = 2011.09.23-491607 -release = 1 +release = 2 +sup_arches = x86_64 i686
groups = Virtualization/Applications url = http://open-vm-tools.sourceforge.net/ @@ -48,7 +49,6 @@ end
packages package %{name} - end
package %{name}-debuginfo template DEBUGINFO diff --git a/ppl/ppl.nm b/ppl/ppl.nm index f4372b0..09b6fe1 100644 --- a/ppl/ppl.nm +++ b/ppl/ppl.nm @@ -5,7 +5,7 @@
name = ppl version = 0.11.2 -release = 2 +release = 3
maintainer = Michael Tremer michael.tremer@ipfire.org groups = Development/Libraries @@ -32,8 +32,6 @@ sources = %{thisapp}.tar.lzma
build requires - autoconf - automake gcc-c++ gmp-devel m4 @@ -45,10 +43,6 @@ build
PARALLELISMFLAGS =
- prepare_cmds - cd %{DIR_APP} && autoreconf -f - end - test make check end diff --git a/python-pyblock/python-pyblock.nm b/python-pyblock/python-pyblock.nm index 8f19172..7400453 100644 --- a/python-pyblock/python-pyblock.nm +++ b/python-pyblock/python-pyblock.nm @@ -3,9 +3,10 @@ # Copyright (C) - IPFire Development Team info@ipfire.org # ###############################################################################
-name = pyblock +name = python-pyblock version = 0.46 -release = 2 +release = 3 +thisapp = pyblock-%{version}
groups = System/Libraries url = http://git.fedorahosted.org/git/?p=pyblock.git;a=summary @@ -21,7 +22,7 @@ sources = %{thisapp}.tar.bz2
build requires - dmraid-devel>=1.0.0.rc15-2 + dmraid-devel >= 1.0.0.rc15-2 libdevmapper-devel libselinux-devel python-devel @@ -42,7 +43,7 @@ build end
packages - package python-%{name} + package %{name}
package %{name}-debuginfo template DEBUGINFO diff --git a/sg3-utils/sg3-utils.nm b/sg3-utils/sg3-utils.nm index 07ec394..ff554d2 100644 --- a/sg3-utils/sg3-utils.nm +++ b/sg3-utils/sg3-utils.nm @@ -3,9 +3,10 @@ # Copyright (C) - IPFire Development Team info@ipfire.org # ###############################################################################
-name = sg3_utils +name = sg3-utils version = 1.32 -release = 1 +release = 2 +thisapp = sg3_utils-%{version}
groups = Applications/System url = http://sg.danny.cz/sg/sg3_utils.html diff --git a/ustr/ustr.nm b/ustr/ustr.nm index a8e8eb9..be7d741 100644 --- a/ustr/ustr.nm +++ b/ustr/ustr.nm @@ -5,7 +5,7 @@
name = ustr version = 1.0.4 -release = 1 +release = 2
groups = System/Libraries url = http://www.and.org/ustr/ @@ -28,27 +28,23 @@ build make check end
+ make_install_targets += libdir=%{libdir} + install_cmds rm -rf %{BUILDROOT}/usr/share - rm -rf %{BUILDROOT}/usr/lib/pkgconfig/*debug* + rm -rf %{BUILDROOT}/usr/lib*/pkgconfig/*debug* rm -rf %{BUILDROOT}/lib/*debug* - rm -rf %{BUILDROOT}/usr/lib/*debug* + rm -rf %{BUILDROOT}/usr/lib*/*debug* end end
packages package %{name} - end
package %{name}-devel template DEVEL
- files - /usr/bin/ - /usr/include/ - /usr/lib/pkgconfig/ - */lib/*.so - end + files += %{bindir} end
package %{name}-debuginfo
hooks/post-receive -- IPFire 3.x development tree
-
git＠ipfire.org