2011/testing/system/base/util-linux - Merge from devel

[Fatih Arslan]

Author: fatih.arslan
Date: Thu Mar 31 08:53:41 2011
New Revision: 116724

Modified:
   2011/testing/system/base/util-linux/actions.py
   2011/testing/system/base/util-linux/pspec.xml
   2011/testing/system/base/util-linux/translations.xml
Log:
Merge from devel

---
 actions.py       |   51 +++++++++++++++++++++++++++++++++++++++------------
 pspec.xml        |   42 +++++++++++++++++++++++++++++++++++++++++-
 translations.xml |    5 +++++
 3 files changed, 85 insertions(+), 13 deletions(-)

Modified: 2011/testing/system/base/util-linux/actions.py
=================================================================
--- 2011/testing/system/base/util-linux/actions.py	(original)
+++ 2011/testing/system/base/util-linux/actions.py	Thu Mar 31 08:53:41 2011
@@ -18,23 +18,45 @@
     shelltools.export("SUID_LDFLAGS", "-pie")
     shelltools.export("AUTOPOINT", "/bin/true")
 
+    options = "--bindir=/bin \
+               --sbindir=/sbin \
+               --disable-login-utils \
+               --disable-use-tty-group \
+               --disable-makeinstall-chown \
+               --disable-rpath \
+               --disable-static \
+               --disable-wall"
+
+    if get.buildTYPE() == "emul32":
+        options += " --prefix=/emul32 \
+                     --bindir=/emul32/bin \
+                     --sbindir=/emul32/sbin \
+                     --libdir=/usr/lib32 \
+                     --without-ncurses \
+                     --disable-partx \
+                     --disable-raw \
+                     --disable-write \
+                     --disable-libblkid \
+                     --disable-mount \
+                     --disable-fsck \
+                     --disable-libmount \
+                     --without-audit"
+
+        shelltools.export("CFLAGS", "%s -m32" % get.CFLAGS())
+
+    else:
+        options += " --enable-partx \
+                     --enable-raw \
+                     --enable-write \
+                     --with-audit"
+
+
     autotools.autoreconf("-fi")
+    autotools.configure(options)
 
     # Extra fedora switches:
     # --enable-login-utils will enable some utilities we ship in shadow
     # --enable-kill will enable the kill utility we ship in coreutils
-    autotools.configure('--bindir=/bin \
-                         --sbindir=/sbin \
-                         --enable-partx \
-                         --enable-raw \
-                         --enable-write \
-                         --with-audit \
-                         --disable-login-utils \
-                         --disable-use-tty-group \
-                         --disable-makeinstall-chown \
-                         --disable-rpath \
-                         --disable-static \
-                         --disable-wall')
 
 def build():
     autotools.make()
@@ -42,5 +64,10 @@
 def install():
     autotools.rawInstall("DESTDIR=%s" % get.installDIR())
 
+    if get.buildTYPE() == "emul32":
+        pisitools.domove("/emul32/lib32/libuuid.so", "/usr/lib32")
+        pisitools.domove("/emul32/lib32/pkgconfig/uuid.pc", "/usr/lib32/pkgconfig")
+        pisitools.removeDir("/emul32")
+
     pisitools.dodoc("AUTHORS", "COPYING", "DEPRECATED", "README*", "TODO", "docs/*")
     pisitools.insinto("/%s/%s" % (get.docDIR(), get.srcNAME()), "example.files")

Modified: 2011/testing/system/base/util-linux/pspec.xml
=================================================================
--- 2011/testing/system/base/util-linux/pspec.xml	(original)
+++ 2011/testing/system/base/util-linux/pspec.xml	Thu Mar 31 08:53:41 2011
@@ -52,7 +52,6 @@
             <Patch level="1">suse/mkzimage_cmdline.patch</Patch>
 
             <Patch level="1">ntfs-3g.patch</Patch>
-
         </Patches>
     </Source>
 
@@ -123,8 +122,49 @@
         </Files>
     </Package>
 
+    <Package>
+        <Name>libuuid-32bit</Name>
+        <PartOf>emul32</PartOf>
+        <Summary>32-bit shared libraries for libuuid</Summary>
+        <BuildType>emul32</BuildType>
+        <RuntimeDependencies>
+            <Dependency release="current">libuuid</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="library">/usr/lib32</Path>
+            <Path fileType="data">/usr/lib32/pkgconfig/uuid.pc</Path>
+        </Files>
+    </Package>
 
     <History>
+        <Update release="46">
+            <Date>2011-03-15</Date>
+            <Version>2.18</Version>
+            <Comment>This package has no devel sub package, thus it's better to include lib32 files to 32bit package</Comment>
+            <Name>Fatih Arslan</Name>
+            <Email>farslan at pardus.org.tr</Email>
+        </Update>
+        <Update release="45">
+            <Date>2011-03-02</Date>
+            <Version>2.18</Version>
+            <Comment>Specify bindir and sbindir specially for emul32 buildtype.</Comment>
+            <Name>Fatih Arslan</Name>
+            <Email>farslan at pardus.org.tr</Email>
+        </Update>
+        <Update release="44">
+            <Date>2011-03-01</Date>
+            <Version>2.18</Version>
+            <Comment>Prevent override of 64-bit executables. Add main package as dependency</Comment>
+            <Name>Fatih Arslan</Name>
+            <Email>farslan at pardus.org.tr</Email>
+        </Update>
+        <Update release="43">
+            <Date>2011-03-01</Date>
+            <Version>2.18</Version>
+            <Comment>Add lib32 package for libuuid</Comment>
+            <Name>Fatih Arslan</Name>
+            <Email>farslan at pardus.org.tr</Email>
+        </Update>
         <Update release="42">
             <Date>2010-11-25</Date>
             <Version>2.18</Version>

Modified: 2011/testing/system/base/util-linux/translations.xml
=================================================================
--- 2011/testing/system/base/util-linux/translations.xml	(original)
+++ 2011/testing/system/base/util-linux/translations.xml	Thu Mar 31 08:53:41 2011
@@ -16,4 +16,9 @@
         <Name>uuidd</Name>
         <Summary xml:lang="tr">Zaman tabanlı UUID'lerin benzersizliğini garantileyen sistem hizmeti</Summary>
     </Package>
+
+    <Package>
+        <Name>libuuid-32bit</Name>
+        <Summary xml:lang="tr">libuuid için 32-bit paylaşımlı kitaplıklar</Summary>
+    </Package>
 </PISI>