Skip to content

Commit 524c791

Browse files
committed
Update qgis-mime.xml for RPM, replace wrong ext in buildrpms.sh
1 parent 3caf61a commit 524c791

File tree

3 files changed

+41
-7
lines changed

3 files changed

+41
-7
lines changed

rpm/buildrpms.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ then
103103

104104
print_info "Creating source tarball"
105105
# Create source tarball
106-
git -C .. archive --format=tar --prefix=qgis-$version/ $BRANCH | bzip2 > sources/qgis-$version.tar.gz
106+
git -C .. archive --format=tar --prefix=qgis-$version/ $BRANCH | bzip2 > sources/qgis-$version.tar.bz2
107107

108108
print_info "Creating source package"
109109
# Create spec file

rpm/qgis.spec.template

+10-3
Original file line numberDiff line numberDiff line change
@@ -227,12 +227,19 @@ install -pm0644 %{SOURCE5} \
227227
# Install application and MIME icons
228228
for size in 8x8 16x16 22x22 24x24 32x32 36x36 42x42 48x48 64x64 72x72 80x80 96x96 128x128 192x192 256x256 512x512; do
229229
install -pd %{buildroot}%{_datadir}/icons/hicolor/$size/apps
230-
install -pm0644 debian/icons/%{name}-icon$size.png %{buildroot}%{_datadir}/icons/hicolor/$size/apps/qgis.png
230+
install -pm0644 debian/icons/%{name}-icon${size}.png %{buildroot}%{_datadir}/icons/hicolor/${size}/apps/%{name}.png
231231
done
232232

233-
for size in 8x8 16x16 22x22 24x24 32x32 36x36 42x42 48x48 64x64 72x72 80x80 96x96 128x128; do
233+
for ext in qgs qlr qml qpt; do
234+
for size in 8x8 16x16 22x22 24x24 32x32 36x36 42x42 48x48 64x64 72x72 80x80 96x96 128x128 192x192 256x256 512x512; do
235+
install -pd %{buildroot}%{_datadir}/icons/hicolor/$size/apps
236+
install -pm0644 debian/icons/%{name}-${ext}${size}.png %{buildroot}%{_datadir}/icons/hicolor/${size}/apps/%{name}-${ext}.png
237+
done
238+
done
239+
240+
for size in 8x8 16x16 22x22 24x24 32x32 36x36 42x42 48x48 64x64 72x72 80x80 96x96 128x128 192x192 256x256 512x512; do
234241
install -pd %{buildroot}%{_datadir}/icons/hicolor/$size/mimetypes
235-
install -pm0644 debian/icons/qgis-mime-icon$size.png %{buildroot}%{_datadir}/icons/hicolor/$size/mimetypes/qgis-mime.png
242+
install -pm0644 debian/icons/qgis-mime-icon${size}.png %{buildroot}%{_datadir}/icons/hicolor/${size}/mimetypes/qgis-mime.png
236243
done
237244

238245
install -pd %{buildroot}%{_datadir}/pixmaps

rpm/sources/qgis-mime.xml

+30-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<comment xml:lang="de">QGIS-Projekt</comment>
77
<sub-class-of type="application/xml"/>
88
<alias type="application/x-qgis"/>
9-
<icon name="qgis-mime"/>
9+
<icon name="qgis-qgs"/>
1010
<magic priority="50">
1111
<match type="string" offset="0" value="&lt;!DOCTYPE qgis">
1212
<match type="string" offset="0:256" value="&lt;qgis projectname"/>
@@ -17,14 +17,41 @@
1717

1818
<mime-type type="application/x-qgis-layer-settings">
1919
<comment>QGIS layer settings</comment>
20-
<comment xml:lang="de">QGIS Layer Einstellungen</comment>
20+
<comment xml:lang="de">QGIS-Layereinstellungen</comment>
2121
<sub-class-of type="application/xml"/>
22-
<icon name="qgis-mime"/>
22+
<icon name="qgis-qml"/>
2323
<magic priority="50">
2424
<match type="string" offset="0" value="&lt;!DOCTYPE qgis">
2525
<match type="string" offset="0:256" value="&lt;qgis version"/>
2626
</match>
2727
</magic>
2828
<glob pattern="*.qml"/>
2929
</mime-type>
30+
31+
<mime-type type="application/x-qgis-layer-definition">
32+
<comment>QGIS layer definition</comment>
33+
<comment xml:lang="de">QGIS-Layerdefinition</comment>
34+
<sub-class-of type="application/xml"/>
35+
<icon name="qgis-qlr"/>
36+
<magic priority="50">
37+
<match type="string" offset="0" value="&lt;!DOCTYPE qgis">
38+
<match type="string" offset="0:256" value="&lt;qgis version"/>
39+
</match>
40+
</magic>
41+
<glob pattern="*.qlr"/>
42+
</mime-type>
43+
44+
<mime-type type="application/x-qgis-composer-template">
45+
<comment>QGIS composer template</comment>
46+
<comment xml:lang="de">QGIS-Druckzusammenstellungsvorlage</comment>
47+
<sub-class-of type="application/xml"/>
48+
<icon name="qgis-qpt"/>
49+
<magic priority="50">
50+
<match type="string" offset="0" value="&lt;!DOCTYPE qgis">
51+
<match type="string" offset="0:256" value="&lt;qgis version"/>
52+
</match>
53+
</magic>
54+
<glob pattern="*.qpt"/>
55+
</mime-type>
56+
3057
</mime-info>

0 commit comments

Comments
 (0)