rpms/esc/devel esc-1.0.1-nss-devel-fix.patch, NONE, 1.1 esc.spec, 1.32, 1.33

Jack Magne (jmagne) fedora-extras-commits at redhat.com
Sat Jan 19 02:29:26 UTC 2008


Author: jmagne

Update of /cvs/pkgs/rpms/esc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15114

Modified Files:
	esc.spec 
Added Files:
	esc-1.0.1-nss-devel-fix.patch 
Log Message:
Fix build error because of new nss-devel package.

esc-1.0.1-nss-devel-fix.patch:

--- NEW FILE esc-1.0.1-nss-devel-fix.patch ---
--- ./esc/src/lib/coolkey/CoolKeyHandler.cpp.fix9	2008-01-18 11:56:55.000000000 -0800
+++ ./esc/src/lib/coolkey/CoolKeyHandler.cpp	2008-01-18 11:59:12.000000000 -0800
@@ -49,6 +49,11 @@
 
 #include <string>
 
+#ifndef CKO_NETSCAPE
+#define CKO_NETSCAPE CKO_NSS
+#endif
+
+
 #ifndef CKO_MOZILLA_READER
 #define CKO_MOZILLA_READER     (CKO_NETSCAPE+5)
 #define CKA_MOZILLA_IS_COOL_KEY (CKO_NETSCAPE+24)


Index: esc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/esc/devel/esc.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- esc.spec	18 Jan 2008 18:44:02 -0000	1.32
+++ esc.spec	19 Jan 2008 02:28:49 -0000	1.33
@@ -16,6 +16,7 @@
 Patch6: esc-1.0.1-log-fixes-1.patch
 Patch7: esc-1.0.1-lic-fix.patch 
 Patch8: esc-1.0.1-misc.patch
+Patch9:  esc-1.0.1-nss-devel-fix.patch
 
 BuildRequires: doxygen fontconfig-devel freetype-devel >= 2.1
 BuildRequires: glib2-devel libIDL-devel atk-devel gtk2-devel libjpeg-devel
@@ -74,6 +75,7 @@
 %patch6 -p1 -b .fix6
 %patch7 -p1 -b .fix7
 %patch8 -p1 -b .fix8
+%patch9 -p1 -b .fix9
 
 
 #Unpack xulrunner where esc expects it to be.




More information about the fedora-extras-commits mailing list