rpms/pstoedit/devel pstoedit-3.45-elif.patch, NONE, 1.1 pstoedit.spec, 1.11, 1.12

Denis Leroy denis at fedoraproject.org
Tue Feb 10 06:59:01 UTC 2009


Author: denis

Update of /cvs/pkgs/rpms/pstoedit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16491

Modified Files:
	pstoedit.spec 
Added Files:
	pstoedit-3.45-elif.patch 
Log Message:
Added patch to fix incorrect cpp directive

pstoedit-3.45-elif.patch:

--- NEW FILE pstoedit-3.45-elif.patch ---
--- pstoedit-3.45/src/dynload.cpp~	2007-07-22 13:27:36.000000000 +0200
+++ pstoedit-3.45/src/dynload.cpp	2009-02-10 07:54:14.000000000 +0100
@@ -138,7 +138,7 @@
 		dlclose(handle);
 #elif defined(_WIN32)
 		(void) WINFREELIB((HINSTANCE) handle);
-#elif
+#else
 #error "system unsupported so far"
 #endif
 		handle = 0;


Index: pstoedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pstoedit/devel/pstoedit.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pstoedit.spec	7 Feb 2009 19:10:46 -0000	1.11
+++ pstoedit.spec	10 Feb 2009 06:58:31 -0000	1.12
@@ -11,6 +11,7 @@
 Patch1:		pstoedit-3.45-quiet.patch
 Patch2:		pstoedit-3.45-gcc43.patch
 Patch3:         pstoedit-3.45-asy.patch
+Patch4:         pstoedit-3.45-elif.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	ghostscript
 BuildRequires:	gd-devel
@@ -46,10 +47,12 @@
 %patch1 -p1 -b .quiet
 %patch2 -p1 -b .gcc43
 %patch3 -p1 -b .asy
+%patch4 -p1 -b .elif
 dos2unix doc/*.htm doc/readme.txt
 
 %build
 %configure --disable-static --with-emf --without-swf
+# Cannot be built in parallel
 make
 
 
@@ -89,9 +92,11 @@
 %{_libdir}/pkgconfig/*.pc
 %{_datadir}/aclocal/*.m4
 
+
 %changelog
 * Sat Feb  7 2009 Denis Leroy <denis at poolshark.org> - 3.45-5
 - Added patch for improved asymptote support (#483503)
+- Added patch to fix incorrect cpp directive
 
 * Wed Sep 24 2008 Denis Leroy <denis at poolshark.org> - 3.45-4
 - Fixed cxxflags patch fuziness issue




More information about the fedora-extras-commits mailing list