diff --git a/.gitignore b/.gitignore index a525b97..c5a7eb6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /libunity_7.1.4+15.10.20151002.orig.tar.gz +/libunity_7.1.4+16.04.20180209.1.orig.tar.gz diff --git a/libunity.spec b/libunity.spec index b5b3dc9..8d8fab3 100644 --- a/libunity.spec +++ b/libunity.spec @@ -6,13 +6,13 @@ Name: libunity Summary: Library for integrating with Unity and Plasma Version: 7.1.4 -Release: 11.20151002%{?dist} +Release: 12.20180209%{?dist} # most files LGPLv3, with a handful of GPLv3 (unity-sound-menu* sources in particular) License: GPLv3 URL: https://launchpad.net/libunity # same sources as shipped in ubuntu packages -Source0: https://launchpad.net/ubuntu/+archive/primary/+files/libunity_%{version}+15.10.20151002.orig.tar.gz +Source0: https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/libunity/%{version}+16.04.20180209.1-0ubuntu1/libunity_%{version}+16.04.20180209.1.orig.tar.gz BuildRequires: automake libtool gnome-common BuildRequires: intltool @@ -43,7 +43,7 @@ Requires: python3-gobject-base %prep -%setup -q -n libunity-%{version}+15.10.20151002 +%setup -q -c %build @@ -58,11 +58,11 @@ export PYTHON --disable-silent-rules \ --disable-static -make %{?_smp_mflags} +%make_build %install -make install DESTDIR=%{buildroot} +%make_install ## unpackaged files # libtool, unused lib symlink @@ -71,11 +71,11 @@ rm -fv \ %{buildroot}%{_libdir}/libunity/*.{la,so} -%post -p /sbin/ldconfig +%ldconfig_post %postun -/sbin/ldconfig -%if 0%{?fedora} < 24 +%{?ldconfig} +%if 0%{?fedora} < 24 && 0%{?rhel} < 8 if [ $1 -eq 0 ]; then glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : fi @@ -119,6 +119,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %changelog +* Thu Nov 15 2018 Rex Dieter - 7.1.4-12.20180209 +- 20180209 snapshot used by ubuntu +- use %%make_build %%make_install %%ldconfig + * Fri Jul 13 2018 Fedora Release Engineering - 7.1.4-11.20151002 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 0503c6f..c38a671 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -95b0b5c2925d67d799ebdc59c973d17d libunity_7.1.4+15.10.20151002.orig.tar.gz +SHA512 (libunity_7.1.4+16.04.20180209.1.orig.tar.gz) = fbce79dfeff93c4ab8e07de740d4366aae0d14aad06d3316595f9fb021a01ab1bd5967921886a49ab1cba19639aa11faf17c5805756240d7e725d9980b81d68f