[packages/codeblocks] - updated to 16.01

baggins baggins at pld-linux.org
Sun May 29 21:15:52 CEST 2016


commit e3da79011668f7d524bbf209cd1bd7a87353f7a5
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun May 29 21:15:41 2016 +0200

    - updated to 16.01

 codeblocks-ac.patch  |  4 ++--
 codeblocks-pwd.patch | 10 +++++-----
 codeblocks.spec      | 13 ++++++-------
 3 files changed, 13 insertions(+), 14 deletions(-)
---
diff --git a/codeblocks.spec b/codeblocks.spec
index 5a32aa3..ef6b308 100644
--- a/codeblocks.spec
+++ b/codeblocks.spec
@@ -2,12 +2,12 @@
 Summary:	An open source, cross platform, free C++ IDE
 Summary(pl.UTF-8):	Wieloplatformowe, darmowe IDE do C++ o otwartych źródłach
 Name:		codeblocks
-Version:	13.12
-Release:	3
+Version:	16.01
+Release:	1
 License:	GPL v3
 Group:		X11/Development/Tools
-Source0:	http://download.sourceforge.net/codeblocks/%{name}_%{version}-1.tar.gz
-# Source0-md5:	4b450f620d9f1875ecf6882ab3c11402
+Source0:	http://download.sourceforge.net/codeblocks/%{name}_%{version}.tar.gz
+# Source0-md5:	823f6c229692367ff74f52098b887b6b
 Patch0:		%{name}-FHS-plugins.patch
 Patch2:		%{name}-ac.patch
 Patch3:		%{name}-pwd.patch
@@ -129,7 +129,7 @@ Ten pakiet dostarcza plików nagłówkowych Code::Blocks. Należy
 instalować ten pakiet tylko w celu pisania wtyczek do Code::Blocks.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}.release
 %patch0 -p1
 %patch2 -p1
 %patch3 -p1
@@ -181,9 +181,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS BUGS COMPILERS README TODO ChangeLog
 %attr(755,root,root) %{_bindir}/cb_share_config
-%attr(755,root,root) %{_bindir}/codeblocks
-%attr(755,root,root) %{_bindir}/codesnippets
 %attr(755,root,root) %{_bindir}/cb_console_runner
+%attr(755,root,root) %{_bindir}/codeblocks
 %attr(755,root,root) %{_libdir}/libwxsmithlib.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libwxsmithlib.so.0
 %attr(755,root,root) %{_libdir}/libcodeblocks.so.*.*.*
diff --git a/codeblocks-ac.patch b/codeblocks-ac.patch
index 9c8cbca..0ff07e0 100644
--- a/codeblocks-ac.patch
+++ b/codeblocks-ac.patch
@@ -2,13 +2,13 @@ diff -urN codeblocks-8.02/acinclude.m4 codeblocks-8.02.new/acinclude.m4
 --- 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
-         LDFLAGS="-Wl,--no-undefined"
+         CXXFLAGS="-g -DDEBUG -DCB_AUTOCONF $CXXFLAGS"
          AC_MSG_RESULT(yes)
      else
 -        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"
-         LDFLAGS="-Wl,--no-undefined"
          AC_MSG_RESULT(no)
      fi
+ ])
diff --git a/codeblocks-pwd.patch b/codeblocks-pwd.patch
index 8a3e25a..9628999 100644
--- a/codeblocks-pwd.patch
+++ b/codeblocks-pwd.patch
@@ -75,8 +75,8 @@ diff -ur codeblocks-13.12/src/plugins/contrib/BrowseTracker/Makefile.am codebloc
  CLEANFILES = $(pkgdata_DATA)
  
  BrowseTracker.zip: manifest.xml
--	PWD=`pwd` cd $(srcdir) && zip $(PWD)/BrowseTracker.zip manifest.xml > /dev/null
-+	zip $(PWD)/BrowseTracker.zip manifest.xml > /dev/null
+-	PWD=`pwd` cd $(srcdir) && zip -R $(PWD)/BrowseTracker.zip manifest.xml *.xrc images/*.png images/16x16/*.png > /dev/null
++	zip -R $(PWD)/BrowseTracker.zip manifest.xml *.xrc images/*.png images/16x16/*.png > /dev/null
 diff -ur codeblocks-13.12/src/plugins/contrib/byogames/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/byogames/Makefile.am
 --- codeblocks-13.12/src/plugins/contrib/byogames/Makefile.am	2013-11-17 20:34:09.000000000 +0100
 +++ codeblocks-13.12.pwd/src/plugins/contrib/byogames/Makefile.am	2014-01-18 19:35:30.548711201 +0100
@@ -204,9 +204,9 @@ diff -ur codeblocks-13.12/src/plugins/contrib/FileManager/Makefile.am codeblocks
 @@ -41,4 +41,4 @@
  CLEANFILES = $(pkgdata_DATA)
  
- FileManager.zip: manifest.xml Resources/fileexplorersettings.xrc
--	PWD=`pwd` cd $(srcdir) && zip -j9 $(PWD)/FileManager.zip manifest.xml Resources/fileexplorersettings.xrc > /dev/null
-+	zip -j9 $(PWD)/FileManager.zip manifest.xml Resources/fileexplorersettings.xrc > /dev/null
+ FileManager.zip: manifest.xml Resources/fileexplorersettings.xrc Resources/CommitBrowser.xrc
+-	PWD=`pwd` cd $(srcdir) && zip -j9 $(PWD)/FileManager.zip manifest.xml Resources/fileexplorersettings.xrc Resources/CommitBrowser.xrc > /dev/null
++	zip -j9 $(PWD)/FileManager.zip manifest.xml Resources/fileexplorersettings.xrc Resources/CommitBrowser.xrc > /dev/null
 diff -ur codeblocks-13.12/src/plugins/contrib/headerfixup/Makefile.am codeblocks-13.12.pwd/src/plugins/contrib/headerfixup/Makefile.am
 --- codeblocks-13.12/src/plugins/contrib/headerfixup/Makefile.am	2013-11-17 20:34:08.000000000 +0100
 +++ codeblocks-13.12.pwd/src/plugins/contrib/headerfixup/Makefile.am	2014-01-18 19:35:30.548711201 +0100
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/codeblocks.git/commitdiff/e3da79011668f7d524bbf209cd1bd7a87353f7a5



More information about the pld-cvs-commit mailing list