rpms/amarok/devel amarok-1.2.4-gcc4bl.patch, NONE, 1.1 amarok.spec, 1.14, 1.15

Aurelien Bompard (abompard) fedora-extras-commits at redhat.com
Sun May 29 13:51:42 UTC 2005


Author: abompard

Update of /cvs/extras/rpms/amarok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22393/devel

Modified Files:
	amarok.spec 
Added Files:
	amarok-1.2.4-gcc4bl.patch 
Log Message:
- new version: 1.2.4
- waiting for bug #159090 to build on FC-4


amarok-1.2.4-gcc4bl.patch:

--- NEW FILE amarok-1.2.4-gcc4bl.patch ---
--- amarok-1.2.4/configure.gcc4bl	2005-05-19 19:02:45.000000000 +0200
+++ amarok-1.2.4/configure	2005-05-29 08:44:18.000000000 +0200
@@ -4120,7 +4120,7 @@
 
 #ifdef __GNUC__
 #if __GNUC__ == 4 && __GNUC_MINOR__ == 0 && __GNUC_PATCHLEVEL__ == 0
-choke me
+//choke me
 #endif
 #endif
 


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- amarok.spec	24 May 2005 10:56:29 -0000	1.14
+++ amarok.spec	29 May 2005 13:51:40 -0000	1.15
@@ -13,6 +13,7 @@
 License:    GPL
 Url:        http://amarok.kde.org
 Source0:    http://dl.sf.net/amarok/amarok-1.2.4.tar.bz2
+Patch0:     amarok-1.2.4-gcc4bl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdemultimedia-devel >= 6:3.2
@@ -90,6 +91,8 @@
 
 %prep
 %setup -q
+# remove test for GCC blacklisting
+%patch0 -p1 -b .gcc4bl
 
 
 %build




More information about the fedora-extras-commits mailing list