diff --git a/.gitignore b/.gitignore index f1cfd33..09663fe 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ /copyq-2.4.6.tar.gz +/CopyQ-2.4.7.tar.gz +/copyq-rhbz-1227038.patch diff --git a/CopyQ-2.4.7.tar.gz b/CopyQ-2.4.7.tar.gz new file mode 100644 index 0000000..2cfc67c Binary files /dev/null and b/CopyQ-2.4.7.tar.gz differ diff --git a/copyq-rhbz-1227038.patch b/copyq-rhbz-1227038.patch new file mode 100644 index 0000000..12829c3 --- /dev/null +++ b/copyq-rhbz-1227038.patch @@ -0,0 +1,14 @@ +diff -up CopyQ-2.4.7/shared/copyq.appdata.xml.fix CopyQ-2.4.7/shared/copyq.appdata.xml +--- CopyQ-2.4.7/shared/copyq.appdata.xml.fix 2015-06-01 17:30:27.957538270 -0700 ++++ CopyQ-2.4.7/shared/copyq.appdata.xml 2015-06-01 17:23:27.357553784 -0700 +@@ -3,7 +3,9 @@ + + copyq.desktop + CC0-1.0 +- GPL-3.0+ ++ GPL-3.0+ ++ CopyQ ++ Advanced Qt based clipboard manager + + +

diff --git a/copyq.spec b/copyq.spec index 9ffd25b..b5df876 100644 --- a/copyq.spec +++ b/copyq.spec @@ -1,25 +1,32 @@ +%global project CopyQ Name: copyq Summary: Advanced clipboard manager -Version: 2.4.6 -Release: 5%{?dist} +Version: 2.4.7 +Release: 1%{?dist} License: GPLv3+ -Url: http://sourceforge.net/projects/%{name}/ -Source0: http://sourceforge.net/projects/%{name}/files/%{name}-%{version}.tar.gz -BuildRequires: cmake, libXtst-devel, qt4-devel, qtwebkit-devel -BuildRequires: desktop-file-utils, libXfixes-devel +Url: https://hluk.github.io/%{project}/ +Source0: https://github.com/hluk/%{project}/archive/v%{version}.tar.gz#/%{project}-%{version}.tar.gz +Patch0: %{name}-rhbz-1227038.patch +BuildRequires: libXtst-devel, libXfixes-devel, desktop-file-utils +BuildRequires: kf5-rpm-macros, qt5-qtbase-devel, qt5-qtwebkit-devel, qt5-qtsvg-devel +BuildRequires: qt5-qttools-devel, qt5-qtscript-devel, qwt-qt5-devel +BuildRequires: extra-cmake-modules, appstream-qt-devel, libappstream-glib %description CopyQ is advanced clipboard manager with searchable and editable history with support for image formats, command line control and more. %prep -%setup -qn %{name}-%{version} +%setup -qn %{project}-%{version} +%patch0 -p1 %build -%cmake -DCMAKE_SKIP_RPATH=TRUE \ - -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DPLUGIN_INSTALL_PREFIX=%{_libdir}/%{name}/plugins \ - -DTRANSLATION_INSTALL_PREFIX:PATH=share/%{name}/locale +%{cmake_kf5} -DCMAKE_SKIP_RPATH=TRUE \ + -DWITH_QT5=ON \ + -DWITH_TESTS=TRUE \ + -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DPLUGIN_INSTALL_PREFIX=%{_libdir}/%{name}/plugins \ + -DTRANSLATION_INSTALL_PREFIX:PATH=share/%{name}/locale make %{?_smp_mflags} %install @@ -28,13 +35,16 @@ make DESTDIR=$RPM_BUILD_ROOT install %check desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop +appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml %files -f %{name}.lang %doc AUTHORS CHANGES HACKING README.md %license LICENSE %{_bindir}/%{name} %{_libdir}/%{name}/ +%{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/applications/%{name}.desktop +%{_datadir}/icons/hicolor/*/apps/%{name}*.png %{_datadir}/icons/hicolor/*/apps/%{name}*.svg %dir %{_datadir}/%{name}/ %dir %{_datadir}/%{name}/locale/ @@ -53,6 +63,12 @@ fi /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Mon Jun 1 2015 Gerald Cox 2.4.7-1 +- Upstream release rhbz#1227038 + +* Fri May 8 2015 Gerald Cox 2.4.6-6 +- Change requirement from Qt4 to Qt5 + * Fri May 1 2015 Gerald Cox 2.4.6-5 - Deactivate DEBUG messages rhbz#1217874 diff --git a/sources b/sources index 9453dab..9cc314b 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -d5dbc9dd506baf2657fecab1a8485616 copyq-2.4.6.tar.gz +4215c5e3fc0c5bb050b79f07cfb88a20 CopyQ-2.4.7.tar.gz +a11e5a16f9d3bd849263f2144e7f9805 copyq-rhbz-1227038.patch