Skip to content

Ensure that product icons are packaged#1587

Merged
imobachgs merged 1 commit intoagama-project:masterfrom
lkocman:product_icons
Sep 6, 2024
Merged

Ensure that product icons are packaged#1587
imobachgs merged 1 commit intoagama-project:masterfrom
lkocman:product_icons

Conversation

@lkocman
Copy link
Copy Markdown
Collaborator

@lkocman lkocman commented Sep 6, 2024

Hello folks

Here's a fix that ensures installation of missing product icons but I'm not really happy about two things.

It seems that we're somehow trying to webpack this (I don't really have experience with this) I know that we're doing some npm installation in spec so I'm not sure if we should fix the webpack instead.

{_builddir}/agama/src/assets/products/*.svg
web/webpack.config.js:  { from: "./src/assets/products/*.svg", to: "assets/logos/[name][ext]" }

Why do we have it in src/assets/products/.svg and install it into assets/logos/.svg ?
Let's just use same path in both cases.

Cheers

image

@lkocman lkocman changed the title DO Ensure that product icons are packaged Ensure that product icons are packaged Sep 6, 2024
@imobachgs imobachgs merged commit f05eb53 into agama-project:master Sep 6, 2024
@imobachgs
Copy link
Copy Markdown
Contributor

I overlooked this pull request and had created an identical patch to fix the issue :-) Thank you!

@imobachgs
Copy link
Copy Markdown
Contributor

We need to think a little bit about this, because IMHO the logos could be included in the products package (where they are mentioned). But, by now, it is good enough.

imobachgs added a commit that referenced this pull request Sep 6, 2024
)

The logos/ directory is already inside web_ui/.


## Problem

Latest agama-web-ui [is not
building](https://build.opensuse.org/package/live_build_log/systemsmanagement:Agama:Devel/agama-web-ui/openSUSE_Tumbleweed/x86_64)
after #1587 .


## Solution

Since the logos are already installed in `web_ui/logos`, we can drop the
two (non-existent)? directories
listed in the %files section:

```
%{_datadir}/agama/assets
%{_datadir}/agama/products
```


## Testing

- *Tested manually*
@dgdavid
Copy link
Copy Markdown
Contributor

dgdavid commented Sep 10, 2024

Why do we have it in src/assets/products/.svg and install it into assets/logos/.svg ?

My fault @lkocman I don't know why I chosen the latest while working on #1550

We need to think a little bit about this, because IMHO the logos could be included in the products package (where they are mentioned)

Agree. The product package should be responsible of placing its assets in the web_ui assets directory instead of adding them one by one to the web client build. We should work on defining it.

@imobachgs imobachgs mentioned this pull request Sep 20, 2024
imobachgs added a commit that referenced this pull request Sep 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants