Skip to content

Commit 97cdf0d

Browse files
gruljagrulja
committed
Update to 5.0
1 parent 60715a8 commit 97cdf0d

File tree

4 files changed

+58
-28
lines changed

4 files changed

+58
-28
lines changed

‎CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ project(MediaWriter)
22

33
cmake_minimum_required(VERSION 3.17)
44

5-
set(MEDIAWRITER_MAJOR_VERSION "4")
6-
set(MEDIAWRITER_MINOR_VERSION "99")
5+
set(MEDIAWRITER_MAJOR_VERSION "5")
6+
set(MEDIAWRITER_MINOR_VERSION "0")
77
# MICRO_VERSION >= 50 means a development version
8-
set(MEDIAWRITER_MICRO_VERSION "50")
8+
set(MEDIAWRITER_MICRO_VERSION "0")
99
set(MEDIAWRITER_VERSION "${MEDIAWRITER_MAJOR_VERSION}.${MEDIAWRITER_MINOR_VERSION}.${MEDIAWRITER_MICRO_VERSION}")
1010

1111
set(QT_MIN_VERSION "6.2.0")

‎dist/fedora/mediawriter.spec‎

Lines changed: 53 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,80 @@
11
Name: mediawriter
2-
Version: 4.0
2+
Version: 5.0.0
33
Release: 1%{?dist}
44
Summary: Fedora Media Writer
55

66
License: GPLv2+
7-
URL: https://github.com/MartinBriza/MediaWriter
8-
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
7+
URL: https://github.com/FedoraQt/MediaWriter
8+
Source0: https://github.com/FedoraQt/MediaWriter/archive/MediaWriter-%{version}.tar.gz
9+
10+
Provides: liveusb-creator = %{version}-%{release}
11+
Obsoletes: liveusb-creator <= 3.95.4-2
912

10-
BuildRequires: qt5-qtbase-devel
11-
BuildRequires: qt5-qtdeclarative-devel
12-
BuildRequires: gettext
13-
#BuildRequires: libappstream-glib
1413
BuildRequires: gcc-c++
14+
BuildRequires: gettext
15+
BuildRequires: cmake
16+
BuildRequires: make
17+
BuildRequires: libappstream-glib
18+
BuildRequires: libadwaita-qt6-devel
19+
BuildRequires: qt6-qtbase-devel
20+
BuildRequires: qt6-qtdeclarative-devel
21+
BuildRequires: xz-devel
22+
23+
Requires: qt6-qtsvg
24+
Requires: qt6-qtdeclarative
25+
26+
%if !0%{?flatpak}
27+
Requires: polkit
28+
%endif
29+
Requires: xz-libs
1530

16-
Requires: qt5-qtbase%{?_isa}
17-
Requires: qt5-qtquickcontrols%{?_isa} >= 5.3.0
18-
Requires: polkit%{?_isa}
19-
%if 0%{?fedora} && 0%{?fedora} < 25
20-
Requires: udisks2%{?_isa}
31+
%if !0%{?flatpak}
32+
%if 0%{?fedora} && 0%{?fedora} != 25
33+
Requires: storaged
2134
%else
22-
Requires: storaged%{?_isa}
35+
Requires: udisks
36+
%endif
2337
%endif
2438

2539
%description
2640
A tool to write images of Fedora media to portable drives
2741
like flash drives or memory cards.
2842

2943
%prep
30-
%autosetup -p1 -n MediaWriter-%{commit}
31-
mkdir %{_target_platform}
44+
%autosetup -p1 -n MediaWriter-%{version}
45+
46+
# Install the theme into correct prefix when building for /app
47+
sed -i 's@\${QT6_INSTALL_QML}@%{_qt6_qmldir}@' src/theme/CMakeLists.txt
3248

3349
%build
34-
pushd %{_target_platform}
35-
%{qmake_qt5} PREFIX=%{_prefix} MEDIAWRITER_VERSION=%{version}-%{dist} ..
36-
popd
37-
%make_build -C %{_target_platform}
50+
%cmake
51+
52+
%cmake_build
3853

3954
%install
40-
make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}
55+
%cmake_install
4156

57+
%check
58+
appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/org.fedoraproject.MediaWriter.appdata.xml
4259

4360
%files
4461
%{_bindir}/%{name}
4562
%{_libexecdir}/%{name}/
63+
%{_datadir}/metainfo/org.fedoraproject.MediaWriter.appdata.xml
64+
%{_datadir}/applications/org.fedoraproject.MediaWriter.desktop
65+
%{_datadir}/icons/hicolor/16x16/apps/org.fedoraproject.MediaWriter.png
66+
%{_datadir}/icons/hicolor/22x22/apps/org.fedoraproject.MediaWriter.png
67+
%{_datadir}/icons/hicolor/24x24/apps/org.fedoraproject.MediaWriter.png
68+
%{_datadir}/icons/hicolor/32x32/apps/org.fedoraproject.MediaWriter.png
69+
%{_datadir}/icons/hicolor/48x48/apps/org.fedoraproject.MediaWriter.png
70+
%{_datadir}/icons/hicolor/64x64/apps/org.fedoraproject.MediaWriter.png
71+
%{_datadir}/icons/hicolor/128x128/apps/org.fedoraproject.MediaWriter.png
72+
%{_datadir}/icons/hicolor/256x256/apps/org.fedoraproject.MediaWriter.png
73+
%{_datadir}/icons/hicolor/512x512/apps/org.fedoraproject.MediaWriter.png
74+
%{_qt6_qmldir}/QtQuick/Controls/org/fedoraproject/AdwaitaTheme/
75+
%{_qt6_qmldir}/org/fedoraproject/AdwaitaTheme/libadwaitathemeplugin.so
76+
%{_qt6_qmldir}/org/fedoraproject/AdwaitaTheme/qmldir
4677

4778
%changelog
48-
* Tue Aug 9 2016 Martin Bříza <[email protected]> 4.0
49-
- Initial release
50-
79+
* Mon May 09 06 2022 Jan Grulich <[email protected]> - 5.0.0-1
80+
- 5.0.0

‎src/app/data/org.fedoraproject.MediaWriter.appdata.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,6 @@
158158
<update_contact>[email protected]</update_contact>
159159
<content_rating type="oars-1.1"/>
160160
<releases>
161-
<release version="5.0.0" date="2022-05-10"/>
161+
<release version="5.0.0" date="2022-05-09"/>
162162
</releases>
163163
</application>

‎src/app/data/org.fedoraproject.MediaWriter.appdata.xml.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@
2929
<update_contact>[email protected]</update_contact>
3030
<content_rating type="oars-1.1"/>
3131
<releases>
32-
<release version="5.0.0" date="2022-05-10"/>
32+
<release version="5.0.0" date="2022-05-09"/>
3333
</releases>
3434
</application>

0 commit comments

Comments
 (0)