PR#3: Fix the build - rpms/qdigidoc - src.fedoraproject.org

rpms / qdigidoc

#3 Fix the build

Merged 5 years ago by germano. Opened 5 years ago by cserpentis.

Unknown source master into master

Dmitri Smirnov • 5 years ago

6636f5d

qdigidoc.spec

file modified

+6 -5

		`@@ -1,6 +1,7 @@`
		`# Tool for managing estonian ID card and provide fully qualified digital`
		`# signature for users of Estonian ID card.`
		`# Limited support is also available for ID Cards of Latvia and Finland.`
		`+ %global upstream_name qdigidoc4`

		`Name: qdigidoc`
		`Version: 4.2.0`
		`@@ -8,8 +9,8 @@`
		`Summary: Estonian digital signature and encryption application`
		`License: LGPLv2+`
		`URL: https://github.com/open-eid/DigiDoc4-Client`
		`- Source0: %{url}/releases/download/v%{version}/%{name}-%{version}.tar.gz`
		`- Patch0: sandbox-qdigidoc.patch`
		`+ Source0: %{url}/releases/download/v%{version}/%{upstream_name}-%{version}.tar.gz`
		`+ Patch0: sandbox-qdigidoc4.patch`
		`Source1: EE.xml`
		`Source2: config.json`
		`Source3: config.pub`
		`@@ -57,7 +58,7 @@`
		`extension for the nautilus file manager.`

		`%prep`
		`- %setup -q -n %{name}-%{version}`
		`+ %setup -q -n %{upstream_name}-%{version}`

		`%patch0 -p1`

		`@@ -80,7 +81,7 @@`
		`%install`
		`%make_install`

		`- desktop-file-validate %{buildroot}/%{_datadir}/applications/qdigidoc.desktop`
		`+ desktop-file-validate %{buildroot}/%{_datadir}/applications/qdigidoc4.desktop`

		`%find_lang nautilus-qdigidoc`

		`@@ -91,7 +92,7 @@`
		`%{_datadir}/applications/*.desktop`
		`%{_datadir}/mime/packages/*.xml`
		`%{_datadir}/icons/hicolor///*.png`
		`- %{_mandir}/man1/qdigidoc.1*`
		`+ %{_mandir}/man1/qdigidoc4.1*`
		`%{_datadir}/kde4/services/*.desktop`

		`%files nautilus -f nautilus-qdigidoc.lang`

sandbox-qdigidoc4.patch ~~sandbox-compilation.patch~~

file renamed

