diff --git a/stlink.desktop b/stlink.desktop index e19ca98..54cb403 100644 --- a/stlink.desktop +++ b/stlink.desktop @@ -1,9 +1,9 @@ [Desktop Entry] Name=stlink -GenericName=EmptyEpsilon +GenericName=Stlink Tools Comment=STM32 discovery line Linux programmer Exec=stlink-gui Icon=stlink-gui Terminal=false Type=Application -Categories=Development +Categories=Development;Electronics; diff --git a/stlink.spec b/stlink.spec index c6bcc20..6dc36f6 100644 --- a/stlink.spec +++ b/stlink.spec @@ -5,8 +5,8 @@ Summary: STM32 discovery line Linux programmer License: BSD Url: https://github.com/texane/stlink -Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -Source1: stlink.desktop +Source0: %{name}-fix-linux-install.zip +Patch0: stlink-static.patch BuildRequires: gcc BuildRequires: cmake @@ -35,12 +35,18 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Include files and mandatory libraries for development. %prep -%autosetup +%autosetup -p1 -n %{name}-fix-linux-install +# sed -i 's/# Static library/if (BUILD_STATIC_LIBS)/' CMakeLists.txt +# sed -i 's/# Tools/endif()/' CMakeLists.txt +# sed -i '170d' CMakeLists.txt +# sed -i '170d' CMakeLists.txt +# sed -i '170d' CMakeLists.txt +# sed -i '/add_subdirectory(tests)/d' CMakeLists.txt %build mkdir build pushd build - %cmake .. -DSTLINK_UDEV_RULES_DIR="%{_udevrulesdir}" + %cmake .. -DSTLINK_UDEV_RULES_DIR="%{_udevrulesdir}" -DSTATIC_LIB_INSTALL=OFF %make_build popd @@ -48,15 +54,13 @@ popd pushd build %make_install popd -rm %{buildroot}%{_libdir}/lib%{name}.a -desktop-file-install --dir="%{buildroot}%{_datadir}/applications" %{SOURCE1} +# rm %{buildroot}%{_libdir}/lib%{name}.a +desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %post -/sbin/ldconfig %{udev_rules_update} %postun -/sbin/ldconfig %{udev_rules_update} %files @@ -64,7 +68,7 @@ desktop-file-install --dir="%{buildroot}%{_datadir}/applications" %{SOURCE1} %license LICENSE %config(noreplace) %{_sysconfdir}/modprobe.d/%{name}* %{_bindir}/st-* -%{_libdir}/lib%{name}-shared.so.* +%{_libdir}/lib%{name}.so.* %{_mandir}/man1/st-*.1* %{_udevrulesdir}/49-%{name}* @@ -72,10 +76,11 @@ desktop-file-install --dir="%{buildroot}%{_datadir}/applications" %{SOURCE1} %{_bindir}/%{name}-gui %{_datadir}/%{name} %{_datadir}/applications/%{name}.desktop +%{_datadir}/icons/hicolor/48x48/apps/%{name}-gui.png %files devel %{_includedir}/%{name}* -%{_libdir}/lib%{name}-shared.so +%{_libdir}/lib%{name}.so %{_libdir}/pkgconfig/*.pc %changelog