#2 Update to 1.1.90 and libhandy 1 ABI, based on earlier libhandy1 packaging
Merged 3 years ago by kalev. Opened 3 years ago by kalev.
rpms/ kalev/libhandy libhandy-1  into  rawhide

file modified
+1
@@ -5,3 +5,4 @@ 

  /libhandy-v0.0.10.tar.bz2

  /libhandy-v0.0.11.tar.bz2

  /libhandy-v0.0.13.tar.bz2

+ /libhandy-1.1.90.tar.xz

file modified
+55 -16
@@ -1,59 +1,98 @@ 

  Name:           libhandy

- Version:        0.0.13

- Release:        7%{?dist}

- Summary:        Library with GTK+ widgets for mobile phones

- 

+ Version:        1.1.90

+ Release:        2%{?dist}

+ Summary:        Building blocks for modern adaptive GNOME apps

  License:        LGPLv2+

- URL:            https://source.puri.sm/Librem5/libhandy/

- Source0:        https://source.puri.sm/Librem5/libhandy/-/archive/v%{version}/libhandy-v%{version}.tar.bz2

+ 

+ URL:            https://gitlab.gnome.org/GNOME/libhandy

+ %global majmin %(echo %{version} | cut -d . -f -2)

+ Source0:        https://download.gnome.org/sources/libhandy/%{majmin}/libhandy-%{version}.tar.xz

  

  BuildRequires:  gcc

  BuildRequires:  gtk-doc

  BuildRequires:  meson

+ BuildRequires:  vala

+ 

  BuildRequires:  pkgconfig(gio-2.0)

- BuildRequires:  pkgconfig(glib-2.0)

+ BuildRequires:  pkgconfig(gladeui-2.0)

+ BuildRequires:  pkgconfig(glib-2.0) >= 2.44

  BuildRequires:  pkgconfig(gmodule-2.0)

  BuildRequires:  pkgconfig(gobject-introspection-1.0)

- BuildRequires:  pkgconfig(gtk+-3.0)

- BuildRequires:  vala

+ BuildRequires:  pkgconfig(gtk+-3.0) >= 3.24.1

+ 

+ # Support graphical tests in non-graphical environment

+ BuildRequires:  xorg-x11-server-Xvfb

+ 

+ # Retired in F34

+ Obsoletes:      libhandy1 < 1.1.90-2

+ Provides:       libhandy1 = %{version}-%{release}

+ Provides:       libhandy1%{?_isa} = %{version}-%{release}

  

  %description

  libhandy provides GTK+ widgets and GObjects to ease developing

  applications for mobile phones.

  

+ 

  %package        devel

  Summary:        Development files for %{name}

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

+ # Retired in F34

+ Obsoletes:      libhandy1-devel < 1.1.90-2

+ Provides:       libhandy1-devel = %{version}-%{release}

+ Provides:       libhandy1-devel%{?_isa} = %{version}-%{release}

  

  %description    devel

  The %{name}-devel package contains libraries and header files for

  developing applications that use %{name}.

  

+ 

  %prep

- %autosetup -n libhandy-v%{version} -p1

+ %autosetup -n libhandy-%{version} -p1

+ 

  

  %build

- %meson -Dgtk_doc=true -Dexamples=false -Dglade_catalog=disabled

+ %meson -Dgtk_doc=true -Dexamples=false -Dtests=true

  %meson_build

  

+ 

  %install

  %meson_install

  

- %files

+ %find_lang libhandy

+ 

+ 

+ %check

+ %{shrink:xvfb-run -a %meson_test}

+ 

+ 

+ %files -f libhandy.lang

  %license COPYING

+ %doc AUTHORS

+ %doc HACKING.md

+ %doc NEWS

  %doc README.md

+ 

  %{_libdir}/girepository-1.0/

- %{_libdir}/libhandy-0.0.so.0*

+ %{_libdir}/libhandy-1.so.0

  

  %files devel

- %{_includedir}/libhandy-0.0/

- %{_libdir}/libhandy-0.0.so

- %{_libdir}/pkgconfig/libhandy-0.0.pc

+ %{_includedir}/libhandy-1/

+ 

+ %{_libdir}/glade/

+ %{_libdir}/libhandy-1.so

+ %{_libdir}/pkgconfig/libhandy-1.pc

+ 

  %{_datadir}/gir-1.0/

+ %{_datadir}/glade/

  %{_datadir}/gtk-doc/

  %{_datadir}/vala/

  

+ 

  %changelog

+ * Wed Mar 03 2021 Kalev Lember <klember@redhat.com> - 1.1.90-2

+ - Update to 1.1.90 and libhandy 1 ABI, based on earlier libhandy1 packaging

+ - Obsolete separate libhandy1 and libhandy1-devel packages

+ 

  * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.13-7

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

  

file modified
+1 -1
@@ -1,1 +1,1 @@ 

- SHA512 (libhandy-v0.0.13.tar.bz2) = a0918c55c9ac14af223a83db542e7dc815d97c844d1f0830a1bee4bdcdf248d00d049fa90fd2be96265535a68d56de5143ddd9264b5e997a902ac9558d5096f3

+ SHA512 (libhandy-1.1.90.tar.xz) = 9c9b751a9b1d9e9c9ef0399e1ce3df661b62c87d8cadc3bd8807722987b17b0a063a39acc409a9f2699adc794bdd9be6fda34279faff8b070cd9950870546fa0

This effectively retires old libhandy 0.0 ABI and moves libhandy 1 ABI from libhandy1 package to libhandy package as we no longer have any packages left using the old libhandy 0.0 ABI.

I've reused libhandy1 packaging here as it was, and just updated the package name to libhandy.


My intention is to push this to rawhide and F34 both, but wait with F34 until after the Beta freeze is lifted (and https://bodhi.fedoraproject.org/updates/FEDORA-2021-0aeaa69ccf, the last libhandy 0.0 user, is pushed to stable).

2 new commits added

  • Obsolete separate libhandy1 and libhandy1-devel packages
  • Update to 1.1.90 and libhandy 1 ABI, based on earlier libhandy1 packaging
3 years ago

I think Obsoletes only is the correct thing to do here, since the new package does not "Provide" the libhandy-0 API at all. They're just there to make sure old installed libhandy-0 packages are removed on upgrade.

No, I think you have it backwards. The obsoletes are there to provide libhandy 1 ABI/API, which this package continues to provide.

Err, I meant that "The Provides are there to provide ..." :)

You are, of course, right, and I was wrong. I did indeed have it backwards.

The PR looks good to me! I'd squash the changes into a single commit myself, but that's your choice.

Nice, thanks for taking a look! I put it in two commits so it's easier for you to spot what I actually changed :) The first commit was pretty much just copying libhandy1.spec over to the new name and the other one had the actual changes. Let me squash it all before merging.

rebased onto 7eec401

3 years ago

Pull-Request has been merged by kalev

3 years ago