#25 Rework of the name simplification
Closed 3 years ago by kwizart. Opened 4 years ago by kwizart.
rpms/ kwizart/chromium simplify-name-take2  into  rawhide

file modified
+21 -24
@@ -22,12 +22,22 @@ 

  # We'd like to always have this on.

  %global use_vaapi 0

  

+ # If we build with shared on, then chrome-remote-desktop depends on chromium libs.

+ # If we build with shared off, then users cannot swap out libffmpeg (and i686 gets a lot harder to build)

+ %global shared 1

+ 

  # NEVER EVER EVER turn this on in official builds

  %global freeworld 0

  %if %{freeworld}

  %global lsuffix freeworld

+ %if 0%{?shared}

+ %global nsuffix -libs-media-freeworld

+ %else

+ %global nsuffix -freeworld

+ %endif

  %else

  %global lsuffix fedora

+ %global nsuffix %{nil}

  %endif

  

  # Some people wish not to use the Fedora Google API keys. Mmkay.
@@ -67,10 +77,6 @@ 

  %endif

  %global __requires_exclude ^(%{privlibs})\\.so*

  

- # If we build with shared on, then chrome-remote-desktop depends on chromium libs.

- # If we build with shared off, then users cannot swap out libffmpeg (and i686 gets a lot harder to build)

- %global shared 1

- 

  # AddressSanitizer mode

  # https://www.chromium.org/developers/testing/addresssanitizer

  %global asan 0
@@ -156,11 +162,7 @@ 

  

  %global majorversion 77

  

- %if %{freeworld}

- Name:		chromium%{chromium_channel}%{?freeworld:-freeworld}

- %else

- Name:		chromium%{chromium_channel}

- %endif

+ Name:		chromium%{chromium_channel}%{nsuffix}

  Version:	%{majorversion}.0.3865.90

  Release:	2%{?dist}

  Summary:	A WebKit (Blink) powered web browser
@@ -507,9 +509,16 @@ 

  Provides:	webrtc = 0.2

  Obsoletes:	webrtc <= 0.1

  %if 0%{?shared}

+ %if 0%{?freeworld}

+ # chromium-libs-media-freeworld case

+ Requires(post): %{_sbindir}/update-alternatives

+ Requires(preun): %{_sbindir}/update-alternatives

+ %else

+ # chromium case with shared libs

  Requires:       chromium-libs%{_isa} = %{version}-%{release}

  # This is broken out so it can be replaced.

  Requires:	chromium-libs-media%{_isa} = %{version}-%{release}

+ %endif

  # Nothing to do here. chromium-libs is real.

  %else

  Provides:	chromium-libs = %{version}-%{release}
@@ -643,21 +652,7 @@ 

  %description libs

  Shared libraries used by chromium (and chrome-remote-desktop).

  

- %if %{freeworld}

- %package -n chromium-libs-media-freeworld

- Summary: Chromium media libraries built with all possible codecs

- Provides: chromium-libs-media = %{version}-%{release}

- Provides: chromium-libs-media%{_isa} = %{version}-%{release}

- Requires: chromium-libs%{_isa} = %{version}

- Requires(post): %{_sbindir}/update-alternatives

- Requires(preun): %{_sbindir}/update-alternatives

- 

- %description -n chromium-libs-media-freeworld

- Chromium media libraries built with all possible codecs. Chromium is an

- open-source web browser, powered by WebKit (Blink). This package replaces

- the default chromium-libs-media package, which is limited in what it

- can include.

- %else

+ %if ! %{freeworld}

  %package libs-media

  Summary: Shared libraries used by the chromium media subsystem

  Requires: chromium-libs%{_isa} = %{version}
@@ -1438,6 +1433,7 @@ 

    os.remove(path)

  end

  

+ %if %{shared}

  %if %{freeworld}

  %posttrans -n chromium-libs-media-freeworld

  %{_sbindir}/update-alternatives --install \
@@ -1473,6 +1469,7 @@ 

      %{_libdir}/chromium-browser/libffmpeg.so.fedora

  fi

  %endif

+ %endif

  

  %pre -n chrome-remote-desktop

  getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-desktop

no initial comment

Pull-Request has been closed by kwizart

3 years ago