diff --git a/.gitignore b/.gitignore index 68738d3..dd39e33 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /wacomtablet-2.1.0-g8ad842e.tar.xz /114856-wacomtablet-3.0.0~beta1.tar.xz /wacomtablet-2.9.82.tar.xz +/wacomtablet-3.1.0.tar.xz diff --git a/kcm_wacomtablet.spec b/kcm_wacomtablet.spec index 5e25807..fea9630 100644 --- a/kcm_wacomtablet.spec +++ b/kcm_wacomtablet.spec @@ -1,24 +1,17 @@ -%define beta beta2 - Name: kcm_wacomtablet Summary: KDE Control module for Wacom Graphictablets -Version: 3.0.0 -Release: 0.7.%{beta}%{?dist} +Version: 3.1.0 +Release: 1%{?dist} License: GPLv2+ # mirror URL: https://github.com/KDE/wacomtablet -## hack to avoid epoch for now -- rex -%global real_ver 2.9.82 -Source0: https://download.kde.org/unstable/wacomtablet/%{real_ver}/wacomtablet-%{real_ver}.tar.xz +Source0: https://download.kde.org/stable/wacomtablet/%{version}/wacomtablet-%{version}.tar.xz ## upstream patches BuildRequires: extra-cmake-modules -BuildRequires: gettext -BuildRequires: libXi-devel -BuildRequires: kf5-kdelibs4support-devel BuildRequires: kf5-ki18n-devel BuildRequires: kf5-kdbusaddons-devel BuildRequires: kf5-kdoctools-devel @@ -28,10 +21,14 @@ BuildRequires: kf5-kwidgetsaddons-devel BuildRequires: kf5-kwindowsystem-devel BuildRequires: kf5-kxmlgui-devel BuildRequires: kf5-plasma-devel +BuildRequires: kf5-rpm-macros + BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtdeclarative-devel BuildRequires: qt5-qtx11extras-devel -BuildRequires: kf5-rpm-macros + +BuildRequires: libXi-devel +BuildRequires: pkgconfig(libwacom) BuildRequires: pkgconfig(xorg-wacom) BuildRequires: pkgconfig(xrandr) @@ -46,7 +43,7 @@ with profile support to handle different button/pen layouts per profile. %prep -%autosetup -p1 -n wacomtablet-%{real_ver} +%autosetup -p1 -n wacomtablet-%{version} %build @@ -55,7 +52,7 @@ pushd %{_target_platform} %{cmake_kf5} .. popd -make %{?_smp_mflags} -C %{_target_platform} +%make_build -C %{_target_platform} %install @@ -65,14 +62,14 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %files -f %{name}.lang -%doc AUTHORS README +%doc AUTHORS %license COPYING* %{_datadir}/dbus-1/interfaces/org.kde.Wacom*.xml +%{_kf5_sysconfdir}/xdg/wacomtablet.* %{_kf5_bindir}/kde_wacom_tabletfinder %{_kf5_datadir}/applications/kde_wacom_tabletfinder.desktop %{_kf5_datadir}/kservices5/kcm_wacomtablet.desktop %{_kf5_datadir}/kservices5/plasma-applet-org.kde.plasma.wacomtablet.desktop -%{_kf5_datadir}/kservices5/kded/wacomtablet.desktop %{_kf5_datadir}/kservices5/plasma-dataengine-wacomtablet.desktop %{_kf5_datadir}/knotifications5/wacomtablet.notifyrc %{_kf5_datadir}/plasma/plasmoids/org.kde.plasma.wacomtablet/ @@ -81,10 +78,14 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %{_kf5_metainfodir}/org.kde.plasma.wacomtablet.appdata.xml %{_kf5_metainfodir}/org.kde.wacomtablet.metainfo.xml %{_qt5_plugindir}/kcm_wacomtablet.so -%{_qt5_plugindir}/kded_wacomtablet.so +%{_kf5_plugindir}/kded/wacomtablet.so %{_qt5_plugindir}/plasma/dataengine/plasma_engine_wacomtablet.so + %changelog +* Sun Sep 02 2018 Rex Dieter - 3.1.0-1 +- 3.1.0 (#1624665) + * Fri Jul 13 2018 Fedora Release Engineering - 3.0.0-0.7.beta2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 66864bb..d77f90b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wacomtablet-2.9.82.tar.xz) = ba1b8d15ed4ce52c14ca0ac494cfb9200b9c891c6ac19ee5a306496e1c04f6abc8b83290bc31199a634ed8b4b4469dc185a967be183f1ed6b53956bc19038904 +SHA512 (wacomtablet-3.1.0.tar.xz) = 763eddaca5471f62fb18e8c9f24d1be2a91e49eeaec4ce0b0ab6c89f1d85b9a6bcf32c67e79dee2e958dfba5bd354b4f4685a080ac06d461150a5da3a78a8915