diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2019-07-30 13:40:52 +0200 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2019-07-31 12:40:51 +0200 |
| commit | 634844354ee6ed884128086a80c3ee32c889d8c9 (patch) | |
| tree | afdf2d9c4c5962ac7631d1f21dda03796307b666 /sysui/desktop | |
| parent | e569b9d40eb02f53a3f13024af4ab1dc9ca7634a (diff) | |
sysui: fix rpm errors in freedesktop-menus (4.14.1)
RPM build errors:
Explicit %attr() mode not applicable to symlink: /workdir/CustomTarget/sysui/rpm/libreofficedev/freedesktop/usr/bin/libreofficedev6.1
Installed (but unpackaged) file(s) found:
/usr/local/lib/girepository-1.0/LOKDocView-0.1.typelib
/usr/share/gir-1.0/LOKDocView-0.1.gir
The LOKDocView problem turned out to be the result of the first
incremental build after adding --with-package-format, and previously it
was avoided with a if in configure; moving the commands out of
create_tree.sh should be more obvious and reliable though.
Change-Id: I69c1566e26eeaa1d8bf88a3650a78da6ddfb5a3b
Reviewed-on: https://gerrit.libreoffice.org/76596
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Diffstat (limited to 'sysui/desktop')
| -rw-r--r-- | sysui/desktop/freedesktop/freedesktop-menus.spec | 2 | ||||
| -rwxr-xr-x | sysui/desktop/share/create_tree.sh | 15 |
2 files changed, 1 insertions, 16 deletions
diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec b/sysui/desktop/freedesktop/freedesktop-menus.spec index bdc378554065..f646bb7ff8ca 100644 --- a/sysui/desktop/freedesktop/freedesktop-menus.spec +++ b/sysui/desktop/freedesktop/freedesktop-menus.spec @@ -394,7 +394,7 @@ done # compat symlinks %attr(0755,root,root) /opt/%unixfilename %endif -%attr(0755, root, root) /usr/bin/* +/usr/bin/* /usr/share/applications/%unixfilename-base.desktop /usr/share/applications/%unixfilename-calc.desktop /usr/share/applications/%unixfilename-draw.desktop diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh index 9fc2b998c86f..36dc4ff7a0e6 100755 --- a/sysui/desktop/share/create_tree.sh +++ b/sysui/desktop/share/create_tree.sh @@ -83,18 +83,3 @@ for i in base calc draw impress writer; do done cp "${APPDATA_SOURCE_DIR}/org.libreoffice.kde.metainfo.xml" "${DESTDIR}/${PREFIXDIR}/share/appdata/org.${PREFIX}.kde.metainfo.xml" -# Generate gobject-introspection files -if [ -n "$INTROSPECTION_SCANNER" ]; then - mkdir -p "${DESTDIR}/${PREFIXDIR}/share/gir-1.0" - g-ir-scanner "${SRCDIR}/include/LibreOfficeKit/LibreOfficeKitGtk.h" "${SRCDIR}/libreofficekit/source/gtk/lokdocview.cxx" \ - `${PKG_CONFIG} --cflags gobject-introspection-1.0 gtk+-3.0` -I"${SRCDIR}/include/" \ - --include=GLib-2.0 --include=GObject-2.0 --include=Gio-2.0 \ - --library=libreofficekitgtk --library-path="${INSTDIR}/program" \ - --include=Gdk-3.0 --include=GdkPixbuf-2.0 --include=Gtk-3.0 \ - --namespace=LOKDocView --nsversion=0.1 --identifier-prefix=LOKDoc --symbol-prefix=lok_doc \ - --output="${DESTDIR}/${PREFIXDIR}/share/gir-1.0/LOKDocView-0.1.gir" --warn-all --no-libtool - - mkdir -p "${DESTDIR}/${LIBDIR}/girepository-1.0" - g-ir-compiler "${DESTDIR}/${PREFIXDIR}/share/gir-1.0/LOKDocView-0.1.gir" \ - --output="${DESTDIR}/${LIBDIR}/girepository-1.0/LOKDocView-0.1.typelib" -fi |