Skip to content

Commit

Permalink
system-config-printer: fix .ui data installation path
Browse files Browse the repository at this point in the history
Also fix setup.py invocation during make install.

Ref: pypa/setuptools#3143
  • Loading branch information
MingcongBai committed Apr 2, 2024
1 parent 5cfa2ff commit 54811fa
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 12 deletions.
15 changes: 3 additions & 12 deletions app-admin/system-config-printer/01-runtime/beyond
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,15 @@ abinfo "Splitting out system-config-printer GUI ..."
# installing the GUI by default, the system has two GUI applications for
# printer management, which is not desirable.
mkdir -pv "$SRCDIR"/guidir/etc/xdg/autostart
mkdir -pv "$SRCDIR"/guidir/usr/{bin,share/{applications,man/man1,metainfo,system-config-printer/{__pycache__,xml,ui}}}
mkdir -pv "$SRCDIR"/guidir/usr/{bin,share/{applications,man/man1,metainfo,system-config-printer/}}
for i in \
"$PKGDIR"/usr/bin/system-config-printer-applet \
"$PKGDIR"/usr/share/system-config-printer/__pycache__/applet* \
"$PKGDIR"/usr/share/system-config-printer/applet.py* \
"$PKGDIR"/etc/xdg/autostart/print-applet.desktop \
"$PKGDIR"/usr/share/man/man1/system-config-printer-applet.1* \
"$PKGDIR"/usr/bin/system-config-printer \
"$PKGDIR"/usr/bin/install-printerdriver \
"$PKGDIR"/usr/share/system-config-printer/__pycache__/check-device-ids* \
"$PKGDIR"/usr/share/system-config-printer/__pycache__/HIG* \
"$PKGDIR"/usr/share/system-config-printer/__pycache__/SearchCriterion* \
"$PKGDIR"/usr/share/system-config-printer/__pycache__/serversettings* \
"$PKGDIR"/usr/share/system-config-printer/__pycache__/system-config-printer* \
"$PKGDIR"/usr/share/system-config-printer/__pycache__/ToolbarSearchEntry* \
"$PKGDIR"/usr/share/system-config-printer/__pycache__/userdefault* \
"$PKGDIR"/usr/share/system-config-printer/__pycache__/install-printerdriver* \
"$PKGDIR"/usr/share/system-config-printer/__pycache__ \
"$PKGDIR"/usr/share/system-config-printer/check-device-ids.py* \
"$PKGDIR"/usr/share/system-config-printer/HIG.py* \
"$PKGDIR"/usr/share/system-config-printer/SearchCriterion.py* \
Expand All @@ -39,8 +31,7 @@ for i in \
"$PKGDIR"/usr/share/system-config-printer/troubleshoot \
"$PKGDIR"/usr/share/system-config-printer/icons \
"$PKGDIR"/usr/share/system-config-printer/install-printerdriver.py* \
"$PKGDIR"/usr/share/system-config-printer/xml/__pycache__ \
"$PKGDIR"/usr/share/system-config-printer/xml/validate.py* \
"$PKGDIR"/usr/share/system-config-printer/xml \
"$PKGDIR"/usr/share/system-config-printer/ui \
"$PKGDIR"/usr/share/applications/system-config-printer.desktop \
"$PKGDIR"/usr/share/metainfo/system-config-printer.appdata.xml \
Expand Down
4 changes: 4 additions & 0 deletions app-admin/system-config-printer/01-runtime/prepare
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# FIXME: (from Fedora) workaround https://github.com/pypa/setuptools/issues/3143
abinfo "Fixing setup.py invocation ..."
sed -e 's/setup.py install --prefix=$(DESTDIR)$(prefix)/setup.py install --root $(DESTDIR) --prefix=$(prefix)/' \
-i "$SRCDIR"/Makefile*
1 change: 1 addition & 0 deletions app-admin/system-config-printer/spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
VER=1.5.17
REL=1
SRCS="https://github.com/OpenPrinting/system-config-printer/releases/download/v$VER/system-config-printer-$VER.tar.xz"
CHKSUMS="sha256::dc9c8ad03f7983962ddf0ef05621c948370bd1763cd90c3dcff672280aa2d6e6"
CHKUPDATE="anitya::id=8855"

0 comments on commit 54811fa

Please sign in to comment.