Attachment 3169 Details for Bug 4551 – diff between mdv 2011 imported spec file and cleaned spec file

[patch] diff between mdv 2011 imported spec file and cleaned spec file

aeolus.specdiff (text/plain), 4.07 KB, created by Philippe Didier on 2012-11-25 17:48:32 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Philippe Didier

Created: 2012-11-25 17:48:32 CET

Size: 4.07 KB

patch

obsolete

>--- aeolus.specmdv	2012-11-25 17:39:22.037768386 +0100
>+++ aeolus.spec	2012-11-25 17:41:50.207129447 +0100
>@@ -1,23 +1,20 @@
>-Name:          aeolus
>-Summary:       Synthesised pipe organ emulator
>-Version:       0.8.4
>-Release:       %mkrel 1
>-License:       GPLv2+ and CC-BY-SA
>-Group:	       Sound
>-Source0:       http://www.kokkinizita.net/linuxaudio/downloads/%{name}-%{version}.tar.bz2
>-Source1:       http://www.kokkinizita.net/linuxaudio/downloads/stops-0.3.0.tar.bz2
>-Source2:       %{name}.desktop
>+Name:		aeolus
>+Summary:	Synthesised pipe organ emulator
>+Version:	0.8.4
>+Release:	%mkrel 1
>+License:	GPLv2+ and CC-BY-SA
>+Group:		Sound/Midi
>+Source0:	http://kokkinizita.linuxaudio.org/linuxaudio/downloads/%{name}-%{version}.tar.bz2
>+Source1:	http://kokkinizita.linuxaudio.org/linuxaudio/downloads/stops-0.3.0.tar.bz2
> # http://commons.wikimedia.org/wiki/File:Logo_aeolus.png / resized to 48x48
> # CC-BY-SA License
>-Source3:       %{name}48x48.png
>-URL: 	       http://www.kokkinizita.net/linuxaudio/aeolus/index.html
>-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-buildroot
>-Obsoletes:     %mklibname %{name}
>-BuildRequires: clthreads-devel
>-BuildRequires: clalsadrv-devel >= 2.0.0
>-BuildRequires: clxclient-devel
>-BuildRequires: libjack-devel
>-BuildRequires: readline-devel
>+Source2:	%{name}48x48.png
>+URL:		http://www.kokkinizita.net/linuxaudio/aeolus/index.html
>+BuildRequires:	clthreads-devel
>+BuildRequires:	clalsadrv-devel >= 2.0.0
>+BuildRequires:	clxclient-devel
>+BuildRequires:	libjack-devel
>+BuildRequires:	readline-devel
> 
> %description
> Aeolus is a synthesised (i.e. not sampled) pipe organ emulator that 
>@@ -35,14 +32,13 @@
> e.g. a 1GHz, 256Mb machine. 
> 
> %files
>-%defattr(-,root,root)
> %config %{_sysconfdir}/%{name}.conf
> %{_bindir}/%{name}
> %{_datadir}/%{name}
> %{_datadir}/applications/%{name}.desktop
> %{_datadir}/pixmaps/%{name}.png
>-%{_libdir}/aeolus_txt.so
>-%{_libdir}/aeolus_x11.so
>+%{_libdir}/aeolus*.so
>+
> 
> #--------------------------------------------------------------------
> 
>@@ -57,6 +53,7 @@
> sed -i -e 's/-lrt//g' Makefile
> sed -i -e 's/\/sbin\/ldconfig/#\/sbin\/ldconfig/g' Makefile
> sed -i -e 's#-O3#%{optflags}#' Makefile
>+sed -i -e '31s/$/ -ldl/' Makefile
> 
> %build
> cd source
>@@ -77,10 +74,51 @@
> EOF
> 
> # desktop file and icon
>-install -d -m755 %{buildroot}%{_datadir}/{applications,pixmaps}
>-install -D -m644 %{SOURCE2} %{buildroot}%{_datadir}/applications
>-install -m644 %{SOURCE3} %{buildroot}%{_datadir}/pixmaps/%{name}.png
>+install -d -m755 %{buildroot}%{_datadir}/pixmaps
>+install -m644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/%{name}.png
>+
>+mkdir -p %{buildroot}%{_datadir}/applications
>+cat > %{buildroot}%{_datadir}/applications/%{name}.desktop << EOL
>+[Desktop Entry]
>+Type=Application
>+Exec=aeolus
>+GenericName=Aeolus
>+GenericName[en_GB]=Aeolus
>+Icon=aeolus
>+Name=Aeolus
>+Comment=Virtual pipe organ based on additive synthesis
>+Name[en_GB]=Aeolus
>+Comment[en_GB]=Virtual pipe organ based on additive synthesis
>+Name[cs]=Aeolus
>+Comment[cs]=VirtuÃ¡lnÃ varhany zaloÅ¾enÃ© na aditivnÃ syntÃ©ze
>+Name[de]=Aeolus
>+Comment[de]=Virtuelle Pfeifenorgel, auf additiver Synthese beasierend
>+Name[es]=Aeolus
>+Comment[es]=Ãrgano virtual basado en la sÃntesis aditiva
>+Name[fr]=Aeolus
>+Comment[fr]=Orgue virtuel basÃ© sur la synthÃ¨se additive
>+Name[it]= Aeolus
>+Comment[it]= Virtual pipe organ basato sulla sintesi additiva
>+Name[ja]=Aeolus
>+Comment[ja]=ãã¼ãã£ã«ãã¤ããªã«ã¬ã³
>+Name[nb]=Aeolus
>+Comment[nb]=Virtuelt orgel basert pÃ¥ additivsyntese
>+Name[nl]=Aeolus
>+Comment[nl]=Virtueel pijporgel gebaseerd op toegevoegde syntheses
>+Name[pl]=Aeolus
>+Comment[pl]=Wirtualne organy piszczaÅkowe
>+Name[pt_BR]=Aeolus
>+Comment[pt_BR]=Virtual pipe organ based on additive synthesis
>+Name[sk]=Aeolus
>+Comment[sk]=VirtuÃ¡lny pÃÅ¡talovÃ½ organ zaloÅ¾enÃ½ na aditÃvnej syntÃ©ze
>+Name[zh_CN]=Aeolus
>+Comment[zh_CN]=åºäºå æ³åæçèæç®¡éåä»¶
>+Name[zh_TW]=Aeolus
>+Comment[zh_TW]=ä»¥çåå¤ç¨®åæå¨çºåºç¤çèæ¬ç®¡é¢¨ç´
>+StartupNotify=true
>+Terminal=false
>+Categories=Audio;AudioVideo;Midi;X-Mageia-CrossDesktop;
>+X-KDE-SubstituteUID=false
>+EOL
> 
>-%clean
>-rm -fr %{buildroot}
>

