diff --git a/.gitignore b/.gitignore index c6ae98b..fe271ae 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ unetbootin-source-485.tar.gz /unetbootin-647.tar.gz /unetbootin-655.tar.gz /unetbootin-657.tar.gz +/unetbootin-source-677.tar.gz diff --git a/sources b/sources index 09975ce..477ffd7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (unetbootin-657.tar.gz) = 69ffdbc23f372c795e84267dfbed2221783a7efc9b1d5f589e7c308384cdfd0d9cf0950058f665e2c10bf6f17e0efd3eff81a1bedb98da316583f2462dfed2d9 +SHA512 (unetbootin-source-677.tar.gz) = be4785d3541630fc39cd5fde21ee7ed017b5a5b7a1efd62be70d33a013ae92bff82b1b925def61133ae57cf68a4c3e78679a0dac80c6681ca3f11e751ceb953e diff --git a/unetbootin-675-desktop.patch b/unetbootin-675-desktop.patch new file mode 100644 index 0000000..b71907d --- /dev/null +++ b/unetbootin-675-desktop.patch @@ -0,0 +1,23 @@ + * unetbootin.desktop: error: key "GenericName[en_US]" in group "Desktop Entry" + is a localized key, but there is no non-localized key "GenericName" + * unetbootin.desktop: warning: value "Application;System;" for key + "Categories" in group "Desktop Entry" contains a deprecated value + * "Application" + +--- a/unetbootin.desktop ++++ b/unetbootin.desktop +@@ -2,11 +2,9 @@ + Version=1.0 + Name=UNetbootin + Comment=Tool for creating Live USB drives +-Categories=Application;System; +-Exec=/usr/bin/unetbootin_asroot ++Categories=System; ++Exec=/usr/bin/unetbootin + Terminal=false + Type=Application +-Name[en_US]=UNetbootin +-GenericName[en_US]=UNetbootin +-Comment[en_US]=Tool for creating Live USB drives ++GenericName=UNetbootin + Icon=unetbootin diff --git a/unetbootin.spec b/unetbootin.spec index 951af29..d661d10 100644 --- a/unetbootin.spec +++ b/unetbootin.spec @@ -1,11 +1,11 @@ Name: unetbootin -Version: 657 -Release: 7%{?dist} +Version: 677 +Release: 1%{?dist} Summary: Create bootable Live USB drives for a variety of Linux distributions License: GPLv2+ URL: https://unetbootin.github.io/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -#Source0: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz +Source0: https://sourceforge.net/projects/%{name}/files/UNetbootin/%{version}/%{name}-source-%{version}.tar.gz +Patch0: unetbootin-675-desktop.patch # Syslinux is only available on x86 architectures ExclusiveArch: %{ix86} x86_64 @@ -26,26 +26,19 @@ downloaded one or your preferred distribution isn't on the list. %prep -%autosetup +%setup -c +%patch0 -p1 # Fix desktop file -pushd src/unetbootin - sed -i '/^Version/d' unetbootin.desktop - sed -i '/\[en_US\]/d' unetbootin.desktop - sed -i 's|/usr/bin/unetbootin|unetbootin|g' unetbootin.desktop -popd - +sed -i '/^RESOURCES/d' unetbootin.pro %build -pushd src/unetbootin - lupdate-qt4 unetbootin.pro - lrelease-qt4 unetbootin.pro - %{?qmake_qt4}%{!?qmake_qt4:qmake-qt4}} - %make_build -popd +lupdate-qt4 unetbootin.pro +lrelease-qt4 unetbootin.pro +%{?qmake_qt4}%{!?qmake_qt4:qmake-qt4}} +%make_build %install -pushd src/unetbootin install -D -p -m 755 unetbootin %{buildroot}%{_bindir}/unetbootin # Install desktop file desktop-file-install --vendor="" --remove-category=Application --dir=%{buildroot}%{_datadir}/applications unetbootin.desktop @@ -57,13 +50,16 @@ install -D -p -m 644 unetbootin_512.png %{buildroot}%{_datadir}/pixmaps/unetboot %files -%doc readme.md +%doc README.TXT %{_bindir}/unetbootin %{_datadir}/unetbootin/ %{_datadir}/applications/unetbootin.desktop %{_datadir}/pixmaps/unetbootin.png %changelog +* Fri Apr 03 2020 Mohan Boddu - 677-1 +- Rebuilt for 677 version + * Fri Jan 31 2020 Fedora Release Engineering - 657-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild