[sdcc/f20] Remove non-free directory from package
Roy Rankin
rrankin at fedoraproject.org
Mon Sep 2 22:10:37 UTC 2013
commit 3d8c0673828fdb055910dd18ee0ce06e92d91796
Author: Roy Rankin <rrankin at ihug.com.au>
Date: Tue Sep 3 08:10:21 2013 +1000
Remove non-free directory from package
.gitignore | 1 +
sdcc-3.2.0.diff | 196 -------------------------------------------------------
sdcc.spec | 18 +++--
sources | 2 +-
4 files changed, 12 insertions(+), 205 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 684df94..14203c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/sdcc-src-3.2.0.tar.bz2
+/sdcc-src-3.3.0.tar.bz2
diff --git a/sdcc.spec b/sdcc.spec
index 8522a2b..b19e392 100644
--- a/sdcc.spec
+++ b/sdcc.spec
@@ -1,6 +1,6 @@
Name: sdcc
-Version: 3.2.0
-Release: 5%{?dist}
+Version: 3.3.0
+Release: 0%{?dist}
Summary: Small Device C Compiler
Group: Applications/Engineering
License: GPLv2+
@@ -8,10 +8,6 @@ URL: http://sdcc.sourceforge.net/
Source0: http://downloads.sourceforge.net/sdcc/sdcc-src-%{version}.tar.bz2
Source1: README.fedora
-# Misc fixes to allow building with boost > 1.50.0
-# Mostly from upstream's 3.3.0 prereleases.
-Patch0: sdcc-3.2.0.diff
-
BuildRequires: bison
BuildRequires: boost-devel
BuildRequires: flex
@@ -55,8 +51,7 @@ Emacs extensions for SDCC.
%prep
-%setup -q -n sdcc
-%patch0 -p1
+%setup -q
find -name '*.{c,h,cc}' -exec chmod -x '{}' \;
# Disable brp-strip-static-archive for now because it errors trying to
@@ -82,6 +77,9 @@ mv $RPM_BUILD_ROOT%{_bindir}/*.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
find $RPM_BUILD_ROOT -type f -name \*.c -exec chmod a-x '{}' \;
mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/sdcc
mv $RPM_BUILD_ROOT%{_bindir}/* $RPM_BUILD_ROOT%{_libexecdir}/sdcc
+# remove non-free component
+rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/non-free
+
# Create launch scripts in _bindir
pushd $RPM_BUILD_ROOT%{_bindir}
@@ -122,6 +120,10 @@ popd
%changelog
+* Mon Sep 02 2013 Roy Rankin <rrankin at ihug.com.au> - 3.3.0-0
+- Remove non-free directory tree which is not GPL compatible
+- Upstream update 3.3.0
+
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index b23e0e6..93ba1ce 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0808a9b4109d2ba6046ddd7b679a0012 sdcc-src-3.2.0.tar.bz2
+c7c6aa75415580795ecc4fd31948e5ba sdcc-src-3.3.0.tar.bz2
More information about the scm-commits
mailing list