--- aeolus.specmdv	2012-11-25 17:39:22.037768386 +0100
+++ aeolus.spec	2012-11-25 17:41:50.207129447 +0100
@@ -1,23 +1,20 @@
-Name:          aeolus
-Summary:       Synthesised pipe organ emulator
-Version:       0.8.4
-Release:       %mkrel 1
-License:       GPLv2+ and CC-BY-SA
-Group:	       Sound
-Source0:       http://www.kokkinizita.net/linuxaudio/downloads/%{name}-%{version}.tar.bz2
-Source1:       http://www.kokkinizita.net/linuxaudio/downloads/stops-0.3.0.tar.bz2
-Source2:       %{name}.desktop
+Name:		aeolus
+Summary:	Synthesised pipe organ emulator
+Version:	0.8.4
+Release:	%mkrel 1
+License:	GPLv2+ and CC-BY-SA
+Group:		Sound/Midi
+Source0:	http://kokkinizita.linuxaudio.org/linuxaudio/downloads/%{name}-%{version}.tar.bz2
+Source1:	http://kokkinizita.linuxaudio.org/linuxaudio/downloads/stops-0.3.0.tar.bz2
 # http://commons.wikimedia.org/wiki/File:Logo_aeolus.png / resized to 48x48
 # CC-BY-SA License
-Source3:       %{name}48x48.png
-URL: 	       http://www.kokkinizita.net/linuxaudio/aeolus/index.html
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Obsoletes:     %mklibname %{name}
-BuildRequires: clthreads-devel
-BuildRequires: clalsadrv-devel >= 2.0.0
-BuildRequires: clxclient-devel
-BuildRequires: libjack-devel
-BuildRequires: readline-devel
+Source2:	%{name}48x48.png
+URL:		http://www.kokkinizita.net/linuxaudio/aeolus/index.html
+BuildRequires:	clthreads-devel
+BuildRequires:	clalsadrv-devel >= 2.0.0
+BuildRequires:	clxclient-devel
+BuildRequires:	libjack-devel
+BuildRequires:	readline-devel
 
 %description
 Aeolus is a synthesised (i.e. not sampled) pipe organ emulator that 
