From 3208726db84591b80b41edd529bcbee060d79d9f Mon Sep 17 00:00:00 2001 From: Jens Lody fedora@jenslody.de Date: Dec 31 2017 21:44:33 +0000 Subject: Code::Blocks release 17.12.

Remove unneeded patches (all in upstream now)

---

diff --git a/codeblocks.spec b/codeblocks.spec index c8bab0d..ac1beb2 100644 --- a/codeblocks.spec +++ b/codeblocks.spec @@ -6,8 +6,8 @@ %endif

Name: codeblocks -Version: 16.01 -Release: 12%{?svnrelease}%{?dist} +Version: 17.12 +Release: 1%{?svnrelease}%{?dist} Summary: An open source, cross platform, free C++ IDE License: GPLv3+ URL: http://www.codeblocks.org/ @@ -15,31 +15,9 @@ URL: http://www.codeblocks.org/ # fedora-getsvn codeblocks svn://svn.code.sf.net/p/codeblocks/code/trunk %%{svnrev} Source0: %{name}-svn%{svnrev}.tar.bz2 %else -Source0: https://sourceforge.net/projects/%%7Bname%7D/files/Sources/%%7Bversion%7D/%%... +Source0: https://sourceforge.net/projects/%%7Bname%7D/files/Sources/%%7Bversion%7D/%%... %endif Patch0: codeblocks-autorev.patch -Source1: codeblocks.appdata.xml -Source2: codeblocks-contrib.metainfo.xml -# images for license fix patches, backported from codeblocks svn. -Source3: arnold_schwarzenegger.jpg -Source4: flower.jpg -# patch 1 and 2 are fixes for rhbz #1295328 -# replace image with problematic license in opencv-wizard -Patch1: codeblocks-16.01-opencv-wizard.patch -# update wxPdfDoc in source-exporter with recent git to fix license issues -Patch2: codeblocks-16.01-source-exporter.patch -# use system tinyxml, squirrel, astyle libraries -Patch3: codeblocks-16.01-unbundle.patch -# fix rhbz #1342076, #1349232, #1330252, #1350094 -Patch4: codeblocks-16.01-gcc6.patch -# set Fedora specific path for spellchecker -Patch5: codeblocks-16.01-spellchecker-settings.patch -# fix malformed code to build with gcc7 -Patch6: codeblocks-16.01-gcc7.patch -# backport changes for astyle 2.06 -Patch7: codeblocks-16.01-astyle2.06-backport.patch -# backport patch for crash in wxSmith -Patch8: codeblocks-16.01-wxsmith.patch

BuildRequires: libtool BuildRequires: wxGTK-devel @@ -62,7 +40,7 @@ BuildRequires: desktop-file-utils Requires: %{name}-libs = %{version}-%{release} Requires: shared-mime-info Requires: xterm -Provides: bundled(wxScintilla) = 1.7.1 +Provides: bundled(wxScintilla) = 3.53.0

%global pkgdatadir %{_datadir}/%{name} %global pkglibdir %{_libdir}/%{name} @@ -127,19 +105,7 @@ Additional Code::Blocks plug-ins. %setup -q -n %{name} %patch0 -p1 %else -%setup -q -n %{name}-%{version}.release -%patch1 -p1 -rm -f src/plugins/scriptedwizard/resources/opencv/files/lena.jpg -cp %{SOURCE3} src/plugins/scriptedwizard/resources/opencv/files/ -%patch2 -p1 -rm -f src/plugins/contrib/source_exporter/wxPdfDocument/samples/minimal/lena.jpg -cp %{SOURCE4} src/plugins/contrib/source_exporter/wxPdfDocument/samples/minimal/ -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 +%setup -q %endif

@@ -161,7 +127,8 @@ find . -type f -and -not -name "*.cpp" -and -not -name "*.h" -and -not -name "*. %build

%configure \ - --with-contrib-plugins=all + --with-contrib-plugins=all \ + --with-boost-libdir=%{_libdir}

# remove unbundled stuff rm -rf src/include/tinyxml src/base/tinyxml @@ -184,11 +151,7 @@ make %{?_smp_mflags} %make_install

%if 0%{?fedora} -%if %{snapshot} appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.{appdata,metainfo}.xml -%else -DESTDIR=%{buildroot} appstream-util install %{SOURCE1} %{SOURCE2} -%endif %endif desktop-file-validate %{buildroot}/%{_datadir}/applications/codeblocks.desktop

@@ -410,6 +373,10 @@ fi

%changelog +* Sun Dec 31 2017 Jens Lody fedora@jenslody.de - 17.12-1 +- Code::Blocks release 17.12. +- Remove unneeded patches (all in upstream now). + * Wed Aug 02 2017 Fedora Release Engineering releng@fedoraproject.org - 16.01-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild

diff --git a/sources b/sources index afbafb8..1eab444 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -823f6c229692367ff74f52098b887b6b codeblocks_16.01.tar.gz +SHA512 (codeblocks_17.12.tar.xz) = f90e756ca6f532656eeed34c6259c6a96ae85d172fc11e39f696ded9189cab7171d0cead18524fbab50dd782f21adbc7d52e2ea90535a3ed0aef5946b8a476e1

https://src.fedoraproject.org/rpms/codeblocks/c/3208726db84591b80b41edd529bc...