Skip to content

Commit

Permalink
fix: solve several building issues (#1805)
Browse files Browse the repository at this point in the history
- **fix(live): drop unused xf86 packages**
- **fix: include agama-dbus-monitor in the Ruby package**
  • Loading branch information
imobachgs authored Dec 3, 2024
2 parents d516cc1 + f19b52a commit fa9cbee
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 14 deletions.
11 changes: 9 additions & 2 deletions live/src/agama-installer.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Dec 3 12:41:31 UTC 2024 - Imobach Gonzalez Sosa <[email protected]>

- Drop unneeded packages (gh#agama-project/agama#1805):
- xf86-video-* are obsoleted by the modesetting driver.
- xf86-input-wacom is obsoleted by libinput.

-------------------------------------------------------------------
Mon Dec 2 14:53:12 UTC 2024 - Ladislav Slezák <[email protected]>

Expand Down Expand Up @@ -65,13 +72,13 @@ Mon Sep 16 15:46:23 UTC 2024 - Lubos Kocman <[email protected]>
- Use $kiwi_iname instead of static agama-live reference in all of
config-cdroom/* with exception of s390x, where for some reason
we use SUSE Linux... string instead


-------------------------------------------------------------------
Mon Sep 9 15:55:16 UTC 2024 - Eugenio Paolantonio <[email protected]>

- Firefox: set browser.startup.homepage_override.mstone to ignore
(gh#openSUSE/agama#1593)
(gh#openSUSE/agama#1593)

-------------------------------------------------------------------
Sun Sep 8 06:28:35 UTC 2024 - Lubos Kocman <[email protected]>
Expand Down
6 changes: 0 additions & 6 deletions live/src/agama-installer.kiwi
Original file line number Diff line number Diff line change
Expand Up @@ -150,12 +150,6 @@
<package name="xorg-x11-server"/>
<package name="xorg-x11-fonts-core"/>
<package name="xf86-input-libinput" />
<package name="xf86-input-wacom" arch="aarch64,x86_64,ppc64le"/>
<package name="xf86-video-amdgpu" arch="x86_64"/>
<package name="xf86-video-intel" arch="x86_64"/>
<package name="xf86-video-nv" arch="x86_64"/>
<package name="xf86-video-qxl" arch="x86_64"/>
<package name="xf86-video-vesa" arch="x86_64"/>
<package name="psmisc"/>
<package name="joe"/>
<package name="checkmedia"/>
Expand Down
6 changes: 6 additions & 0 deletions rust/package/agama.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Dec 3 12:58:48 UTC 2024 - Imobach Gonzalez Sosa <[email protected]>

- Do not refer to the agama-dbus-monitor because it is part of the
Ruby package (gh#agama-project/agama#1805).

-------------------------------------------------------------------
Mon Dec 2 11:29:46 UTC 2024 - Imobach Gonzalez Sosa <[email protected]>

Expand Down
6 changes: 0 additions & 6 deletions rust/package/agama.spec
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,6 @@ install -D -m 0644 %{_builddir}/agama/share/agama-web-server.service %{buildroot
install -D -d -m 0755 %{buildroot}%{_libexecdir}
install -D -m 0755 %{_builddir}/agama/share/agama-scripts.sh %{buildroot}%{_libexecdir}/agama-scripts.sh
install -D -m 0644 %{_builddir}/agama/share/agama-scripts.service %{buildroot}%{_unitdir}/agama-scripts.service
install -D -m 0644 %{_builddir}/agama/share/agama-dbus-monitor.service %{buildroot}%{_unitdir}/agama-dbus-monitor.service

# install manpages
mkdir -p %{buildroot}%{_mandir}/man1
Expand All @@ -175,28 +174,24 @@ echo $PATH

%pre
%service_add_pre agama-web-server.service
%service_add_pre agama-dbus-monitor.service

%pre -n agama-scripts
%service_add_pre agama-scripts.service

%post
%service_add_post agama-web-server.service
%service_add_post agama-dbus-monitor.service

%post -n agama-scripts
%service_add_post agama-scripts.service

%preun
%service_del_preun agama-web-server.service
%service_del_preun agama-dbus-monitor.service

%preun -n agama-scripts
%service_del_preun agama-scripts.service

%postun
%service_del_postun_with_restart agama-web-server.service
%service_del_postun_with_restart agama-dbus-monitor.service

%postun -n agama-scripts
%service_del_postun_with_restart agama-scripts.service
Expand All @@ -209,7 +204,6 @@ echo $PATH
%{_datadir}/dbus-1/agama-services
%{_pam_vendordir}/agama
%{_unitdir}/agama-web-server.service
%{_unitdir}/agama-dbus-monitor.service

%files -n agama-cli
%{_bindir}/agama
Expand Down
6 changes: 6 additions & 0 deletions service/agama-yast.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ install -D -m 0644 %{mod_full_name}/share/dbus.conf %{buildroot}%{_datadir}/dbus
install --directory %{buildroot}%{_datadir}/dbus-1/agama-services
install -m 0644 --target-directory=%{buildroot}%{_datadir}/dbus-1/agama-services %{mod_full_name}/share/org.opensuse.Agama*.service
install -D -m 0644 %{mod_full_name}/share/agama.service %{buildroot}%{_unitdir}/agama.service
install -D -m 0644 %{mod_full_name}/share/agama-dbus-monitor.service %{buildroot}%{_unitdir}/agama-dbus-monitor.service
install -D -m 0644 %{mod_full_name}/share/agama-proxy-setup.service %{buildroot}%{_unitdir}/agama-proxy-setup.service
install --directory %{buildroot}/usr/share/agama/conf.d
install -D -m 0644 %{mod_full_name}/conf.d/*.yaml %{buildroot}/usr/share/agama/conf.d/
Expand All @@ -60,21 +61,26 @@ sh "%{SOURCE2}" "%{SOURCE1}"

%pre
%service_add_pre agama.service
%service_add_pre agama-dbus-monitor.service

%post
%service_add_post agama.service
%service_add_post agama-dbus-monitor.service

%preun
%service_del_preun agama.service
%service_del_preun agama-dbus-monitor.service

%postun
%service_del_postun_with_restart agama.service
%service_del_postun_with_restart agama-dbus-monitor.service

%files
%{_datadir}/dbus-1/agama.conf
%dir %{_datadir}/dbus-1/agama-services
%{_datadir}/dbus-1/agama-services/org.opensuse.Agama*.service
%{_unitdir}/agama.service
%{_unitdir}/agama-dbus-monitor.service
%{_unitdir}/agama-proxy-setup.service
%dir %{_datadir}/agama
%dir %{_datadir}/agama/conf.d
Expand Down
6 changes: 6 additions & 0 deletions service/package/rubygem-agama-yast.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Dec 3 13:00:58 UTC 2024 - Imobach Gonzalez Sosa <[email protected]>

- Include the agama-dbus-monitor package in the spec file
(gh#agama-project/agama#1805).

-------------------------------------------------------------------
Sun Dec 1 21:59:11 UTC 2024 - David Diaz <[email protected]>

Expand Down

0 comments on commit fa9cbee

Please sign in to comment.