@@ -35,14 +32,13 @@
 e.g. a 1GHz, 256Mb machine. 
 
 %files
-%defattr(-,root,root)
 %config %{_sysconfdir}/%{name}.conf
 %{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
-%{_libdir}/aeolus_txt.so
-%{_libdir}/aeolus_x11.so
+%{_libdir}/aeolus*.so
+
 
 #--------------------------------------------------------------------
 
@@ -57,6 +53,7 @@
 sed -i -e 's/-lrt//g' Makefile
 sed -i -e 's/\/sbin\/ldconfig/#\/sbin\/ldconfig/g' Makefile
 sed -i -e 's#-O3#%{optflags}#' Makefile
+sed -i -e '31s/$/ -ldl/' Makefile
 
 %build
 cd source
@@ -77,10 +74,51 @@
 EOF
 
 # desktop file and icon
-install -d -m755 %{buildroot}%{_datadir}/{applications,pixmaps}
-install -D -m644 %{SOURCE2} %{buildroot}%{_datadir}/applications
-install -m644 %{SOURCE3} %{buildroot}%{_datadir}/pixmaps/%{name}.png
+install -d -m755 %{buildroot}%{_datadir}/pixmaps
+install -m644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/%{name}.png
+
+mkdir -p %{buildroot}%{_datadir}/applications
+cat > %{buildroot}%{_datadir}/applications/%{name}.desktop << EOL
+[Desktop Entry]
+Type=Application
+Exec=aeolus
+GenericName=Aeolus
+GenericName[en_GB]=Aeolus
+Icon=aeolus
+Name=Aeolus
+Comment=Virtual pipe organ based on additive synthesis
+Name[en_GB]=Aeolus
+Comment[en_GB]=Virtual pipe organ based on additive synthesis
+Name[cs]=Aeolus
+Comment[cs]=VirtuÃ¡lnÃ varhany zaloÅ¾enÃ© na aditivnÃ syntÃ©ze
+Name[de]=Aeolus
+Comment[de]=Virtuelle Pfeifenorgel, auf additiver Synthese beasierend
+Name[es]=Aeolus
+Comment[es]=Ãrgano virtual basado en la sÃntesis aditiva
+Name[fr]=Aeolus
+Comment[fr]=Orgue virtuel basÃ© sur la synthÃ¨se additive
+Name[it]= Aeolus
+Comment[it]= Virtual pipe organ basato sulla sintesi additiva
+Name[ja]=Aeolus
+Comment[ja]=ãã¼ãã£ã«ãã¤ããªã«ã¬ã³
+Name[nb]=Aeolus
+Comment[nb]=Virtuelt orgel basert pÃ¥ additivsyntese
+Name[nl]=Aeolus
+Comment[nl]=Virtueel pijporgel gebaseerd op toegevoegde syntheses
+Name[pl]=Aeolus
+Comment[pl]=Wirtualne organy piszczaÅkowe
+Name[pt_BR]=Aeolus
+Comment[pt_BR]=Virtual pipe organ based on additive synthesis
+Name[sk]=Aeolus
+Comment[sk]=VirtuÃ¡lny pÃÅ¡talovÃ½ organ zaloÅ¾enÃ½ na aditÃvnej syntÃ©ze
+Name[zh_CN]=Aeolus
+Comment[zh_CN]=åºäºå æ³åæçèæç®¡éåä»¶
+Name[zh_TW]=Aeolus
+Comment[zh_TW]=ä»¥çåå¤ç¨®åæå¨çºåºç¤çèæ¬ç®¡é¢¨ç´
+StartupNotify=true
+Terminal=false
+Categories=Audio;AudioVideo;Midi;X-Mageia-CrossDesktop;
+X-KDE-SubstituteUID=false
+EOL
 
-%clean
-rm -fr %{buildroot}

Actions: View | Diff

Attachments on bug 4551: 3119 | 3120 | 3168 | 3169