Skip to content

Commit

Permalink
Fix spec file
Browse files Browse the repository at this point in the history
Do not create /usr/share/flakes as part of the
package. Let the tooling create the directory
if not present
  • Loading branch information
schaefi committed Nov 23, 2024
1 parent ca138c8 commit 1cdeafa
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
4 changes: 1 addition & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ BINDIR ?= ${PREFIX}/bin
SBINDIR ?= ${PREFIX}/sbin
SHAREDIR ?= ${PREFIX}/share/podman-pilot
COMPLETIONDIR ?= ${PREFIX}/share/bash-completion/completions
FLAKEDIR ?= ${PREFIX}/share/flakes
TEMPLATEDIR ?= /etc/flakes

ARCH = $(shell uname -m)
Expand Down Expand Up @@ -82,7 +81,6 @@ install:
install -d -m 755 $(DESTDIR)$(SHAREDIR)
install -d -m 755 $(DESTDIR)$(COMPLETIONDIR)
install -d -m 755 $(DESTDIR)$(TEMPLATEDIR)
install -d -m 755 $(DESTDIR)$(FLAKEDIR)
install -d -m 755 ${DESTDIR}/usr/share/man/man8
install -m 755 target/release/podman-pilot \
$(DESTDIR)$(BINDIR)/podman-pilot
Expand Down Expand Up @@ -116,7 +114,7 @@ uninstall:
rm -f $(DESTDIR)$(BINDIR)/flake-ctl
rm -f $(DESTDIR)$(BINDIR)/podman-pilot
rm -f $(DESTDIR)$(BINDIR)/firecracker-pilot
rm -rf $(DESTDIR)$(FLAKEDIR) $(DESTDIR)$(SHAREDIR) $(DESTDIR)$(TEMPLATEDIR)
rm -rf $(DESTDIR)$(SHAREDIR) $(DESTDIR)$(TEMPLATEDIR)

man:
${MAKE} -C doc man
Expand Down
1 change: 0 additions & 1 deletion package/flake-pilot.spec
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,6 @@ install -m 644 flakes.yml %{buildroot}/etc/flakes.yml

%files
%defattr(-,root,root)
%dir /usr/share/flakes
%dir /etc/flakes
%config /etc/flakes.yml
/usr/bin/flake-ctl
Expand Down

0 comments on commit 1cdeafa

Please sign in to comment.