rpms/codeblocks/F-8 .cvsignore, 1.20, 1.21 codeblocks.spec, 1.23, 1.24 sources, 1.20, 1.21 codeblocks-autorev.patch, 1.4, NONE codeblocks-getsvn, 1.1, NONE
Dan Horak (sharkcz)
fedora-extras-commits at redhat.com
Sun Mar 2 15:29:40 UTC 2008
- Previous message (by thread): rpms/glade3/F-7 glade3.spec,1.9,1.10
- Next message (by thread): rpms/codeblocks/F-7 .cvsignore, 1.20, 1.21 codeblocks.spec, 1.22, 1.23 sources, 1.20, 1.21 codeblocks-autorev.patch, 1.4, NONE codeblocks-getsvn, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: sharkcz
Update of /cvs/extras/rpms/codeblocks/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26891
Modified Files:
.cvsignore codeblocks.spec sources
Removed Files:
codeblocks-autorev.patch codeblocks-getsvn
Log Message:
* Sun Mar 2 2008 Dan Horak <dan[at]danny.cz> 8.02-1
- update to stable release 8.02
- update BR to use system libraries
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/F-8/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore 21 Feb 2008 16:35:50 -0000 1.20
+++ .cvsignore 2 Mar 2008 15:29:02 -0000 1.21
@@ -1 +1 @@
-codeblocks-svn4872.tar.bz2
+codeblocks-8.02-src.tar.bz2
Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/F-8/codeblocks.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- codeblocks.spec 21 Feb 2008 16:35:50 -0000 1.23
+++ codeblocks.spec 2 Mar 2008 15:29:02 -0000 1.24
@@ -1,26 +1,20 @@
-%define rev 4872
-%define date 20080211
-
Name: codeblocks
-Version: 1.0
-Release: 0.30.%{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,8 +42,6 @@
%package contrib-libs
Summary: Libraries needed to run Code::Blocks contrib plugins
Group: System Environment/Libraries
-# the wxSmith plugin and libwxsmith* libraries are now GPLv3+
-License: GPLv2+ and GPLv3+
Obsoletes: %{name}-contrib < 1.0-0.28.20071210svn4719
%description contrib-libs
@@ -58,8 +50,6 @@
%package contrib
Summary: Additional Code::Blocks plugins
Group: Development/Tools
-# the wxSmith plugin and libwxsmith* libraries are now GPLv3+
-License: GPLv2+ and GPLv3+
Requires: %{name} = %{version}-%{release}
Requires: %{name}-contrib-libs = %{version}-%{release}
@@ -73,10 +63,9 @@
%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
@@ -84,15 +73,15 @@
# 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 ThreadSearch 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
@@ -100,15 +89,11 @@
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!
@@ -225,6 +210,7 @@
%files contrib
%defattr(-,root,root)
%{pkgdatadir}/AutoVersioning.zip
+%{pkgdatadir}/BrowseTracker.zip
%{pkgdatadir}/ThreadSearch.zip
%{pkgdatadir}/byogames.zip
%{pkgdatadir}/cb_koders.zip
@@ -247,6 +233,7 @@
%{pkgdatadir}/lib_finder
%{plugindir}/libAutoVersioning.so
+%{plugindir}/libBrowseTracker.so
%{plugindir}/libThreadSearch.so
%{plugindir}/libbyogames.so
%{plugindir}/libcb_koders.so
@@ -266,6 +253,10 @@
%changelog
+* Sun Mar 2 2008 Dan Horak <dan[at]danny.cz> 8.02-1
+- update to stable release 8.02
+- update BR to use system libraries
+
* Mon Feb 18 2008 Dan Horak <dan[at]danny.cz> 1.0-0.30.20080211svn4872
- update to revision 4872
- really fix the multilib problem with the contrib subpackage (#433124)
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/F-8/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources 21 Feb 2008 16:35:50 -0000 1.20
+++ sources 2 Mar 2008 15:29:02 -0000 1.21
@@ -1 +1 @@
-32b5517fbae8960272788bdc95a89605 codeblocks-svn4872.tar.bz2
+ac15b4b3de50d7650c2f7a8dbcb30f88 codeblocks-8.02-src.tar.bz2
--- codeblocks-autorev.patch DELETED ---
--- codeblocks-getsvn DELETED ---
- Previous message (by thread): rpms/glade3/F-7 glade3.spec,1.9,1.10
- Next message (by thread): rpms/codeblocks/F-7 .cvsignore, 1.20, 1.21 codeblocks.spec, 1.22, 1.23 sources, 1.20, 1.21 codeblocks-autorev.patch, 1.4, NONE codeblocks-getsvn, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list