#1 Split gcr-base in a separate package
Merged 5 years ago by kalev. Opened 5 years ago by fidencio.
rpms/ fidencio/gcr master  into  master

Split gcr-base in a separate package
Fabiano Fidêncio • 5 years ago  
file modified
+14 -3
@@ -4,7 +4,7 @@ 

  

  Name:           gcr

  Version:        3.28.1

- Release:        2%{?dist}

+ Release:        3%{?dist}

  Summary:        A library for bits of crypto UI and parsing

  

  License:        LGPLv2+
@@ -27,6 +27,7 @@ 

  BuildRequires:  /usr/bin/gpg2

  BuildRequires:  /usr/bin/valac

  BuildRequires:  /usr/bin/xsltproc

+ Requires: %{name}-base%{?_isa} = %{version}-%{release}

  

  %description

  gcr is a library for displaying certificates, and crypto UI, accessing
@@ -42,6 +43,12 @@ 

  %description devel

  The gcr-devel package includes the header files for the gcr library.

  

+ %package base

+ Summary: Library files for gcr

+ Conflicts: %{name} < 3.28.1-3

+ 

+ %description base

+ The gcr-base package includes the gcr-base library.

  

  %prep

  %autosetup -p1
@@ -82,9 +89,7 @@ 

  %{_datadir}/GConf/gsettings/org.gnome.crypto.pgp_keyservers.convert

  %{_datadir}/glib-2.0/schemas/org.gnome.crypto.pgp.gschema.xml

  %{_libdir}/girepository-1.0

- %{_libdir}/libgck-1.so.*

  %{_libdir}/libgcr-3.so.*

