diff --git a/mp-rpmlintrc b/mp-rpmlintrc index 891e544..bfe5b2b 100644 --- a/mp-rpmlintrc +++ b/mp-rpmlintrc @@ -1,23 +1,2 @@ -addFilter("incorrect-fsf-address .*/usr/share/mp-5/mp_core.mpsl") -addFilter("incorrect-fsf-address .*/usr/share/mp-5/mp_crypt.mpsl") -addFilter("incorrect-fsf-address .*/usr/share/mp-5/mp_session.mpsl") -addFilter("incorrect-fsf-address .*/usr/share/mp-5/mp_move.mpsl") -addFilter("incorrect-fsf-address .*/usr/share/mp-5/mp_writing.mpsl") -addFilter("incorrect-fsf-address .*/usr/share/mp-5/mp_toys.mpsl") -addFilter("incorrect-fsf-address .*/usr/share/mp-5/mp_misc.mpsl") -addFilter("incorrect-fsf-address .*/usr/share/mp-5/mp_syntax.mpsl") -addFilter("incorrect-fsf-address .*/usr/share/mp-5/mp_vcs.mpsl") -addFilter("incorrect-fsf-address .*/usr/share/mp-5/mp_spell.mpsl") -addFilter("incorrect-fsf-address .*/usr/share/mp-5/mp_edit.mpsl") -addFilter("incorrect-fsf-address .*/usr/share/mp-5/mp_macro.mpsl") -addFilter("incorrect-fsf-address .*/usr/share/mp-5/mp_templates.mpsl") -addFilter("incorrect-fsf-address .*/usr/share/mp-5/mp_clipboard.mpsl") -addFilter("incorrect-fsf-address .*/usr/share/mp-5/mp_tui.mpsl") -addFilter("incorrect-fsf-address .*/usr/share/mp-5/mp_search.mpsl") -addFilter("incorrect-fsf-address .*/usr/share/mp-5/mp_drv.mpsl") -addFilter("incorrect-fsf-address .*/usr/share/mp-5/mp_build.mpsl") -addFilter("incorrect-fsf-address .*/usr/share/mp-5/mp_tags.mpsl") -addFilter("incorrect-fsf-address .*/usr/share/mp-5/mp_dir.mpsl") -addFilter("incorrect-fsf-address .*/usr/share/mp-5/mp_file.mpsl") addFilter("no-manual-page-for-binary .*mpsl") diff --git a/mp.changes b/mp.changes index 34af435..c4235c6 100644 --- a/mp.changes +++ b/mp.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Dec 4 08:23:42 UTC 2024 - Martin Pluskal + +- Modernise spec file and remove obsolete rpmlintrc filters + ------------------------------------------------------------------- Tue Dec 3 13:35:57 UTC 2024 - Friedrich Haubensak diff --git a/mp.spec b/mp.spec index a1ef32c..be38014 100644 --- a/mp.spec +++ b/mp.spec @@ -1,7 +1,7 @@ # # spec file for package mp # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -20,11 +20,10 @@ Name: mp Version: 5.2.13 Release: 0 Summary: A text editor for programmers -License: GPL-2.0 -Group: Productivity/Text/Editors -Url: http://triptico.com/software/mp.html -Source0: http://triptico.com/download/mp/mp-%{version}.tar.gz -Source1: http://triptico.com/download/mp/mp-%{version}.tar.gz.asc +License: GPL-2.0-only +URL: https://triptico.com/software/mp.html +Source0: https://triptico.com/download/mp/mp-%{version}.tar.gz +Source1: https://triptico.com/download/mp/mp-%{version}.tar.gz.asc Source2: %{name}.keyring Source3: %{name}-5.desktop Source4: %{name}-5.png @@ -38,10 +37,6 @@ BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(gtk+-3.0) -%if 0%{?suse_version} < 1500 -Requires(post): update-desktop-files -Requires(postun): update-desktop-files -%endif %description Minimum Profit @@ -74,7 +69,6 @@ Features %package gtk3 Summary: A text editor for programmers (GTK+3 version) -Group: Productivity/Text/Editors Requires: %{name} = %{version} %description gtk3 @@ -112,10 +106,10 @@ Features %build export CFLAGS="%{optflags}" ./config.sh --prefix=%{_prefix} --docdir=%{_docdir}/mp-5 -make %{?_smp_mflags} +%make_build mv mp-5 mp-5-qt5 WITHOUT_QT5=1 WITHOUT_QT4=1 ./config.sh --prefix=%{_prefix} --docdir=%{_docdir}/mp-5 -make %{?_smp_mflags} +%make_build mv mp-5 mp-5-gtk3 mv mp-5-qt5 mp-5 @@ -131,23 +125,15 @@ install -m 644 mp-5.1 %{buildroot}/%{_mandir}/man1/mp-5-gtk3.1 %suse_update_desktop_file %{name}-5 TextEditor %find_lang minimum-profit -rm %{buildroot}%{_datadir}/doc/packages/mp-5/mpsl_quickref.ps +rm %{buildroot}%{_docdir}/mp-5/mpsl_quickref.ps %fdupes -s %{buildroot} -%if 0%{?suse_version} < 1500 -%post -%desktop_database_post - -%postun -%desktop_database_postun -%endif - %files -f minimum-profit.lang %{_bindir}/%{name}-5 %{_bindir}/%{name}sl %dir %{_docdir}/%{name}-5 %{_docdir}/%{name}-5/* -%{_mandir}/man1/%{name}-5.1%{ext_man} +%{_mandir}/man1/%{name}-5.1%{?ext_man} %dir %{_datadir}/%{name}-5 %{_datadir}/%{name}-5/* %{_datadir}/applications/%{name}-5.desktop @@ -156,6 +142,6 @@ rm %{buildroot}%{_datadir}/doc/packages/mp-5/mpsl_quickref.ps %files gtk3 %{_bindir}/%{name}-5-gtk3 %{_datadir}/applications/%{name}-5-gtk3.desktop -%{_mandir}/man1/%{name}-5-gtk3.1%{ext_man} +%{_mandir}/man1/%{name}-5-gtk3.1%{?ext_man} %changelog