rpms/codeblocks/F-7 codeblocks-infopane.patch, NONE, 1.1 codeblocks.spec, 1.18, 1.19

[Dan Horak (sharkcz)]

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19713

Modified Files:
	codeblocks.spec 
Added Files:
	codeblocks-infopane.patch 
Log Message:
- update to revision 4413


codeblocks-infopane.patch:

--- NEW FILE codeblocks-infopane.patch ---
Index: src/src/main.cpp
===================================================================
--- src/src/main.cpp	(revision 4400)
+++ src/src/main.cpp	(working copy)
@@ -61,7 +61,6 @@
 #include <editorcolourset.h>
 #include <logmanager.h>
 
-#include "infopane.h"
 #include "dlgaboutplugin.h"
 #include "dlgabout.h"
 #include "startherepage.h"
Index: src/src/Makefile.am
===================================================================
--- src/src/Makefile.am	(revision 4400)
+++ src/src/Makefile.am	(working copy)
@@ -34,7 +34,6 @@
 			dlgabout.cpp \
 			dlgaboutplugin.cpp \
 			environmentsettingsdlg.cpp \
-			infopane.cpp \
 			ipc.cpp \
 			main.cpp \
 			prefix.cpp \
@@ -52,7 +51,6 @@
 			dlgabout.h \
 			dlgaboutplugin.h \
 			environmentsettingsdlg.h \
-			infopane.h \
 			ipc.h \
 			main.h \
 			prefix.h \


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/F-7/codeblocks.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- codeblocks.spec	10 Aug 2007 11:14:00 -0000	1.18
+++ codeblocks.spec	30 Aug 2007 17:33:05 -0000	1.19
@@ -1,9 +1,9 @@
-%define		rev	4280
-%define		date	20070718
+%define		rev	4413
+%define		date	20070828
 
 Name:		codeblocks
 Version:	1.0
-Release:	0.25.%{date}svn%{rev}%{?dist}
+Release:	0.27.%{date}svn%{rev}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPLv2+
@@ -20,6 +20,7 @@
 Patch1:		codeblocks-plugins.patch
 Patch2:		codeblocks-desktop.patch
 Patch3:		codeblocks-autorev.patch
+Patch100:	codeblocks-infopane.patch
 Source100:	codeblocks-getsvn
 
 %description
@@ -58,12 +59,14 @@
 %define		pkglibdir	%{_libdir}/%{name}
 %define		plugindir	%{pkglibdir}/plugins
 
-%prep
 
+%prep
 %setup -q -n codeblocks
 %patch1
 %patch2 -p1
 %patch3
+%patch100
+
 
 %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
@@ -89,34 +92,11 @@
 
 # generate revision.m4
 echo "m4_define([SVN_REV], %{rev})" > revision.m4
-echo "m4_define([SVN_REVISION], trunk-r%{rev})" >> revision.m4
+echo "m4_define([SVN_REVISION], 1.0svn%{rev})" >> revision.m4
+echo "m4_define([SVN_DATE], %{date})" >> revision.m4
 
 ./bootstrap
 
-# generate autorevision.h
-cat > src/sdk/autorevision.h << EOF
-/*%{rev}*/
-#ifndef AUTOREVISION_H
-#define AUTOREVISION_H
-
-
-#include <wx/string.h>
-
-#define SVN_REVISION	"%{rev}"
-
-#define SVN_DATE	"%{date}"
-
-namespace autorevision
-{
-	const unsigned int svn_revision = %{rev};
-	const wxString svnRevision(_T("%{rev}"));
-}
-
-
-
-#endif
-
-EOF
 
 %configure --with-contrib-plugins=all
 
@@ -126,6 +106,7 @@
 
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -140,9 +121,11 @@
 	--add-category X-Fedora \
 	src/setup/mime/codeblocks.desktop
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post
 update-mime-database /usr/share/mime &> /dev/null || :
 
@@ -157,6 +140,7 @@
 
 %postun contrib -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root)
 %doc README COPYING AUTHORS BUGS COMPILERS NEWS ChangeLog
@@ -258,6 +242,13 @@
 
 
 %changelog
+* Wed Aug 29 2007 Dan Horak <dan[at]danny.cz> 1.0-0.27.20070828svn4413
+- update to revision 4413
+- update the License tag
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.0-0.26.20070718svn4280
+- Rebuild for selinux ppc32 issue (F8).
+
 * 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