The package rpms/wordgrinder.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/wordgrinder.git/commit/?id=b2211c89a....
Change: +ExcludeArch: s390x ppc64 ppc64le
Thanks.
Full change: ============
commit 07520f1b5bbbb330c96578dac89de01429804a1b Merge: 393dda9 b2211c8 Author: Ben Cotton bcotton@fedoraproject.org Date: Thu Jul 6 16:04:49 2017 -0400
Merge branch 'master' into f26
commit b2211c89af5bbd75289f33c09f435c85deb8a6e1 Author: Ben Cotton bcotton@fedoraproject.org Date: Thu Jul 6 15:53:03 2017 -0400
Exclude architectures where all of our dependencies are not available
diff --git a/wordgrinder.spec b/wordgrinder.spec index a0d925f..18c208c 100644 --- a/wordgrinder.spec +++ b/wordgrinder.spec @@ -15,6 +15,8 @@ BuildRequires: gcc make ncurses-devel BuildRequires: luajit luajit-devel compat-lua-libs compat-lua-devel compat-lua lua-filesystem-compat BuildRequires: zlib-devel libXft-devel Requires: ncurses luajit lua-filesystem-compat +# luaJIT is not available on all architectures +ExcludeArch: s390x ppc64 ppc64le
%description WordGrinder is a Unicode-aware character cell word processor that runs in a
commit 8e0292c62bc58d65fe7f56f1a8c49535a1c7c7cf Author: Ben Cotton bcotton@fedoraproject.org Date: Thu Jul 6 15:43:49 2017 -0400
Initial import (#1460246)
diff --git a/.gitignore b/.gitignore index e69de29..05b5955 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/wordgrinder-0.6.tar.gz diff --git a/fedora_build.patch b/fedora_build.patch new file mode 100644 index 0000000..146d459 --- /dev/null +++ b/fedora_build.patch @@ -0,0 +1,66 @@ +diff --git a/Makefile b/Makefile +index 7967eef..f63e7f3 100644 +--- a/Makefile ++++ b/Makefile +@@ -12,7 +12,16 @@ WINCC = mingw32-gcc.exe + WINDRES = windres.exe + MAKENSIS = makensis + +-USE_LUAJIT = n ++# Do we build with debug symbols? ++DEBUGINFO = n ++ ++# Detect Fedora systems and adjust accordingly ++ifneq ($(wildcard /etc/fedora-release),) ++ # Fedora uses lua 5.3, so we'll use luaJIT instead ++ USE_LUAJIT = y ++else ++ USE_LUAJIT = n ++endif + + ifneq ($(findstring Windows,$(OS)),) + OS = windows +@@ -35,8 +44,14 @@ else + LIBROOT := /usr/lib + INCROOT := /usr + ifeq ($(USE_LUAJIT),y) +- LUA_INCLUDE := $(INCROOT)/include/luajit-2.0 ++ # Fedora 26 uses a newer version of luaJIT, so check for that ++ ifneq ($(wildcard $(INCROOT)/include/luajit-2.1),) ++ LUA_INCLUDE := $(INCROOT)/include/luajit-2.1 ++ else ++ LUA_INCLUDE := $(INCROOT)/include/luajit-2.0 ++ endif + LUA_LIB := -lluajit-5.1 ++ LUA_PATH := $(hide)/bin/lua-5.1 + # The ImmutabliseArray() code, used by the debug version of + # WordGrinder to ensure we don't modify stuff we shouldn't, + # uses new 5.2 metamethods and doesn't work on LuaJIT. +@@ -44,6 +59,7 @@ else + else + LUA_INCLUDE := $(INCROOT)/include/lua5.2 + LUA_LIB := -llua5.2 ++ LUA_PATH := $(hide)lua + TESTER = bin/wordgrinder-debug + endif + +@@ -74,6 +90,10 @@ override CFLAGS += \ + -fdata-sections \ + --std=gnu99 + ++ifeq ($(DEBUGINFO),y) ++ override CFLAGS += -g ++endif ++ + override LDFLAGS += \ + + WININSTALLER := bin/WordGrinder\ $(VERSION)\ setup.exe +@@ -160,7 +180,7 @@ LUASCRIPTS := \ + $(OBJ)/luascripts.c: $(LUASCRIPTS) + @echo SCRIPTS + @mkdir -p $(OBJ) +- $(hide)lua tools/multibin2c.lua script_table $^ > $@ ++ $(LUA_PATH) tools/multibin2c.lua script_table $^ > $@ + + clean:: + @echo CLEAN $(OBJ)/luascripts.c diff --git a/sources b/sources index e69de29..9e85314 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +SHA512 (wordgrinder-0.6.tar.gz) = 3548522d883f68a6b8d657295f2be52550b347c4a975c55fa9f97b62ee8c7a4a54d02bf1e4fb97b8656701aa1451a8eb2bdda29d052891e519cbb98f463608c6 diff --git a/wordgrinder.spec b/wordgrinder.spec new file mode 100644 index 0000000..a0d925f --- /dev/null +++ b/wordgrinder.spec @@ -0,0 +1,64 @@ +Name: wordgrinder +Version: 0.6 +Release: 4%{?dist} +Summary: A command line word processor + +License: MIT +URL: http://cowlark.com/wordgrinder +%global pkgid %{name}-%{version} +Source: https://github.com/davidgiven/%%7Bname%7D/archive/%%7Bname%7D-%%7Bversion%7D... + +# Patch the Makefile to work with Fedora technology and policy +Patch1: fedora_build.patch + +BuildRequires: gcc make ncurses-devel +BuildRequires: luajit luajit-devel compat-lua-libs compat-lua-devel compat-lua lua-filesystem-compat +BuildRequires: zlib-devel libXft-devel +Requires: ncurses luajit lua-filesystem-compat + +%description +WordGrinder is a Unicode-aware character cell word processor that runs in a +terminal (or a Windows console). It is designed to get the hell out of your way +and let you get some work done. + +WordGrinder is a word processor for processing words. It is not WYSIWYG. It is +not point and click. It is not a desktop publisher. It is not a text editor. It +does not do fonts and it barely does styles. What it does do is words. It's +designed for writing text. It gets out of your way and lets you type + +%prep + +%setup -q -n %{name}-%{name}-%{version} +%patch1 -p1 + +############################################################################### +%build + +make %{?_smp_mflags} DEBUGINFO=y + +############################################################################### +%install + +make install PREFIX=$RPM_BUILD_ROOT/%{_prefix} + +############################################################################### +%files +%license COPYING +%_bindir/wordgrinder +%_docdir/wordgrinder/README.wg +%_mandir/man1/wordgrinder.1* + +############################################################################### +%changelog + +* Thu Jul 06 2017 Ben Cotton bcotton@fedoraproject.org - 0.6-4 +- Fix debuginfo issues + +* Thu Jul 06 2017 Ben Cotton bcotton@fedoraproject.org - 0.6-3 +- Update the patch to build on Fedora 26 + +* Sun Jul 02 2017 Ben Cotton bcotton@fedoraproject.org - 0.6-2 +- Change lua to a version supported by upstream (5.1) + +* Wed Jun 07 2017 Ben Cotton bcotton@fedoraproject.org - 0.6-1 +- Initial RPM release