#44 Drop unneeded Requires(post) and Requires(postun) dependencies
Closed 5 years ago by sgallagh. Opened 5 years ago by sgallagh.
rpms/ sgallagh/fedora-release deploops  into  master

file modified
+8 -23
@@ -14,7 +14,7 @@ 

  Summary:        Fedora release files

  Name:           fedora-release

  Version:        30

- Release:        0.12

+ Release:        0.13

  License:        MIT

  URL:            https://fedoraproject.org/

  
@@ -217,15 +217,6 @@ 

  Provides:       system-release

  Provides:       system-release(%{version})

  Requires:       fedora-release-common = %{version}-%{release}

- Requires:       systemd

- Requires:       cockpit-bridge

- Requires:       cockpit-networkmanager

- Requires:       cockpit-shell

- Requires:       cockpit-storaged

- Requires:       cockpit-ws

- Requires:       openssh-server

- 

- Requires(post):	systemd

  

  

  %description server
@@ -278,10 +269,6 @@ 

  Provides:       system-release(%{version})

  Requires:       fedora-release-common = %{version}-%{release}

  Provides:       system-release-product

- # needed for captive portal support

- Requires:       NetworkManager-config-connectivity-fedora

- Requires(post): /usr/bin/glib-compile-schemas

- Requires(postun): /usr/bin/glib-compile-schemas

  

  

  %description workstation
@@ -507,15 +494,6 @@ 

  install -d %{buildroot}%{_sysconfdir}/swid/swidtags.d

  ln -s %{_swidtagdir} %{buildroot}%{_sysconfdir}/swid/swidtags.d/fedoraproject.org

  

- %postun workstation

- if [ $1 -eq 0 ] ; then

-     glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :

- fi

- 

- 

- %posttrans workstation

- glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :

- 

  

  %files common

  %license licenses/LICENSE licenses/Fedora-Legal-README.txt
@@ -617,6 +595,13 @@ 

  

  

  %changelog

+ * Sun Nov 11 2018 Stephen Gallagher <sgallagh@redhat.com> - 30-0.13

+ - Drop unneeded Requires(post) and Requires(postun) dependencies causing

+   loops. The glib-compile-schemas dependency is now handled by file triggers

+   and the systemd requirement was just completely erroneous.

+ - Also drop strict dependencies on edition packages. They are causing

+   un-breakable dependency loops.

+ 

  * Tue Oct 23 2018 Stephen Gallagher <sgallagh@redhat.com> - 30-0.12

  - Convert to more maintainable implementation of variant-handling

  

The glib-compile-schemas dependency is now handled by file triggers and the systemd requirement was just completely erroneous.

Scratch-build available at https://koji.fedoraproject.org/koji/taskinfo?taskID=30806555 for testing.

Signed-off-by: Stephen Gallagher sgallagh@redhat.com

rebased onto debee1de6ef7e737430e840d2886754ef59d6a74

5 years ago

Rebased and actually dropped the scriptlets themselves as well.

Scratch-build at https://koji.fedoraproject.org/koji/taskinfo?taskID=30806906

rebased onto 7cdf451d5f3bb02f9807edba97c2de8539724626

5 years ago

Rebased again to drop the other Requires: lines as well. Those were in there to say “if you uninstall any of these, the system stops reporting itself as $EDITION”, which worked in the old approach because system-release was provided by the bare fedora-release package and then fedora-release-$EDITION` would provide these requires and could safely be ordered much later in the transaction.

With the new approach, we'll need to trim down to minimal dependencies so it can be ordered early in the transaction.

Scratch-build at https://koji.fedoraproject.org/koji/taskinfo?taskID=30807532

with an update to the commit message to explain the removal of the cockpit etc. deps, ack. This does seem to fix Rawhide installs.

rebased onto 242d999

5 years ago

Pull-Request has been closed by sgallagh

5 years ago

Ack, this is a nice change. Implementation looks good too.