diff --git a/.gitignore b/.gitignore index aa4569d..68738d3 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /wacomtablet-2.1.0-ede16d1.tar.xz /wacomtablet-2.1.0-g8ad842e.tar.xz /114856-wacomtablet-3.0.0~beta1.tar.xz +/wacomtablet-2.9.82.tar.xz diff --git a/0014-Fix-lookupProperty-for-xcb-backend.patch b/0014-Fix-lookupProperty-for-xcb-backend.patch deleted file mode 100644 index 4bb9ff5..0000000 --- a/0014-Fix-lookupProperty-for-xcb-backend.patch +++ /dev/null @@ -1,27 +0,0 @@ -From c31339e0de76884ab2233da68c04994c99e339e1 Mon Sep 17 00:00:00 2001 -From: Weng Xuetian -Date: Tue, 26 Jan 2016 17:30:01 -0800 -Subject: [PATCH 14/14] Fix lookupProperty for xcb backend - -There's no point check return atom value. Original implementation tends -to check the pointer is null, instead of the atom value. ---- - src/common/x11inputdevice-xcb.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/common/x11inputdevice-xcb.cpp b/src/common/x11inputdevice-xcb.cpp -index f499b7d..4d70bc1 100644 ---- a/src/common/x11inputdevice-xcb.cpp -+++ b/src/common/x11inputdevice-xcb.cpp -@@ -526,7 +526,7 @@ bool X11InputDevice::lookupProperty(const QString& property, X11InputDevice::Ato - { - Q_D(const X11InputDevice); - -- if (!isOpen() || property.isEmpty() || atom == XCB_ATOM_NONE) { -+ if (!isOpen() || property.isEmpty()) { - return false; - } - --- -2.5.0 - diff --git a/kcm_wacomtablet.spec b/kcm_wacomtablet.spec index 597f63b..9dd6af7 100644 --- a/kcm_wacomtablet.spec +++ b/kcm_wacomtablet.spec @@ -1,21 +1,19 @@ -%define beta beta1 +%define beta beta2 Name: kcm_wacomtablet Summary: KDE Control module for Wacom Graphictablets Version: 3.0.0 -Release: 0.4.%{beta}%{?dist} +Release: 0.5.%{beta}%{?dist} License: GPLv2+ -URL: https://projects.kde.org/projects/extragear/base/wacomtablet -# wget -c http://anongit.kde.org/wacomtablet/wacomtablet-latest.tar.gz -Source0: http://kde-apps.org/CONTENT/content-files/114856-wacomtablet-%{version}~%{beta}.tar.xz - -# Fix build, translations still don't install though -Patch0: wacomtablet-translations.patch +# 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 ## upstream patches -Patch14: 0014-Fix-lookupProperty-for-xcb-backend.patch BuildRequires: extra-cmake-modules BuildRequires: gettext @@ -48,7 +46,7 @@ with profile support to handle different button/pen layouts per profile. %prep -%autosetup -p1 -n wacomtablet-%{version}%{?beta:~%{beta}} +%autosetup -p1 -n wacomtablet-%{real_ver} %build @@ -63,28 +61,33 @@ make %{?_smp_mflags} -C %{_target_platform} %install make install/fast DESTDIR=%{buildroot} -C %{_target_platform} +%find_lang %{name} --all-name --with-html + -%files -%doc AUTHORS COPYING README -%license COPYING -%{_kf5_docdir}/HTML/en/kcontrol/ +%files -f %{name}.lang +%doc AUTHORS README +%license COPYING* %{_datadir}/dbus-1/interfaces/org.kde.Wacom*.xml %{_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.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.wacomtablet/ +%{_kf5_datadir}/plasma/plasmoids/org.kde.plasma.wacomtablet/ %{_kf5_datadir}/plasma/services/wacomtablet.operations %{_kf5_datadir}/wacomtablet/ +%{_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 %{_qt5_plugindir}/plasma/dataengine/plasma_engine_wacomtablet.so - %changelog +* Fri Dec 29 2017 Rex Dieter - 3.0.0-0.5.beta2 +- 3.0.0-beta2 (aka 2.9.82), +translations + * Thu Aug 03 2017 Fedora Release Engineering - 3.0.0-0.4.beta1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index 8a9d48e..66864bb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -95d1d29063d6de2ab0881c33e8eacb05 114856-wacomtablet-3.0.0~beta1.tar.xz +SHA512 (wacomtablet-2.9.82.tar.xz) = ba1b8d15ed4ce52c14ca0ac494cfb9200b9c891c6ac19ee5a306496e1c04f6abc8b83290bc31199a634ed8b4b4469dc185a967be183f1ed6b53956bc19038904 diff --git a/wacomtablet-translations.patch b/wacomtablet-translations.patch deleted file mode 100644 index f6149b2..0000000 --- a/wacomtablet-translations.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -up wacomtablet-3.0.0~beta1/CMakeLists.txt.no_po wacomtablet-3.0.0~beta1/CMakeLists.txt ---- wacomtablet-3.0.0~beta1/CMakeLists.txt.no_po 2015-10-28 12:53:01.000000000 -0500 -+++ wacomtablet-3.0.0~beta1/CMakeLists.txt 2016-02-16 13:14:06.956310204 -0600 -@@ -56,6 +56,7 @@ add_subdirectory( src ) - add_subdirectory( data ) - add_subdirectory( images ) - add_subdirectory( doc ) -+add_subdirectory( po ) - - ### Tests - if(BUILD_TESTING) -@@ -66,5 +67,3 @@ endif() - - feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) - --include(MacroOptionalAddSubdirectory) --macro_optional_add_subdirectory( po )