rpms/codeblocks/FC-6 .cvsignore, 1.15, 1.16 codeblocks.spec, 1.15, 1.16 sources, 1.15, 1.16 codeblocks-wx28-centre.patch, 1.1, NONE codeblocks-wx28-listbook.patch, 1.2, NONE codeblocks-wx28-wizard.patch, 1.2, NONE codeblocks-wx28-wxsmith.patch, 1.2, NONE

[Dan Horak (sharkcz)]

Author: sharkcz

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

Modified Files:
	.cvsignore codeblocks.spec sources 
Removed Files:
	codeblocks-wx28-centre.patch codeblocks-wx28-listbook.patch 
	codeblocks-wx28-wizard.patch codeblocks-wx28-wxsmith.patch 
Log Message:
 - update to revision 4280
 - added missing ldconfig call for the contrib subpackage
 - fix permissions for source files



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	8 Apr 2007 16:12:40 -0000	1.15
+++ .cvsignore	20 Jul 2007 19:39:02 -0000	1.16
@@ -1 +1 @@
-codeblocks-svn3816.tar.bz2
+codeblocks-svn4280.tar.bz2


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/codeblocks.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- codeblocks.spec	8 Apr 2007 16:12:40 -0000	1.15
+++ codeblocks.spec	20 Jul 2007 19:39:02 -0000	1.16
@@ -1,9 +1,9 @@
-%define		rev	3816
-%define		date	20070406
+%define		rev	4280
+%define		date	20070718
 
 Name:		codeblocks
 Version:	1.0
-Release:	0.24.%{date}svn%{rev}%{?dist}
+Release:	0.25.%{date}svn%{rev}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPL
@@ -20,10 +20,6 @@
 Patch1:		codeblocks-plugins.patch
 Patch2:		codeblocks-desktop.patch
 Patch3:		codeblocks-autorev.patch
-Patch100:	codeblocks-wx28-listbook.patch
-Patch101:	codeblocks-wx28-centre.patch
-Patch102:	codeblocks-wx28-wizard.patch
-Patch103:	codeblocks-wx28-wxsmith.patch
 Source100:	codeblocks-getsvn
 
 %description
@@ -68,28 +64,29 @@
 %patch1
 %patch2 -p1
 %patch3
-%patch100
-%patch101
-%patch102
-%patch103
 
 %build
 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
+for p in astyle autosave classwizard codecompletion compilergcc debuggergdb defaultmimehandler projectsimporter 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 lib_finder profiler regex_testbed source_exporter symtab wxSmith
+for p in byogames cb_koders codesnippets codestat dragscroll envvars help_plugin keybinder lib_finder profiler regex_testbed source_exporter symtab wxSmith wxSmithContribItems
 do
 	sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/contrib/$p/Makefile.am
 done
 
+sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/contrib/wxSmith/plugin/Makefile.am
+
 sed -i 's|@libdir@|%{_libdir}|' src/sdk/configmanager.cpp
 
+# remove execute bits from source files
+find src/plugins/contrib/regex_testbed -type f -exec chmod a-x {} ';'
+
 # generate revision.m4
 echo "m4_define([SVN_REV], %{rev})" > revision.m4
 echo "m4_define([SVN_REVISION], trunk-r%{rev})" >> revision.m4
@@ -105,9 +102,9 @@
 
 #include <wx/string.h>
 
-#define SVN_REVISION "%{rev}"
+#define SVN_REVISION	"%{rev}"
 
-#define SVN_DATE     "%{date}"
+#define SVN_DATE	"%{date}"
 
 namespace autorevision
 {
@@ -121,7 +118,7 @@
 
 EOF
 
-%configure --enable-contrib
+%configure --with-contrib-plugins=all
 
 # Don't use rpath!
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -156,6 +153,10 @@
 
 %postun libs -p /sbin/ldconfig
 
+%post contrib -p /sbin/ldconfig
+
+%postun contrib -p /sbin/ldconfig
+
 %files
 %defattr(-,root,root)
 %doc README COPYING AUTHORS BUGS COMPILERS NEWS ChangeLog
@@ -172,6 +173,7 @@
 %{plugindir}/libcompiler.so
 %{plugindir}/libdebugger.so
 %{plugindir}/libdefaultmimehandler.so
+%{plugindir}/libprojectsimporter.so
 %{plugindir}/libscriptedwizard.so
 %{plugindir}/libtodo.so
 
@@ -198,6 +200,7 @@
 %{pkgdatadir}/debugger.zip
 %{pkgdatadir}/defaultmimehandler.zip
 %{pkgdatadir}/manager_resources.zip
+%{pkgdatadir}/projectsimporter.zip
 %{pkgdatadir}/resources.zip
 %{pkgdatadir}/scriptedwizard.zip
 %{pkgdatadir}/start_here.zip
@@ -206,16 +209,19 @@
 
 %files libs
 %defattr(-,root,root)
-%{_libdir}/*.so.*
+%{_libdir}/lib%{name}.so.*
 
 %files devel
 %defattr(-,root,root)
 %{_includedir}/%{name}
-%{_libdir}/*.so
+%{_libdir}/lib%{name}.so
 %{_libdir}/pkgconfig/%{name}.pc
 
 %files contrib
 %defattr(-,root,root)
+%{_libdir}/libwxsmithlib.so.*
+%exclude %{_libdir}/libwxsmithlib.so
+
 %{pkgdatadir}/byogames.zip
 %{pkgdatadir}/cb_koders.zip
 %{pkgdatadir}/codesnippets.zip
@@ -230,6 +236,7 @@
 %{pkgdatadir}/RegExTestbed.zip
 %{pkgdatadir}/SymTab.zip
 %{pkgdatadir}/wxsmith.zip
+%{pkgdatadir}/wxsmithcontribitems.zip
 %{pkgdatadir}/images/codesnippets
 %{pkgdatadir}/images/wxsmith
 
@@ -247,9 +254,15 @@
 %{plugindir}/libRegExTestbed.so
 %{plugindir}/libSymTab.so
 %{plugindir}/libwxsmith.so
+%{plugindir}/libwxsmithcontribitems.so
 
 
 %changelog
+* Thu Jul 19 2007 Dan Horak <dan[at]danny.cz> 1.0-0.25.20070718svn4280
+- update to revision 4280
+- added missing ldconfig call for the contrib subpackage
+- fix permissions for source files
+
 * Sat Apr  7 2007 Dan Horak <dan[at]danny.cz> 1.0-0.24.20070406svn3816
 - update to revision 3816
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	8 Apr 2007 16:12:40 -0000	1.15
+++ sources	20 Jul 2007 19:39:02 -0000	1.16
@@ -1 +1 @@
-2c9f245d2c91034028c9e52930e00be9  codeblocks-svn3816.tar.bz2
+cd91a877e05cc7e5de22f7cddff0087e  codeblocks-svn4280.tar.bz2


--- codeblocks-wx28-centre.patch DELETED ---


--- codeblocks-wx28-listbook.patch DELETED ---


--- codeblocks-wx28-wizard.patch DELETED ---


--- codeblocks-wx28-wxsmith.patch DELETED ---