+20 -21

		`@@ -1,9 +1,9 @@`
		`- diff -urNr qdigidoc-3.13.6-orig/client/CMakeLists.txt qdigidoc-3.13.6/client/CMakeLists.txt`
		`- --- qdigidoc-3.13.6-orig/client/CMakeLists.txt 2017-12-20 12:16:52.000000000 +0100`
		`- +++ qdigidoc-3.13.6/client/CMakeLists.txt 2018-02-08 19:13:28.618395917 +0100`
		`- @@ -1,20 +1,12 @@`
		`- set_app_name( PROGNAME qdigidocclient )`
		`-`
		`+ diff -urdN qdigidoc4-4.2.0-orig/client/CMakeLists.txt qdigidoc4-4.2.0/client/CMakeLists.txt`
		`+ --- qdigidoc4-4.2.0-orig/client/CMakeLists.txt 2018-11-15 11:25:35.000000000 +0100`
		`+ +++ qdigidoc4-4.2.0/client/CMakeLists.txt 2018-11-19 20:55:30.954722663 +0100`
		`+ @@ -1,19 +1,10 @@`
		`+ set_app_name( PROGNAME qdigidoc4 )`
		`+`
		`-add_executable( TSLDownload TSLDownload.cpp )`
		`-target_link_libraries( TSLDownload Qt5::Network )`
		`-add_custom_command(`
		`@@ -12,21 +12,20 @@`
		`- COMMAND $<TARGET_FILE:TSLDownload> "${CMAKE_CURRENT_BINARY_DIR}" ${TSL_URL} ${TSL_INCLUDE}`
		`- WORKING_DIRECTORY ${_qt5Core_install_prefix}/bin`
		`-)`
		`-`
		`- add_definitions( -DPKCS11_MODULE="${PKCS11_MODULE}" )`
		`- include_directories( ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/common ${OPENSSL_INCLUDE_DIR} )`
		`-`
		`+ -`
		`+ include_directories( ${CMAKE_SOURCE_DIR} )`
		`+`
		`configure_file( translations/tr.qrc tr.qrc COPYONLY )`
		`qt5_add_translation( SOURCES translations/en.ts translations/et.ts translations/ru.ts )`
		`- -qt5_add_resources( SOURCES images/images.qrc ${CMAKE_CURRENT_BINARY_DIR}/tr.qrc ${CMAKE_CURRENT_BINARY_DIR}/TSL.qrc )`
		`- +qt5_add_resources( SOURCES images/images.qrc ${CMAKE_CURRENT_BINARY_DIR}/tr.qrc TSL.qrc )`
		`- qt5_wrap_ui( SOURCES MainWindow.ui MobileDialog.ui SettingsDialog.ui SignatureDialog.ui )`
		`-`
		`- if( APPLE )`
		`- diff -urNr qdigidoc-3.13.6-orig/common/CMakeLists.txt qdigidoc-3.13.6/common/CMakeLists.txt`
		`- --- qdigidoc-3.13.6-orig/common/CMakeLists.txt 2017-12-20 12:16:53.000000000 +0100`
		`- +++ qdigidoc-3.13.6/common/CMakeLists.txt 2018-02-08 19:24:03.112803454 +0100`
		`- @@ -16,13 +16,7 @@`
		`+ -qt5_add_resources( SOURCES images/images.qrc fonts/fonts.qrc ${CMAKE_CURRENT_BINARY_DIR}/tr.qrc ${CMAKE_CURRENT_BINARY_DIR}/TSL.qrc )`
		`+ +qt5_add_resources( SOURCES images/images.qrc fonts/fonts.qrc ${CMAKE_CURRENT_BINARY_DIR}/tr.qrc TSL.qrc )`
		`+ qt5_wrap_ui( SOURCES MainWindow.ui dialogs/AddRecipients.ui dialogs/CertificateHistory.ui dialogs/CertificateDetails.ui dialogs/FirstRun.ui dialogs/KeyDialog.ui dialogs/MobileDialog.ui dialogs/MobileProgress.ui`
		`+ dialogs/PinPopup.ui dialogs/PinUnblock.ui dialogs/RoleAddressDialog.ui dialogs/SettingsDialog.ui dialogs/SignatureDialog.ui dialogs/Updater.ui dialogs/WaitDialog.ui dialogs/WarningDialog.ui`
		`+ widgets/Accordion.ui widgets/AccordionTitle.ui widgets/AddressItem.ui widgets/CardWidget.ui widgets/ContainerPage.ui widgets/FileItem.ui`
		`+ diff -urdN qdigidoc4-4.2.0-orig/common/CMakeLists.txt qdigidoc4-4.2.0/common/CMakeLists.txt`
		`+ --- qdigidoc4-4.2.0-orig/common/CMakeLists.txt 2018-11-15 11:28:57.000000000 +0100`
		`+ +++ qdigidoc4-4.2.0/common/CMakeLists.txt 2018-11-19 21:06:40.647468418 +0100`
		`+ @@ -11,13 +11,7 @@`
		`endif()`
		`add_definitions( -DCONFIG_URL="${CONFIG_URL}" )`
		`list( APPEND SOURCES Configuration.cpp )`
		`@@ -39,5 +38,5 @@`
		`- qt5_add_resources( SOURCES ${CMAKE_CURRENT_BINARY_DIR}/config.qrc )`
		`+ qt5_add_resources( SOURCES config.qrc )`
		`endif()`
		`-`
		`- if( WIN32 )`
		`+`
		`+ configure_file( translations/common_tr.qrc common_tr.qrc COPYONLY )`