diff --git a/.gitignore b/.gitignore index ab820af..64d0660 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,7 @@ +/noarch +/.build* +*.rpm +ulauncher /ulauncher_5.7.0.tar.gz /ulauncher_5.7.1.tar.gz /ulauncher_5.7.3.tar.gz @@ -8,3 +12,22 @@ /ulauncher_5.9.0.tar.gz /ulauncher_5.10.0.tar.gz /ulauncher_5.11.0.tar.gz +/ulauncher_5.12.0.tar.gz +/ulauncher_5.12.1.tar.gz +/ulauncher_5.12.2.tar.gz +/ulauncher_5.13.0.tar.gz +/ulauncher_5.14.0.tar.gz +/ulauncher_5.14.1.tar.gz +/ulauncher_5.14.2.tar.gz +/ulauncher_5.14.3.tar.gz +/ulauncher_5.14.4.tar.gz +/ulauncher_5.14.6.tar.gz +/ulauncher_5.14.7.tar.gz +/ulauncher_5.15.0.tar.gz +/ulauncher_5.15.1.tar.gz +/ulauncher_5.15.2.tar.gz +/ulauncher_5.15.3.tar.gz +/ulauncher_5.15.4.tar.gz +/ulauncher_5.15.6.tar.gz +/ulauncher_5.15.7.tar.gz +/ulauncher_5.15.15.tar.gz diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..4d9827d --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,26 @@ +copy_upstream_release_description: false +downstream_package_name: ulauncher +upstream_package_name: Ulauncher +upstream_project_url: https://github.com/Ulauncher/Ulauncher + +jobs: + - job: pull_from_upstream + trigger: release + dist_git_branches: + - fedora-rawhide + # - fedora-development + # - fedora-all + + - job: koji_build + trigger: commit + allowed_pr_authors: ["packit", "atim", "troycurtisjr"] + allowed_committers: ["packit", "atim", "troycurtisjr"] + dist_git_branches: + - fedora-all + # - epel-9 + + - job: bodhi_update + trigger: commit + dist_git_branches: + - fedora-branched + # - epel-9 diff --git a/changelog b/changelog new file mode 100644 index 0000000..d3aca26 --- /dev/null +++ b/changelog @@ -0,0 +1,69 @@ +* Fri Aug 06 2021 Troy Curtis, Jr - 5.11.0-5 +- Fix systemd service file to start consistently as a user service. +- Require wmctrl which is used by the included ulauncher-toggle script. + https://bugzilla.redhat.com/show_bug.cgi?id=1985744 + +* Wed Jul 21 2021 Troy Curtis, Jr - 5.11.0-4 +- Put the systemd file in the right place for user systemd files. + +* Tue Jul 20 2021 Troy Curtis, Jr - 5.11.0-3 +- Add patch to resolve errors in extensions when Gtk4 is present. + +* Fri Jun 04 2021 Python Maint - 5.11.0-2 +- Rebuilt for Python 3.10 + +* Sun Apr 18 2021 Artem Polishchuk - 5.11.0-1 +- build(update): 5.11.0 +- build: libappindicator-gtk3 now optional dep | GH-commit: 87f41b3 + +* Mon Mar 22 2021 Artem Polishchuk - 5.10.0-3 +- build: libappindicator-gtk3 now hard dep + +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 5.10.0-2 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + +* Mon Feb 08 2021 Artem Polishchuk - 5.10.0-1 +- build(update): 5.10.0 + +* Wed Jan 27 2021 Fedora Release Engineering - 5.9.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Sun Nov 22 2020 Artem Polishchuk - 5.9.0-1 +- build(update): 5.9.0 + +* Sun Nov 22 2020 Artem Polishchuk - 5.8.2-1 +- build(update): 5.8.2 + +* Sat Nov 7 2020 Artem Polishchuk - 5.8.1-2 +- build: add new systemd unit | rh#1895572 + +* Wed Oct 28 2020 Artem Polishchuk - 5.8.1-1 +- build(update): 5.8.1 + +* Wed Jul 29 2020 Fedora Release Engineering - 5.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sun Jun 28 2020 Artem Polishchuk - 5.8.0-1 +- Update to 5.8.0 + +* Tue May 26 2020 Miro Hrončok - 5.7.5-2 +- Rebuilt for Python 3.9 + +* Sat Apr 25 2020 Artem Polishchuk - 5.7.5-1 +- Update to 5.7.5 + +* Sat Apr 18 2020 Artem Polishchuk - 5.7.4-1 +- Update to 5.7.4 + +* Sun Apr 12 2020 Artem Polishchuk - 5.7.3-1 +- Update to 5.7.3 + +* Wed Apr 08 2020 Artem Polishchuk - 5.7.1-1 +- Update to 5.7.1 + +* Sat Mar 28 2020 Artem Polishchuk - 5.7.0-1 +- Update to 5.7.0 + +* Wed Feb 26 2020 Artem Polishchuk - 5.6.1-4 +- Initial package diff --git a/sources b/sources index d3ba2db..99f9a13 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ulauncher_5.11.0.tar.gz) = d9ea1234cf70fa653ec333fddb8f239243ed6ba3e2780e97160c6fa8c78e12230034da2a3c9a02a1eace1578efbcb239aa7a763e22ae7067e44685fe84176f12 +SHA512 (ulauncher_5.15.15.tar.gz) = f29579b85c79cafcea3af5ef03b144c0e9ad14ecba5a77f16ac779b9798b8c0f8ba0bd964a68d3341b377f4eff5fdea11e637d1d14d21dea86936448de5aea31 diff --git a/ulauncher.service b/ulauncher.service deleted file mode 100644 index 1b0e1bb..0000000 --- a/ulauncher.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Linux Application Launcher -Documentation=https://ulauncher.io/ -After=display-manager.service - -[Service] -Type=simple -Restart=always -RestartSec=1 -ExecStart=/usr/bin/ulauncher --hide-window - -[Install] -WantedBy=graphical.target diff --git a/ulauncher.spec b/ulauncher.spec index 4d76dd2..3bf59b2 100644 --- a/ulauncher.spec +++ b/ulauncher.spec @@ -1,36 +1,32 @@ Name: ulauncher -Version: 5.11.0 -Release: 1%{?dist} -Summary: Linux Application Launcher +Version: 5.15.15 +Release: %{autorelease} +Summary: Feature rich application Launcher for Linux BuildArch: noarch -License: GPLv3+ +License: GPL-3.0-or-later URL: https://github.com/Ulauncher/Ulauncher Source0: %{url}/releases/download/%{version}/%{name}_%{version}.tar.gz -# https://bugzilla.redhat.com/show_bug.cgi?id=1895572 -Source1: https://raw.githubusercontent.com/Ulauncher/Ulauncher/%{version}/contrib/systemd/%{name}.service - BuildRequires: desktop-file-utils BuildRequires: intltool BuildRequires: keybinder3-devel BuildRequires: python3-dbus -BuildRequires: python3-devel +BuildRequires: python3-devel >= 3.6 BuildRequires: python3-distutils-extra +# Need to call out setuptools since distutils-extra uses it, but doesn't list it as a requirement +BuildRequires: python3-setuptools BuildRequires: python3-gobject-devel >= 3.30 BuildRequires: python3-inotify BuildRequires: python3-Levenshtein BuildRequires: python3-pyxdg BuildRequires: python3-websocket-client BuildRequires: systemd-rpm-macros - BuildRequires: python3dist(requests) - BuildRequires: pkgconfig(gtk+-3.0) - Requires: hicolor-icon-theme Requires: keybinder3 -Requires: webkitgtk4 +Requires: webkit2gtk4.1 Requires: python3-cairo Requires: python3-dbus Requires: python3-gobject @@ -38,17 +34,19 @@ Requires: python3-inotify Requires: python3-Levenshtein Requires: python3-pyxdg Requires: python3-websocket-client - +Requires: wmctrl Recommends: libappindicator-gtk3 %description -Ulauncher is a fast application launcher for Linux. It's is written in Python, -using GTK+. +Ulauncher is a fast application launcher for Linux. It's written in Python using +GTK+, and features: App Search (fuzzy matching), Calculator, Extensions, +Shortcuts, File browser mode and Custom Color Themes. %prep %autosetup -n %{name} -p1 -sed -i "s|version='%%VERSION%'|version='%{version}'|g" setup.py +# Newer version patch: https://github.com/Ulauncher/Ulauncher/issues/1194 +sed -i "s|version=''|version='%{version}'|g" setup.py %build @@ -56,29 +54,21 @@ sed -i "s|version='%%VERSION%'|version='%{version}'|g" setup.py %install - -# https://github.com/Ulauncher/Ulauncher/issues/521 -install -m 0644 -Dp build/share/applications/ulauncher.desktop \ - %{buildroot}%{_datadir}/applications/%{name}.desktop - %py3_install -install -Dpm0644 %{SOURCE1} -t \ - %{buildroot}%{_unitdir} - %check desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %post -%systemd_post %{name}.service +%systemd_user_post %{name}.service %preun -%systemd_preun %{name}.service +%systemd_user_preun %{name}.service %postun -%systemd_postun_with_restart %{name}.service +%systemd_user_postun_with_restart %{name}.service %files @@ -100,64 +90,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/*/apps/%{name}-indicator.svg %{_datadir}/icons/hicolor/*/apps/%{name}.svg %{_datadir}/icons/ubuntu-mono-*/scalable/apps/%{name}-indicator.svg -%{_unitdir}/%{name}.service +%{_userunitdir}/%{name}.service %{python3_sitelib}/%{name}-*-py*.egg-info %{python3_sitelib}/%{name}/ %changelog -* Sun Apr 18 2021 Artem Polishchuk - 5.11.0-1 -- build(update): 5.11.0 -- build: libappindicator-gtk3 now optional dep | GH-commit: 87f41b3 - -* Mon Mar 22 2021 Artem Polishchuk - 5.10.0-3 -- build: libappindicator-gtk3 now hard dep - -* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 5.10.0-2 -- Rebuilt for updated systemd-rpm-macros - See https://pagure.io/fesco/issue/2583. - -* Mon Feb 08 2021 Artem Polishchuk - 5.10.0-1 -- build(update): 5.10.0 - -* Wed Jan 27 2021 Fedora Release Engineering - 5.9.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Sun Nov 22 2020 Artem Polishchuk - 5.9.0-1 -- build(update): 5.9.0 - -* Sun Nov 22 2020 Artem Polishchuk - 5.8.2-1 -- build(update): 5.8.2 - -* Sat Nov 7 2020 Artem Polishchuk - 5.8.1-2 -- build: add new systemd unit | rh#1895572 - -* Wed Oct 28 2020 Artem Polishchuk - 5.8.1-1 -- build(update): 5.8.1 - -* Wed Jul 29 2020 Fedora Release Engineering - 5.8.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sun Jun 28 2020 Artem Polishchuk - 5.8.0-1 -- Update to 5.8.0 - -* Tue May 26 2020 Miro Hrončok - 5.7.5-2 -- Rebuilt for Python 3.9 - -* Sat Apr 25 2020 Artem Polishchuk - 5.7.5-1 -- Update to 5.7.5 - -* Sat Apr 18 2020 Artem Polishchuk - 5.7.4-1 -- Update to 5.7.4 - -* Sun Apr 12 2020 Artem Polishchuk - 5.7.3-1 -- Update to 5.7.3 - -* Wed Apr 08 2020 Artem Polishchuk - 5.7.1-1 -- Update to 5.7.1 - -* Sat Mar 28 2020 Artem Polishchuk - 5.7.0-1 -- Update to 5.7.0 - -* Wed Feb 26 2020 Artem Polishchuk - 5.6.1-4 -- Initial package +%autochangelog