[Mageia-dev] Last versions of programs concerning Computer Assisted Music

[PhilippeDidier]

Colin Guthrie a écrit :

> 
> FYI, these lines can be more neatly (IMO) done as:
> 
> install -D -p %{buildroot}%{_datadir}/%{name}/icons/ardour_icon_48px.png
> %{buildroot}%{_iconsdir}/hicolor/48x48/apps/ardour3.png
> 
> 
> (you can also add "-m 0644" if you want to be specific about permission.
> 
> All that said, if the icons are being shipped already, why not just
> symlink them rather than provide two copies? (in which case the install
> -d lines should remain :D)
> 
> Col
> 
So ... here is a  svndiff adding symlinks instead of copying

It works for me (applied to the last spec from Cauldron)
I could build and install

I think it may be commited (even if not submitted : it's just a cosmetic
improvement...)


-------------- next part --------------
Index: SPECS/ardour3.spec
===================================================================
--- SPECS/ardour3.spec	(révision 405348)
+++ SPECS/ardour3.spec	(copie de travail)
@@ -12,7 +12,7 @@
 Version:	3.0
 Release:	%{release}
 Summary:	Professional multi-track audio recording application
-Group:		Sound/Mixers
+Group:		Sound/Editors and Converters
 License:	GPLv2+
 URL:		http://ardour.org/
 
@@ -21,6 +21,8 @@
 %if %{rev}
 Source0:	%{name}-%{rev}.tar.bz2
 %else
+# NB to receive a free (as beer) source tarbal you need to give your e.mail address here :
+# "http://community.ardour.org/download_process_selection_and_amount" you'll get a download link
 Source0:	%{oname}-%{version}.tar.bz2
 %endif
 Source1:	%{name}.desktop
@@ -117,8 +119,32 @@
 desktop-file-install \
 --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
 
+# Symlink icons and mimetypes into the right folders
 install -d -m 0755 %{buildroot}%{_iconsdir}
-cp -f %{buildroot}%{_datadir}/%{name}/icons/application-x-ardour_48px.png %{buildroot}%{_iconsdir}/%{name}.png
+install -d -m 0755 %{buildroot}%{_iconsdir}/hicolor/16x16/apps
+install -d -m 0755 %{buildroot}%{_iconsdir}/hicolor/22x22/apps
+install -d -m 0755 %{buildroot}%{_iconsdir}/hicolor/32x32/apps
+install -d -m 0755 %{buildroot}%{_iconsdir}/hicolor/48x48/apps
+install -d -m 0755 %{buildroot}%{_iconsdir}/hicolor/16x16/mimetypes
+install -d -m 0755 %{buildroot}%{_iconsdir}/hicolor/22x22/mimetypes
+install -d -m 0755 %{buildroot}%{_iconsdir}/hicolor/32x32/mimetypes
+install -d -m 0755 %{buildroot}%{_iconsdir}/hicolor/48x48/mimetypes
+ln -s %{buildroot}%{_datadir}/%{name}/icons/application-x-ardour_16px.png \
+%{buildroot}%{_iconsdir}/hicolor/16x16/mimetypes/application-x-ardour3.png
+ln -s %{buildroot}%{_datadir}/%{name}/icons/application-x-ardour_22px.png \
+%{buildroot}%{_iconsdir}/hicolor/22x22/mimetypes/application-x-ardour3.png
+ln -s %{buildroot}%{_datadir}/%{name}/icons/application-x-ardour_32px.png \
+%{buildroot}%{_iconsdir}/hicolor/32x32/mimetypes/application-x-ardour3.png
+ln -s %{buildroot}%{_datadir}/%{name}/icons/application-x-ardour_48px.png \
+%{buildroot}%{_iconsdir}/hicolor/48x48/mimetypes/application-x-ardour3.png
+ln -s %{buildroot}%{_datadir}/%{name}/icons/ardour_icon_16px.png \
+%{buildroot}%{_iconsdir}/hicolor/16x16/apps/ardour3.png
+ln -s %{buildroot}%{_datadir}/%{name}/icons/ardour_icon_22px.png \
+%{buildroot}%{_iconsdir}/hicolor/22x22/apps/ardour3.png
+ln -s %{buildroot}%{_datadir}/%{name}/icons/ardour_icon_32px.png \
+%{buildroot}%{_iconsdir}/hicolor/32x32/apps/ardour3.png
+ln -s %{buildroot}%{_datadir}/%{name}/icons/ardour_icon_48px.png \
+%{buildroot}%{_iconsdir}/hicolor/48x48/apps/ardour3.png
 
 
 %files
@@ -138,5 +164,5 @@
 %config(noreplace) %{_sysconfdir}/%{name}/mixer.bindings
 %dir %{_sysconfdir}/%{name}/export
 %config(noreplace) %{_sysconfdir}/%{name}/export/CD.format
-%{_iconsdir}/ardour3.png
+%{_iconsdir}/hicolor/*
 %{_datadir}/locale/*/*/*.mo