From 50df10d8725c9c0a27e4b25538f259f723904b77 Mon Sep 17 00:00:00 2001 From: Dan Horák Date: Mar 15 2008 16:41:28 +0000 Subject: - update to stable release 8.02 - update BR to use system libraries --- diff --git a/.cvsignore b/.cvsignore index 46a7773..12894d3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -codeblocks-svn4719.tar.bz2 +codeblocks-8.02-src.tar.bz2 diff --git a/codeblocks-autorev.patch b/codeblocks-autorev.patch deleted file mode 100644 index f4b1053..0000000 --- a/codeblocks-autorev.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- 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_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 - 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 2007-02-13 12:28:07.000000000 +0100 -+++ src/Makefile.am 2007-02-27 09:57:47.000000000 +0100 -@@ -1,4 +1,4 @@ --SUBDIRS = base build_tools include sdk src plugins tools setup templates scripts wxsmith -+SUBDIRS = base include sdk src plugins tools setup templates scripts wxsmith - - dist_pkgdata_DATA = tips.txt - diff --git a/codeblocks-getsvn b/codeblocks-getsvn deleted file mode 100755 index fb9e6cc..0000000 --- a/codeblocks-getsvn +++ /dev/null @@ -1,15 +0,0 @@ -#! /bin/sh - -if [ $# -ne 1 ]; -then - echo "Usage: $0 " - exit 1 -fi - -rev=$1 - -cd /tmp - -rm -rf codeblocks -LANG=C TZ=GMT svn export svn://svn.berlios.de/codeblocks/trunk -r ${rev} codeblocks -tar cjvf codeblocks-svn${rev}.tar.bz2 codeblocks diff --git a/codeblocks.spec b/codeblocks.spec index 53ab77a..c55d8b8 100644 --- a/codeblocks.spec +++ b/codeblocks.spec @@ -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 @@ Development files needed to build Code::Blocks plugins. %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 @@ Additional Code::Blocks plugins. %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 @@ find . -type f -and -not -name "*.cpp" -and -not -name "*.h" -and -not -name "*. # 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 @@ sed -i 's|@libdir@|%{_libdir}|' src/sdk/configmanager.cpp 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 @@ update-mime-database /usr/share/mime &> /dev/null || : %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 @@ update-mime-database /usr/share/mime &> /dev/null || : %{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 @@ update-mime-database /usr/share/mime &> /dev/null || : %changelog +* Sun Mar 2 2008 Dan Horak 8.02-1 +- update to stable release 8.02 +- update BR to use system libraries + +* Mon Feb 18 2008 Dan Horak 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 1.0-0.29.20080209svn4868 +- update to revision 4868 + * Tue Dec 11 2007 Dan Horak 1.0-0.28.20071210svn4719 - update to revision 4719 - fix multiarch problem with contrib subpackage (#340911) diff --git a/sources b/sources index ae1463a..c240925 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3fb0bc53b3682a36f0783f4506ef8f1e codeblocks-svn4719.tar.bz2 +ac15b4b3de50d7650c2f7a8dbcb30f88 codeblocks-8.02-src.tar.bz2