rpms/codeblocks/FC-5 .cvsignore, 1.2, 1.3 codeblocks-plugins.patch, 1.1, 1.2 codeblocks.spec, 1.1, 1.2 sources, 1.2, 1.3
Dan Horak (sharkcz)
fedora-extras-commits at redhat.com
Sun Oct 8 09:18:38 UTC 2006
Author: sharkcz
Update of /cvs/extras/rpms/codeblocks/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15749
Modified Files:
.cvsignore codeblocks-plugins.patch codeblocks.spec sources
Log Message:
- update to revision 3030
- change the install paths for plugins in the spec file
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 13 Sep 2006 20:21:13 -0000 1.2
+++ .cvsignore 8 Oct 2006 09:18:38 -0000 1.3
@@ -1 +1 @@
-codeblocks-svn2965.tar.bz2
+codeblocks-svn3030.tar.bz2
codeblocks-plugins.patch:
Index: codeblocks-plugins.patch
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/codeblocks-plugins.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- codeblocks-plugins.patch 13 Sep 2006 20:21:13 -0000 1.1
+++ codeblocks-plugins.patch 8 Oct 2006 09:18:38 -0000 1.2
@@ -1,255 +1,3 @@
-diff -Nru --exclude .svn codeblocks/src/plugins/astyle/Makefile.am codeblocks-devel/src/plugins/astyle/Makefile.am
---- codeblocks/src/plugins/astyle/Makefile.am 2006-07-11 14:09:17.000000000 +0200
-+++ codeblocks-devel/src/plugins/astyle/Makefile.am 2006-07-23 09:41:41.000000000 +0200
-@@ -5,7 +5,7 @@
- -I$(top_srcdir)/src/sdk \
- -I$(top_srcdir)/src/sdk/wxscintilla/include
-
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
-
- lib_LTLIBRARIES = libastyle.la
-
-diff -Nru --exclude .svn codeblocks/src/plugins/autosave/Makefile.am codeblocks-devel/src/plugins/autosave/Makefile.am
---- codeblocks/src/plugins/autosave/Makefile.am 2006-07-11 14:09:17.000000000 +0200
-+++ codeblocks-devel/src/plugins/autosave/Makefile.am 2006-07-23 09:42:45.000000000 +0200
-@@ -2,7 +2,7 @@
- -I$(top_srcdir)/src/sdk \
- -I$(top_srcdir)/src/sdk/wxscintilla/include
-
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
-
- lib_LTLIBRARIES = libautosave.la
-
-diff -Nru --exclude .svn codeblocks/src/plugins/classwizard/Makefile.am codeblocks-devel/src/plugins/classwizard/Makefile.am
---- codeblocks/src/plugins/classwizard/Makefile.am 2006-07-11 14:09:17.000000000 +0200
-+++ codeblocks-devel/src/plugins/classwizard/Makefile.am 2006-07-23 09:42:59.000000000 +0200
-@@ -4,7 +4,7 @@
- -I$(top_srcdir)/src/sdk \
- -I$(top_srcdir)/src/sdk/wxscintilla/include
-
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
-
- lib_LTLIBRARIES = libclasswizard.la
-
-diff -Nru --exclude .svn codeblocks/src/plugins/codecompletion/Makefile.am codeblocks-devel/src/plugins/codecompletion/Makefile.am
---- codeblocks/src/plugins/codecompletion/Makefile.am 2006-07-11 14:09:17.000000000 +0200
-+++ codeblocks-devel/src/plugins/codecompletion/Makefile.am 2006-07-23 09:43:20.000000000 +0200
-@@ -4,7 +4,7 @@
- -I$(top_srcdir)/src/sdk \
- -I$(top_srcdir)/src/sdk/wxscintilla/include
-
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
-
- lib_LTLIBRARIES = libcodecompletion.la
-
-diff -Nru --exclude .svn codeblocks/src/plugins/compilergcc/Makefile.am codeblocks-devel/src/plugins/compilergcc/Makefile.am
---- codeblocks/src/plugins/compilergcc/Makefile.am 2006-07-14 14:02:10.000000000 +0200
-+++ codeblocks-devel/src/plugins/compilergcc/Makefile.am 2006-07-23 09:43:33.000000000 +0200
-@@ -9,7 +9,7 @@
-
- AM_CXXFLAGS = -DDEPSLIB_UNIX
-
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
-
- lib_LTLIBRARIES = libcompiler.la
-
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/byogames/Makefile.am codeblocks-devel/src/plugins/contrib/byogames/Makefile.am
---- codeblocks/src/plugins/contrib/byogames/Makefile.am 2006-07-11 14:09:16.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/byogames/Makefile.am 2006-07-23 09:44:44.000000000 +0200
-@@ -2,7 +2,7 @@
- -I$(top_srcdir)/src/sdk \
- -I$(top_srcdir)/src/sdk/wxscintilla/include
-
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
-
- lib_LTLIBRARIES = libbyogames.la
-
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/cb_koders/Makefile.am codeblocks-devel/src/plugins/contrib/cb_koders/Makefile.am
---- codeblocks/src/plugins/contrib/cb_koders/Makefile.am 2006-07-11 14:09:16.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/cb_koders/Makefile.am 2006-07-23 09:44:55.000000000 +0200
-@@ -4,7 +4,7 @@
- -I$(top_srcdir)/src/sdk \
- -I$(top_srcdir)/src/sdk/wxscintilla/include
-
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
-
- lib_LTLIBRARIES = libcb_koders.la
-
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/codesnippets/Makefile.am codeblocks-devel/src/plugins/contrib/codesnippets/Makefile.am
---- codeblocks/src/plugins/contrib/codesnippets/Makefile.am 2006-07-11 14:09:16.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/codesnippets/Makefile.am 2006-07-23 09:44:44.000000000 +0200
-@@ -2,7 +2,7 @@
- -I$(top_srcdir)/src/sdk \
- -I$(top_srcdir)/src/sdk/wxscintilla/include
-
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
-
- lib_LTLIBRARIES = libcodesnippets.la
-
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/codestat/Makefile.am codeblocks-devel/src/plugins/contrib/codestat/Makefile.am
---- codeblocks/src/plugins/contrib/codestat/Makefile.am 2006-07-11 14:09:16.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/codestat/Makefile.am 2006-07-23 09:44:55.000000000 +0200
-@@ -4,7 +4,7 @@
- -I$(top_srcdir)/src/sdk \
- -I$(top_srcdir)/src/sdk/wxscintilla/include
-
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
-
- lib_LTLIBRARIES = libcodestat.la
-
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/dragscroll/Makefile.am codeblocks-devel/src/plugins/contrib/dragscroll/Makefile.am
---- codeblocks/src/plugins/contrib/dragscroll/Makefile.am 2006-07-11 14:09:17.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/dragscroll/Makefile.am 2006-07-23 09:45:14.000000000 +0200
-@@ -2,7 +2,7 @@
- -I$(top_srcdir)/src/sdk \
- -I$(top_srcdir)/src/sdk/wxscintilla/include
-
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
-
- lib_LTLIBRARIES = libdragscroll.la
-
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/envvars/Makefile.am codeblocks-devel/src/plugins/contrib/envvars/Makefile.am
---- codeblocks/src/plugins/contrib/envvars/Makefile.am 2006-07-11 14:09:16.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/envvars/Makefile.am 2006-07-23 09:45:25.000000000 +0200
-@@ -2,7 +2,7 @@
- -I$(top_srcdir)/src/sdk \
- -I$(top_srcdir)/src/sdk/wxscintilla/include
-
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
- pkgdata_DATA = envvars.zip
-
- lib_LTLIBRARIES = libenvvars.la
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/help_plugin/Makefile.am codeblocks-devel/src/plugins/contrib/help_plugin/Makefile.am
---- codeblocks/src/plugins/contrib/help_plugin/Makefile.am 2006-07-11 14:09:16.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/help_plugin/Makefile.am 2006-07-23 09:45:35.000000000 +0200
-@@ -3,7 +3,7 @@
- -I$(top_srcdir)/src/sdk/wxscintilla/include \
- -include "sdk.h"
-
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
-
- lib_LTLIBRARIES = libhelp_plugin.la
-
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/keybinder/Makefile.am codeblocks-devel/src/plugins/contrib/keybinder/Makefile.am
---- codeblocks/src/plugins/contrib/keybinder/Makefile.am 2006-07-11 14:09:17.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/keybinder/Makefile.am 2006-07-23 09:45:43.000000000 +0200
-@@ -2,7 +2,7 @@
- -I$(top_srcdir)/src/sdk \
- -I$(top_srcdir)/src/sdk/wxscintilla/include
-
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
-
- lib_LTLIBRARIES = libkeybinder.la
-
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/profiler/Makefile.am codeblocks-devel/src/plugins/contrib/profiler/Makefile.am
---- codeblocks/src/plugins/contrib/profiler/Makefile.am 2006-07-11 14:09:05.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/profiler/Makefile.am 2006-07-23 09:45:55.000000000 +0200
-@@ -4,7 +4,7 @@
- -I$(top_srcdir)/src/sdk \
- -I$(top_srcdir)/src/sdk/wxscintilla/include
-
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
-
- lib_LTLIBRARIES = libprofiler.la
-
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/source_exporter/Makefile.am codeblocks-devel/src/plugins/contrib/source_exporter/Makefile.am
---- codeblocks/src/plugins/contrib/source_exporter/Makefile.am 2006-07-11 14:09:17.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/source_exporter/Makefile.am 2006-07-23 09:46:06.000000000 +0200
-@@ -6,7 +6,7 @@
- -I$(top_srcdir)/src/plugins/contrib/source_exporter/wxPdfDocument/include \
- -include "sdk.h"
-
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
-
- lib_LTLIBRARIES = libexporter.la
-
-diff -Nru --exclude .svn codeblocks/src/plugins/contrib/wxSmith/Makefile.am codeblocks-devel/src/plugins/contrib/wxSmith/Makefile.am
---- codeblocks/src/plugins/contrib/wxSmith/Makefile.am 2006-07-14 14:02:10.000000000 +0200
-+++ codeblocks-devel/src/plugins/contrib/wxSmith/Makefile.am 2006-07-23 09:46:17.000000000 +0200
-@@ -11,7 +11,7 @@
- -I$(top_srcdir)/src/sdk/wxscintilla/include \
- -I$(top_srcdir)/src/sdk/propgrid/include
-
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
-
- lib_LTLIBRARIES = libwxsmith.la
-
-diff -Nru --exclude .svn codeblocks/src/plugins/debuggergdb/Makefile.am codeblocks-devel/src/plugins/debuggergdb/Makefile.am
---- codeblocks/src/plugins/debuggergdb/Makefile.am 2006-07-11 14:09:17.000000000 +0200
-+++ codeblocks-devel/src/plugins/debuggergdb/Makefile.am 2006-07-23 09:43:50.000000000 +0200
-@@ -6,7 +6,7 @@
- -I$(top_srcdir)/src/sdk/scripting/include \
- -I$(top_srcdir)/src/sdk/scripting/sqplus
-
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
-
- lib_LTLIBRARIES = libdebuggergdb.la
-
-diff -Nru --exclude .svn codeblocks/src/plugins/defaultmimehandler/Makefile.am codeblocks-devel/src/plugins/defaultmimehandler/Makefile.am
---- codeblocks/src/plugins/defaultmimehandler/Makefile.am 2006-07-11 14:09:18.000000000 +0200
-+++ codeblocks-devel/src/plugins/defaultmimehandler/Makefile.am 2006-07-23 09:44:03.000000000 +0200
-@@ -4,7 +4,7 @@
- -I$(top_srcdir)/src/sdk \
- -I$(top_srcdir)/src/sdk/wxscintilla/include
-
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
-
- lib_LTLIBRARIES = libdefaultmimehandler.la
-
-diff -Nru --exclude .svn codeblocks/src/plugins/scriptedwizard/Makefile.am codeblocks-devel/src/plugins/scriptedwizard/Makefile.am
---- codeblocks/src/plugins/scriptedwizard/Makefile.am 2006-07-14 14:02:13.000000000 +0200
-+++ codeblocks-devel/src/plugins/scriptedwizard/Makefile.am 2006-07-23 09:44:14.000000000 +0200
-@@ -6,7 +6,7 @@
- -I$(top_srcdir)/src/sdk/scripting/include \
- -I$(top_srcdir)/src/sdk/scripting/sqplus
-
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
-
- lib_LTLIBRARIES = libscriptedwizard.la
-
-diff -Nru --exclude .svn codeblocks/src/plugins/todo/Makefile.am codeblocks-devel/src/plugins/todo/Makefile.am
---- codeblocks/src/plugins/todo/Makefile.am 2006-07-11 14:09:17.000000000 +0200
-+++ codeblocks-devel/src/plugins/todo/Makefile.am 2006-07-23 09:44:23.000000000 +0200
-@@ -4,7 +4,7 @@
- -I$(top_srcdir)/src/sdk \
- -I$(top_srcdir)/src/sdk/wxscintilla/include
-
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
-
- lib_LTLIBRARIES = libtodo.la
-
-diff -Nru --exclude .svn codeblocks/src/plugins/xpmanifest/Makefile.am codeblocks-devel/src/plugins/xpmanifest/Makefile.am
---- codeblocks/src/plugins/xpmanifest/Makefile.am 2006-07-11 14:09:18.000000000 +0200
-+++ codeblocks-devel/src/plugins/xpmanifest/Makefile.am 2006-07-23 09:44:33.000000000 +0200
-@@ -2,7 +2,7 @@
- -I$(top_srcdir)/src/sdk \
- -I$(top_srcdir)/src/sdk/wxscintilla/include
-
--libdir = $(pkgdatadir)/plugins
-+libdir = @libdir@/@PACKAGE@/plugins
-
- lib_LTLIBRARIES = libxpmanifest.la
-
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
Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/codeblocks.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- codeblocks.spec 13 Sep 2006 20:21:13 -0000 1.1
+++ codeblocks.spec 8 Oct 2006 09:18:38 -0000 1.2
@@ -1,9 +1,9 @@
-%define rev 2965
-%define date 20060909
+%define rev 3030
+%define date 20061007
Name: codeblocks
Version: 1.0
-Release: 0.9.%{date}svn%{rev}%{?dist}
+Release: 0.10.%{date}svn%{rev}%{?dist}
Summary: An open source, cross platform, free C++ IDE
Group: Development/Tools
License: GPL
@@ -62,6 +62,17 @@
find . -type f -and -not -name "*.cpp" -and -not -name "*.h" -and -not -name "*.png" -and -not -name "*.bmp" -and -not -name "*.c" -and -not -name "*.cxx" -and -not -name "*.ico" | sed "s/.*/\"\\0\"/" | xargs dos2unix &> /dev/null
chmod a+x bootstrap src/update
+# fix the dir, where plugins are installed
+for p in astyle autosave classwizard codecompletion compilergcc debuggergdb defaultmimehandler scriptedwizard todo xpmanifest
+do
+ sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/$p/Makefile.am
+done
+
+for p in byogames cb_koders codesnippets codestat dragscroll envvars help_plugin keybinder profiler source_exporter wxSmith
+do
+ sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/contrib/$p/Makefile.am
+done
+
echo "m4_define([SVN_REVISION], trunk-r%{rev})" > revision.m4
./bootstrap
@@ -138,7 +149,7 @@
%{plugindir}/libclasswizard.so
%{plugindir}/libcodecompletion.so
%{plugindir}/libcompiler.so
-%{plugindir}/libdebuggergdb.so
+%{plugindir}/libdebugger.so
%{plugindir}/libdefaultmimehandler.so
%{plugindir}/libscriptedwizard.so
%{plugindir}/libtodo.so
@@ -161,13 +172,14 @@
%{pkgdatadir}/templates/*
%{pkgdatadir}/astyle.zip
%{pkgdatadir}/autosave.zip
-%{pkgdatadir}/class_wizard.zip
-%{pkgdatadir}/code_completion.zip
-%{pkgdatadir}/compiler_gcc.zip
-%{pkgdatadir}/debugger_gdb.zip
+%{pkgdatadir}/classwizard.zip
+%{pkgdatadir}/codecompletion.zip
+%{pkgdatadir}/compiler.zip
+%{pkgdatadir}/debugger.zip
%{pkgdatadir}/defaultmimehandler.zip
%{pkgdatadir}/manager_resources.zip
%{pkgdatadir}/resources.zip
+%{pkgdatadir}/scriptedwizard.zip
%{pkgdatadir}/start_here.zip
%{pkgdatadir}/todo.zip
%{pkgdatadir}/tips.txt
@@ -180,10 +192,16 @@
%files contrib
%defattr(-,root,root)
+%{pkgdatadir}/byogames.zip
+%{pkgdatadir}/cb_koders.zip
+%{pkgdatadir}/codesnippets.zip
%{pkgdatadir}/codestat.zip
+%{pkgdatadir}/dragscroll.zip
%{pkgdatadir}/envvars.zip
+%{pkgdatadir}/exporter.zip
%{pkgdatadir}/help_plugin.zip
-%{pkgdatadir}/profiler.zip
+%{pkgdatadir}/keybinder.zip
+%{pkgdatadir}/CBProfiler.zip
%{pkgdatadir}/wxsmith.zip
%{pkgdatadir}/images/codesnippets
%{pkgdatadir}/images/wxsmith
@@ -202,6 +220,10 @@
%changelog
+* Sun Oct 8 2006 Dan Horak <dan[at]danny.cz> 1.0-0.10.20061007svn3030
+- update to revision 3030
+- change the install paths for plugins in the spec file
+
* Wed Sep 13 2006 Dan Horak <dan[at]danny.cz> 1.0-0.9.20060909svn2965
- do not require .svn directories for building
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 13 Sep 2006 20:21:13 -0000 1.2
+++ sources 8 Oct 2006 09:18:38 -0000 1.3
@@ -1 +1 @@
-3d5cadadd3b22098966213dc21ff1515 codeblocks-svn2965.tar.bz2
+5622cdb4e744ac9279a8092a15c273e5 codeblocks-svn3030.tar.bz2
More information about the scm-commits
mailing list