- *-pwd.patch get rid of $(PWD) from Makefile to allow build on

  builders that can't use it
- removed unneeded *.la files
- rel 0.5

Changed files:
    codeblocks-pwd.patch -> 1.1
    codeblocks.spec -> 1.10

diff --git a/codeblocks-pwd.patch b/codeblocks-pwd.patch
new file mode 100644 (file)
index 0000000..4ff32c4
--- /dev/null
+++ b/codeblocks-pwd.patch
@@ -0,0 +1,117 @@
+--- codeblocks-1.0rc2/src/sdk/resources/Makefile.am.orig       2006-01-16 16:57:32.000000000 +0100
++++ codeblocks-1.0rc2/src/sdk/resources/Makefile.am    2006-01-16 16:59:02.000000000 +0100
+@@ -7,4 +7,4 @@
+ CLEANFILES = $(pkgdata_DATA)
+ 
+ manager_resources.zip:
+-      PWD=`pwd` cd $(srcdir) && zip -j $(PWD)/manager_resources.zip *.xrc images/*.png > /dev/null
++      zip -j manager_resources.zip *.xrc images/*.png > /dev/null
+--- codeblocks-1.0rc2/src/src/resources/Makefile.am.orig       2006-03-06 17:37:21.000000000 +0100
++++ codeblocks-1.0rc2/src/src/resources/Makefile.am    2006-03-06 17:39:05.000000000 +0100
+@@ -9,7 +9,9 @@
+ CLEANFILES = $(pkgdata_DATA)
+ 
+ resources.zip:
+-      PWD=`pwd` cd $(srcdir) && zip $(PWD)/resources.zip *.xrc images/*.png images/16x16/*.png > /dev/null
++      zip resources.zip *.xrc images/*.png images/16x16/*.png > /dev/null
+ 
+ start_here.zip:
+-      PWD=`pwd` cd $(srcdir)/start_here && zip $(PWD)/start_here.zip *.htm* *.png > /dev/null
++      cd start_here && \
++      zip ../start_here.zip *.htm* *.png > /dev/null && \
++      cd ..
+--- codeblocks-1.0rc2/src/plugins/todo/resources/Makefile.am.orig      2006-03-06 17:37:08.000000000 +0100
++++ codeblocks-1.0rc2/src/plugins/todo/resources/Makefile.am   2006-03-06 17:37:13.000000000 +0100
+@@ -2,6 +2,6 @@
+ CLEANFILES = $(pkgdata_DATA)
+ 
+ todo.zip:
+-      PWD=`pwd` cd $(srcdir) && zip $(PWD)/todo.zip *.xrc > /dev/null
++      zip todo.zip *.xrc > /dev/null
+ 
+ EXTRA_DIST = add_todo.xrc settings.xrc
+--- codeblocks-1.0rc2/src/plugins/contrib/codestat/resources/Makefile.am.orig  2006-03-06 17:36:45.000000000 +0100
++++ codeblocks-1.0rc2/src/plugins/contrib/codestat/resources/Makefile.am       2006-03-06 17:36:51.000000000 +0100
+@@ -4,4 +4,4 @@
+ CLEANFILES = $(pkgdata_DATA)
+ 
+ codestat.zip:
+-      PWD=`pwd` cd $(srcdir) && zip $(PWD)/codestat.zip *.xrc > /dev/null
++      zip codestat.zip *.xrc > /dev/null
+--- codeblocks-1.0rc2/src/plugins/contrib/profiler/resources/Makefile.am.orig  2006-03-06 17:36:28.000000000 +0100
++++ codeblocks-1.0rc2/src/plugins/contrib/profiler/resources/Makefile.am       2006-03-06 17:36:34.000000000 +0100
+@@ -4,4 +4,4 @@
+ CLEANFILES = $(pkgdata_DATA)
+ 
+ profiler.zip:
+-      PWD=`pwd` cd $(srcdir) && zip $(PWD)/profiler.zip *.xrc > /dev/null
++      zip profiler.zip *.xrc > /dev/null
+--- codeblocks-1.0rc2/src/plugins/classwizard/resources/Makefile.am.orig       2006-03-06 17:36:14.000000000 +0100
++++ codeblocks-1.0rc2/src/plugins/classwizard/resources/Makefile.am    2006-03-06 17:36:21.000000000 +0100
+@@ -4,4 +4,4 @@
+ CLEANFILES = $(pkgdata_DATA)
+ 
+ class_wizard.zip:
+-      PWD=`pwd` cd $(srcdir) && zip $(PWD)/class_wizard.zip *.xrc > /dev/null
++      zip class_wizard.zip *.xrc > /dev/null
+--- codeblocks-1.0rc2/src/plugins/defaultmimehandler/resources/Makefile.am.orig        2006-03-06 17:36:00.000000000 +0100
++++ codeblocks-1.0rc2/src/plugins/defaultmimehandler/resources/Makefile.am     2006-03-06 17:36:07.000000000 +0100
+@@ -2,6 +2,6 @@
+ CLEANFILES = $(pkgdata_DATA)
+ 
+ defaultmimehandler.zip:
+-      PWD=`pwd` cd $(srcdir) && zip $(PWD)/defaultmimehandler.zip *.xrc > /dev/null
++      zip defaultmimehandler.zip *.xrc > /dev/null
+ 
+ EXTRA_DIST = edit_files_handling.xrc
+--- codeblocks-1.0rc2/src/plugins/compilergcc/resources/Makefile.am.orig       2006-03-06 17:35:47.000000000 +0100
++++ codeblocks-1.0rc2/src/plugins/compilergcc/resources/Makefile.am    2006-03-06 17:35:53.000000000 +0100
+@@ -2,7 +2,7 @@
+ CLEANFILES = $(pkgdata_DATA)
+ 
+ compiler_gcc.zip:
+-      PWD=`pwd` cd $(srcdir) && zip $(PWD)/compiler_gcc.zip *.xrc images/*.png images/16x16/*.png > /dev/null
++      zip compiler_gcc.zip *.xrc images/*.png images/16x16/*.png > /dev/null
+ 
+ EXTRA_DIST = advanced_compiler_options.xrc \
+       compiler_menu.xrc \
+--- codeblocks-1.0rc2/src/plugins/codecompletion/resources/Makefile.am.orig    2006-03-06 17:35:30.000000000 +0100
++++ codeblocks-1.0rc2/src/plugins/codecompletion/resources/Makefile.am 2006-03-06 17:35:38.000000000 +0100
+@@ -2,7 +2,7 @@
+ CLEANFILES = $(pkgdata_DATA)
+ 
+ code_completion.zip:
+-      PWD=`pwd` cd $(srcdir) && zip $(PWD)/code_completion.zip *.xrc > /dev/null
++      zip code_completion.zip *.xrc > /dev/null
+ 
+ install-exec-local:
+       mkdir -p $(DESTDIR)$(pkgdatadir)/images/codecompletion
+--- codeblocks-1.0rc2/src/plugins/astyle/resources/Makefile.am.orig    2006-03-06 17:35:14.000000000 +0100
++++ codeblocks-1.0rc2/src/plugins/astyle/resources/Makefile.am 2006-03-06 17:35:22.000000000 +0100
+@@ -4,4 +4,4 @@
+ CLEANFILES = $(pkgdata_DATA)
+ 
+ astyle.zip:
+-      PWD=`pwd` cd $(srcdir) && zip $(PWD)/astyle.zip *.xrc > /dev/null
++      zip astyle.zip *.xrc > /dev/null
+--- codeblocks-1.0rc2/src/plugins/pluginwizard/resources/Makefile.am.orig      2006-03-06 17:34:59.000000000 +0100
++++ codeblocks-1.0rc2/src/plugins/pluginwizard/resources/Makefile.am   2006-03-06 17:35:06.000000000 +0100
+@@ -2,6 +2,6 @@
+ CLEANFILES = $(pkgdata_DATA)
+ 
+ plugin_wizard.zip:
+-      PWD=`pwd` cd $(srcdir) && zip $(PWD)/plugin_wizard.zip *.xrc > /dev/null
++      zip plugin_wizard.zip *.xrc > /dev/null
+ 
+ EXTRA_DIST = new_plugin.xrc plugin_info.xrc
+--- codeblocks-1.0rc2/src/plugins/debuggergdb/resources/Makefile.am.orig       2006-03-06 17:33:17.000000000 +0100
++++ codeblocks-1.0rc2/src/plugins/debuggergdb/resources/Makefile.am    2006-03-06 17:34:31.000000000 +0100
+@@ -2,7 +2,7 @@
+ CLEANFILES = $(pkgdata_DATA)
+ 
+ debugger_gdb.zip:
+-      PWD=`pwd` cd $(srcdir) && zip $(PWD)/debugger_gdb.zip *.xrc images/*.png images/16x16/*.png > /dev/null
++      zip debugger_gdb.zip *.xrc images/*.png images/16x16/*.png > /dev/null
+ 
+ EXTRA_DIST = backtrace.xrc \
+       debugger_menu.xrc \

diff --git a/codeblocks.spec b/codeblocks.spec
index e164f9d4ff1e430fa03ad42e3ae101d049ece980..b7e553e69ba7d5e8f09efaab927d731a3b67c605 100644 (file)
--- a/codeblocks.spec
+++ b/codeblocks.spec
@@ -3,7 +3,7 @@ Summary(pl):    Wieloplatformowe, darmowe IDE do C++ o otwartych 
 Name:          codeblocks
 Version:       1.0
 %define                _rc     rc2
-Release:       0.%{_rc}.0.4
+Release:       0.%{_rc}.0.5
 License:       GPL
 Group:         Development/Languages
 Source0:       http://dl.sourceforge.net/codeblocks/%{name}-%{version}%{_rc}.tgz
@@ -11,6 +11,7 @@ Source0:      http://dl.sourceforge.net/codeblocks/%{name}-%{version}%{_rc}.tgz
 Source1:       %{name}.conf
 Patch0:                %{name}-ac.patch
 Patch1:                %{name}-fhs.patch
+Patch2:                %{name}-pwd.patch
 URL:           http://www.codeblocks.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -112,6 +113,7 @@ find . -type f -and -not -name "*.cpp" -and -not -name "*.h" -and -not -name "*.
 chmod a+x acinclude.m4 src/update
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -131,6 +133,9 @@ install -d $RPM_BUILD_ROOT/%{_sysconfdir}
        DESTDIR=$RPM_BUILD_ROOT
 cp %{SOURCE1} "$RPM_BUILD_ROOT/%{_sysconfdir}/Code::Blocks v1.0"
 
+rm -rf $RPM_BUILD_ROOT%{_pluginsdir}/*.la
+rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT