diff --git a/.abf.yml b/.abf.yml index f812374..cedce60 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - IMSProg-1.0.29-2.tar.gz: 2f8dc3296c57a4a2e9ae917ad12e448674e6923f + IMSProg-1.1.10.tar.gz: 7db8e16cf3f7f90984ac702f6753b95080875b0d diff --git a/IMSProg-1.0.29.patch b/IMSProg-1.0.29.patch deleted file mode 100644 index 4d5398f..0000000 --- a/IMSProg-1.0.29.patch +++ /dev/null @@ -1,135 +0,0 @@ -diff -ruN a/IMSProg_editor/CMakeLists.txt b/IMSProg_editor/CMakeLists.txt ---- a/IMSProg_editor/CMakeLists.txt 2023-11-02 18:41:23.000000000 +0900 -+++ b/IMSProg_editor/CMakeLists.txt 2023-11-07 21:23:01.772564354 +0900 -@@ -32,13 +32,13 @@ - target_link_libraries(${PROJECT_NAME} Qt5::Core) - target_link_libraries(${PROJECT_NAME} Qt5::Widgets) - --install(TARGETS ${PROJECT_NAME} DESTINATION /opt/IMSProg) --install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/other/IMSProg_editor.desktop" DESTINATION /usr/share/applications) --install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/img/chipEdit64.png" DESTINATION /usr/share/pixmaps) --install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/language/chipEditor_ru_RU.qm" DESTINATION /opt/IMSProg/language) --install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/language/chipEditor_de_DE.qm" DESTINATION /opt/IMSProg/language) --install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/language/chipEditor_es_ES.qm" DESTINATION /opt/IMSProg/language) --install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/language/chipEditor_zn_CH.qm" DESTINATION /opt/IMSProg/language) --install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/language/chipEditor_uk_UA.qm" DESTINATION /opt/IMSProg/language) -+install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) -+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/other/IMSProg_editor.desktop" DESTINATION ${SHARE_INSTALL_PREFIX}/applications) -+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/img/chipEdit64.png" DESTINATION ${SHARE_INSTALL_PREFIX}/icons/hicolor/64x64/apps RENAME IMSProg_editor.png) -+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/language/chipEditor_ru_RU.qm" DESTINATION ${SHARE_INSTALL_PREFIX}/IMSProg/language) -+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/language/chipEditor_de_DE.qm" DESTINATION ${SHARE_INSTALL_PREFIX}/IMSProg/language) -+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/language/chipEditor_es_ES.qm" DESTINATION ${SHARE_INSTALL_PREFIX}/IMSProg/language) -+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/language/chipEditor_zn_CH.qm" DESTINATION ${SHARE_INSTALL_PREFIX}/IMSProg/language) -+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/language/chipEditor_uk_UA.qm" DESTINATION ${SHARE_INSTALL_PREFIX}/IMSProg/language) - - -diff -ruN a/IMSProg_editor/main.cpp b/IMSProg_editor/main.cpp ---- a/IMSProg_editor/main.cpp 2023-11-02 18:41:23.000000000 +0900 -+++ b/IMSProg_editor/main.cpp 2023-11-07 21:19:08.168135750 +0900 -@@ -8,7 +8,7 @@ - QApplication a(argc, argv); - QTranslator translator; - QString translateName = "chipEditor_" + QLocale::system().name(); -- if(translator.load(translateName, "language/")) a.installTranslator(&translator); -+ if(translator.load(translateName, "/usr/share/IMSProg/language/")) a.installTranslator(&translator); - a.installTranslator(&translator); - MainWindow w; - w.show(); -diff -ruN a/IMSProg_editor/other/IMSProg_editor.desktop b/IMSProg_editor/other/IMSProg_editor.desktop ---- a/IMSProg_editor/other/IMSProg_editor.desktop 2023-11-02 18:41:23.000000000 +0900 -+++ b/IMSProg_editor/other/IMSProg_editor.desktop 2023-11-07 21:45:27.943806599 +0900 -@@ -2,10 +2,8 @@ - Version=1.0 - Type=Application - Name=IMSProg_editor --Comment=Chip Database Editor --Exec=/opt/IMSProg/IMSProg_editor --Icon=/usr/share/pixmaps/chipEdit64.png --Path=/opt/IMSProg -+Exec=IMSProg_editor -+Icon=IMSProg_editor - Terminal=false - Encoding=UTF-8 - Categories=Electronics;Development; -diff -ruN a/IMSProg_programmer/CMakeLists.txt b/IMSProg_programmer/CMakeLists.txt ---- a/IMSProg_programmer/CMakeLists.txt 2023-11-02 18:41:23.000000000 +0900 -+++ b/IMSProg_programmer/CMakeLists.txt 2023-11-07 21:27:22.975283810 +0900 -@@ -84,13 +84,13 @@ - target_link_libraries(${PROJECT_NAME} Qt5::Core) - target_link_libraries(${PROJECT_NAME} Qt5::Widgets ${LibUSB_LIBRARIES}) - --install(TARGETS ${PROJECT_NAME} DESTINATION /opt/IMSProg) --install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/other/IMSProg.desktop" DESTINATION /usr/share/applications) --install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/img/IMSProg64.png" DESTINATION /usr/share/pixmaps) --install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/database/IMSProg.Dat" DESTINATION /opt/IMSProg) -+install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) -+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/other/IMSProg.desktop" DESTINATION ${SHARE_INSTALL_PREFIX}/applications) -+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/img/IMSProg64.png" DESTINATION ${SHARE_INSTALL_PREFIX}/icons/hicolor/64x64/apps RENAME IMSProg.png) -+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/database/IMSProg.Dat" DESTINATION ${SHARE_INSTALL_PREFIX}/IMSProg) - install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/other/99-CH341.rules" DESTINATION /etc/udev/rules.d) --install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/language/chipProgrammer_ru_RU.qm" DESTINATION /opt/IMSProg/language) --install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/language/chipProgrammer_es_ES.qm" DESTINATION /opt/IMSProg/language) --install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/language/chipProgrammer_de_DE.qm" DESTINATION /opt/IMSProg/language) --install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/language/chipProgrammer_zn_CH.qm" DESTINATION /opt/IMSProg/language) --install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/language/chipProgrammer_uk_UA.qm" DESTINATION /opt/IMSProg/language) -+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/language/chipProgrammer_ru_RU.qm" DESTINATION ${SHARE_INSTALL_PREFIX}/IMSProg/language) -+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/language/chipProgrammer_es_ES.qm" DESTINATION ${SHARE_INSTALL_PREFIX}/IMSProg/language) -+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/language/chipProgrammer_de_DE.qm" DESTINATION ${SHARE_INSTALL_PREFIX}/IMSProg/language) -+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/language/chipProgrammer_zn_CH.qm" DESTINATION ${SHARE_INSTALL_PREFIX}/IMSProg/language) -+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/language/chipProgrammer_uk_UA.qm" DESTINATION ${SHARE_INSTALL_PREFIX}/IMSProg/language) -diff -ruN a/IMSProg_programmer/main.cpp b/IMSProg_programmer/main.cpp ---- a/IMSProg_programmer/main.cpp 2023-11-02 18:41:23.000000000 +0900 -+++ b/IMSProg_programmer/main.cpp 2023-11-07 21:19:08.168135750 +0900 -@@ -25,7 +25,7 @@ - QApplication a(argc, argv); - QTranslator translator; - QString translateName = "chipProgrammer_" + QLocale::system().name(); -- if(translator.load(translateName, "language/")) a.installTranslator(&translator); -+ if(translator.load(translateName, "/usr/share/IMSProg/language/")) a.installTranslator(&translator); - a.installTranslator(&translator); - MainWindow w; - w.show(); -diff -ruN a/IMSProg_programmer/mainwindow.cpp b/IMSProg_programmer/mainwindow.cpp ---- a/IMSProg_programmer/mainwindow.cpp 2023-11-02 18:41:23.000000000 +0900 -+++ b/IMSProg_programmer/mainwindow.cpp 2023-11-07 21:30:10.844815660 +0900 -@@ -1125,15 +1125,7 @@ - - void MainWindow::on_actionEdit_chips_Database_triggered() - { -- if(QFileInfo::exists("IMSProg_editor") && !QDir("IMSProg_editor").exists()){ -- //The file exists and is not a folder -- QProcess::execute("./IMSProg_editor"); -- progInit(); -- } -- else { -- //The file doesn't exist, either the path doesn't exist or is the path of a folder -- QMessageBox::about(this, tr("Error"), tr("Not found file `IMSProg_editor`!")); -- } -+ QProcess::execute("IMSProg_editor"); - } - - void MainWindow::doNotDisturb() -@@ -1240,7 +1232,7 @@ - int index2; - //opening chip database file - ui->statusBar->showMessage(tr("Opening DAT file")); -- QFile datfile("IMSProg.Dat"); -+ QFile datfile("/usr/share/IMSProg/IMSProg.Dat"); - QByteArray dataChips; - if (!datfile.open(QIODevice::ReadOnly)) - { -diff -ruN a/IMSProg_programmer/other/IMSProg.desktop b/IMSProg_programmer/other/IMSProg.desktop ---- a/IMSProg_programmer/other/IMSProg.desktop 2023-11-02 18:41:23.000000000 +0900 -+++ b/IMSProg_programmer/other/IMSProg.desktop 2023-11-07 21:30:52.035663782 +0900 -@@ -2,9 +2,8 @@ - Version=1.0 - Type=Application - Name=IMSProg --Icon=/usr/share/pixmaps/IMSProg64.png --Exec=/opt/IMSProg/IMSProg --Path=/opt/IMSProg/ -+Icon=IMSProg -+Exec=IMSProg - NoDisplay=false - Categories=Electronics;Development; - StartupNotify=true diff --git a/IMSProg-1.1.10.patch b/IMSProg-1.1.10.patch new file mode 100644 index 0000000..fee37d7 --- /dev/null +++ b/IMSProg-1.1.10.patch @@ -0,0 +1,44 @@ +diff -ruN a/IMSProg_editor/other/IMSProg_editor.desktop b/IMSProg_editor/other/IMSProg_editor.desktop +--- a/IMSProg_editor/other/IMSProg_editor.desktop 2024-01-28 18:57:32.000000000 +0900 ++++ b/IMSProg_editor/other/IMSProg_editor.desktop 2024-01-29 11:42:32.522395811 +0900 +@@ -1,9 +1,9 @@ + [Desktop Entry] + Version=1.0 + Type=Application +-Name=IMSProg_editor +-Exec=/usr/bin/IMSProg_editor +-Icon=/usr/share/pixmaps/chipEdit64.png ++Name=IMSProg_editor ++Exec=IMSProg_editor ++Icon=IMSProg_editor + Path=/usr/bin/ + Terminal=false + Categories=Electronics;Development; +diff -ruN a/IMSProg_programmer/other/IMSProg_database_update.desktop b/IMSProg_programmer/other/IMSProg_database_update.desktop +--- a/IMSProg_programmer/other/IMSProg_database_update.desktop 2024-01-28 18:57:32.000000000 +0900 ++++ b/IMSProg_programmer/other/IMSProg_database_update.desktop 2024-01-29 11:53:09.540908467 +0900 +@@ -2,8 +2,8 @@ + Version=1.0 + Type=Application + Name=IMSProg_updater +-Icon=/usr/share/pixmaps/IMSProg_database_update.png +-Exec=/usr/bin/IMSProg_database_update ++Icon=IMSProg_database_update ++Exec=IMSProg_database_update + Path=/usr/bin/ + NoDisplay=false + Categories=Electronics;Development; +diff -ruN a/IMSProg_programmer/other/IMSProg.desktop b/IMSProg_programmer/other/IMSProg.desktop +--- a/IMSProg_programmer/other/IMSProg.desktop 2024-01-28 18:57:32.000000000 +0900 ++++ b/IMSProg_programmer/other/IMSProg.desktop 2024-01-29 11:43:04.875890375 +0900 +@@ -2,8 +2,8 @@ + Version=1.0 + Type=Application + Name=IMSProg +-Icon=/usr/share/pixmaps/IMSProg64.png +-Exec=/usr/bin/IMSProg ++Icon=IMSProg ++Exec=IMSProg + Path=/usr/bin/ + NoDisplay=false + Categories=Electronics;Development; diff --git a/IMSProg.spec b/IMSProg.spec index 3a4d769..8c0dd53 100644 --- a/IMSProg.spec +++ b/IMSProg.spec @@ -1,6 +1,6 @@ Name: IMSProg -Version: 1.0.29 -%global rel 2 +Version: 1.1.10 +%global rel %{nil} Release: 1 Summary: I2C, SPI and MicroWire EEPROM/Flash chip programmer for CH341a devices Summary(ru_RU.UTF-8): I2C, SPI and MicroWire EEPROM/Flash программатор для CH341a устройств @@ -8,8 +8,8 @@ License: GPL-3.0-or-later Group: Development/Tools Url: https://github.com/bigbigmdm/IMSProg -Source: https://github.com/bigbigmdm/IMSProg/archive/refs/tags/v%{version}-%{rel}.tar.gz?/%{name}-%{version}-%{rel}.tar.gz -Patch: %{name}-1.0.29.patch +Source: https://github.com/bigbigmdm/IMSProg/archive/refs/tags/v%{version}%{rel}.tar.gz?/%{name}-%{version}%{rel}.tar.gz +Patch: IMSProg-1.1.10.patch BuildRequires: cmake BuildRequires: pkgconfig(Qt5Core) @@ -46,7 +46,7 @@ Minpro I, XP866+. Вы можете редактировать базу данн EZP Chip. %prep -%autosetup -p1 -n %{name}-%{version}-%{rel} +%autosetup -p1 -n %{name}-%{version}%{rel} # update translations lrelease-qt5 IMSProg_editor/language/*.ts @@ -72,23 +72,25 @@ pushd IMSProg_programmer %make_install -C build popd -# move udev rules to _udevrulesdir -mkdir -p %{buildroot}%{_udevrulesdir} -mv %{buildroot}%{_sysconfdir}/udev/rules.d/99-CH341.rules \ - %{buildroot}%{_udevrulesdir}/99-CH341.rules - # rename README cp IMSProg_editor/README.md IMSProg_editor.md cp IMSProg_programmer/README.md IMSProg_programmer.md %files %doc README.md IMSProg_editor.md IMSProg_programmer.md +%doc %{_docdir}/imsprog/html/index.html %{_bindir}/%{name} %{_bindir}/%{name}_editor -%{_datadir}/%{name} +%{_sysconfdir}/imsprog/IMSProg.Dat +%{_bindir}/IMSProg_database_update +%{_datadir}/imsprog %{_datadir}/applications/%{name}.desktop %{_datadir}/applications/%{name}_editor.desktop +%{_datadir}/applications/IMSProg_database_update.desktop %{_udevrulesdir}/99-CH341.rules -%{_iconsdir}/hicolor/64x64/apps/%{name}_editor.png -%{_iconsdir}/hicolor/64x64/apps/%{name}.png - +%{_mandir}/man1/IMSProg.1.xz +%{_mandir}/man1/IMSProg_database_update.1* +%{_mandir}/man1/IMSProg_editor.1* +%{_datadir}/pixmaps/IMSProg64.png +%{_datadir}/pixmaps/IMSProg_database_update.png +%{_datadir}/pixmaps/chipEdit64.png