rpms/codeblocks/devel codeblocks-infopane.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 codeblocks.spec, 1.19, 1.20 sources, 1.16, 1.17
Dan Horak (sharkcz)
fedora-extras-commits at redhat.com
Thu Aug 30 17:29:08 UTC 2007
Author: sharkcz
Update of /cvs/extras/rpms/codeblocks/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19426
Modified Files:
.cvsignore codeblocks.spec sources
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: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore 20 Jul 2007 17:26:38 -0000 1.16
+++ .cvsignore 30 Aug 2007 17:28:35 -0000 1.17
@@ -1 +1 @@
-codeblocks-svn4280.tar.bz2
+codeblocks-svn4413.tar.bz2
Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/codeblocks.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- codeblocks.spec 29 Aug 2007 19:06:23 -0000 1.19
+++ codeblocks.spec 30 Aug 2007 17:28:35 -0000 1.20
@@ -1,9 +1,9 @@
-%define rev 4280
-%define date 20070718
+%define rev 4413
+%define date 20070828
Name: codeblocks
Version: 1.0
-Release: 0.26.%{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,8 +242,12 @@
%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.
+- 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
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources 20 Jul 2007 17:26:38 -0000 1.16
+++ sources 30 Aug 2007 17:28:35 -0000 1.17
@@ -1 +1 @@
-cd91a877e05cc7e5de22f7cddff0087e codeblocks-svn4280.tar.bz2
+a833b807c163cb0d0eaddf8fc6f957ce codeblocks-svn4413.tar.bz2
More information about the scm-commits
mailing list