[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. c1c17f2f517c7cdf87244d5b74f648dd0b064151

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. c1c17f2f517c7cdf87244d5b74f648dd0b064151

[git]

[-- Attachment #1: Type: text/plain, Size: 2631 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  c1c17f2f517c7cdf87244d5b74f648dd0b064151 (commit)
       via  435e4304fae2df83f1824467867471362f353e19 (commit)
      from  334b59874c3e8c85de2e69232cbbfd42bfdd7954 (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 c1c17f2f517c7cdf87244d5b74f648dd0b064151
Merge: 334b598 435e430
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed May 16 22:45:52 2012 +0200

    Merge remote-tracking branch 'maniacikarus/man-db'

commit 435e4304fae2df83f1824467867471362f353e19
Author: Christian Schmidt <christian.schmidt(a)ipfire.org>
Date:   Mon Apr 30 23:17:30 2012 +0200

    man-db: Disabled rpath and moved libs. Added dependency for xz.
    
    Fixes #10105 #10106

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

Summary of changes:
 man-db/man-db.nm |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

Difference in files:
diff --git a/man-db/man-db.nm b/man-db/man-db.nm
index 255c0ed..224fe0a 100644
--- a/man-db/man-db.nm
+++ b/man-db/man-db.nm
@@ -5,7 +5,7 @@
 
 name       = man-db
 version    = 2.6.1
-release    = 1
+release    = 2
 
 groups     = Documentation
 url        = http://savannah.nongnu.org/projects/man-db
@@ -32,23 +32,22 @@ build
 
 	configure_options += \
 		--disable-setuid \
-		--with-browser=/usr/bin/lynx \
-		--with-col=/usr/bin/col \
-		--with-vgrind=/usr/bin/vgrind \
-		--with-grap=/usr/bin/grap
+		--with-browser=%{bindir}/lynx \
+		--with-col=%{bindir}/col \
+		--with-vgrind=%{bindir}/vgrind \
+		--with-grap=%{bindir}/grap \
+		--disable-rpath
 
 	prepare_cmds
 		sed -i -e '\%\t/usr/man%d' -e '\%\t/usr/local/man%d' \
 			src/man_db.conf.in
 	end
-end
 
-# This package installs a lib in /usr/lib/man-db and links all binaries
-# against it. Seems as if the ABI is not stable, yet and so we need to
-# accept that.
-quality-agent
-	whitelist_rpath
-		%{libdir}/man-db
+	install_cmds
+		# Move some libs
+		mv -v %{BUILDROOT}%{libdir}/man-db/* %{BUILDROOT}%{libdir}/
+		rm -rf %{BUILDROOTi}%{libdir}/man-db/
+
 	end
 end
 
@@ -59,6 +58,7 @@ packages
 		requires
 			groff
 			less
+			xz
 		end
 
 		# This package also should be known as man.


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