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

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 4216 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  47902c21be198525dc2ebe7f4caed1c6d2497346 (commit)
      from  86fb1cccf0f99dbc62d1cfc831a6d0eb20237c35 (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 47902c21be198525dc2ebe7f4caed1c6d2497346
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Mar 11 19:56:05 2012 +0100

    pakfire: Add two more patches.
    
    One of them fixes wrong detection of python-abi (kernel) and
    the other one fixes again false detections of the libs-location check.

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

Summary of changes:
 pakfire/pakfire.nm                                 |    2 +-
 .../pakfire-0.9.20-python-abi-find-requires.patch  |   29 ++++++++++++++++++++
 ...akfire-0.9.20-revert-libs-location-in-usr.patch |   22 +++++++++++++++
 3 files changed, 52 insertions(+), 1 deletions(-)
 create mode 100644 pakfire/patches/pakfire-0.9.20-python-abi-find-requires.patch
 create mode 100644 pakfire/patches/pakfire-0.9.20-revert-libs-location-in-usr.patch

Difference in files:
diff --git a/pakfire/pakfire.nm b/pakfire/pakfire.nm
index cf891d3..3217f43 100644
--- a/pakfire/pakfire.nm
+++ b/pakfire/pakfire.nm
@@ -5,7 +5,7 @@
 
 name       = pakfire
 version    = 0.9.20
-release    = 5
+release    = 6
 
 maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
 groups     = System/Packaging
diff --git a/pakfire/patches/pakfire-0.9.20-python-abi-find-requires.patch b/pakfire/patches/pakfire-0.9.20-python-abi-find-requires.patch
new file mode 100644
index 0000000..512d454
--- /dev/null
+++ b/pakfire/patches/pakfire-0.9.20-python-abi-find-requires.patch
@@ -0,0 +1,29 @@
+commit d16c15690f94589c2667a5096c21cec16daee7b7
+Author: Michael Tremer <michael.tremer(a)ipfire.org>
+Date:   Sun Mar 11 19:53:10 2012 +0100
+
+    find-requires: Filter false positives for python abi.
+
+diff --git a/tools/find-requires b/tools/find-requires
+index 52b6651..044c59f 100755
+--- a/tools/find-requires
++++ b/tools/find-requires
+@@ -43,14 +43,16 @@ while read file; do
+ 		*/usr/lib*/python*/*)
+ 			# Sort out all python files.
+ 			;;
+-		*/usr/lib*/python*)
++		*/usr/lib/python*|*/usr/lib64/python*)
+ 			# This will only get the python directory.
+ 			file=$(basename ${file})
+ 
+ 			# Strip the python version from the string.
+ 			python_version="${file#python}"
+ 
+-			echo "python-abi = ${python_version}"
++			if [ -n "${python_version}" ]; then
++				echo "python-abi = ${python_version}"
++			fi
+ 			continue
+ 			;;
+ 	esac
diff --git a/pakfire/patches/pakfire-0.9.20-revert-libs-location-in-usr.patch b/pakfire/patches/pakfire-0.9.20-revert-libs-location-in-usr.patch
new file mode 100644
index 0000000..f5b6dda
--- /dev/null
+++ b/pakfire/patches/pakfire-0.9.20-revert-libs-location-in-usr.patch
@@ -0,0 +1,22 @@
+commit 882bb1851ab12ee3ba1561552faf90850e212052
+Author: Michael Tremer <michael.tremer(a)ipfire.org>
+Date:   Sun Mar 11 17:59:34 2012 +0100
+
+    QA: libs-location: Revert checking in /usr/lib(64).
+    
+    That was not such a good idea because upstream is messing
+    too much with library names.
+
+diff --git a/tools/quality-agent.d/003-libs-location b/tools/quality-agent.d/003-libs-location
+index 479f170..0ee8237 100755
+--- a/tools/quality-agent.d/003-libs-location
++++ b/tools/quality-agent.d/003-libs-location
+@@ -25,7 +25,7 @@ function check() {
+ 	local failed=0
+ 	local found
+ 
+-	for lib in $(find ${BUILDROOT}/{,usr/}${libdir} -maxdepth 1 -type f -name "lib*.so.*" 2>/dev/null); do
++	for lib in $(find ${BUILDROOT}/${libdir} -maxdepth 1 -type f -name "lib*.so.*" 2>/dev/null); do
+ 		lib=${lib##*/}
+ 		lib=${lib%%.so*}
+ 


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