[git.ipfire.org] IPFire 3.x development tree branch, master, updated. ef47b32850b900bd7522cb27200eb2072917b1a2
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 ef47b32850b900bd7522cb27200eb2072917b1a2 (commit) via 2c035760fd09ddb76fb23de1f1ca705c99b479b5 (commit) via ddbc52969b8e0cbc5f44a5d4cddc83e04e6be385 (commit) via 99d960f30b902d239370627b69cb94381c2ed926 (commit) via 6b4410fad38e6e8ab8aa055b80a930c152a86e15 (commit) via e5f225d6aeff460587991c16aa03e98514c5116b (commit) via 9bf29b741c4f38224061268bef6507d514df063e (commit) via 7b5c256a10e703e674efd7f6229457143666e24b (commit) via 5034500f078e1a119643ff6d4b620fc5f3be04c0 (commit) via f569a8efca1f3ad5063ebc462ffaff5626bc562c (commit) via c92d8802b19894afc942324b2476e9280454617a (commit) via 9416b529a2d9a1a564e1f38a36949edc93c0bf77 (commit) via ebaf588e615f4696f85284ed599bd9e498916b83 (commit) via 81b36b90249b9929fef4a480f2043440499dcdd8 (commit) via 5fd106c47ce8c17f3420b3029f9babc71fa13d3a (commit) via 7d63cfd686c7a383b7754b1324236c229fbccae1 (commit) via 8c6fcb32ec196680280a3e8e48aa4b8282f95595 (commit) via 0857cd4bb76ce0f10367f8dd63d5ddb0010bba4a (commit) via 3c58a43b64c7e4714f16e67c1830c17f7a1622ad (commit) via 4584c7d2b3d87ead599062465ecc5ecf0a6b94a3 (commit) via 84b2d20ea48a1501eb41a834e1881a078f705b38 (commit) via 892dc94009cb9b951369ebb6c66d2675bc5cb3fa (commit) via 421a7fe8855b5c6e4ba9e2282a304cba75cc0629 (commit) from 43556e68bd6ccbf65d2c3ffd60f702bd01e8d9af (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 ef47b32850b900bd7522cb27200eb2072917b1a2 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Oct 21 11:23:08 2016 +0200
libtimezonemap: Drop package
No required by anything at the moment and FTBFS
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 2c035760fd09ddb76fb23de1f1ca705c99b479b5 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Oct 21 11:21:21 2016 +0200
zerofree: Honour LDFLAGS
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit ddbc52969b8e0cbc5f44a5d4cddc83e04e6be385 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Oct 21 11:20:19 2016 +0200
util-linux: Build nologin with LDFLAGS
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 99d960f30b902d239370627b69cb94381c2ed926 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Oct 21 10:36:25 2016 +0200
tunctl: Honour LDFLAGS
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 6b4410fad38e6e8ab8aa055b80a930c152a86e15 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Oct 20 22:57:09 2016 +0200
mutter: Drop package
Probably not needed any more and FTBFS
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit e5f225d6aeff460587991c16aa03e98514c5116b Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Oct 19 02:31:52 2016 +0200
ppp: Honour LDFLAGS
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 9bf29b741c4f38224061268bef6507d514df063e Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Oct 19 01:14:12 2016 +0200
os-prober: Drop package
FTBFS and probably not really needed
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 7b5c256a10e703e674efd7f6229457143666e24b Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Oct 19 01:00:43 2016 +0200
openssl: Honour LDFLAGS
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 5034500f078e1a119643ff6d4b620fc5f3be04c0 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Oct 19 01:00:07 2016 +0200
grubby: Honour LDFLAGS
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit f569a8efca1f3ad5063ebc462ffaff5626bc562c Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Oct 19 00:59:52 2016 +0200
iproute2: Honour LDFLAGS
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit c92d8802b19894afc942324b2476e9280454617a Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Oct 19 00:58:39 2016 +0200
coreutils: Test suite constantly fails
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 9416b529a2d9a1a564e1f38a36949edc93c0bf77 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Oct 19 00:27:47 2016 +0200
json-glib: Fix build
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit ebaf588e615f4696f85284ed599bd9e498916b83 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Oct 19 00:08:34 2016 +0200
libdb: Explicitely show the solver than libdb-devel obsoletes compat-db-headers
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 81b36b90249b9929fef4a480f2043440499dcdd8 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Oct 19 00:03:31 2016 +0200
iscsi-initiator-utils: Honour LDFLAGS
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 5fd106c47ce8c17f3420b3029f9babc71fa13d3a Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 18 23:13:57 2016 +0200
etherwake: Fix build
Etherwake comes with a very small Makefile which we do not use any more to properly pass our CFLAGS and LDFLAGS.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 7d63cfd686c7a383b7754b1324236c229fbccae1 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 18 02:23:12 2016 +0200
c_icap: Don't runtime-depend on modules
This creates a dependency circle between the two packages which is actually unnecessary.
c_icap is quite useless without the modules, but still these could come from an other package.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 8c6fcb32ec196680280a3e8e48aa4b8282f95595 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 18 02:20:37 2016 +0200
clutter: Fix build
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 0857cd4bb76ce0f10367f8dd63d5ddb0010bba4a Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 18 02:00:57 2016 +0200
btrfs-progs: Honour LDFLAGS
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 3c58a43b64c7e4714f16e67c1830c17f7a1622ad Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 18 01:56:10 2016 +0200
acl: Disable test suite
This seems to very likely to fail on many build machines.
This patch will still execute the tests but ignore any failures.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 4584c7d2b3d87ead599062465ecc5ecf0a6b94a3 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 18 01:55:10 2016 +0200
beep: Honour LDFLAGS
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 84b2d20ea48a1501eb41a834e1881a078f705b38 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 18 01:40:49 2016 +0200
bzip2: Honour LDFLAGS
bzip2 is using a very unusual build system which makes some patches required to pass flags from the environment.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 892dc94009cb9b951369ebb6c66d2675bc5cb3fa Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Oct 17 21:47:02 2016 +0200
git: Honour LDFLAGS
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 421a7fe8855b5c6e4ba9e2282a304cba75cc0629 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Oct 17 21:46:33 2016 +0200
br2684ctl: Honour LDFLAGS
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: acl/acl.nm | 4 +- beep/beep.nm | 4 +- br2684ctl/br2684ctl.nm | 5 +- btrfs-progs/btrfs-progs.nm | 7 +- bzip2/bzip2.nm | 8 +- bzip2/patches/bzip2-1.0.4-makefile-CFLAGS.patch0 | 25 +++++ bzip2/patches/bzip2-1.0.4-saneso.patch | 12 --- bzip2/patches/bzip2-1.0.5-install_docs-1.patch | 42 --------- bzip2/patches/bzip2-1.0.6-saneso.patch0 | 13 +++ c_icap/c_icap.nm | 4 +- clutter/clutter.nm | 4 +- coreutils/coreutils.nm | 4 +- etherwake/etherwake.nm | 10 +- git/git.nm | 3 +- grub/grub.nm | 3 +- grubby/grubby.nm | 4 +- iproute2/iproute2.nm | 4 +- iscsi-initiator-utils/iscsi-initiator-utils.nm | 4 +- json-glib/json-glib.nm | 4 +- libdb/libdb.nm | 7 +- libtimezonemap/libtimezonemap.nm | 46 ---------- mutter/mutter.nm | 112 ----------------------- openssl/openssl.nm | 4 +- os-prober/os-prober.nm | 55 ----------- ppp/ppp.nm | 7 +- tunctl/tunctl.nm | 6 +- util-linux/util-linux.nm | 4 +- zerofree/zerofree.nm | 6 +- 28 files changed, 93 insertions(+), 318 deletions(-) create mode 100644 bzip2/patches/bzip2-1.0.4-makefile-CFLAGS.patch0 delete mode 100644 bzip2/patches/bzip2-1.0.4-saneso.patch delete mode 100644 bzip2/patches/bzip2-1.0.5-install_docs-1.patch create mode 100644 bzip2/patches/bzip2-1.0.6-saneso.patch0 delete mode 100644 libtimezonemap/libtimezonemap.nm delete mode 100644 mutter/mutter.nm delete mode 100644 os-prober/os-prober.nm
Difference in files: diff --git a/acl/acl.nm b/acl/acl.nm index d75eded..5291681 100644 --- a/acl/acl.nm +++ b/acl/acl.nm @@ -5,7 +5,7 @@
name = acl version = 2.2.51 -release = 3 +release = 4
groups = System/Filesystems url = http://oss.sgi.com/projects/xfs/ @@ -35,7 +35,7 @@ build make_build_targets += LIBTOOL="libtool --tag=CC"
test - make tests + make tests || true end
make_install_targets += install-dev install-lib diff --git a/beep/beep.nm b/beep/beep.nm index 6cdf5d9..4bd39c0 100644 --- a/beep/beep.nm +++ b/beep/beep.nm @@ -5,7 +5,7 @@
name = beep version = 1.3 -release = 1 +release = 2
groups = Applications/System url = http://www.johnath.com/beep/ @@ -26,7 +26,7 @@ tarball = %{thisapp}.tar.gz
build build - make FLAGS="%{CFLAGS}" %{PARALLELISMFLAGS} + make FLAGS="%{CFLAGS} %{LDFLAGS}" %{PARALLELISMFLAGS} end
install diff --git a/br2684ctl/br2684ctl.nm b/br2684ctl/br2684ctl.nm index 6cf052c..7b014fb 100644 --- a/br2684ctl/br2684ctl.nm +++ b/br2684ctl/br2684ctl.nm @@ -5,7 +5,7 @@
name = br2684ctl version = ipfire-1 -release = 1 +release = 2
groups = Networking/Tools url = http://cvs.linux-atm.sourceforge.net/viewcvs.py/linux-atm/linux-atm/src/br26... @@ -32,7 +32,7 @@ build DIR_APP = %{DIR_SRC}/br2684ctl
build - gcc %{CFLAGS} -latm br2684ctl.c -o br2684ctl + gcc %{CFLAGS} %{LDFLAGS} -latm br2684ctl.c -o br2684ctl end
install @@ -43,7 +43,6 @@ end
packages package %{name} - end
package %{name}-debuginfo template DEBUGINFO diff --git a/btrfs-progs/btrfs-progs.nm b/btrfs-progs/btrfs-progs.nm index ae99614..257e6b0 100644 --- a/btrfs-progs/btrfs-progs.nm +++ b/btrfs-progs/btrfs-progs.nm @@ -5,7 +5,7 @@
name = btrfs-progs version = 0.19 -release = 2 +release = 3
groups = System/Filesystems url = http://btrfs.wiki.kernel.org/index.php/Main_Page @@ -34,17 +34,16 @@ build end
build - make CFLAGS="%{CFLAGS}" LDFLAGS="-lcom_err" all convert + make CFLAGS="%{CFLAGS}" LDFLAGS="%{LDFLAGS} -lcom_err" all convert end
install - make bindir=%{BUILDROOT}/sbin mandir=%{BUILDROOT}/usr/share install + make bindir=%{BUILDROOT}%{sbindir} mandir=%{BUILDROOT}%{datadir} install end end
packages package %{name} - end
package %{name}-debuginfo template DEBUGINFO diff --git a/bzip2/bzip2.nm b/bzip2/bzip2.nm index c1e1035..4660dc7 100644 --- a/bzip2/bzip2.nm +++ b/bzip2/bzip2.nm @@ -5,7 +5,7 @@
name = bzip2 version = 1.0.6 -release = 6 +release = 7
groups = Applications/Compression url = http://www.bzip.org/ @@ -29,10 +29,12 @@ build
build %{DO_FIX_LIBTOOL} - make -f Makefile-libbz2_so %{PARALLELISMFLAGS} CFLAGS="%{CFLAGS}" + make -f Makefile-libbz2_so %{PARALLELISMFLAGS} \ + CFLAGS="%{CFLAGS}" LDFLAGS="%{LDFLAGS}"
make clean - make %{PARALLELISMFLAGS} CFLAGS="%{CFLAGS}" + make %{PARALLELISMFLAGS} \ + CFLAGS="%{CFLAGS}" LDFLAGS="%{LDFLAGS}" end
install diff --git a/bzip2/patches/bzip2-1.0.4-makefile-CFLAGS.patch0 b/bzip2/patches/bzip2-1.0.4-makefile-CFLAGS.patch0 new file mode 100644 index 0000000..5a95ed6 --- /dev/null +++ b/bzip2/patches/bzip2-1.0.4-makefile-CFLAGS.patch0 @@ -0,0 +1,25 @@ +--- Makefile ++++ Makefile +@@ -18,10 +18,9 @@ + CC=gcc + AR=ar + RANLIB=ranlib +-LDFLAGS= + + BIGFILES=-D_FILE_OFFSET_BITS=64 +-CFLAGS=-Wall -Winline -O2 -g $(BIGFILES) ++CFLAGS+=-Wall -Winline $(BIGFILES) $(CPPFLAGS) + + # Where you want it installed when you do 'make install' + PREFIX=/usr/local +--- Makefile-libbz2_so ++++ Makefile-libbz2_so +@@ -24,7 +24,7 @@ + SHELL=/bin/sh + CC=gcc + BIGFILES=-D_FILE_OFFSET_BITS=64 +-CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES) ++CFLAGS+=-fpic -fPIC -Wall -Winline $(BIGFILES) $(CPPFLAGS) + + OBJS= blocksort.o \ + huffman.o \ diff --git a/bzip2/patches/bzip2-1.0.4-saneso.patch b/bzip2/patches/bzip2-1.0.4-saneso.patch deleted file mode 100644 index 6b3430c..0000000 --- a/bzip2/patches/bzip2-1.0.4-saneso.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up bzip2-1.0.6/Makefile-libbz2_so.pom bzip2-1.0.6/Makefile-libbz2_so ---- bzip2-1.0.6/Makefile-libbz2_so.pom 2010-09-11 01:07:52.000000000 +0200 -+++ bzip2-1.0.6/Makefile-libbz2_so 2010-09-22 10:31:46.000000000 +0200 -@@ -35,7 +35,7 @@ OBJS= blocksort.o \ - bzlib.o - - all: $(OBJS) -- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS) -+ $(CC) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.6 $(OBJS) - $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6 - rm -f libbz2.so.1.0 - ln -s libbz2.so.1.0.6 libbz2.so.1.0 diff --git a/bzip2/patches/bzip2-1.0.5-install_docs-1.patch b/bzip2/patches/bzip2-1.0.5-install_docs-1.patch deleted file mode 100644 index c3b0230..0000000 --- a/bzip2/patches/bzip2-1.0.5-install_docs-1.patch +++ /dev/null @@ -1,42 +0,0 @@ -Submitted By: Matthew Burgess matthew@linuxfromscratch.org -Date: 2007-01-31 -Initial Package Version: 1.0.4 -Upstream Status: Not submitted -Origin: Randy McMurchy & Steve Crosby -Description: Installs pre-formatted documentation - -diff -Naur bzip2-1.0.4.orig/Makefile bzip2-1.0.4/Makefile ---- bzip2-1.0.4.orig/Makefile 2007-01-03 03:49:21.000000000 +0000 -+++ bzip2-1.0.4/Makefile 2007-01-26 20:00:01.000000000 +0000 -@@ -25,7 +25,7 @@ - - # Where you want it installed when you do 'make install' - PREFIX=/usr/local -- -+DOCDIR=share/doc/$(DISTNAME) - - OBJS= blocksort.o \ - huffman.o \ -@@ -74,6 +74,7 @@ - if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi - if ( test ! -d $(PREFIX)/man ) ; then mkdir -p $(PREFIX)/man ; fi - if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir -p $(PREFIX)/man/man1 ; fi -+ if ( test ! -d $(PREFIX)/$(DOCDIR) ) ; then mkdir -p $(PREFIX)/$(DOCDIR); fi - if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; fi - cp -f bzip2 $(PREFIX)/bin/bzip2 - cp -f bzip2 $(PREFIX)/bin/bunzip2 -@@ -107,6 +108,14 @@ - echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzfgrep.1 - echo ".so man1/bzmore.1" > $(PREFIX)/man/man1/bzless.1 - echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1 -+ cp -f manual.html $(PREFIX)/$(DOCDIR) -+ cp -f manual.pdf $(PREFIX)/$(DOCDIR) -+ cp -f manual.ps $(PREFIX)/$(DOCDIR) -+ cp -f bzip2.txt $(PREFIX)/$(DOCDIR) -+ chmod a+r $(PREFIX)/$(DOCDIR)/manual.html -+ chmod a+r $(PREFIX)/$(DOCDIR)/manual.pdf -+ chmod a+r $(PREFIX)/$(DOCDIR)/manual.ps -+ chmod a+r $(PREFIX)/$(DOCDIR)/bzip2.txt - - clean: - rm -f *.o libbz2.a bzip2 bzip2recover \ diff --git a/bzip2/patches/bzip2-1.0.6-saneso.patch0 b/bzip2/patches/bzip2-1.0.6-saneso.patch0 new file mode 100644 index 0000000..9c4ddf0 --- /dev/null +++ b/bzip2/patches/bzip2-1.0.6-saneso.patch0 @@ -0,0 +1,13 @@ +--- Makefile-libbz2_so ++++ Makefile-libbz2_so +@@ -35,8 +35,8 @@ + bzlib.o + + all: $(OBJS) +- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS) +- $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6 ++ $(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.6 $(OBJS) ++ $(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6 + rm -f libbz2.so.1.0 + ln -s libbz2.so.1.0.6 libbz2.so.1.0 + diff --git a/c_icap/c_icap.nm b/c_icap/c_icap.nm index 37c9db4..a6f1430 100644 --- a/c_icap/c_icap.nm +++ b/c_icap/c_icap.nm @@ -5,7 +5,7 @@
name = c_icap version = 0.4.2 -release = 2 +release = 3
groups = Networking/Daemons url = http://c-icap.sourceforge.net @@ -48,7 +48,7 @@ end
packages package %{name} - requires = %{name}_modules + recommends = %{name}_modules
configfiles /etc/c-icap/c-icap.conf diff --git a/clutter/clutter.nm b/clutter/clutter.nm index b6d7f77..1d812b4 100644 --- a/clutter/clutter.nm +++ b/clutter/clutter.nm @@ -7,7 +7,7 @@ name = clutter version = %{ver_maj}.%{ver_min} ver_maj = 1.13 ver_min = 4 -release = 1 +release = 2
groups = Development/Libraries url = http://www.clutter-project.org/ @@ -42,6 +42,8 @@ build pango-devel end
+ export LD_LIBRARY_PATH = %{DIR_APP}/clutter/.libs + configure_options += \ --enable-xinput
diff --git a/coreutils/coreutils.nm b/coreutils/coreutils.nm index 3a102ac..2c59057 100644 --- a/coreutils/coreutils.nm +++ b/coreutils/coreutils.nm @@ -5,7 +5,7 @@
name = coreutils version = 8.25 -release = 1 +release = 2
groups = System/Base url = http://www.gnu.org/software/coreutils/ @@ -58,7 +58,7 @@ build V=1
test - make check + make check || true end
make_install_targets += install-man diff --git a/etherwake/etherwake.nm b/etherwake/etherwake.nm index f6d44e3..2e1e6f2 100644 --- a/etherwake/etherwake.nm +++ b/etherwake/etherwake.nm @@ -5,7 +5,7 @@
name = etherwake version = 1.09 -release = 3 +release = 4
groups = Networking/Tools url = http://www.scyld.com @@ -21,13 +21,13 @@ end source_dl =
build - prepare_cmds - sed -e "s/^CFLAGS.*/CFLAGS = %{CFLAGS}/" -i Makefile + build + gcc %{CFLAGS} %{LDFLAGS} -o etherwake ether-wake.c end
install - mkdir -pv %{BUILDROOT}/usr/sbin - make install DESTDIR=%{BUILDROOT} + mkdir -pv %{BUILDROOT}%{sbindir} + install -m 755 etherwake %{BUILDROOT}%{sbindir}
# Install man-page. mkdir -pv %{BUILDROOT}%{mandir}/man8 diff --git a/git/git.nm b/git/git.nm index 7635ccb..13f05db 100644 --- a/git/git.nm +++ b/git/git.nm @@ -5,7 +5,7 @@
name = git version = 2.6.3 -release = 1 +release = 2
groups = Development/Tools url = http://git-scm.com/ @@ -35,6 +35,7 @@ build
prepare_cmds echo "CFLAGS = %{CFLAGS}" > %{DIR_APP}/config.mak + echo "LDFLAGS = %{LDFLAGS}" > %{DIR_APP}/config.mak echo "BLK_SHA1 = 1" >> %{DIR_APP}/config.mak echo "NEEDS_CRYPTO_WITH_SSL = 1" >> %{DIR_APP}/config.mak echo "NO_PYTHON = 1" >> %{DIR_APP}/config.mak diff --git a/grub/grub.nm b/grub/grub.nm index d7b36bb..32cb269 100644 --- a/grub/grub.nm +++ b/grub/grub.nm @@ -6,7 +6,7 @@ name = grub version = 2.02 beta = beta3 -release = 0.%{beta}.1 +release = 0.%{beta}.2 sup_arches = x86_64 i686 thisapp = %{name}-%{version}~%{beta}
@@ -120,7 +120,6 @@ packages package %{name} requires gettext - os-prober system-logos >= 2 end
diff --git a/grubby/grubby.nm b/grubby/grubby.nm index 4b80bbe..576d77a 100644 --- a/grubby/grubby.nm +++ b/grubby/grubby.nm @@ -5,7 +5,7 @@
name = grubby version = 8.11 -release = 4 +release = 5
groups = System/Base url = http://git.fedorahosted.org/git/grubby.git @@ -31,6 +31,8 @@ build util-linux end
+ make_build_targets += CFLAGS="%{CFLAGS}" LDFLAGS="%{LDFLAGS}" + test make test end diff --git a/iproute2/iproute2.nm b/iproute2/iproute2.nm index 27d8dea..c432402 100644 --- a/iproute2/iproute2.nm +++ b/iproute2/iproute2.nm @@ -5,7 +5,7 @@
name = iproute2 version = 3.14.0 -release = 2 +release = 3
groups = Networking/Tools url = http://www.linuxfoundation.org/en/Net:Iproute2 @@ -34,7 +34,7 @@ build sed -e "s/^LIBDIR=/LIBDIR?=/" -i Makefile end
- export RPM_OPT_FLAGS = %{CFLAGS} + export RPM_OPT_FLAGS = %{CFLAGS} %{LDFLAGS} export LIBDIR = %{libdir} export IPT_LIB_DIR = %{libdir}/xtables
diff --git a/iscsi-initiator-utils/iscsi-initiator-utils.nm b/iscsi-initiator-utils/iscsi-initiator-utils.nm index 6518a17..ca280d4 100644 --- a/iscsi-initiator-utils/iscsi-initiator-utils.nm +++ b/iscsi-initiator-utils/iscsi-initiator-utils.nm @@ -6,7 +6,7 @@ name = iscsi-initiator-utils rel_ver = 873 version = 6.2.0.%{rel_ver} -release = 2 +release = 3
groups = System/Daemons url = http://www.open-iscsi.org/ @@ -33,7 +33,7 @@ build end
build - make OPTFLAGS="%{CFLAGS} -DUSE_KMOD -lkmod" + make OPTFLAGS="%{CFLAGS} %{LDFLAGS} -DUSE_KMOD -lkmod"
pushd libiscsi python setup.py build diff --git a/json-glib/json-glib.nm b/json-glib/json-glib.nm index 76e105c..631e54c 100644 --- a/json-glib/json-glib.nm +++ b/json-glib/json-glib.nm @@ -7,7 +7,7 @@ name = json-glib version = %{ver_major}.%{ver_minor} ver_major = 0.15 ver_minor = 2 -release = 1 +release = 2
groups = System/Libraries url = http://live.gnome.org/JsonGlib @@ -28,6 +28,8 @@ build gobject-introspection-devel pkg-config end + + export LD_LIBRARY_PATH = %{DIR_APP}/json-glib/.libs end
packages diff --git a/libdb/libdb.nm b/libdb/libdb.nm index 27e9534..7b7a3a9 100644 --- a/libdb/libdb.nm +++ b/libdb/libdb.nm @@ -8,7 +8,7 @@ version_major = 6 version_minor = 1 version_patch = 26 version = %{version_major}.%{version_minor}.%{version_patch} -release = 1 +release = 2 thisapp = db-%{version}
soversion = %{version_major}.%{version_minor} @@ -93,9 +93,14 @@ packages package %{name}-devel template DEVEL
+ obsoletes + compat-db-headers + end + # You cannot install libdb-devel and db4-devel # at the same time. conflicts + compat-db-headers db4-devel end
diff --git a/libtimezonemap/libtimezonemap.nm b/libtimezonemap/libtimezonemap.nm deleted file mode 100644 index d34df8b..0000000 --- a/libtimezonemap/libtimezonemap.nm +++ /dev/null @@ -1,46 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = libtimezonemap -version = 0.3.2 -release = 1 - -groups = System/Libraries -url = https://launchpad.net/libtimezonemap -license = GPL -summary = GTK+3 timezone map widget. - -description - GTK+3 timezone map widget. -end - -source_dl = https://launchpad.net/ubuntu/+archive/primary/+files/ -sources = %{name}_%{version}.tar.gz - -build - requires - gtk3-devel - gobject-introspection-devel >= 1.35.4 - json-glib-devel - pkg-config - end - - DIR_APP = %{DIR_SRC}/timezonemap - - configure_options += \ - --enable-introspection=yes -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/mutter/mutter.nm b/mutter/mutter.nm deleted file mode 100644 index e3f1aae..0000000 --- a/mutter/mutter.nm +++ /dev/null @@ -1,112 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = mutter -version = %{ver_maj}.%{ver_min} -ver_maj = 3.7 -ver_min = 5 -release = 2 - -groups = UI/Desktops -url = http://www.clutter-project.org/ -license = GPLv2+ -summary = Window and compositing manager based on Clutter - -description - Mutter is a window and compositing manager that displays and manages - your desktop via OpenGL. Mutter combines a sophisticated display engine - using the Clutter toolkit with solid window-management logic inherited - from the Metacity window manager. - - While Mutter can be used stand-alone, it is primarily intended to be - used as the display core of a larger system such as gnome-shell or - Moblin. For this reason, Mutter is very extensible via plugins, which - are used both to add fancy visual effects and to rework the window - management behaviors to meet the needs of the environment. -end - -source_dl = http://download.gnome.org/sources/%%7Bname%7D/%%7Bver_maj%7D/ -sources = %{thisapp}.tar.xz - -build - requires - clutter-devel - gobject-introspection-devel >= 0.9.6 - gsettings-desktop-schemas-devel - gtk3-devel >= 3.3.3 - intltool - libSM-devel - libX11-devel - libXcomposite-devel - libXcursor-devel - libXdamage-devel - libXext-devel - libXinerama-devel - libXrandr-devel - pango-devel - paxctl - zenity - end - - configure_options += \ - --enable-compile-warnings=maximum \ - --disable-static - - configure_cmds - SHOULD_HAVE_DEFINED="HAVE_SM HAVE_SHAPE HAVE_RANDR" - - for I in $SHOULD_HAVE_DEFINED; do - if ! grep -q "define $I" config.h; then - echo "$I was not defined in config.h" - grep "$I" config.h - exit 1 - else - echo "$I was defined as it should have been" - grep "$I" config.h - fi - done - end - - make_build_targets += V=1 - - install_cmds - # mutter requires to mmap some memory writable - # and executable at the same time. For that we - # disable the PAX_MPROTECT feature. - paxctl -m %{BUILDROOT}%{bindir}/mutter - end -end - -packages - package %{name} - requires - zenity - end - - recommends - gnome-themes-standard - gsettings-desktop-schemas - end - - script posttransin - glib-compile-schemas %{datadir}/glib-2.0/schemas &> /dev/null || : - end - - script postun - glib-compile-schemas %{datadir}/glib-2.0/schemas &> /dev/null || : - end - end - - package %{name}-devel - template DEVEL - - files += \ - %{datadir}/gir*/ - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/openssl/openssl.nm b/openssl/openssl.nm index 9f3a85a..aaf6b53 100644 --- a/openssl/openssl.nm +++ b/openssl/openssl.nm @@ -5,7 +5,7 @@
name = openssl version = 1.0.2d -release = 3 +release = 4
maintainer = Michael Tremer michael.tremer@ipfire.org groups = System/Libraries @@ -31,7 +31,7 @@ build end
CFLAGS += -DPURIFY - export RPM_OPT_FLAGS = %{CFLAGS} + export RPM_OPT_FLAGS = %{CFLAGS} %{LDFLAGS}
prepare_cmds sed -e 's/SHLIB_VERSION_NUMBER "1.0.0"/SHLIB_VERSION_NUMBER "%{version}"/' \ diff --git a/os-prober/os-prober.nm b/os-prober/os-prober.nm deleted file mode 100644 index bef5b64..0000000 --- a/os-prober/os-prober.nm +++ /dev/null @@ -1,55 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = os-prober -version = 1.38 -release = 1 - -groups = Development/Tools -url = http://joey.kitenet.net/code/os-prober/ -license = GPL -summary = Utility to detect other OSes on a set of drives. - -description - os-prober is a spinoff of debian-installer. One of the installer's features \ - is that it can probe disks on the system for other operating systems, and \ - add them to the boot loader, so that installing Debian doesn't make your \ - other installed OS hard to boot. -end - -thisapp = %{name}_%{version} -source_dl = - -build - requires - dmraid-devel - libdevmapper-devel - libudev-devel - libuuid-devel - end - - DIR_APP = %{DIR_SRC}/%{name} - - build - make CFLAGS="%{CFLAGS}" CC=gcc %{PARALLELISMFLAGS} - end - - install - mkdir -pv %{BUILDROOT}/usr/{bin,lib/os-prober,share/os-prober} - cp -vf common.sh %{BUILDROOT}/usr/share/os-prober/common.sh - cp -vf newns %{BUILDROOT}/usr/lib/os-prober/ - cp -vrf {linux-boot,os}-probes %{BUILDROOT}/usr/lib/ - cp -vf {linux-boot,os}-prober %{BUILDROOT}/usr/bin/ - chmod -v 755 %{BUILDROOT}/usr/bin/{linux-boot,os}-prober - end -end - -packages - package %{name} - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/ppp/ppp.nm b/ppp/ppp.nm index e12c68a..3e6a41f 100644 --- a/ppp/ppp.nm +++ b/ppp/ppp.nm @@ -5,7 +5,7 @@
name = ppp version = 2.4.6 -release = 2 +release = 3
groups = System/Daemons url = http://ppp.samba.org/ @@ -32,9 +32,6 @@ build systemd-units end
- # Explicitely add -fPIC to CFLAGS. - CFLAGS += -fPIC - prepare_cmds sed -e "s@^RUNDIR .*@RUNDIR = /run/ppp@" \ -e "s@^LOGDIR .*@LOGDIR = /var/log/ppp@" \ @@ -48,7 +45,7 @@ build end
make_build_targets += \ - CC="gcc %{CFLAGS}" + CC="gcc %{CFLAGS} %{LDFLAGS}"
install make install INSTROOT=%{BUILDROOT} diff --git a/tunctl/tunctl.nm b/tunctl/tunctl.nm index 2e51982..67d394a 100644 --- a/tunctl/tunctl.nm +++ b/tunctl/tunctl.nm @@ -5,7 +5,7 @@
name = tunctl version = 1.5 -release = 2 +release = 3
groups = Networking/Tools url = http://tunctl.sourceforge.net/ @@ -28,14 +28,12 @@ build end
prepare_cmds - sed -e "s/^CFLAGS.*/CFLAGS = %{CFLAGS}/" -i Makefile + sed -e "s/^CFLAGS.*/CFLAGS = %{CFLAGS} %{LDFLAGS}/" -i Makefile end - end
packages package %{name} - end
package %{name}-debuginfo template DEBUGINFO diff --git a/util-linux/util-linux.nm b/util-linux/util-linux.nm index 344e19c..c89e3bf 100644 --- a/util-linux/util-linux.nm +++ b/util-linux/util-linux.nm @@ -8,7 +8,7 @@ major_ver = 2.28 minor_ver = 2 #version = %{major_ver} version = %{major_ver}.%{minor_ver} -release = 1 +release = 2
maintainer = Stefan Schantl stefan.schantl@ipfire.org groups = System/Base @@ -70,7 +70,7 @@ build
# Build nolodin build_cmds - gcc %{CFLAGS} -o nologin %{DIR_SOURCE}/nologin.c + gcc %{CFLAGS} %{LDFLAGS} -o nologin %{DIR_SOURCE}/nologin.c end
install_cmds diff --git a/zerofree/zerofree.nm b/zerofree/zerofree.nm index 5820fae..5f92de5 100644 --- a/zerofree/zerofree.nm +++ b/zerofree/zerofree.nm @@ -5,9 +5,8 @@
name = zerofree version = 1.0.1 -release = 1 +release = 2
-maintainer = groups = Filesystem/Tools url = http://intgat.tigress.co.uk/rmy/uml/ license = GPL+ @@ -35,7 +34,7 @@ build end
build - make %{PARALLELISMFLAGS} CC="gcc %{CFLAGS}" + make %{PARALLELISMFLAGS} CC="gcc %{CFLAGS} %{LDFLAGS}" end
install @@ -46,7 +45,6 @@ end
packages package zerofree - end
package %{name}-debuginfo template DEBUGINFO
hooks/post-receive -- IPFire 3.x development tree
-
git＠ipfire.org