Skip to content

Commit

Permalink
Update qgis-mime.xml for RPM, replace wrong ext in buildrpms.sh
Browse files Browse the repository at this point in the history
  • Loading branch information
daniviga committed Oct 2, 2017
1 parent 3caf61a commit 524c791
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 7 deletions.
2 changes: 1 addition & 1 deletion rpm/buildrpms.sh
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ then

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

print_info "Creating source package"
# Create spec file
Expand Down
13 changes: 10 additions & 3 deletions rpm/qgis.spec.template
Original file line number Diff line number Diff line change
Expand Up @@ -227,12 +227,19 @@ install -pm0644 %{SOURCE5} \
# Install application and MIME icons
for size in 8x8 16x16 22x22 24x24 32x32 36x36 42x42 48x48 64x64 72x72 80x80 96x96 128x128 192x192 256x256 512x512; do
install -pd %{buildroot}%{_datadir}/icons/hicolor/$size/apps
install -pm0644 debian/icons/%{name}-icon$size.png %{buildroot}%{_datadir}/icons/hicolor/$size/apps/qgis.png
install -pm0644 debian/icons/%{name}-icon${size}.png %{buildroot}%{_datadir}/icons/hicolor/${size}/apps/%{name}.png
done

for size in 8x8 16x16 22x22 24x24 32x32 36x36 42x42 48x48 64x64 72x72 80x80 96x96 128x128; do
for ext in qgs qlr qml qpt; do
for size in 8x8 16x16 22x22 24x24 32x32 36x36 42x42 48x48 64x64 72x72 80x80 96x96 128x128 192x192 256x256 512x512; do
install -pd %{buildroot}%{_datadir}/icons/hicolor/$size/apps
install -pm0644 debian/icons/%{name}-${ext}${size}.png %{buildroot}%{_datadir}/icons/hicolor/${size}/apps/%{name}-${ext}.png
done
done

for size in 8x8 16x16 22x22 24x24 32x32 36x36 42x42 48x48 64x64 72x72 80x80 96x96 128x128 192x192 256x256 512x512; do
install -pd %{buildroot}%{_datadir}/icons/hicolor/$size/mimetypes
install -pm0644 debian/icons/qgis-mime-icon$size.png %{buildroot}%{_datadir}/icons/hicolor/$size/mimetypes/qgis-mime.png
install -pm0644 debian/icons/qgis-mime-icon${size}.png %{buildroot}%{_datadir}/icons/hicolor/${size}/mimetypes/qgis-mime.png
done

install -pd %{buildroot}%{_datadir}/pixmaps
Expand Down
33 changes: 30 additions & 3 deletions rpm/sources/qgis-mime.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<comment xml:lang="de">QGIS-Projekt</comment>
<sub-class-of type="application/xml"/>
<alias type="application/x-qgis"/>
<icon name="qgis-mime"/>
<icon name="qgis-qgs"/>
<magic priority="50">
<match type="string" offset="0" value="&lt;!DOCTYPE qgis">
<match type="string" offset="0:256" value="&lt;qgis projectname"/>
Expand All @@ -17,14 +17,41 @@

<mime-type type="application/x-qgis-layer-settings">
<comment>QGIS layer settings</comment>
<comment xml:lang="de">QGIS Layer Einstellungen</comment>
<comment xml:lang="de">QGIS-Layereinstellungen</comment>
<sub-class-of type="application/xml"/>
<icon name="qgis-mime"/>
<icon name="qgis-qml"/>
<magic priority="50">
<match type="string" offset="0" value="&lt;!DOCTYPE qgis">
<match type="string" offset="0:256" value="&lt;qgis version"/>
</match>
</magic>
<glob pattern="*.qml"/>
</mime-type>

<mime-type type="application/x-qgis-layer-definition">
<comment>QGIS layer definition</comment>
<comment xml:lang="de">QGIS-Layerdefinition</comment>
<sub-class-of type="application/xml"/>
<icon name="qgis-qlr"/>
<magic priority="50">
<match type="string" offset="0" value="&lt;!DOCTYPE qgis">
<match type="string" offset="0:256" value="&lt;qgis version"/>
</match>
</magic>
<glob pattern="*.qlr"/>
</mime-type>

<mime-type type="application/x-qgis-composer-template">
<comment>QGIS composer template</comment>
<comment xml:lang="de">QGIS-Druckzusammenstellungsvorlage</comment>
<sub-class-of type="application/xml"/>
<icon name="qgis-qpt"/>
<magic priority="50">
<match type="string" offset="0" value="&lt;!DOCTYPE qgis">
<match type="string" offset="0:256" value="&lt;qgis version"/>
</match>
</magic>
<glob pattern="*.qpt"/>
</mime-type>

</mime-info>

0 comments on commit 524c791

Please sign in to comment.