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

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

[git]

[-- Attachment #1: Type: text/plain, Size: 2769 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  fc95e0100711063f6d60f2a9f25fe38d94f82a48 (commit)
      from  2374e4ddc5bf9f125a79d365815738d72bc317dd (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 fc95e0100711063f6d60f2a9f25fe38d94f82a48
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Mar 2 17:42:31 2012 +0100

    util-linux: Fix packaging libs to right location.

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

Summary of changes:
 util-linux/util-linux.nm |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)

Difference in files:
diff --git a/util-linux/util-linux.nm b/util-linux/util-linux.nm
index 707ead3..ade2ab4 100644
--- a/util-linux/util-linux.nm
+++ b/util-linux/util-linux.nm
@@ -6,7 +6,7 @@
 name       = util-linux
 major_ver  = 2.20
 version    = %{major_ver}
-release    = 2
+release    = 3
 
 groups     = System/Base
 url        = http://kernel.org/~kzak/util-linux/
@@ -101,9 +101,9 @@ packages
 		obsoletes = util-linux-ng
 
 		conflicts
-			setup<3.0-2
+			setup < 3.0-2
 			util-linux-ng
-			sysvinit<=2.86-2
+			sysvinit <= 2.86-2
 		end
 
 		preprequires += coreutils
@@ -126,7 +126,7 @@ packages
 		end
 
 		files
-			/%{lib}/libblkid.*
+			%{libdir}/libblkid.*
 		end
 	end
 
@@ -136,10 +136,10 @@ packages
 		description = %{summary}
 
 		files
-			/usr/include/blkid/
-			%{libdir}/libblkid.*
+			%{includedir}/blkid/
+			%{libdir}/libblkid.so
 			%{libdir}/pkgconfig/blkid.pc
-			/usr/share/man/man3/*blkid*
+			%{mandir}/man3/*blkid*
 		end
 	end
 
@@ -152,7 +152,7 @@ packages
 		end
 
 		files
-			/%{lib}/libuuid.*
+			%{libdir}/libuuid.*
 		end
 	end
 
@@ -162,10 +162,10 @@ packages
 		description = %{summary}
 
 		files
-			/usr/include/uuid/
-			%{libdir}/libuuid.*
+			%{includedir}/uuid/
+			%{libdir}/libuuid.so
 			%{libdir}/pkgconfig/uuid.pc
-			/usr/share/man/man3/*uuid*
+			%{mandir}/man3/*uuid*
 		end
 	end
 
@@ -178,7 +178,7 @@ packages
 		end
 
 		files
-			/%{lib}/libmount.*
+			%{libdir}/libmount.*
 		end
 	end
 
@@ -188,10 +188,10 @@ packages
 		description = %{summary}
 
 		files
-			/usr/include/mount/
-			%{libdir}/libmount.*
+			%{includedir}/mount/
+			%{libdir}/libmount.so
 			%{libdir}/pkgconfig/mount.pc
-			/usr/share/man/man3/*mount*
+			%{mandir}/man3/*mount*
 		end
 	end
 


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