rpms/codeblocks/FC-5 .cvsignore, 1.5, 1.6 codeblocks-plugins.patch, 1.2, 1.3 codeblocks.spec, 1.4, 1.5 sources, 1.5, 1.6

[Dan Horak (sharkcz)]

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12983

Modified Files:
	.cvsignore codeblocks-plugins.patch codeblocks.spec sources 
Log Message:
- update to revision 3202
- fixed plugin loading on 64-bit platforms



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	3 Nov 2006 10:06:23 -0000	1.5
+++ .cvsignore	11 Nov 2006 09:39:56 -0000	1.6
@@ -1 +1 @@
-codeblocks-svn3170.tar.bz2
+codeblocks-svn3202.tar.bz2

codeblocks-plugins.patch:

Index: codeblocks-plugins.patch
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/codeblocks-plugins.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- codeblocks-plugins.patch	8 Oct 2006 09:18:38 -0000	1.2
+++ codeblocks-plugins.patch	11 Nov 2006 09:39:56 -0000	1.3
@@ -1,14 +1,11 @@
-diff -Nru --exclude .svn codeblocks/src/sdk/configmanager.cpp codeblocks-devel/src/sdk/configmanager.cpp
---- codeblocks/src/sdk/configmanager.cpp	2006-07-08 08:56:20.000000000 +0200
-+++ codeblocks-devel/src/sdk/configmanager.cpp	2006-07-23 12:10:01.000000000 +0200
-@@ -448,9 +448,7 @@
+--- src/sdk/configmanager.cpp.orig	2006-11-08 14:53:00.000000000 +0100
++++ src/sdk/configmanager.cpp	2006-11-08 17:48:05.000000000 +0100
+@@ -389,7 +389,7 @@
+             return ::wxGetCwd();
  
          case sdPluginsGlobal:
-         {
--            wxString p = ConfigManager::data_path_global + _T("/plugins");
--            if(!wxDirExists(p + wxFILE_SEP_PATH))
--                CreateDirRecursively(p + wxFILE_SEP_PATH);
-+            wxString p = _T("/usr/lib/codeblocks/plugins/");
-             return p;
-         }
+-            return ConfigManager::data_path_global + _T("/plugins");
++            return _T("@libdir@/codeblocks/plugins");
  
+         case sdPluginsUser:
+             return ConfigManager::data_path_user   + _T("/plugins");


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/codeblocks.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- codeblocks.spec	3 Nov 2006 10:06:23 -0000	1.4
+++ codeblocks.spec	11 Nov 2006 09:39:56 -0000	1.5
@@ -1,9 +1,9 @@
-%define		rev	3170
-%define		date	20061102
+%define		rev	3202
+%define		date	20061110
 
 Name:		codeblocks
 Version:	1.0
-Release:	0.12.%{date}svn%{rev}%{?dist}
+Release:	0.13.%{date}svn%{rev}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPL
@@ -53,7 +53,7 @@
 %prep
 
 %setup -q -n codeblocks
-%patch1 -p1
+%patch1
 %patch2 -p1
 %patch3
 
@@ -72,6 +72,9 @@
 	sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/contrib/$p/Makefile.am
 done
 
+sed -i 's|@libdir@|%{_libdir}|' src/sdk/configmanager.cpp
+
+# generate revision.m4
 echo "m4_define([SVN_REVISION], trunk-r%{rev})" > revision.m4
 
 ./bootstrap
@@ -225,7 +228,11 @@
 
 
 %changelog
-* Fri Nov  3 2006 Dan Horak <dan[at]danny.cz> 1.0-0.12.20061029svn3170
+* Fri Nov 10 2006 Dan Horak <dan[at]danny.cz> 1.0-0.13.20061110svn3202
+- update to revision 3202
+- fixed plugin loading on 64-bit platforms
+
+* Fri Nov  3 2006 Dan Horak <dan[at]danny.cz> 1.0-0.12.20061102svn3170
 - update to revision 3170
 
 * Mon Oct 30 2006 Dan Horak <dan[at]danny.cz> 1.0-0.11.20061029svn3157


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	3 Nov 2006 10:06:23 -0000	1.5
+++ sources	11 Nov 2006 09:39:56 -0000	1.6
@@ -1 +1 @@
-bfcda3308b08a096edbc4c0328e98c4b  codeblocks-svn3170.tar.bz2
+ce1054b4451df382a6b7fa34562fe1ed  codeblocks-svn3202.tar.bz2