Merge pull request #16908 from suvari/master

zeitgeist: fix build

util/admin/zeitgeist/actions.py

@@ -4,16 +4,23 @@
 # Licensed under the GNU General Public License, version 3.
 # See the file https://www.gnu.org/licenses/gpl-3.0.txt
 
-from pisi.actionsapi import shelltools, autotools, get
+from pisi.actionsapi import shelltools, autotools, get, pisitools
 
 def setup():
     shelltools.system("NOCONFIGURE=1 ./autogen.sh")
-    autotools.configure("--enable-fts --enable-datahub")
+    autotools.configure("--disable-systemd-services \
+            --without-systemd \
+            --enable-fts \
+            --enable-datahub")
 
 def build():
     autotools.make()
 
 def install():
-    data = "nodist_systemd_user_DATA = ''"
+    autotools.rawInstall("DESTDIR=%s" % get.installDIR())
-    doc = "zeitgeistdoc_DATA = 'AUTHORS COPYING MAINTAINERS NEWS'"
+        # unneeded systemd service file
-    autotools.rawInstall("DESTDIR=%s %s %s" % (get.installDIR(), data, doc))
+    pisitools.removeDir("/usr/lib/systemd")
+
+    # data = "nodist_systemd_user_DATA = ''"
+    # doc = "zeitgeistdoc_DATA = 'AUTHORS COPYING MAINTAINERS NEWS'"
+    # autotools.rawInstall("DESTDIR=%s %s %s" % (get.installDIR(), data, doc))

util/admin/zeitgeist/pspec.xml

@@ -53,8 +53,16 @@
             <Path fileType="config">/etc</Path>
             <Path fileType="executable">/usr/bin</Path>
             <Path fileType="executable">/usr/libexec</Path>
-            <Path fileType="library">/usr/lib</Path>
+<!--             <Path fileType="library">/usr/lib</Path> -->
-            <Path fileType="data">/usr/share</Path>
+            <Path fileType="data">/usr/share/vala</Path>
+            <Path fileType="data">/usr/share/bash-completion</Path>
+            <Path fileType="man">/usr/share/man</Path>
+            <Path fileType="doc">/usr/share/zeitgeist/doc</Path>
+            <Path fileType="data">/usr/share/zeitgeist/ontology</Path>
+            <Path fileType="config">/usr/share/dbus-1</Path>
+            <Path fileType="library">/usr/lib/libzeitgeist-2.0.so*</Path>
+            <Path fileType="library">/usr/lib/girepository-1.0</Path>
+            <Path fileType="library">/usr/lib/python3.11/site-packages</Path>
         </Files>
     </Package>
 
@@ -67,6 +75,7 @@
         <Files>
             <Path fileType="header">/usr/include</Path>
             <Path fileType="data">/usr/lib/pkgconfig</Path>
+            <Path fileType="data">/usr/share/gir-1.0</Path>
         </Files>
     </Package>