rpms/codeblocks/FC-6 codeblocks-wx28-wizard.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 codeblocks-autorev.patch, 1.2, 1.3 codeblocks.spec, 1.13, 1.14 sources, 1.13, 1.14

[Dan Horak (sharkcz)]

Author: sharkcz

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

Modified Files:
	.cvsignore codeblocks-autorev.patch codeblocks.spec sources 
Added Files:
	codeblocks-wx28-wizard.patch 
Log Message:
 - update the autorev.patch
 - update to revision 3592
 - added patch for New Project wizard with wxGTK 2.8 (#225058)
 - created -libs subpackage to make package multilib-aware (#228356)


codeblocks-wx28-wizard.patch:

--- NEW FILE codeblocks-wx28-wizard.patch ---
Index: src/plugins/scriptedwizard/wiz.cpp
===================================================================
--- src/plugins/scriptedwizard/wiz.cpp	(revision 3562)
+++ src/plugins/scriptedwizard/wiz.cpp	(working copy)
@@ -1001,8 +1001,12 @@
         wxWizardPageSimple::Chain(m_Pages[i - 1], m_Pages[i]);
 
     // allow the wizard to size itself around the pages
+#if wxCHECK_VERSION(2, 8, 0)
+    m_pWizard->GetPageAreaSizer()->Add(m_Pages[0]);
+#else
     for (size_t i = 1; i < m_Pages.GetCount(); ++i)
         m_pWizard->GetPageAreaSizer()->Add(m_Pages[i]);
+#endif
 
     m_pWizard->Fit();
 }


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	26 Jan 2007 13:29:37 -0000	1.13
+++ .cvsignore	13 Feb 2007 16:01:49 -0000	1.14
@@ -1 +1 @@
-codeblocks-svn3540.tar.bz2
+codeblocks-svn3592.tar.bz2

codeblocks-autorev.patch:

Index: codeblocks-autorev.patch
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/codeblocks-autorev.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- codeblocks-autorev.patch	30 Oct 2006 08:39:39 -0000	1.2
+++ codeblocks-autorev.patch	13 Feb 2007 16:01:49 -0000	1.3
@@ -1,19 +1,21 @@
---- bootstrap.orig	2006-09-13 18:01:54.000000000 +0200
-+++ bootstrap	2006-09-13 18:02:04.000000000 +0200
-@@ -8,13 +8,6 @@
- #  - automake 1.7+
+--- bootstrap	(revision 3562)
++++ bootstrap	(working copy)
+@@ -6,15 +6,6 @@
+ #  - automake 1.7+, 1.9+ for make dist
  #  - libtool 1.4+
  
 -# Touch revision.m4
 -if [ -f ./update_revision.sh ]; then
 -	./update_revision.sh;
 -elif [ ! -f ./revision.m4 ]; then
--	echo "m4_define([SVN_REVISION], trunk-r0)" > ./revision.m4;
+-	echo "m4_define([SVN_REV], 0)" > ./revision.m4;
+-	echo "m4_define([SVN_REVISION], trunk-r0)" >> ./revision.m4;
+-	echo "m4_define([SVN_DATE], )" >> ./revision.m4;
 -fi
 -
  # Deal with some gentoo-specific issues
- export WANT_AUTOMAKE='1.7'
- export WANT_AUTOCONF='2.5'
+ WANT_AUTOMAKE='1.9 1.8 1.7' #latest of these is chosen or default if none hits
+ export WANT_AUTOMAKE
 --- src/Makefile.am.orig	2006-10-15 10:11:04.000000000 +0200
 +++ src/Makefile.am	2006-10-15 10:11:09.000000000 +0200
 @@ -1,4 +1,4 @@


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/codeblocks.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- codeblocks.spec	26 Jan 2007 13:42:24 -0000	1.13
+++ codeblocks.spec	13 Feb 2007 16:01:49 -0000	1.14
@@ -1,9 +1,9 @@
-%define		rev	3540
-%define		date	20070125
+%define		rev	3592
+%define		date	20070211
 
 Name:		codeblocks
 Version:	1.0
-Release:	0.21.%{date}svn%{rev}%{?dist}
+Release:	0.23.%{date}svn%{rev}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPL
@@ -15,12 +15,14 @@
 BuildRequires:	dos2unix
 BuildRequires:	autoconf, automake, libtool
 BuildRequires:	desktop-file-utils
+Requires:	%{name}-libs = %{version}-%{release}
 Requires:	shared-mime-info
 Patch1:		codeblocks-plugins.patch
 Patch2:		codeblocks-desktop.patch
 Patch3:		codeblocks-autorev.patch
 Patch100:	codeblocks-wx28-listbook.patch
 Patch101:	codeblocks-wx28-wxsmith.patch
+Patch102:	codeblocks-wx28-wizard.patch
 Source100:	codeblocks-getsvn
 
 %description
@@ -30,10 +32,17 @@
 extended with plugin DLLs. It includes a plugin wizard, so you can compile
 your own plugins.
 
+%package libs
+Summary:	Libraries needed to run Code::Blocks and its plugins
+Group:		System Environment/Libraries
+
+%description libs
+Libraries needed to run Code::Blocks and its plugins.
+
 %package devel
 Summary:	Files needed to build Code::Blocks plugins
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-libs = %{version}-%{release}
 Requires:	pkgconfig
 
 %description devel
@@ -60,6 +69,7 @@
 %patch3
 %patch100
 %patch101
+%patch102
 
 %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
@@ -79,7 +89,8 @@
 sed -i 's|@libdir@|%{_libdir}|' src/sdk/configmanager.cpp
 
 # generate revision.m4
-echo "m4_define([SVN_REVISION], trunk-r%{rev})" > revision.m4
+echo "m4_define([SVN_REV], %{rev})" > revision.m4
+echo "m4_define([SVN_REVISION], trunk-r%{rev})" >> revision.m4
 
 ./bootstrap
 
@@ -134,19 +145,20 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/ldconfig
 update-mime-database /usr/share/mime &> /dev/null || :
 
 %postun
-/sbin/ldconfig
 update-mime-database /usr/share/mime &> /dev/null || :
 
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
 %files
 %defattr(-,root,root)
 %doc README COPYING AUTHORS BUGS COMPILERS NEWS ChangeLog
 
 %{_bindir}/*
-%{_libdir}/*.so.*
 %{_mandir}/man1/*.gz
 
 %dir %{pkglibdir}
@@ -192,6 +204,10 @@
 %{pkgdatadir}/todo.zip
 %{pkgdatadir}/tips.txt
 
+%files libs
+%defattr(-,root,root)
+%{_libdir}/*.so.*
+
 %files devel
 %defattr(-,root,root)
 %{_includedir}/%{name}
@@ -234,6 +250,14 @@
 
 
 %changelog
+* Tue Feb 13 2007 Dan Horak <dan[at]danny.cz> 1.0-0.23.20070211svn3592
+- update the autorev.patch
+
+* Tue Feb 13 2007 Dan Horak <dan[at]danny.cz> 1.0-0.22.20070211svn3592
+- update to revision 3592
+- added patch for New Project wizard with wxGTK 2.8 (#225058)
+- created -libs subpackage to make package multilib-aware (#228356)
+
 * Fri Jan 26 2007 Dan Horak <dan[at]danny.cz> 1.0-0.21.20070125svn3540
 - update the listbook.patch
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	26 Jan 2007 13:29:37 -0000	1.13
+++ sources	13 Feb 2007 16:01:49 -0000	1.14
@@ -1 +1 @@
-cd2382b6c0f932f5d46f03c935979504  codeblocks-svn3540.tar.bz2
+7c3e8b377cb4df9817b55a609e853a0c  codeblocks-svn3592.tar.bz2