rpms/codeblocks/EL-5 .cvsignore, 1.19, 1.20 codeblocks.spec, 1.22, 1.23 sources, 1.19, 1.20 codeblocks-8.02-gcc-detect.patch, 1.1, NONE codeblocks-desktop.patch, 1.2, NONE codeblocks-plugins.patch, 1.3, NONE codeblocks-run.patch, 1.1, NONE
Dan Horák
sharkcz at fedoraproject.org
Mon Jun 28 06:25:30 UTC 2010
Author: sharkcz
Update of /cvs/extras/rpms/codeblocks/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv1416
Modified Files:
.cvsignore codeblocks.spec sources
Removed Files:
codeblocks-8.02-gcc-detect.patch codeblocks-desktop.patch
codeblocks-plugins.patch codeblocks-run.patch
Log Message:
* Sun Jun 27 2010 Dan Horák <dan[at]danny.cz> - 10.05-1
- updated to 10.05 release
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/EL-5/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore 15 Mar 2008 16:41:28 -0000 1.19
+++ .cvsignore 28 Jun 2010 06:25:30 -0000 1.20
@@ -1 +1 @@
-codeblocks-8.02-src.tar.bz2
+codeblocks-10.05-src.tar.bz2
Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/EL-5/codeblocks.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- codeblocks.spec 31 Oct 2008 09:12:01 -0000 1.22
+++ codeblocks.spec 28 Jun 2010 06:25:30 -0000 1.23
@@ -1,113 +1,98 @@
Name: codeblocks
-Version: 8.02
-Release: 3%{?dist}
+Version: 10.05
+Release: 1%{?dist}
Summary: An open source, cross platform, free C++ IDE
Group: Development/Tools
License: GPLv3+
URL: http://www.codeblocks.org/
-Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tar.bz2
+Source0: http://download.berlios.de/%{name}/%{name}-%{version}-src.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: wxGTK-devel >= 2.8.0, zlib-devel, bzip2-devel
+BuildRequires: wxGTK-devel >= 2.8.0
+BuildRequires: zlib-devel
+BuildRequires: bzip2-devel
BuildRequires: zip
BuildRequires: dos2unix
BuildRequires: desktop-file-utils
Requires: %{name}-libs = %{version}-%{release}
Requires: shared-mime-info
-# Fedora packaging rules
-Patch1: codeblocks-plugins.patch
-# update to recent standards (http://developer.berlios.de/patch/?func=detailpatch&patch_id=2567&group_id=5358)
-Patch2: codeblocks-desktop.patch
-# bug #461120 (http://developer.berlios.de/patch/?func=detailpatch&patch_id=2568&group_id=5358)
-Patch3: codeblocks-run.patch
-# bug #469096 (fixed in upstream svn revision 5159)
-Patch4: codeblocks-8.02-gcc-detect.patch
+
+%define pkgdatadir %{_datadir}/%{name}
+%define pkglibdir %{_libdir}/%{name}
+%define plugindir %{pkglibdir}/plugins
+
%description
Code::Blocks is a free C++ IDE built specifically to meet the most demanding
needs of its users. It was designed, right from the start, to be extensible
-and configurable. Built around a plugin framework, Code::Blocks can be
-extended with plugin DLLs. It includes a plugin wizard, so you can compile
-your own plugins.
+and configurable. Built around a plug-in framework, Code::Blocks can be
+extended with plug-in DLLs. It includes a plug-in wizard, so you can compile
+your own plug-ins.
%package libs
-Summary: Libraries needed to run Code::Blocks and its plugins
+Summary: Libraries needed to run Code::Blocks and its plug-ins
Group: System Environment/Libraries
%description libs
-Libraries needed to run Code::Blocks and its plugins.
+Libraries needed to run Code::Blocks and its plug-ins.
%package devel
-Summary: Files needed to build Code::Blocks plugins
+Summary: Files needed to build Code::Blocks plug-ins
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
-Requires: pkgconfig
%description devel
-Development files needed to build Code::Blocks plugins.
+Development files needed to build Code::Blocks plug-ins.
%package contrib-libs
-Summary: Libraries needed to run Code::Blocks contrib plugins
+Summary: Libraries needed to run Code::Blocks contrib plug-ins
Group: System Environment/Libraries
-Obsoletes: %{name}-contrib < 1.0-0.28.20071210svn4719
%description contrib-libs
-Libraries needed to run Code::Blocks contrib plugins.
+Libraries needed to run Code::Blocks contrib plug-ins.
+
+%package contrib-devel
+Summary: Files needed to build Code::Blocks contrib plug-ins
+Group: Development/Libraries
+Requires: %{name}-contrib-libs = %{version}-%{release}
+
+%description contrib-devel
+Development files needed to build Code::Blocks contrib plug-ins.
%package contrib
-Summary: Additional Code::Blocks plugins
+Summary: Additional Code::Blocks plug-ins
Group: Development/Tools
Requires: %{name} = %{version}-%{release}
Requires: %{name}-contrib-libs = %{version}-%{release}
+Requires: cppcheck
+Requires: valgrind
%description contrib
-Additional Code::Blocks plugins.
-
-
-%define pkgdatadir %{_datadir}/%{name}
-%define pkglibdir %{_libdir}/%{name}
-%define plugindir %{pkglibdir}/plugins
+Additional Code::Blocks plug-ins.
%prep
-%setup -q
-%patch1
-%patch2 -p1
-%patch3 -p0 -b .run
-%patch4 -p0 -b .gcc-detect
+%setup -q -n %{name}-%{version}-release
# 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
-# 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)/plugins|@libdir@/@PACKAGE@/plugins|' src/plugins/$p/Makefile.*
-done
-
-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)/plugins|@libdir@/@PACKAGE@/plugins|' src/plugins/contrib/$p/Makefile.*
-done
-
-sed -i 's|$(pkgdatadir)/plugins|@libdir@/@PACKAGE@/plugins|' src/plugins/contrib/wxSmith/plugin/Makefile.*
-
-sed -i 's|@libdir@|%{_libdir}|' src/sdk/configmanager.cpp
-
# remove execute bits from source files
find src/plugins/contrib/regex_testbed -type f -exec chmod a-x {} ';'
+find src/plugins/contrib/IncrementalSearch -type f -exec chmod a-x {} ';'
find src/plugins/compilergcc -type f -exec chmod a-x {} ';'
-# fix version inside the configure script
-sed -i 's/1\.0svn/%{version}/g' configure
+# fix version string
+sed -i 's/10.05-release/%{version}/g' configure
+
+# remove resource archives, they are corrupted
+rm -f src/src/resources/*.zip
%build
+CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%configure --with-contrib-plugins=all
-# 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}
@@ -117,17 +102,21 @@ rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT INSTALL="/usr/bin/install -p" install
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/wxSmithContribItems/*.la
rm -f $RPM_BUILD_ROOT%{plugindir}/*.la
desktop-file-install --vendor fedora \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
- --add-category X-Fedora \
--delete-original \
$RPM_BUILD_ROOT%{_datadir}/applications/codeblocks.desktop
# set a fixed timestamp (source archive creation) to generated resource archives
touch -r %{SOURCE0} $RPM_BUILD_ROOT%{pkgdatadir}/*.zip
+# generate linker config file for wxSmithContribItems libraries
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d
+echo "%{_libdir}/wxSmithContribItems" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/%{name}-contrib-%{_arch}.conf
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -149,7 +138,7 @@ update-mime-database /usr/share/mime &>
%files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%doc README COPYING AUTHORS BUGS COMPILERS NEWS ChangeLog
%{_bindir}/*
@@ -170,7 +159,7 @@ update-mime-database /usr/share/mime &>
%{plugindir}/libtodo.so
%{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/icons/gnome/48x48/mimetypes/*.png
+%{_datadir}/icons/hicolor/48x48/mimetypes/*.png
%{_datadir}/mime/packages/%{name}.xml
%{_datadir}/pixmaps/%{name}.png
@@ -201,32 +190,51 @@ update-mime-database /usr/share/mime &>
%{pkgdatadir}/tips.txt
%files libs
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%{_libdir}/lib%{name}.so.*
%files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%{_includedir}/%{name}
%{_libdir}/lib%{name}.so
%{_libdir}/pkgconfig/%{name}.pc
%files contrib-libs
-%defattr(-,root,root)
+%defattr(-,root,root,-)
+%{_sysconfdir}/ld.so.conf.d/%{name}-contrib-%{_arch}.conf
%{_libdir}/libwxsmithlib.so.*
+%{_libdir}/wxSmithContribItems/*.so.*
%exclude %{_libdir}/libwxsmithlib.so
+%files contrib-devel
+%defattr(-,root,root,-)
+%{_includedir}/wxsmith
+%{_includedir}/wxSmithContribItems
+%{_libdir}/wxSmithContribItems/*.so
+%{_libdir}/pkgconfig/wxsmith.pc
+%{_libdir}/pkgconfig/wxsmithaui.pc
+%{_libdir}/pkgconfig/wxsmith-contrib.pc
+
%files contrib
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%{pkgdatadir}/AutoVersioning.zip
%{pkgdatadir}/BrowseTracker.zip
+%{pkgdatadir}/Cccc.zip
+%{pkgdatadir}/CppCheck.zip
+%{pkgdatadir}/HexEditor.zip
+%{pkgdatadir}/IncrementalSearch.zip
+%{pkgdatadir}/MouseSap.zip
%{pkgdatadir}/ThreadSearch.zip
+%{pkgdatadir}/Valgrind.zip
%{pkgdatadir}/byogames.zip
%{pkgdatadir}/cb_koders.zip
%{pkgdatadir}/codesnippets.zip
%{pkgdatadir}/codestat.zip
+%{pkgdatadir}/copystrings.zip
%{pkgdatadir}/dragscroll.zip
%{pkgdatadir}/envvars.zip
%{pkgdatadir}/exporter.zip
+%{pkgdatadir}/headerfixup.zip
%{pkgdatadir}/help_plugin.zip
%{pkgdatadir}/keybinder.zip
%{pkgdatadir}/lib_finder.zip
@@ -234,6 +242,7 @@ update-mime-database /usr/share/mime &>
%{pkgdatadir}/RegExTestbed.zip
%{pkgdatadir}/SymTab.zip
%{pkgdatadir}/wxsmith.zip
+%{pkgdatadir}/wxSmithAui.zip
%{pkgdatadir}/wxsmithcontribitems.zip
%{pkgdatadir}/images/ThreadSearch
%{pkgdatadir}/images/codesnippets
@@ -242,14 +251,22 @@ update-mime-database /usr/share/mime &>
%{plugindir}/libAutoVersioning.so
%{plugindir}/libBrowseTracker.so
+%{plugindir}/libCccc.so
+%{plugindir}/libCppCheck.so
+%{plugindir}/libHexEditor.so
+%{plugindir}/libIncrementalSearch.so
+%{plugindir}/libMouseSap.so
%{plugindir}/libThreadSearch.so
+%{plugindir}/libValgrind.so
%{plugindir}/libbyogames.so
%{plugindir}/libcb_koders.so
%{plugindir}/libcodesnippets.so
%{plugindir}/libcodestat.so
+%{plugindir}/libcopystrings.so
%{plugindir}/libdragscroll.so
%{plugindir}/libenvvars.so
%{plugindir}/libexporter.so
+%{plugindir}/libheaderfixup.so
%{plugindir}/libhelp_plugin.so
%{plugindir}/libkeybinder.so
%{plugindir}/liblib_finder.so
@@ -257,17 +274,42 @@ update-mime-database /usr/share/mime &>
%{plugindir}/libRegExTestbed.so
%{plugindir}/libSymTab.so
%{plugindir}/libwxsmith.so
+%{plugindir}/libwxSmithAui.so
%{plugindir}/libwxsmithcontribitems.so
%changelog
-* Fri Oct 31 2008 Dan Horak <dan[at]danny.cz> 8.02-3
+* Sun Jun 27 2010 Dan Horák <dan[at]danny.cz> - 10.05-1
+- updated to 10.05 release
+
+* Sat Feb 13 2010 Dan Horák <dan[at]danny.cz> - 8.02-10
+- fixed linking with the new --no-add-needed default (#564644)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8.02-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Jun 15 2009 Dan Horák <dan[at]danny.cz> 8.02-8
+- fix gsocket between glib >= 2.21 and wxGTK in rawhide
+
+* Sat Feb 28 2009 Dan Horák <dan[at]danny.cz> 8.02-7
+- update desktop file (#487796)
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8.02-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Feb 18 2009 Dan Horak <dan[at]danny.cz> 8.02-5
+- fix compile error with gcc 4.4/glibc 2.9.90
+
+* Fri Oct 31 2008 Dan Horak <dan[at]danny.cz> 8.02-4
- fix gcc detection (#469096)
-* Sat Sep 20 2008 Dan Horak <dan[at]danny.cz> 8.02-2
+* Sat Sep 20 2008 Dan Horak <dan[at]danny.cz> 8.02-3
- update desktop file
- fix running console applications (#461120)
+* Fri Aug 29 2008 Dan Horak <dan[at]danny.cz> 8.02-2
+- refresh patches
+
* 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: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/EL-5/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources 15 Mar 2008 16:41:28 -0000 1.19
+++ sources 28 Jun 2010 06:25:30 -0000 1.20
@@ -1 +1 @@
-ac15b4b3de50d7650c2f7a8dbcb30f88 codeblocks-8.02-src.tar.bz2
+ab077d562e98b0586f2f86c14cb773ba codeblocks-10.05-src.tar.bz2
--- codeblocks-8.02-gcc-detect.patch DELETED ---
--- codeblocks-desktop.patch DELETED ---
--- codeblocks-plugins.patch DELETED ---
--- codeblocks-run.patch DELETED ---
More information about the scm-commits
mailing list