Attachment 3524 Details for Bug 9094 – diff for the spec file

[patch] diff for the spec file

svndiff (text/plain), 3.77 KB, created by Philippe Didier on 2013-02-17 19:34:16 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Philippe Didier

Created: 2013-02-17 19:34:16 CET

Size: 3.77 KB

patch

obsolete

>Index: SPECS/bristol.spec
>===================================================================
>--- SPECS/bristol.spec	(rÃ©vision 331338)
>+++ SPECS/bristol.spec	(copie de travail)
>@@ -3,14 +3,15 @@
> 
> Name:		bristol
> Summary:	Synthesizer Emulator Pack
>-Version:	0.60.10
>+Version:	0.60.11
> Release:	%mkrel 1
> License:	GPLv2
> Group:		Sound/Midi
> URL:		http://%{name}.sourceforge.net/
> Source:		http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
> Source1:	synths.txt
>-Patch0:		bristol-0.60.10-mga-link.patch
>+#Patch0:	bristol-0.60.10-mga-link.patch  
>+# no more needed : has been merged upstream
> 
> BuildRequires:	pkgconfig(x11)
> BuildRequires:	pkgconfig(jack)
>@@ -19,43 +20,43 @@
> 
> # These obsoletes are needed for Mandriva 2010.1 compatibility
> # but may be suppressed for Mageia4
>-Obsoletes:	%{name}-arp2600 < 0.60.10
>-Obsoletes:	%{name}-axxe < 0.60.10
>-Obsoletes:	%{name}-b3 < 0.60.10
>-Obsoletes:	%{name}-bit99 < 0.60.10
>-Obsoletes:	%{name}-bit100 < 0.60.10
>-Obsoletes:	%{name}-bitone < 0.60.10
>-Obsoletes:	%{name}-bm < 0.60.10
>-Obsoletes:	%{name}-bme700 < 0.60.10
>-Obsoletes:	%{name}-dx < 0.60.10
>-Obsoletes:	%{name}-explorer < 0.60.10
>-Obsoletes:	%{name}-juno < 0.60.10
>-Obsoletes:	%{name}-jupiter < 0.60.10
>-Obsoletes:	%{name}-memory < 0.60.10
>-Obsoletes:	%{name}-mg1 < 0.60.10
>-Obsoletes:	%{name}-mini < 0.60.10
>-Obsoletes:	%{name}-mono < 0.60.10
>-Obsoletes:	%{name}-monopoly < 0.60.10
>-Obsoletes:	%{name}-obx < 0.60.10
>-Obsoletes:	%{name}-obxa < 0.60.10
>-Obsoletes:	%{name}-odyssey < 0.60.10
>-Obsoletes:	%{name}-poly800 < 0.60.10
>-Obsoletes:	%{name}-polysix < 0.60.10
>-Obsoletes:	%{name}-pro1 < 0.60.10
>-Obsoletes:	%{name}-pro10 < 0.60.10
>-Obsoletes:	%{name}-pro52 < 0.60.10
>-Obsoletes:	%{name}-prophet < 0.60.10
>-Obsoletes:	%{name}-rhodes < 0.60.10
>-Obsoletes:	%{name}-rhodesbass < 0.60.10
>-Obsoletes:	%{name}-roadrunner < 0.60.10
>-Obsoletes:	%{name}-sidney < 0.60.10
>-Obsoletes:	%{name}-solina < 0.60.10
>-Obsoletes:	%{name}-sonic6 < 0.60.10
>-Obsoletes:	%{name}-stratus < 0.60.10
>-Obsoletes:	%{name}-trilogy < 0.60.10
>-Obsoletes:	%{name}-vox < 0.60.10
>-Obsoletes:	%{name}-voxM2 < 0.60.10
>-Obsoletes:	%{name}-voyager < 0.60.10
>+Obsoletes:	%{name}-arp2600 < 0.60.11
>+Obsoletes:	%{name}-axxe < 0.60.11
>+Obsoletes:	%{name}-b3 < 0.60.11
>+Obsoletes:	%{name}-bit99 < 0.60.11
>+Obsoletes:	%{name}-bit100 < 0.60.11
>+Obsoletes:	%{name}-bitone < 0.60.11
>+Obsoletes:	%{name}-bm < 0.60.11
>+Obsoletes:	%{name}-bme700 < 0.60.11
>+Obsoletes:	%{name}-dx < 0.60.11
>+Obsoletes:	%{name}-explorer < 0.60.11
>+Obsoletes:	%{name}-juno < 0.60.11
>+Obsoletes:	%{name}-jupiter < 0.60.11
>+Obsoletes:	%{name}-memory < 0.60.11
>+Obsoletes:	%{name}-mg1 < 0.60.11
>+Obsoletes:	%{name}-mini < 0.60.11
>+Obsoletes:	%{name}-mono < 0.60.11
>+Obsoletes:	%{name}-monopoly < 0.60.11
>+Obsoletes:	%{name}-obx < 0.60.11
>+Obsoletes:	%{name}-obxa < 0.60.11
>+Obsoletes:	%{name}-odyssey < 0.60.11
>+Obsoletes:	%{name}-poly800 < 0.60.11
>+Obsoletes:	%{name}-polysix < 0.60.11
>+Obsoletes:	%{name}-pro1 < 0.60.11
>+Obsoletes:	%{name}-pro10 < 0.60.11
>+Obsoletes:	%{name}-pro52 < 0.60.11
>+Obsoletes:	%{name}-prophet < 0.60.11
>+Obsoletes:	%{name}-rhodes < 0.60.11
>+Obsoletes:	%{name}-rhodesbass < 0.60.11
>+Obsoletes:	%{name}-roadrunner < 0.60.11
>+Obsoletes:	%{name}-sidney < 0.60.11
>+Obsoletes:	%{name}-solina < 0.60.11
>+Obsoletes:	%{name}-sonic6 < 0.60.11
>+Obsoletes:	%{name}-stratus < 0.60.11
>+Obsoletes:	%{name}-trilogy < 0.60.11
>+Obsoletes:	%{name}-vox < 0.60.11
>+Obsoletes:	%{name}-voxM2 < 0.60.11
>+Obsoletes:	%{name}-voyager < 0.60.11
> 
> %description
> Bristol emulates several vintage synthesizers, mainly keyboards: 
>@@ -81,7 +82,7 @@
> 
> %prep
> %setup -q
>-%patch0 -p1 -b .bristol-0.60.10-mga-link.patch
>+#%%patch0 -p1 -b .bristol-0.60.10-mga-link.patch
> chmod  a-x bitmaps/*/*
> chmod  a-x bitmaps/bicon.svg bitmaps/icon_bitmap.xbm
> chmod  a-x COPYING AUTHORS NEWS memory/mini/readme.txt \

Index: SPECS/bristol.spec
===================================================================
--- SPECS/bristol.spec	(rÃ©vision 331338)
+++ SPECS/bristol.spec	(copie de travail)
@@ -3,14 +3,15 @@
 
 Name:		bristol
 Summary:	Synthesizer Emulator Pack
-Version:	0.60.10
+Version:	0.60.11
 Release:	%mkrel 1
 License:	GPLv2
 Group:		Sound/Midi
 URL:		http://%{name}.sourceforge.net/
 Source:		http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1:	synths.txt
-Patch0:		bristol-0.60.10-mga-link.patch
+#Patch0:	bristol-0.60.10-mga-link.patch  
+# no more needed : has been merged upstream
 
 BuildRequires:	pkgconfig(x11)
 BuildRequires:	pkgconfig(jack)
@@ -19,43 +20,43 @@
 
 # These obsoletes are needed for Mandriva 2010.1 compatibility
 # but may be suppressed for Mageia4
-Obsoletes:	%{name}-arp2600 < 0.60.10
-Obsoletes:	%{name}-axxe < 0.60.10
-Obsoletes:	%{name}-b3 < 0.60.10
-Obsoletes:	%{name}-bit99 < 0.60.10
-Obsoletes:	%{name}-bit100 < 0.60.10
-Obsoletes:	%{name}-bitone < 0.60.10
-Obsoletes:	%{name}-bm < 0.60.10
-Obsoletes:	%{name}-bme700 < 0.60.10
-Obsoletes:	%{name}-dx < 0.60.10
-Obsoletes:	%{name}-explorer < 0.60.10
-Obsoletes:	%{name}-juno < 0.60.10
-Obsoletes:	%{name}-jupiter < 0.60.10
-Obsoletes:	%{name}-memory < 0.60.10
-Obsoletes:	%{name}-mg1 < 0.60.10
-Obsoletes:	%{name}-mini < 0.60.10
-Obsoletes:	%{name}-mono < 0.60.10
-Obsoletes:	%{name}-monopoly < 0.60.10
-Obsoletes:	%{name}-obx < 0.60.10
-Obsoletes:	%{name}-obxa < 0.60.10
-Obsoletes:	%{name}-odyssey < 0.60.10
-Obsoletes:	%{name}-poly800 < 0.60.10
-Obsoletes:	%{name}-polysix < 0.60.10
-Obsoletes:	%{name}-pro1 < 0.60.10
-Obsoletes:	%{name}-pro10 < 0.60.10
-Obsoletes:	%{name}-pro52 < 0.60.10
-Obsoletes:	%{name}-prophet < 0.60.10
-Obsoletes:	%{name}-rhodes < 0.60.10
-Obsoletes:	%{name}-rhodesbass < 0.60.10
-Obsoletes:	%{name}-roadrunner < 0.60.10
-Obsoletes:	%{name}-sidney < 0.60.10
-Obsoletes:	%{name}-solina < 0.60.10
-Obsoletes:	%{name}-sonic6 < 0.60.10
-Obsoletes:	%{name}-stratus < 0.60.10
-Obsoletes:	%{name}-trilogy < 0.60.10
-Obsoletes:	%{name}-vox < 0.60.10
-Obsoletes:	%{name}-voxM2 < 0.60.10
-Obsoletes:	%{name}-voyager < 0.60.10
+Obsoletes:	%{name}-arp2600 < 0.60.11
+Obsoletes:	%{name}-axxe < 0.60.11
+Obsoletes:	%{name}-b3 < 0.60.11
+Obsoletes:	%{name}-bit99 < 0.60.11
+Obsoletes:	%{name}-bit100 < 0.60.11
+Obsoletes:	%{name}-bitone < 0.60.11
+Obsoletes:	%{name}-bm < 0.60.11
+Obsoletes:	%{name}-bme700 < 0.60.11
+Obsoletes:	%{name}-dx < 0.60.11
+Obsoletes:	%{name}-explorer < 0.60.11
+Obsoletes:	%{name}-juno < 0.60.11
+Obsoletes:	%{name}-jupiter < 0.60.11
+Obsoletes:	%{name}-memory < 0.60.11
+Obsoletes:	%{name}-mg1 < 0.60.11
+Obsoletes:	%{name}-mini < 0.60.11
+Obsoletes:	%{name}-mono < 0.60.11
+Obsoletes:	%{name}-monopoly < 0.60.11
+Obsoletes:	%{name}-obx < 0.60.11
+Obsoletes:	%{name}-obxa < 0.60.11
+Obsoletes:	%{name}-odyssey < 0.60.11
+Obsoletes:	%{name}-poly800 < 0.60.11
+Obsoletes:	%{name}-polysix < 0.60.11
+Obsoletes:	%{name}-pro1 < 0.60.11
+Obsoletes:	%{name}-pro10 < 0.60.11
+Obsoletes:	%{name}-pro52 < 0.60.11
+Obsoletes:	%{name}-prophet < 0.60.11
+Obsoletes:	%{name}-rhodes < 0.60.11
+Obsoletes:	%{name}-rhodesbass < 0.60.11
+Obsoletes:	%{name}-roadrunner < 0.60.11
+Obsoletes:	%{name}-sidney < 0.60.11
+Obsoletes:	%{name}-solina < 0.60.11
+Obsoletes:	%{name}-sonic6 < 0.60.11
+Obsoletes:	%{name}-stratus < 0.60.11
+Obsoletes:	%{name}-trilogy < 0.60.11
+Obsoletes:	%{name}-vox < 0.60.11
+Obsoletes:	%{name}-voxM2 < 0.60.11
+Obsoletes:	%{name}-voyager < 0.60.11
 
 %description
 Bristol emulates several vintage synthesizers, mainly keyboards: 
@@ -81,7 +82,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .bristol-0.60.10-mga-link.patch
+#%%patch0 -p1 -b .bristol-0.60.10-mga-link.patch
 chmod  a-x bitmaps/*/*
 chmod  a-x bitmaps/bicon.svg bitmaps/icon_bitmap.xbm
 chmod  a-x COPYING AUTHORS NEWS memory/mini/readme.txt \

Actions: View | Diff

Attachments on bug 9094: 3524