Skip to content
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

Support Fedora #997

Merged
merged 14 commits into from
Dec 7, 2021
Merged

Support Fedora #997

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
d958af8
Adding deps install to README
aidan-plenert-macdonald Apr 26, 2021
9aabb3f
Builds digidoc RPM successfully
aidan-plenert-macdonald Apr 27, 2021
e0d296b
Renaming libdigidocpp package for fedora
aidan-plenert-macdonald Nov 4, 2021
2bb1a16
Don't need excludes in Fedora 34
eidins Nov 10, 2021
b1c51d3
upload rpm
eidins Nov 18, 2021
ca4241a
Update build.yml
eidins Nov 24, 2021
36701d4
Update build.yml
eidins Nov 29, 2021
6438495
Update build.yml
eidins Nov 29, 2021
535db3c
Remove unneeded build deps
eidins Nov 30, 2021
2af3777
Adding qt5-linguist
eidins Nov 30, 2021
e2ff4b0
Update .github/workflows/build.yml
metsma Nov 30, 2021
945f5ea
Install Yaru theme workaround only on debian
metsma Nov 30, 2021
d4b3816
Revert "Install Yaru theme workaround only on debian"
metsma Dec 6, 2021
0f98327
Update README.md
metsma Dec 6, 2021
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
25 changes: 24 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,30 @@ set_env( MOBILEID_URL "https://dd-mid.ria.ee/mid-api" CACHE STRING "URL for Mobi
set_env( SMARTID_URL "https://dd-sid.ria.ee/v1" CACHE STRING "URL for Smart-ID" )
set(CMAKE_INTERPROCEDURAL_OPTIMIZATION YES)
set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_DEBUG NO)

set(CPACK_PACKAGE_VERSION ${VERSION})
set(CPACK_GENERATOR "RPM")
set(CPACK_PACKAGE_NAME "qdigidoc4")
set(CPACK_PACKAGE_RELEASE 1)
set(CPACK_PACKAGE_CONTACT "Andrus Randveer")
set(CPACK_PACKAGE_VENDOR "RIA")
set(CPACK_PACKAGING_INSTALL_PREFIX "/usr/")
set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION
"/usr/local" "/usr/local/etc" "/usr/share/man"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Package should not install anything into /usr/local folder

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It had some conflicts with the Fedora 32 (maybe 33?) filesystem package, but in 34 it's fine.

"/usr/share/man/man1" "/usr/lib64/pkgconfig" "/usr/share/icons/hicolor"
"/usr/share/applications" "/usr/share/icons" "/usr/share/mime" "/usr/share/mime/packages"
"/usr/share/icons/hicolor/16x16" "/usr/share/icons/hicolor/16x16/apps" "/usr/share/icons/hicolor/16x16/mimetypes"
"/usr/share/icons/hicolor/22x22" "/usr/share/icons/hicolor/22x22/apps" "/usr/share/icons/hicolor/22x22/mimetypes"
"/usr/share/icons/hicolor/32x32" "/usr/share/icons/hicolor/32x32/apps" "/usr/share/icons/hicolor/32x32/mimetypes"
"/usr/share/icons/hicolor/48x48" "/usr/share/icons/hicolor/48x48/apps" "/usr/share/icons/hicolor/48x48/mimetypes"
"/usr/share/icons/hicolor/128x128" "/usr/share/icons/hicolor/128x128/apps" "/usr/share/icons/hicolor/128x128/mimetypes"
"/usr/share/icons/hicolor/256x256" "/usr/share/icons/hicolor/256x256/apps" "/usr/share/icons/hicolor/256x256/mimetypes"
"/usr/share/icons/hicolor/512x512" "/usr/share/icons/hicolor/512x512/apps" "/usr/share/icons/hicolor/512x512/mimetypes"
"/usr/share/locale/et" "/usr/share/locale/et/LC_MESSAGES"
"/usr/share/locale/ru" "/usr/share/locale/ru/LC_MESSAGES"
"/usr/local/share" "/usr/share/locale"
)
set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_PACKAGE_RELEASE}.${CMAKE_SYSTEM_PROCESSOR}")
include(CPack)
if(APPLE)
add_subdirectory(extensions/DigiDocQL)
elseif(WIN32)
Expand Down
3 changes: 3 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@

* Install

# Ubuntu
sudo apt install cmake qttools5-dev libqt5svg5-dev qttools5-dev-tools libpcsclite-dev libssl-dev libdigidocpp-dev libldap2-dev gettext pkg-config
# Fedora
sudo dnf install qt5-qttools-devel qt5-qtsvg-devel pcsc-lite-devel openssl-devel libdigidocpp openldap-devel gettext pkg-config

* Also runtime dependency opensc-pkcs11 and pcscd is needed

Expand Down