From 5a8972434ab1d485e435dd276541a7f1b73eccfc Mon Sep 17 00:00:00 2001
From: Dan Horák <sharkcz@fedoraproject.org>
Date: Oct 30 2006 07:50:41 +0000
Subject: - update to revision 3157

- kill rpath in the spec file using sed
- fix directory ownership

---

diff --git a/.cvsignore b/.cvsignore
index 060c1ce..3648f90 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-codeblocks-svn3030.tar.bz2
+codeblocks-svn3157.tar.bz2
diff --git a/codeblocks-autorev.patch b/codeblocks-autorev.patch
index 59aedcc..51ec163 100644
--- a/codeblocks-autorev.patch
+++ b/codeblocks-autorev.patch
@@ -14,8 +14,11 @@
  # Deal with some gentoo-specific issues
  export WANT_AUTOMAKE='1.7'
  export WANT_AUTOCONF='2.5'
---- src/tools/Makefile.am.orig	2006-09-13 17:45:04.000000000 +0200
-+++ src/tools/Makefile.am	2006-09-13 17:45:11.000000000 +0200
-@@ -1 +1 @@
--SUBDIRS = autorevision ConsoleRunner
-+SUBDIRS = ConsoleRunner
+--- 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 @@
+-SUBDIRS = build_tools sdk src plugins tools setup templates scripts wxsmith
++SUBDIRS = sdk src plugins tools setup templates scripts wxsmith
+ 
+ dist_pkgdata_DATA = tips.txt
+ 
diff --git a/codeblocks-rpath.patch b/codeblocks-rpath.patch
deleted file mode 100644
index 6b75b83..0000000
--- a/codeblocks-rpath.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- configure.orig	2006-07-18 17:13:01.000000000 +0200
-+++ configure	2006-07-18 17:13:25.000000000 +0200
-@@ -8099,7 +8099,8 @@
-     # are reset later if shared libraries are not supported. Putting them
-     # here allows them to be overridden if necessary.
-     runpath_var=LD_RUN_PATH
--    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
-+#    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
-+    hardcode_libdir_flag_spec=''
-     export_dynamic_flag_spec='${wl}--export-dynamic'
-     # ancient GNU ld didn't support --whole-archive et. al.
-     if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
diff --git a/codeblocks.spec b/codeblocks.spec
index ab98200..c7061e6 100644
--- a/codeblocks.spec
+++ b/codeblocks.spec
@@ -1,9 +1,9 @@
-%define		rev	3030
-%define		date	20061007
+%define		rev	3157
+%define		date	20061029
 
 Name:		codeblocks
 Version:	1.0
-Release:	0.10.%{date}svn%{rev}%{?dist}
+Release:	0.11.%{date}svn%{rev}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPL
@@ -19,7 +19,6 @@ Requires:	shared-mime-info
 Patch1:		codeblocks-plugins.patch
 Patch2:		codeblocks-desktop.patch
 Patch3:		codeblocks-autorev.patch
-Source1:	codeblocks-rpath.patch
 Source100:	codeblocks-getsvn
 
 %description
@@ -68,7 +67,7 @@ do
 	sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/$p/Makefile.am
 done
 
-for p in byogames cb_koders codesnippets codestat dragscroll envvars help_plugin keybinder profiler source_exporter wxSmith
+for p in byogames cb_koders codesnippets codestat dragscroll envvars help_plugin keybinder lib_finder profiler source_exporter symtab wxSmith
 do
 	sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/contrib/$p/Makefile.am
 done
@@ -77,9 +76,6 @@ echo "m4_define([SVN_REVISION], trunk-r%{rev})" > revision.m4
 
 ./bootstrap
 
-# get rid of rpath in libs and plugins
-patch -p0 < %{SOURCE1}
-
 # generate autorevision.h
 cat > src/sdk/autorevision.h << EOF
 /*%{rev}*/
@@ -107,6 +103,10 @@ EOF
 
 %configure --enable-contrib
 
+# Don't use rpath!
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
 make %{?_smp_mflags}
 
 %install
@@ -162,14 +162,15 @@ update-mime-database /usr/share/mime &> /dev/null || :
 %{_datadir}/pixmaps/codeblocks.png
 
 %dir %{pkgdatadir}
-%{pkgdatadir}/icons/*
+%{pkgdatadir}/icons
+%dir %{pkgdatadir}/images
 %{pkgdatadir}/images/*.png
-%{pkgdatadir}/images/16x16/*
-%{pkgdatadir}/images/codecompletion/*
-%{pkgdatadir}/images/settings/*
-%{pkgdatadir}/lexers/*
-%{pkgdatadir}/scripts/*
-%{pkgdatadir}/templates/*
+%{pkgdatadir}/images/16x16
+%{pkgdatadir}/images/codecompletion
+%{pkgdatadir}/images/settings
+%{pkgdatadir}/lexers
+%{pkgdatadir}/scripts
+%{pkgdatadir}/templates
 %{pkgdatadir}/astyle.zip
 %{pkgdatadir}/autosave.zip
 %{pkgdatadir}/classwizard.zip
@@ -201,7 +202,9 @@ update-mime-database /usr/share/mime &> /dev/null || :
 %{pkgdatadir}/exporter.zip
 %{pkgdatadir}/help_plugin.zip
 %{pkgdatadir}/keybinder.zip
-%{pkgdatadir}/CBProfiler.zip
+%{pkgdatadir}/lib_finder.zip
+%{pkgdatadir}/Profiler.zip
+%{pkgdatadir}/SymTab.zip
 %{pkgdatadir}/wxsmith.zip
 %{pkgdatadir}/images/codesnippets
 %{pkgdatadir}/images/wxsmith
@@ -215,11 +218,18 @@ update-mime-database /usr/share/mime &> /dev/null || :
 %{plugindir}/libexporter.so
 %{plugindir}/libhelp_plugin.so
 %{plugindir}/libkeybinder.so
-%{plugindir}/libprofiler.so
+%{plugindir}/liblib_finder.so
+%{plugindir}/libProfiler.so
+%{plugindir}/libSymTab.so
 %{plugindir}/libwxsmith.so
 
 
 %changelog
+* Mon Oct 30 2006 Dan Horak <dan[at]danny.cz> 1.0-0.11.20061029svn3157
+- update to revision 3157
+- kill rpath in the spec file using sed
+- fix directory ownership
+
 * Sun Oct  8 2006 Dan Horak <dan[at]danny.cz> 1.0-0.10.20061007svn3030
 - update to revision 3030
 - change the install paths for plugins in the spec file
diff --git a/sources b/sources
index 07d00cd..ce46ca6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5622cdb4e744ac9279a8092a15c273e5  codeblocks-svn3030.tar.bz2
+da2093d8d0f32d8822836a4c95c71258  codeblocks-svn3157.tar.bz2