Merge pull request #4205 from ertugerata/uefi_support

libsmbios fix

hardware/misc/libsmbios/actions.py

@@ -10,23 +10,31 @@ from pisi.actionsapi import get
 from pisi.actionsapi import shelltools
 
 def setup():
-    shelltools.system("./autogen.sh")
+    shelltools.system("./autogen.sh --no-configure")
     #autotools.autoreconf("-fi")
-    #autotools.configure()
+    shelltools.makedirs("build")
+    shelltools.cd("build")
+    shelltools.system("../configure --prefix=/usr --sbindir=/usr/sbin --sysconfdir=/etc --disable-static --enable-libsmbios_cxx")
+    
+    pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
+    
 
 def build():
+    shelltools.cd("build")
     autotools.make()
 
 def install():
+    shelltools.cd("build")
     autotools.rawInstall("DESTDIR=%s" % get.installDIR())
-    pisitools.insinto("/usr/include", "src/include/smbios")
+    pisitools.insinto("/usr/include", "../src/include/smbios")
 
     # Symlink to /usr/sbin/DellWirelessCtl for the new HAL
     pisitools.dosym("/usr/sbin/smbios-wireless-ctl", "/usr/sbin/DellWirelessCtl")
 
     # Remove yum specific stuff
-    #pisitools.removeDir("/etc/yum")
+    pisitools.removeDir("/etc/yum")
     #pisitools.removeDir("/usr/bin")
-    #pisitools.removeDir("/usr/lib/yum-plugins")
-
-    pisitools.dodoc( "NEWS", "TODO")
+    pisitools.removeDir("/usr/lib/yum-plugins")
+    
+    shelltools.cd("..")
+    pisitools.dodoc("NEWS", "TODO")

hardware/misc/libsmbios/pspec.xml

@@ -28,13 +28,13 @@
             <Dependency>libgcc</Dependency>
         </RuntimeDependencies>
         <Files>
-            <Path fileType="config">/usr/local/etc</Path>
-            <Path fileType="library">/usr/share</Path>
-            <Path fileType="library">/usr/local/lib</Path>
+            <Path fileType="config">/etc</Path>
             <Path fileType="executable">/usr/sbin</Path>
-            <Path fileType="executable">/usr/local/sbin</Path>
+            <Path fileType="library">/usr/lib</Path>
             <Path fileType="doc">/usr/share/doc</Path>
-            <Path fileType="localedata">/usr/local/share</Path>
+            <Path fileType="man">/usr/share/man/man3</Path>
+            <Path fileType="data">/usr/share/smbios-utils</Path>
+            <Path fileType="localedata">/usr/share/locale</Path>
         </Files>
     </Package>
 
@@ -46,12 +46,18 @@
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include/smbios</Path>
-            <Path fileType="data">/usr/lib/pkgconfig</Path>
-            <Path fileType="man">/usr/share/man/man3</Path>
+            <Path fileType="library">/usr/lib/pkgconfig</Path>
         </Files>
     </Package>
 
     <History>
+        <Update release="4">
+            <Date>2017-12-11</Date>
+            <Version>2.3.3</Version>
+            <Comment>Rebuild.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
         <Update release="3">
             <Date>2017-04-29</Date>
             <Version>2.3.3</Version>