rpms/codeblocks/EL-5 .cvsignore, 1.18, 1.19 codeblocks.spec, 1.19, 1.20 sources, 1.18, 1.19 codeblocks-autorev.patch, 1.4, NONE codeblocks-getsvn, 1.1, NONE

[Dan Horak (sharkcz)]

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14820

Modified Files:
	.cvsignore codeblocks.spec sources 
Removed Files:
	codeblocks-autorev.patch codeblocks-getsvn 
Log Message:
* Sun Mar  2 2008 Dan Horak <dan[at]danny.cz> 8.02-1
- update to stable release 8.02
- update BR to use system libraries



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/EL-5/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	11 Dec 2007 18:28:13 -0000	1.18
+++ .cvsignore	15 Mar 2008 16:41:28 -0000	1.19
@@ -1 +1 @@
-codeblocks-svn4719.tar.bz2
+codeblocks-8.02-src.tar.bz2


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/EL-5/codeblocks.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- codeblocks.spec	11 Dec 2007 18:28:13 -0000	1.19
+++ codeblocks.spec	15 Mar 2008 16:41:28 -0000	1.20
@@ -1,26 +1,20 @@
-%define		rev	4719
-%define		date	20071210
-
 Name:		codeblocks
-Version:	1.0
-Release:	0.28.%{date}svn%{rev}%{?dist}
+Version:	8.02
+Release:	1%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
-License:	GPLv2+
+License:	GPLv3+
 URL:		http://www.codeblocks.org/
-Source:		%{name}-svn%{rev}.tar.bz2
+Source:		http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	wxGTK-devel >= 2.8.0
+BuildRequires:	wxGTK-devel >= 2.8.0, zlib-devel, bzip2-devel
 BuildRequires:	zip
 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
-Source100:	codeblocks-getsvn
 
 %description
 Code::Blocks is a free C++ IDE built specifically to meet the most demanding
@@ -48,6 +42,7 @@
 %package contrib-libs
 Summary:	Libraries needed to run Code::Blocks contrib plugins
 Group:		System Environment/Libraries
+Obsoletes:	%{name}-contrib < 1.0-0.28.20071210svn4719
 
 %description contrib-libs
 Libraries needed to run Code::Blocks contrib plugins.
@@ -68,10 +63,9 @@
 
 
 %prep
-%setup -q -n %{name}
+%setup -q
 %patch1
 %patch2 -p1
-%patch3
 
 # convert EOLs
 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 --keepdate &> /dev/null
@@ -79,15 +73,15 @@
 # fix the dir, where plugins are installed
 for p in astyle autosave classwizard codecompletion compilergcc debuggergdb defaultmimehandler openfileslist projectsimporter scriptedwizard todo xpmanifest
 do
-	sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/$p/Makefile.am
+	sed -i 's|$(pkgdatadir)/plugins|@libdir@/@PACKAGE@/plugins|' src/plugins/$p/Makefile.*
 done
 
-for p in AutoVersioning byogames cb_koders codesnippets codestat dragscroll envvars help_plugin keybinder lib_finder profiler regex_testbed source_exporter symtab wxSmith wxSmithContribItems
+for p in AutoVersioning BrowseTracker ThreadSearch 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
+	sed -i 's|$(pkgdatadir)/plugins|@libdir@/@PACKAGE@/plugins|' src/plugins/contrib/$p/Makefile.*
 done
 
-sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/contrib/wxSmith/plugin/Makefile.am
+sed -i 's|$(pkgdatadir)/plugins|@libdir@/@PACKAGE@/plugins|' src/plugins/contrib/wxSmith/plugin/Makefile.*
 
 sed -i 's|@libdir@|%{_libdir}|' src/sdk/configmanager.cpp
 
@@ -95,15 +89,11 @@
 find src/plugins/contrib/regex_testbed -type f -exec chmod a-x {} ';'
 find src/plugins/compilergcc -type f -exec chmod a-x {} ';'
 
-# generate revision.m4
-echo "m4_define([SVN_REV], %{rev})" > revision.m4
-echo "m4_define([SVN_REVISION], 1.0svn%{rev})" >> revision.m4
-echo "m4_define([SVN_DATE], %{date})" >> revision.m4
+# fix version inside the configure script
+sed -i 's/1\.0svn/%{version}/g' configure
 
 
 %build
-./bootstrap
-
 %configure --with-contrib-plugins=all
 
 # Don't use rpath!
@@ -220,6 +210,8 @@
 %files contrib
 %defattr(-,root,root)
 %{pkgdatadir}/AutoVersioning.zip
+%{pkgdatadir}/BrowseTracker.zip
+%{pkgdatadir}/ThreadSearch.zip
 %{pkgdatadir}/byogames.zip
 %{pkgdatadir}/cb_koders.zip
 %{pkgdatadir}/codesnippets.zip
@@ -235,10 +227,14 @@
 %{pkgdatadir}/SymTab.zip
 %{pkgdatadir}/wxsmith.zip
 %{pkgdatadir}/wxsmithcontribitems.zip
+%{pkgdatadir}/images/ThreadSearch
 %{pkgdatadir}/images/codesnippets
 %{pkgdatadir}/images/wxsmith
+%{pkgdatadir}/lib_finder
 
 %{plugindir}/libAutoVersioning.so
+%{plugindir}/libBrowseTracker.so
+%{plugindir}/libThreadSearch.so
 %{plugindir}/libbyogames.so
 %{plugindir}/libcb_koders.so
 %{plugindir}/libcodesnippets.so
@@ -257,6 +253,17 @@
 
 
 %changelog
+* Sun Mar  2 2008 Dan Horak <dan[at]danny.cz> 8.02-1
+- update to stable release 8.02
+- update BR to use system libraries
+
+* Mon Feb 18 2008 Dan Horak <dan[at]danny.cz> 1.0-0.30.20080211svn4872
+- update to revision 4872
+- really fix the multilib problem with the contrib subpackage (#433124)
+
+* Sun Feb 10 2008 Dan Horak <dan[at]danny.cz> 1.0-0.29.20080209svn4868
+- update to revision 4868
+
 * Tue Dec 11 2007 Dan Horak <dan[at]danny.cz> 1.0-0.28.20071210svn4719
 - update to revision 4719
 - fix multiarch problem with contrib subpackage (#340911)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/EL-5/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	11 Dec 2007 18:28:13 -0000	1.18
+++ sources	15 Mar 2008 16:41:28 -0000	1.19
@@ -1 +1 @@
-3fb0bc53b3682a36f0783f4506ef8f1e  codeblocks-svn4719.tar.bz2
+ac15b4b3de50d7650c2f7a8dbcb30f88  codeblocks-8.02-src.tar.bz2


--- codeblocks-autorev.patch DELETED ---


--- codeblocks-getsvn DELETED ---