Skip to content

Fix some complaints from rpmlint #230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nephros merged 5 commits into from
Jan 17, 2022
Merged

Fix some complaints from rpmlint #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
aa74c57
rpmlint: compile/link daemon as PIC
nephros Oct 13, 2021
5860111
rpmlint: mark config files as such
nephros Oct 13, 2021
569bfd4
add rpmlintrc
nephros Oct 13, 2021
3bf8e2b
don't own the whole /usr/share/dbus-1 directory
nephros Jan 14, 2022
21c16bb
do not install documentation
nephros Jan 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions rpm/patchmanager-rpmlintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
addFilter("^patchmanager.*: E: use-tmp-in-%postun")
addFilter("^patchmanager.*: W: dangerous-command-in-%postun")

# we know.
addFilter("^patchmanager.*: W: no-soname /usr/lib/libpreloadpatchmanager\.so")
addFilter("^patchmanager.*: E: shlib-with-non-pic-code /usr/lib/libpreloadpatchmanager\.so")
addFilter("^patchmanager.*: W: non-standard-dir-in-usr libexec")
14 changes: 6 additions & 8 deletions rpm/patchmanager.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ Group: Qt/Qt
License: BSD-3-Clause
URL: https://github.com/sailfishos-patches/patchmanager
Source0: %{name}-%{version}.tar.bz2
# note that it *must* be named that according to
# https://en.opensuse.org/openSUSE:Packaging_checks#Building_Packages_in_spite_of_errors
Source99: patchmanager-rpmlintrc
Requires: unzip
Requires: patch
Requires: grep
Expand Down Expand Up @@ -144,17 +147,12 @@ systemctl-user daemon-reload
%files
%defattr(-,root,root,-)

%doc README.md
%doc doc/example_legacy_patch.json.md
%doc doc/example_patch.json.md
%doc doc/example_patch-rpm.spec

%{_bindir}/%{name}-dialog
%{_sbindir}/%{name}
%dir %{_datadir}/%{name}/patches
%{_datadir}/%{name}/tools
%{_datadir}/dbus-1/
%{_sysconfdir}/dbus-1/system.d/
%{_datadir}/dbus-1/*/org.SfietKonstantin.patchmanager.*
%config %{_sysconfdir}/dbus-1/system.d/org.SfietKonstantin.patchmanager.conf
%{_unitdir}/dbus-org.SfietKonstantin.patchmanager.service
%{_unitdir}/multi-user.target.wants/dbus-org.SfietKonstantin.patchmanager.service
%{_unitdir}/checkForUpdates-org.SfietKonstantin.patchmanager.service
Expand All @@ -165,8 +163,8 @@ systemctl-user daemon-reload
%{_userunitdir}/lipstick-patchmanager.service
%{_userunitdir}/lipstick.service.wants/lipstick-patchmanager.service
%{_libdir}/libpreload%{name}.so
%{_sysconfdir}/firejail/whitelist-common-%{name}.local
%config(noreplace) %{_sysconfdir}/%{name}/manglelist.conf
%config(noreplace) %{_sysconfdir}/firejail/whitelist-common-%{name}.local

%attr(0755,root,root) %{_libexecdir}/pm_apply
%attr(0755,root,root) %{_libexecdir}/pm_unapply
Expand Down
3 changes: 3 additions & 0 deletions src/bin/patchmanager-daemon/patchmanager-daemon.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ PKGCONFIG += rpm
PKGCONFIG += popt

INCLUDEPATH += /usr/include/rpm
QMAKE_CFLAGS += -fPIE
QMAKE_CXXFLAGS += -fPIE
QMAKE_LFLAGS += -pie

isEmpty(PROJECT_PACKAGE_VERSION) {
BUILD_VERSION = "3.0.0"
Expand Down