Author: gotar Date: Thu Jul 1 00:14:00 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- upgraded to 10.05
---- Files affected:
packages/codeblocks:
codeblocks-FHS-plugins.patch (1.1 -> 1.2) , codeblocks-ac.patch (1.3 -> 1.4)
, codeblocks-pwd.patch (1.3 -> 1.4) , codeblocks.spec (1.25 -> 1.26) ,
codeblocks-desktop.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/codeblocks/codeblocks-FHS-plugins.patch
diff -u packages/codeblocks/codeblocks-FHS-plugins.patch:1.1
packages/codeblocks/codeblocks-FHS-plugins.patch:1.2
--- packages/codeblocks/codeblocks-FHS-plugins.patch:1.1 Thu May 22
16:03:31 2008
+++ packages/codeblocks/codeblocks-FHS-plugins.patch Thu Jul 1 02:13:55 2010
@@ -1,13 +1,13 @@
diff -urN codeblocks-8.02_orig/src/sdk/configmanager.cpp
codeblocks-8.02/src/sdk/configmanager.cpp
---- codeblocks-8.02_orig/src/sdk/configmanager.cpp 2008-02-27
13:15:26.000000000 +0000
-+++ codeblocks-8.02/src/sdk/configmanager.cpp 2008-05-22 09:20:22.000000000
+0000
-@@ -467,7 +467,8 @@
- return ::wxGetCwd();
+--- codeblocks-8.02_orig/src/sdk/configmanager.cpp.orig 2010-05-22
12:10:05.000000000 +0200
++++ codeblocks-8.02_orig/src/sdk/configmanager.cpp 2010-07-01
01:17:20.000000000 +0200
+@@ -514,7 +514,8 @@ wxString ConfigManager::GetFolder(Search
case sdPluginsGlobal:
+ #ifndef CB_AUTOCONF
- return ConfigManager::data_path_global + _T("/plugins");
-+ // return ConfigManager::data_path_global + _T("/plugins");
-+ return _T("@libdir@/codeblocks/plugins");
-
- case sdPluginsUser:
- return ConfigManager::data_path_user + _T("/plugins");
++ // return ConfigManager::data_path_global + _T("/plugins");
++ return _T("@libdir@/codeblocks/plugins");
+ #else
+ return ConfigManager::plugin_path_global;
+ #endif
================================================================
Index: packages/codeblocks/codeblocks-ac.patch
diff -u packages/codeblocks/codeblocks-ac.patch:1.3
packages/codeblocks/codeblocks-ac.patch:1.4
--- packages/codeblocks/codeblocks-ac.patch:1.3 Sat Jan 31 01:08:38 2009
+++ packages/codeblocks/codeblocks-ac.patch Thu Jul 1 02:13:55 2010
@@ -1,14 +1,14 @@
diff -urN codeblocks-8.02/acinclude.m4 codeblocks-8.02.new/acinclude.m4
---- codeblocks-8.02/acinclude.m4 2009-01-30 20:16:37.000000000 +0100
-+++ codeblocks-8.02.new/acinclude.m4 2009-01-30 22:59:03.000000000 +0100
-@@ -71,8 +71,8 @@
- CXXFLAGS="-g -DDEBUG $CXXFLAGS"
+--- codeblocks-8.02/acinclude.m4.orig 2010-07-01 01:18:30.000000000 +0200
++++ codeblocks-8.02/acinclude.m4 2010-07-01 01:23:01.000000000 +0200
+@@ -71,8 +71,8 @@ if test "x$enable_debug" = "xyes"; then
+ CXXFLAGS="-g -DDEBUG -DCB_AUTOCONF $CXXFLAGS"
AC_MSG_RESULT(yes)
else
-- CFLAGS="-O2 -ffast-math $CFLAGS"
-- CXXFLAGS="-O2 -ffast-math $CXXFLAGS"
-+ CFLAGS="-Wall -ffast-math $CFLAGS"
-+ CXXFLAGS="-Wall -ffast-math $CXXFLAGS"
+- CFLAGS="-O2 -ffast-math -DCB_AUTOCONF $CFLAGS"
+- CXXFLAGS="-O2 -ffast-math -DCB_AUTOCONF $CXXFLAGS"
++ CFLAGS="-Wall -ffast-math -DCB_AUTOCONF $CFLAGS"
++ CXXFLAGS="-Wall -ffast-math -DCB_AUTOCONF $CXXFLAGS"
AC_MSG_RESULT(no)
fi
================================================================
Index: packages/codeblocks/codeblocks-pwd.patch
diff -u packages/codeblocks/codeblocks-pwd.patch:1.3
packages/codeblocks/codeblocks-pwd.patch:1.4
--- packages/codeblocks/codeblocks-pwd.patch:1.3 Sat Jan 31 14:27:11 2009
+++ packages/codeblocks/codeblocks-pwd.patch Thu Jul 1 02:13:55 2010
@@ -56,17 +56,15 @@
AutoVersioning.zip: manifest.xml
- PWD=`pwd` cd $(srcdir) && zip $(PWD)/AutoVersioning.zip manifest.xml >
/dev/null
+ zip AutoVersioning.zip manifest.xml > /dev/null
-diff -urN codeblocks-8.02/src/plugins/contrib/BrowseTracker/Makefile.am
codeblocks-8.02.new/src/plugins/contrib/BrowseTracker/Makefile.am
---- codeblocks-8.02/src/plugins/contrib/BrowseTracker/Makefile.am
2008-02-18 21:06:04.000000000 +0100
-+++ codeblocks-8.02.new/src/plugins/contrib/BrowseTracker/Makefile.am
2009-01-31 13:30:35.000000000 +0100
-@@ -38,4 +38,4 @@
+diff -urNp
codeblocks-10.05-release.orig/src/plugins/contrib/BrowseTracker/Makefile.am
codeblocks-10.05-release/src/plugins/contrib/BrowseTracker/Makefile.am
+---
codeblocks-10.05-release.orig/src/plugins/contrib/BrowseTracker/Makefile.am
2010-07-01 01:25:12.000000000 +0200
++++ codeblocks-10.05-release/src/plugins/contrib/BrowseTracker/Makefile.am
2010-07-01 01:30:10.000000000 +0200
+@@ -43,4 +43,4 @@ pkgdata_DATA = BrowseTracker.zip
CLEANFILES = $(pkgdata_DATA)
BrowseTracker.zip: manifest.xml
- PWD=`pwd` cd $(srcdir) && zip $(PWD)/BrowseTracker.zip manifest.xml >
/dev/null
-\ Brak znaku nowej linii na końcu pliku
+ zip BrowseTracker.zip manifest.xml > /dev/null
-\ Brak znaku nowej linii na końcu pliku
diff -urN codeblocks-8.02/src/plugins/contrib/byogames/Makefile.am
codeblocks-8.02.new/src/plugins/contrib/byogames/Makefile.am
--- codeblocks-8.02/src/plugins/contrib/byogames/Makefile.am 2007-07-16
16:07:04.000000000 +0200
+++ codeblocks-8.02.new/src/plugins/contrib/byogames/Makefile.am
2009-01-31 13:26:18.000000000 +0100
@@ -85,18 +83,16 @@
cb_koders.zip: manifest.xml
- PWD=`pwd` cd $(srcdir) && zip $(PWD)/cb_koders.zip manifest.xml >
/dev/null
+ zip cb_koders.zip manifest.xml > /dev/null
-diff -urN
codeblocks-8.02/src/plugins/contrib/codesnippets/resources/Makefile.am
codeblocks-8.02.new/src/plugins/contrib/codesnippets/resources/Makefile.am
---- codeblocks-8.02/src/plugins/contrib/codesnippets/resources/Makefile.am
2007-08-08 14:16:12.000000000 +0200
-+++ codeblocks-8.02.new/src/plugins/contrib/codesnippets/resources/Makefile.am
2009-01-31 13:26:49.000000000 +0100
-@@ -68,7 +68,7 @@
+diff -urNp
codeblocks-10.05-release.orig/src/plugins/contrib/codesnippets/resources/Makefile.am
codeblocks-10.05-release/src/plugins/contrib/codesnippets/resources/Makefile.am
+---
codeblocks-10.05-release.orig/src/plugins/contrib/codesnippets/resources/Makefile.am
2010-07-01 01:25:12.000000000 +0200
++++
codeblocks-10.05-release/src/plugins/contrib/codesnippets/resources/Makefile.am
2010-07-01 01:30:18.000000000 +0200
+@@ -136,5 +136,5 @@ dist_image_DATA = allsnippets.png \
EXTRA_DIST = manifest.xml
- codesnippets.zip: manifest.xml
+ codesnippets.zip: $(EXTRA_DIST)
- PWD=`pwd` cd $(srcdir) && zip $(PWD)/codesnippets.zip manifest.xml >
/dev/null
+ zip codesnippets.zip manifest.xml > /dev/null
- install-data-local: codesnippets.zip
- $(mkinstalldirs) $(DESTDIR)$(datadir)/@PACKAGE@/; \
diff -urN codeblocks-8.02/src/plugins/contrib/codestat/resources/Makefile.am
codeblocks-8.02.new/src/plugins/contrib/codestat/resources/Makefile.am
--- codeblocks-8.02/src/plugins/contrib/codestat/resources/Makefile.am
2007-07-16 16:07:04.000000000 +0200
+++ codeblocks-8.02.new/src/plugins/contrib/codestat/resources/Makefile.am
2009-01-31 13:27:05.000000000 +0100
@@ -318,3 +314,90 @@
+ cd start_here && \
+ zip ../start_here.zip *.htm* *.png > /dev/null && \
+ cd ..
+diff -urNp
codeblocks-10.05-release.orig/src/plugins/contrib/Cccc/resources/Makefile.am
codeblocks-10.05-release/src/plugins/contrib/Cccc/resources/Makefile.am
+---
codeblocks-10.05-release.orig/src/plugins/contrib/Cccc/resources/Makefile.am
2010-07-01 01:18:29.000000000 +0200
++++ codeblocks-10.05-release/src/plugins/contrib/Cccc/resources/Makefile.am
2010-07-01 01:29:14.000000000 +0200
+@@ -4,4 +4,4 @@ pkgdata_DATA = Cccc.zip
+ CLEANFILES = $(pkgdata_DATA)
+
+ Cccc.zip: manifest.xml
+- PWD=`pwd` cd $(srcdir) && zip $(PWD)/Cccc.zip manifest.xml > /dev/null
++ zip Cccc.zip manifest.xml > /dev/null
+diff -urNp
codeblocks-10.05-release.orig/src/plugins/contrib/copystrings/Makefile.am
codeblocks-10.05-release/src/plugins/contrib/copystrings/Makefile.am
+--- codeblocks-10.05-release.orig/src/plugins/contrib/copystrings/Makefile.am
2010-07-01 01:18:29.000000000 +0200
++++ codeblocks-10.05-release/src/plugins/contrib/copystrings/Makefile.am
2010-07-01 01:29:30.000000000 +0200
+@@ -22,4 +22,4 @@ pkgdata_DATA = copystrings.zip
+ CLEANFILES = $(pkgdata_DATA)
+
+ copystrings.zip: manifest.xml
+- PWD=`pwd` cd $(srcdir) && zip $(PWD)/copystrings.zip manifest.xml >
/dev/null
++ zip copystrings.zip manifest.xml > /dev/null
+diff -urNp
codeblocks-10.05-release.orig/src/plugins/contrib/CppCheck/resources/Makefile.am
codeblocks-10.05-release/src/plugins/contrib/CppCheck/resources/Makefile.am
+---
codeblocks-10.05-release.orig/src/plugins/contrib/CppCheck/resources/Makefile.am
2010-07-01 01:18:29.000000000 +0200
++++
codeblocks-10.05-release/src/plugins/contrib/CppCheck/resources/Makefile.am
2010-07-01 01:30:24.000000000 +0200
+@@ -4,4 +4,4 @@ pkgdata_DATA = CppCheck.zip
+ CLEANFILES = $(pkgdata_DATA)
+
+ CppCheck.zip: manifest.xml
+- PWD=`pwd` cd $(srcdir) && zip $(PWD)/CppCheck.zip manifest.xml >
/dev/null
++ zip CppCheck.zip manifest.xml > /dev/null
+diff -urNp
codeblocks-10.05-release.orig/src/plugins/contrib/headerfixup/Makefile.am
codeblocks-10.05-release/src/plugins/contrib/headerfixup/Makefile.am
+--- codeblocks-10.05-release.orig/src/plugins/contrib/headerfixup/Makefile.am
2010-07-01 01:18:29.000000000 +0200
++++ codeblocks-10.05-release/src/plugins/contrib/headerfixup/Makefile.am
2010-07-01 01:29:22.000000000 +0200
+@@ -39,4 +39,4 @@ pkgdata_DATA = headerfixup.zip
+ CLEANFILES = $(pkgdata_DATA)
+
+ headerfixup.zip:
+- PWD=`pwd` cd $(srcdir) && zip $(PWD)/headerfixup.zip manifest.xml >
/dev/null
++ zip headerfixup.zip manifest.xml > /dev/null
+diff -urNp
codeblocks-10.05-release.orig/src/plugins/contrib/HexEditor/Makefile.am
codeblocks-10.05-release/src/plugins/contrib/HexEditor/Makefile.am
+--- codeblocks-10.05-release.orig/src/plugins/contrib/HexEditor/Makefile.am
2010-07-01 01:18:29.000000000 +0200
++++ codeblocks-10.05-release/src/plugins/contrib/HexEditor/Makefile.am
2010-07-01 01:29:38.000000000 +0200
+@@ -67,4 +67,4 @@ pkgdata_DATA = HexEditor.zip
+ CLEANFILES = $(pkgdata_DATA)
+
+ HexEditor.zip: manifest.xml
+- PWD=`pwd` cd $(srcdir) && zip $(PWD)/HexEditor.zip manifest.xml >
/dev/null
++ zip HexEditor.zip manifest.xml > /dev/null
+diff -urNp
codeblocks-10.05-release.orig/src/plugins/contrib/IncrementalSearch/Makefile.am
codeblocks-10.05-release/src/plugins/contrib/IncrementalSearch/Makefile.am
+---
codeblocks-10.05-release.orig/src/plugins/contrib/IncrementalSearch/Makefile.am
2010-07-01 01:18:29.000000000 +0200
++++ codeblocks-10.05-release/src/plugins/contrib/IncrementalSearch/Makefile.am
2010-07-01 01:29:57.000000000 +0200
+@@ -30,7 +30,7 @@ pkgdata_DATA = IncrementalSearch.zip
+ CLEANFILES = $(pkgdata_DATA)
+
+ IncrementalSearch.zip: manifest.xml IncrementalSearchToolbar.xrc
IncrementalSearchConfDlg.xrc
+- PWD=`pwd` cd $(srcdir) && zip -R $(PWD)/IncrementalSearch.zip
manifest.xml *.xrc images/*.png images/16x16/*.png > /dev/null
++ zip -R IncrementalSearch.zip manifest.xml *.xrc images/*.png
images/16x16/*.png > /dev/null
+
+ confimagesdir = $(datadir)/@PACKAGE@/images/settings
+
+diff -urNp
codeblocks-10.05-release.orig/src/plugins/contrib/MouseSap/Makefile.am
codeblocks-10.05-release/src/plugins/contrib/MouseSap/Makefile.am
+--- codeblocks-10.05-release.orig/src/plugins/contrib/MouseSap/Makefile.am
2010-07-01 01:18:29.000000000 +0200
++++ codeblocks-10.05-release/src/plugins/contrib/MouseSap/Makefile.am
2010-07-01 01:29:01.000000000 +0200
+@@ -23,4 +23,4 @@ pkgdata_DATA = MouseSap.zip
+ CLEANFILES = $(pkgdata_DATA)
+
+ MouseSap.zip: manifest.xml
+- PWD=`pwd` cd $(srcdir) && zip $(PWD)/MouseSap.zip manifest.xml >
/dev/null
++ zip MouseSap.zip manifest.xml > /dev/null
+diff -urNp
codeblocks-10.05-release.orig/src/plugins/contrib/Valgrind/resources/Makefile.am
codeblocks-10.05-release/src/plugins/contrib/Valgrind/resources/Makefile.am
+---
codeblocks-10.05-release.orig/src/plugins/contrib/Valgrind/resources/Makefile.am
2010-07-01 01:18:29.000000000 +0200
++++
codeblocks-10.05-release/src/plugins/contrib/Valgrind/resources/Makefile.am
2010-07-01 01:30:04.000000000 +0200
+@@ -4,4 +4,4 @@ pkgdata_DATA = Valgrind.zip
+ CLEANFILES = $(pkgdata_DATA)
+
+ Valgrind.zip: manifest.xml
+- PWD=`pwd` cd $(srcdir) && zip $(PWD)/Valgrind.zip manifest.xml >
/dev/null
++ zip Valgrind.zip manifest.xml > /dev/null
+diff -urNp
codeblocks-10.05-release.orig/src/plugins/contrib/wxSmithAui/Makefile.am
codeblocks-10.05-release/src/plugins/contrib/wxSmithAui/Makefile.am
+--- codeblocks-10.05-release.orig/src/plugins/contrib/wxSmithAui/Makefile.am
2010-07-01 01:18:29.000000000 +0200
++++ codeblocks-10.05-release/src/plugins/contrib/wxSmithAui/Makefile.am
2010-07-01 01:29:47.000000000 +0200
+@@ -29,7 +29,7 @@ pkgdata_DATA = wxSmithAui.zip
+ CLEANFILES = $(pkgdata_DATA)
+
+ wxSmithAui.zip: manifest.xml
+- PWD=`pwd` cd $(srcdir) && zip $(PWD)/wxSmithAui.zip manifest.xml >
/dev/null
++ zip wxSmithAui.zip manifest.xml > /dev/null
+
+ libwxSmithAui_la_SOURCES = \
+ ./wxAuiManager/wxsAuiManager.cpp \
================================================================
Index: packages/codeblocks/codeblocks.spec
diff -u packages/codeblocks/codeblocks.spec:1.25
packages/codeblocks/codeblocks.spec:1.26
--- packages/codeblocks/codeblocks.spec:1.25 Sat Jan 31 14:28:40 2009
+++ packages/codeblocks/codeblocks.spec Thu Jul 1 02:13:55 2010
@@ -3,7 +3,7 @@
# - snap build from svn
#
-%bcond_with snap # build snap instead of release
+%bcond_with snap # build snap instead of release
%if %{with snap}
%define _svn svn5082
@@ -17,19 +17,19 @@
Version: 1.0
Release: %{_snap}%{_svn}
%else
-Version: 8.02
+Version: 10.05
Release: 1
%endif
License: GPL v3
Group: X11/Development/Tools
%if %{with snap}
Source0: %{name}-%{_snap}.tar.gz
+# Source0-md5: ab077d562e98b0586f2f86c14cb773ba
%else
-Source0:
http://dl.sourceforge.net/codeblocks/%{name}-%{version}-src.tar.bz2
-# Source0-md5: ac15b4b3de50d7650c2f7a8dbcb30f88
+Source0:
http://download.berlios.de/codeblocks/%{name}-%{version}-src.tar.bz2
+# Source0-md5: ab077d562e98b0586f2f86c14cb773ba
%endif
Patch0: %{name}-FHS-plugins.patch
-Patch1: %{name}-desktop.patch
Patch2: %{name}-ac.patch
Patch3: %{name}-pwd.patch
URL: http://www.codeblocks.org/
@@ -151,12 +151,11 @@
%if %{with snap}
%setup -q -n %{name}-%{_snap}
%else
-%setup -q
+%setup -q -n %{name}-%{version}-release
%endif
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
%patch0 -p1
-%patch1 -p1
%patch2 -p1
%patch3 -p1
@@ -252,18 +251,25 @@
%{_datadir}/%{name}/lib_finder
%{_datadir}/%{name}/templates
%dir %{_libdir}/%{name}
+%dir %{_libdir}/wxSmithContribItems
%dir %{_pluginsdir}
%attr(755,root,root) %{_pluginsdir}/*.so
+%attr(755,root,root) %{_libdir}/wxSmithContribItems/*.so.*
%{_mandir}/man1/*.1*
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libcodeblocks.so
%attr(755,root,root) %{_libdir}/libwxsmithlib.so
+%attr(755,root,root) %{_libdir}/wxSmithContribItems/*.so
%{_libdir}/libcodeblocks.la
%{_libdir}/libwxsmithlib.la
+%{_libdir}/wxSmithContribItems/*.la
%{_pkgconfigdir}/codeblocks.pc
+%{_pkgconfigdir}/wxsmith*.pc
%{_includedir}/codeblocks
+%{_includedir}/wxSmithContribItems
+%{_includedir}/wxsmith
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -271,6 +277,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.26 2010/07/01 00:13:55 gotar
+- upgraded to 10.05
+
Revision 1.25 2009/01/31 13:28:40 megabajt
- re-added -pwd.patch
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/codeblocks/codeblocks-FHS-plugins.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/codeblocks/codeblocks-ac.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/codeblocks/codeblocks-pwd.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/codeblocks/codeblocks.spec?r1=1.25&r2=1.26&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
