diff --git a/.gitignore b/.gitignore index c0a9af5..0faf075 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /libdbusmenu-qt-0.8.2.tar.bz2 /libdbusmenu-qt-0.9.2.tar.bz2 /libdbusmenu-qt-0.9.3-20150604bzr.tar.gz +/libdbusmenu-qt_0.9.3+16.04.20160218.orig.tar.gz diff --git a/dbusmenu-qt.spec b/dbusmenu-qt.spec index 1868195..3a686bf 100644 --- a/dbusmenu-qt.spec +++ b/dbusmenu-qt.spec @@ -1,5 +1,7 @@ -%define snapshot 20150604 +%global ubuntu 16.04 +%global snapshot 20160218 +# FIXME? pkg-config files still report as 0.9.2 %global tarballversion 0.9.2 Summary: A Qt implementation of the DBusMenu protocol @@ -11,7 +13,8 @@ License: LGPLv2+ URL: https://launchpad.net/libdbusmenu-qt/ %if 0%{?snapshot} # bzr branch lp:libdbusmenu-qt && cd libdbusmenu-qt && bzr export --root=libdbusmenu-qt-%{version}-%{snapshot}bzr.tar.gz -Source0: libdbusmenu-qt-%{version}-%{snapshot}bzr.tar.gz +#Source0: libdbusmenu-qt-%{version}-%{snapshot}bzr.tar.gz +Source0: https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/libdbusmenu-qt/%{version}+%{ubuntu}.%{snapshot}-0ubuntu1/libdbusmenu-qt_%{version}+%{ubuntu}.%{snapshot}.orig.tar.gz %else Source0: https://launchpad.net/libdbusmenu-qt/trunk/%{version}/+download/libdbusmenu-qt-%{version}.tar.bz2 %endif @@ -70,7 +73,7 @@ Requires: dbusmenu-qt5%{?_isa} = %{version}-%{release} %prep -%setup -q -n libdbusmenu-qt-%{version} +%autosetup -n libdbusmenu-qt-%{version}+%{ubuntu}.%{snapshot} %build @@ -83,7 +86,7 @@ pushd %{_target_platform} popd -make %{?_smp_mflags} -C %{_target_platform} +%make_build -C %{_target_platform} mkdir %{_target_platform}-qt5 pushd %{_target_platform}-qt5 @@ -94,7 +97,7 @@ pushd %{_target_platform}-qt5 popd -make %{?_smp_mflags} -C %{_target_platform}-qt5 +%make_build -C %{_target_platform}-qt5 %install @@ -147,6 +150,10 @@ xvfb-run -a dbus-launch --exit-with-session make -C %{_target_platform} check AR %changelog +* Fri Dec 21 2018 Rex Dieter - 0.9.3-0.18.20160218 +- libdbusmenu-qt_0.9.3+16.04.20160218 +- use %%autosetup %%make_build + * Thu Jul 12 2018 Fedora Release Engineering - 0.9.3-0.18.20150604 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 245c103..3fe4951 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6e042f7eaf31770851ebf89a93c4f554 libdbusmenu-qt-0.9.3-20150604bzr.tar.gz +SHA512 (libdbusmenu-qt_0.9.3+16.04.20160218.orig.tar.gz) = dfaba59cedd320e6a3b5a9c0a5e13fb9e0952224e39cdd6ee3b32b03d95ac850a533e2a73835a7c0ead93b2283b9c235472bacb84e3d761ebe9e9398345314a9