- %{_libdir}/libgcr-base-3.so.*

  %{_libdir}/libgcr-ui-3.so.*

  %{_datadir}/icons/hicolor/*/apps/*

  %{_datadir}/mime/packages/gcr-crypto-types.xml
@@ -112,8 +117,14 @@ 

  %{_datadir}/gtk-doc/html/gcr-3

  %{_datadir}/vala/

  

+ %files base

+ %{_libdir}/libgck-1.so.*

+ %{_libdir}/libgcr-base-3.so.*

  

  %changelog

+ * Thu Apr 11 2019 Fabiano Fidêncio <fidencio@redhat.com> - 3.28.1-3

+ - Split gcr-base into a new package

+ 

  * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.28.1-2

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

  

gcr-base has been split out of gcr package so other programs can depend
on it without having to pull a whole bunch of dependency.

With the split we go from depending on 44 packages (64 M) to depending
on 7 packages (10 M).

Before the split:

$ sudo dnf install gvfs gvfs-client
Last metadata expiration check: 0:10:28 ago on Thu 11 Apr 2019 04:28:43 PM CEST.
Dependencies resolved.
========================================================================================================================================
 Package                                 Architecture             Version                               Repository                 Size
========================================================================================================================================
Installing:
 gvfs                                    x86_64                   1.40.0-1.fc30                         rawhide                   319 k
Installing dependencies:
 adwaita-cursor-theme                    noarch                   3.32.0-1.fc30                         rawhide                   644 k
 adwaita-icon-theme                      noarch                   3.32.0-1.fc30                         rawhide                    11 M
 at-spi2-atk                             x86_64                   2.32.0-1.fc30                         rawhide                    78 k
 at-spi2-core                            x86_64                   2.32.0-1.fc30                         rawhide                   155 k
 atk                                     x86_64                   2.32.0-1.fc30                         rawhide                   258 k
 avahi-glib                              x86_64                   0.7-18.fc30                           rawhide                    13 k
 colord-libs                             x86_64                   1.4.4-1.fc31                          rawhide                   209 k
 fribidi                                 x86_64                   1.0.5-2.fc30                          rawhide                    82 k
 gcr                                     x86_64                   3.28.1-2.fc30                         rawhide                   668 k
 gdk-pixbuf2-modules                     x86_64                   2.38.1-1.fc31                         rawhide                    86 k
 graphite2                               x86_64                   1.3.10-7.fc30                         rawhide                   109 k
 gtk-update-icon-cache                   x86_64                   3.24.7-2.fc30                         rawhide                    31 k
 gtk3                                    x86_64                   3.24.7-2.fc30                         rawhide                   4.5 M
 gvfs-client                             x86_64                   1.40.0-1.fc30                         rawhide                   746 k
 harfbuzz                                x86_64                   2.3.1-1.fc30                          rawhide                   534 k
 hicolor-icon-theme                      noarch                   0.17-6.fc31                           rawhide                    44 k
 jasper-libs                             x86_64                   2.0.14-8.fc30                         rawhide                   152 k
 jbigkit-libs                            x86_64                   2.1-16.fc30                           rawhide                    49 k
 lcms2                                   x86_64                   2.9-5.fc30                            rawhide                   150 k
 libXcomposite                           x86_64                   0.4.4-16.fc30                         rawhide                    22 k
 libXcursor                              x86_64                   1.1.15-5.fc30                         rawhide                    28 k
 libXdamage                              x86_64                   1.1.4-16.fc30                         rawhide                    20 k
 libXfixes                               x86_64                   5.0.3-9.fc30                          rawhide                    17 k
 libXft                                  x86_64                   2.3.3-1.fc31                          rawhide                    58 k
 libXi                                   x86_64                   1.7.9-9.fc30                          rawhide                    36 k
 libXinerama                             x86_64                   1.1.4-3.fc30                          rawhide                    13 k
 libXrandr                               x86_64                   1.5.2-1.fc31                          rawhide                    25 k
 libXtst                                 x86_64                   1.2.3-9.fc30                          rawhide                    19 k
 libbluray                               x86_64                   1.1.1-1.fc31                          rawhide                   154 k
 libcdio                                 x86_64                   2.0.0-4.fc30                          rawhide                   234 k
 libcdio-paranoia                        x86_64                   10.2+2.0.0-2.fc30                     rawhide                    84 k
 libdatrie                               x86_64                   0.2.9-9.fc30                          rawhide                    29 k
 libepoxy                                x86_64                   1.5.3-2.fc30                          rawhide                   196 k
 libgusb                                 x86_64                   0.3.0-4.fc30                          rawhide                    44 k
 libjpeg-turbo                           x86_64                   2.0.2-1.fc31                          rawhide                   158 k
 libthai                                 x86_64                   0.1.28-2.fc30                         rawhide                   199 k
 libtiff                                 x86_64                   4.0.10-4.fc30                         rawhide                   166 k
 libwayland-client                       x86_64                   1.17.0-1.fc30                         rawhide                    31 k
 libwayland-cursor                       x86_64                   1.17.0-1.fc30                         rawhide                    19 k
 libwayland-egl                          x86_64                   1.17.0-1.fc30                         rawhide                    13 k
 pango                                   x86_64                   1.43.0-3.fc30                         rawhide                   261 k
 rest                                    x86_64                   0.8.1-5.fc30                          rawhide                    63 k
Installing weak dependencies:
 dconf                                   x86_64                   0.32.0-1.fc30                         rawhide                    94 k

Transaction Summary
========================================================================================================================================
Install  44 Packages

Total download size: 21 M
Installed size: 64 M

After the split:

$ sudo dnf install gcr-base-3.28.1-3.fc31.x86_64.rpm  gvfs-1.40.1-1.fc31.x86_64.rpm  gvfs-client-1.40.1-1.fc31.x86_64.rpm
Last metadata expiration check: 0:11:20 ago on Thu 11 Apr 2019 04:28:43 PM CEST.
Dependencies resolved.
========================================================================================================================================
 Package                            Architecture             Version                               Repository                      Size
========================================================================================================================================
Installing:
 gcr-base                           x86_64                   3.28.1-3.fc31                         @commandline                   272 k
 gvfs                               x86_64                   1.40.1-1.fc31                         @commandline                   321 k
 gvfs-client                        x86_64                   1.40.1-1.fc31                         @commandline                   749 k
Installing dependencies:
 avahi-glib                         x86_64                   0.7-18.fc30                           rawhide                         13 k
 libbluray                          x86_64                   1.1.1-1.fc31                          rawhide                        154 k
 libcdio                            x86_64                   2.0.0-4.fc30                          rawhide                        234 k
 libcdio-paranoia                   x86_64                   10.2+2.0.0-2.fc30                     rawhide                         84 k

Transaction Summary
========================================================================================================================================
Install  7 Packages

Total size: 1.8 M
Total download size: 485 k
Installed size: 10 M

https://bugzilla.redhat.com/show_bug.cgi?id=1698842

Signed-off-by: Fabiano Fidêncio fidencio@redhat.com

"Conflicts: %{name} < 3.28.1-2" seems off by one (should be -3). Otherwise looks good to me!

I've pushed a new version fixing the off by one error.

Thanks for the quick review.

rebased onto 3c7a6e7

5 years ago

Pull-Request has been merged by kalev

5 years ago

Thanks! Merged and built and submitted the update to bodhi: https://bodhi.fedoraproject.org/updates/gcr-3.28.1-3.fc30