Accepting request 507939 from home:1Antoine1:branches:devel:tools

- Update to 2.5:
  * CLI: Add --no-trailing-nl option.
  * CLI: Add support for environment variable ANSIFILTER_OPTIONS.
- Changes from 2.4:
  * Fix crash reading irregular escape codes.
- Clean spec file.
- Update GPG public key (key had expired).

- Update to 2.3:
  * Add support for true color escape codes

- Update to 2.2:
  * A lot of changes happened since 1.7. Please refer to
    /usr/share/doc/packages/ansifilter/ChangeLog
  * Build with Qt 5 instead of Qt 4
- Drop ansifilter-compiler_flags.patch: this can be handled in
  %%build with environment variables.
- Add signature verification:
  * Add ansifilter.keyring (ansifilter's main developer Andre Simon
    public key)
  * Add ansifilter-2.2.tar.bz2.asc
- Clean spec file:
  * Remove obsolete conditional for openSUSE < 10.3
  * Simplify build requirements, move GUI specific dependencies
    to GUI subpackage
  * Clean with spec-cleaner

OBS-URL: https://build.opensuse.org/request/show/507939
OBS-URL: https://build.opensuse.org/package/show/devel:tools/ansifilter?expand=0&rev=10
This commit is contained in:
Martin Pluskal 2017-07-04 09:31:08 +00:00 committed by Git OBS Bridge
parent b645b164ca
commit 5a3327370d
8 changed files with 145 additions and 473 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a7e8ecec282bf2d823f89c1ae5cd7ca9da4e49f3dad98df052ea48ffd9a4975c
size 133803

3
ansifilter-2.5.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:30d05ccfa9be98b0328ee29fe39473e55047f1d32a9a2460d3d4d1ff2475f0e2
size 435332

View File

@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCAAdFiEEuMVVdBh/SRgO3HY3UP4CedgFp8cFAllKZCoACgkQUP4CedgF
p8c5AQf/Tl2SCS+uwlaB0B791UrsCCK70uRJ4RX6LkMlDkD1Kpv6CdI8F6F21oJ6
p1AZh9fpkDSbqXEvkTaJM3YhfqD0VG0eRv8ZdIwWZIV/iJFML7cMaTMyB62GOCbn
e3pH8jfLn8Y8hvT3sWxktfq8vbVnjQTQ2Xzu3pYEFrX1/Rn2P+Rb1eJ/FosvJ9Hg
rBkN244o3ZLBD0qiO3Ss5oPP2SxMMfHrGLB21Pv5EuZzS8xosOrytHPBAhjuCKpT
5aoSCTZpmWc/PW2NExelY1GUeKhjhEjl9cwEfS3cSvGIWOBm6LZAtfcXzlfaFjsO
a8W/QwtzVqcE0wF0VCXVEfuzBmHX0A==
=vLDt
-----END PGP SIGNATURE-----

View File

@ -1,395 +0,0 @@
---
src/makefile | 16 +-
src/qt-gui/Makefile | 346 ----------------------------------------------------
2 files changed, 8 insertions(+), 354 deletions(-)
Index: src/makefile
===================================================================
--- src/makefile.orig 2012-01-04 16:17:59.000000000 +0100
+++ src/makefile 2013-10-28 13:59:17.438555472 +0100
@@ -2,26 +2,26 @@
# This file will compile the ansifilter binary.
# See INSTALL for instructions.
-CC=g++
+CXX = g++
-CFLAGS= -c -Wall -O2
+CXXFLAGS = -c -Wall -O2 $(RPM_OPT_FLAGS)
-LDFLAGS=
+LDFLAGS =
-SOURCES=arg_parser.o stringtools.o cmdlineoptions.o main.o platform_fs.o\
+SOURCES = arg_parser.o stringtools.o cmdlineoptions.o main.o platform_fs.o\
codegenerator.o htmlgenerator.o texgenerator.o latexgenerator.o rtfgenerator.o\
plaintextgenerator.o bbcodegenerator.o elementstyle.o stylecolour.o preformatter.o
-OBJECTS=$(SOURCES:.cpp=.o)
-EXECUTABLE=ansifilter
+OBJECTS = $(SOURCES:.cpp=.o)
+EXECUTABLE = ansifilter
all: $(SOURCES) $(EXECUTABLE)
$(EXECUTABLE): $(OBJECTS)
- $(CC) $(LDFLAGS) $(OBJECTS) -o $@
+ $(CXX) $(LDFLAGS) $(OBJECTS) -o $@
.cpp.o:
- $(CC) $(CFLAGS) $< -o $@
+ $(CXX) $(CXXFLAGS) $< -o $@
clean:
@rm -f *.o
Index: src/qt-gui/Makefile
===================================================================
--- src/qt-gui/Makefile 2012-01-04 19:11:18.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,346 +0,0 @@
-#############################################################################
-# Makefile for building: ansifilter-gui
-# Generated by qmake (2.01a) (Qt 4.7.4) on: Mi. Jan 4 19:11:18 2012
-# Project: ansifilter-gui.pro
-# Template: app
-# Command: /usr/bin/qmake -o Makefile ansifilter-gui.pro
-#############################################################################
-
-####### Compiler, tools and options
-
-CC = gcc
-CXX = g++
-DEFINES = -DO2 -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
-CFLAGS = -m64 -pipe -march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2 -fno-strict-aliasing -Wall -W -D_REENTRANT $(DEFINES)
-CXXFLAGS = -m64 -pipe -march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2 -fno-strict-aliasing -Wall -W -D_REENTRANT $(DEFINES)
-INCPATH = -I/usr/share/qt/mkspecs/linux-g++-64 -I. -I/usr/include/QtCore -I/usr/include/QtGui -I/usr/include -I. -I.. -I. -I.
-LINK = g++
-LFLAGS = -m64 -Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu -Wl,-O1
-LIBS = $(SUBLIBS) -L/usr/lib -lQtGui -lQtCore -lpthread
-AR = ar cqs
-RANLIB =
-QMAKE = /usr/bin/qmake
-TAR = tar -cf
-COMPRESS = gzip -9f
-COPY = cp -f
-SED = sed
-COPY_FILE = $(COPY)
-COPY_DIR = $(COPY) -r
-STRIP = strip
-INSTALL_FILE = install -m 644 -p
-INSTALL_DIR = $(COPY_DIR)
-INSTALL_PROGRAM = install -m 755 -p
-DEL_FILE = rm -f
-SYMLINK = ln -f -s
-DEL_DIR = rmdir
-MOVE = mv -f
-CHK_DIR_EXISTS= test -d
-MKDIR = mkdir -p
-
-####### Output directory
-
-OBJECTS_DIR = ./
-
-####### Files
-
-SOURCES = main.cpp \
- mydialog.cpp \
- ../elementstyle.cpp \
- ../plaintextgenerator.cpp \
- ../codegenerator.cpp \
- ../platform_fs.cpp \
- ../rtfgenerator.cpp \
- ../htmlgenerator.cpp \
- ../texgenerator.cpp \
- ../latexgenerator.cpp \
- ../bbcodegenerator.cpp \
- ../stringtools.cpp \
- ../stylecolour.cpp \
- ../preformatter.cpp moc_mydialog.cpp
-OBJECTS = main.o \
- mydialog.o \
- elementstyle.o \
- plaintextgenerator.o \
- codegenerator.o \
- platform_fs.o \
- rtfgenerator.o \
- htmlgenerator.o \
- texgenerator.o \
- latexgenerator.o \
- bbcodegenerator.o \
- stringtools.o \
- stylecolour.o \
- preformatter.o \
- moc_mydialog.o
-DIST = /usr/share/qt/mkspecs/common/g++.conf \
- /usr/share/qt/mkspecs/common/unix.conf \
- /usr/share/qt/mkspecs/common/linux.conf \
- /usr/share/qt/mkspecs/qconfig.pri \
- /usr/share/qt/mkspecs/modules/qt_phonon.pri \
- /usr/share/qt/mkspecs/modules/qt_webkit_version.pri \
- /usr/share/qt/mkspecs/features/qt_functions.prf \
- /usr/share/qt/mkspecs/features/qt_config.prf \
- /usr/share/qt/mkspecs/features/exclusive_builds.prf \
- /usr/share/qt/mkspecs/features/default_pre.prf \
- /usr/share/qt/mkspecs/features/release.prf \
- /usr/share/qt/mkspecs/features/default_post.prf \
- /usr/share/qt/mkspecs/features/warn_on.prf \
- /usr/share/qt/mkspecs/features/qt.prf \
- /usr/share/qt/mkspecs/features/unix/thread.prf \
- /usr/share/qt/mkspecs/features/moc.prf \
- /usr/share/qt/mkspecs/features/resources.prf \
- /usr/share/qt/mkspecs/features/uic.prf \
- /usr/share/qt/mkspecs/features/yacc.prf \
- /usr/share/qt/mkspecs/features/lex.prf \
- /usr/share/qt/mkspecs/features/include_source_dir.prf \
- ansifilter-gui.pro
-QMAKE_TARGET = ansifilter-gui
-DESTDIR =
-TARGET = ansifilter-gui
-
-first: all
-####### Implicit rules
-
-.SUFFIXES: .o .c .cpp .cc .cxx .C
-
-.cpp.o:
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
-
-.cc.o:
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
-
-.cxx.o:
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
-
-.C.o:
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
-
-.c.o:
- $(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<"
-
-####### Build rules
-
-all: Makefile $(TARGET)
-
-$(TARGET): ui_ansifilter.h $(OBJECTS)
- $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
-
-Makefile: ansifilter-gui.pro /usr/share/qt/mkspecs/linux-g++-64/qmake.conf /usr/share/qt/mkspecs/common/g++.conf \
- /usr/share/qt/mkspecs/common/unix.conf \
- /usr/share/qt/mkspecs/common/linux.conf \
- /usr/share/qt/mkspecs/qconfig.pri \
- /usr/share/qt/mkspecs/modules/qt_phonon.pri \
- /usr/share/qt/mkspecs/modules/qt_webkit_version.pri \
- /usr/share/qt/mkspecs/features/qt_functions.prf \
- /usr/share/qt/mkspecs/features/qt_config.prf \
- /usr/share/qt/mkspecs/features/exclusive_builds.prf \
- /usr/share/qt/mkspecs/features/default_pre.prf \
- /usr/share/qt/mkspecs/features/release.prf \
- /usr/share/qt/mkspecs/features/default_post.prf \
- /usr/share/qt/mkspecs/features/warn_on.prf \
- /usr/share/qt/mkspecs/features/qt.prf \
- /usr/share/qt/mkspecs/features/unix/thread.prf \
- /usr/share/qt/mkspecs/features/moc.prf \
- /usr/share/qt/mkspecs/features/resources.prf \
- /usr/share/qt/mkspecs/features/uic.prf \
- /usr/share/qt/mkspecs/features/yacc.prf \
- /usr/share/qt/mkspecs/features/lex.prf \
- /usr/share/qt/mkspecs/features/include_source_dir.prf \
- /usr/lib/libQtGui.prl \
- /usr/lib/libQtCore.prl
- $(QMAKE) -o Makefile ansifilter-gui.pro
-/usr/share/qt/mkspecs/common/g++.conf:
-/usr/share/qt/mkspecs/common/unix.conf:
-/usr/share/qt/mkspecs/common/linux.conf:
-/usr/share/qt/mkspecs/qconfig.pri:
-/usr/share/qt/mkspecs/modules/qt_phonon.pri:
-/usr/share/qt/mkspecs/modules/qt_webkit_version.pri:
-/usr/share/qt/mkspecs/features/qt_functions.prf:
-/usr/share/qt/mkspecs/features/qt_config.prf:
-/usr/share/qt/mkspecs/features/exclusive_builds.prf:
-/usr/share/qt/mkspecs/features/default_pre.prf:
-/usr/share/qt/mkspecs/features/release.prf:
-/usr/share/qt/mkspecs/features/default_post.prf:
-/usr/share/qt/mkspecs/features/warn_on.prf:
-/usr/share/qt/mkspecs/features/qt.prf:
-/usr/share/qt/mkspecs/features/unix/thread.prf:
-/usr/share/qt/mkspecs/features/moc.prf:
-/usr/share/qt/mkspecs/features/resources.prf:
-/usr/share/qt/mkspecs/features/uic.prf:
-/usr/share/qt/mkspecs/features/yacc.prf:
-/usr/share/qt/mkspecs/features/lex.prf:
-/usr/share/qt/mkspecs/features/include_source_dir.prf:
-/usr/lib/libQtGui.prl:
-/usr/lib/libQtCore.prl:
-qmake: FORCE
- @$(QMAKE) -o Makefile ansifilter-gui.pro
-
-dist:
- @$(CHK_DIR_EXISTS) .tmp/ansifilter-gui1.0.0 || $(MKDIR) .tmp/ansifilter-gui1.0.0
- $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/ansifilter-gui1.0.0/ && $(COPY_FILE) --parents mydialog.h .tmp/ansifilter-gui1.0.0/ && $(COPY_FILE) --parents main.cpp mydialog.cpp ../elementstyle.cpp ../plaintextgenerator.cpp ../codegenerator.cpp ../platform_fs.cpp ../rtfgenerator.cpp ../htmlgenerator.cpp ../texgenerator.cpp ../latexgenerator.cpp ../bbcodegenerator.cpp ../stringtools.cpp ../stylecolour.cpp ../preformatter.cpp .tmp/ansifilter-gui1.0.0/ && $(COPY_FILE) --parents ansifilter.ui .tmp/ansifilter-gui1.0.0/ && (cd `dirname .tmp/ansifilter-gui1.0.0` && $(TAR) ansifilter-gui1.0.0.tar ansifilter-gui1.0.0 && $(COMPRESS) ansifilter-gui1.0.0.tar) && $(MOVE) `dirname .tmp/ansifilter-gui1.0.0`/ansifilter-gui1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/ansifilter-gui1.0.0
-
-
-clean:compiler_clean
- -$(DEL_FILE) $(OBJECTS)
- -$(DEL_FILE) *~ core *.core
-
-
-####### Sub-libraries
-
-distclean: clean
- -$(DEL_FILE) $(TARGET)
- -$(DEL_FILE) Makefile
-
-
-check: first
-
-mocclean: compiler_moc_header_clean compiler_moc_source_clean
-
-mocables: compiler_moc_header_make_all compiler_moc_source_make_all
-
-compiler_moc_header_make_all: moc_mydialog.cpp
-compiler_moc_header_clean:
- -$(DEL_FILE) moc_mydialog.cpp
-moc_mydialog.cpp: ui_ansifilter.h \
- mydialog.h
- /usr/bin/moc $(DEFINES) $(INCPATH) mydialog.h -o moc_mydialog.cpp
-
-compiler_rcc_make_all:
-compiler_rcc_clean:
-compiler_image_collection_make_all: qmake_image_collection.cpp
-compiler_image_collection_clean:
- -$(DEL_FILE) qmake_image_collection.cpp
-compiler_moc_source_make_all:
-compiler_moc_source_clean:
-compiler_uic_make_all: ui_ansifilter.h
-compiler_uic_clean:
- -$(DEL_FILE) ui_ansifilter.h
-ui_ansifilter.h: ansifilter.ui
- /usr/bin/uic ansifilter.ui -o ui_ansifilter.h
-
-compiler_yacc_decl_make_all:
-compiler_yacc_decl_clean:
-compiler_yacc_impl_make_all:
-compiler_yacc_impl_clean:
-compiler_lex_make_all:
-compiler_lex_clean:
-compiler_clean: compiler_moc_header_clean compiler_uic_clean
-
-####### Compile
-
-main.o: main.cpp mydialog.h \
- ui_ansifilter.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp
-
-mydialog.o: mydialog.cpp mydialog.h \
- ui_ansifilter.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o mydialog.o mydialog.cpp
-
-elementstyle.o: ../elementstyle.cpp ../elementstyle.h \
- ../stylecolour.h \
- ../enums.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o elementstyle.o ../elementstyle.cpp
-
-plaintextgenerator.o: ../plaintextgenerator.cpp ../plaintextgenerator.h \
- ../codegenerator.h \
- ../elementstyle.h \
- ../stylecolour.h \
- ../enums.h \
- ../preformatter.h \
- ../stringtools.h \
- ../version.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o plaintextgenerator.o ../plaintextgenerator.cpp
-
-codegenerator.o: ../codegenerator.cpp ../codegenerator.h \
- ../elementstyle.h \
- ../stylecolour.h \
- ../enums.h \
- ../preformatter.h \
- ../stringtools.h \
- ../version.h \
- ../htmlgenerator.h \
- ../rtfgenerator.h \
- ../plaintextgenerator.h \
- ../texgenerator.h \
- ../latexgenerator.h \
- ../bbcodegenerator.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o codegenerator.o ../codegenerator.cpp
-
-platform_fs.o: ../platform_fs.cpp ../platform_fs.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o platform_fs.o ../platform_fs.cpp
-
-rtfgenerator.o: ../rtfgenerator.cpp ../charcodes.h \
- ../version.h \
- ../rtfgenerator.h \
- ../codegenerator.h \
- ../elementstyle.h \
- ../stylecolour.h \
- ../enums.h \
- ../preformatter.h \
- ../stringtools.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o rtfgenerator.o ../rtfgenerator.cpp
-
-htmlgenerator.o: ../htmlgenerator.cpp ../htmlgenerator.h \
- ../codegenerator.h \
- ../elementstyle.h \
- ../stylecolour.h \
- ../enums.h \
- ../preformatter.h \
- ../stringtools.h \
- ../version.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o htmlgenerator.o ../htmlgenerator.cpp
-
-texgenerator.o: ../texgenerator.cpp ../texgenerator.h \
- ../codegenerator.h \
- ../elementstyle.h \
- ../stylecolour.h \
- ../enums.h \
- ../preformatter.h \
- ../stringtools.h \
- ../charcodes.h \
- ../version.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o texgenerator.o ../texgenerator.cpp
-
-latexgenerator.o: ../latexgenerator.cpp ../latexgenerator.h \
- ../codegenerator.h \
- ../elementstyle.h \
- ../stylecolour.h \
- ../enums.h \
- ../preformatter.h \
- ../stringtools.h \
- ../version.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o latexgenerator.o ../latexgenerator.cpp
-
-bbcodegenerator.o: ../bbcodegenerator.cpp ../bbcodegenerator.h \
- ../codegenerator.h \
- ../elementstyle.h \
- ../stylecolour.h \
- ../enums.h \
- ../preformatter.h \
- ../stringtools.h \
- ../version.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o bbcodegenerator.o ../bbcodegenerator.cpp
-
-stringtools.o: ../stringtools.cpp ../stringtools.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o stringtools.o ../stringtools.cpp
-
-stylecolour.o: ../stylecolour.cpp ../stylecolour.h \
- ../enums.h \
- ../stringtools.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o stylecolour.o ../stylecolour.cpp
-
-preformatter.o: ../preformatter.cpp ../preformatter.h \
- ../stringtools.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o preformatter.o ../preformatter.cpp
-
-moc_mydialog.o: moc_mydialog.cpp
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_mydialog.o moc_mydialog.cpp
-
-####### Install
-
-install: FORCE
-
-uninstall: FORCE
-
-FORCE:
-

View File

@ -1,3 +1,39 @@
-------------------------------------------------------------------
Mon Jul 3 20:55:21 UTC 2017 - antoine.belvire@opensuse.org
- Update to 2.5:
* CLI: Add --no-trailing-nl option.
* CLI: Add support for environment variable ANSIFILTER_OPTIONS.
- Changes from 2.4:
* Fix crash reading irregular escape codes.
- Clean spec file.
- Update GPG public key (key had expired).
-------------------------------------------------------------------
Mon Sep 26 14:02:25 UTC 2016 - antoine.belvire@opensuse.org
- Update to 2.3:
* Add support for true color escape codes
-------------------------------------------------------------------
Sat Sep 17 21:23:23 UTC 2016 - antoine.belvire@opensuse.org
- Update to 2.2:
* A lot of changes happened since 1.7. Please refer to
/usr/share/doc/packages/ansifilter/ChangeLog
* Build with Qt 5 instead of Qt 4
- Drop ansifilter-compiler_flags.patch: this can be handled in
%%build with environment variables.
- Add signature verification:
* Add ansifilter.keyring (ansifilter's main developer Andre Simon
public key)
* Add ansifilter-2.2.tar.bz2.asc
- Clean spec file:
* Remove obsolete conditional for openSUSE < 10.3
* Simplify build requirements, move GUI specific dependencies
to GUI subpackage
* Clean with spec-cleaner
-------------------------------------------------------------------
Thu Nov 14 12:01:52 UTC 2013 - cfarrell@suse.com

View File

@ -4,7 +4,7 @@ TryExec=ansifilter-gui
Exec=ansifilter-gui %f
Icon=ansifilter
Type=Application
Categories=
Categories=Utility;TextEditor;
StartupNotify=false
Name=Ansifilter
GenericName=ANSI escape code converter

43
ansifilter.keyring Normal file
View File

@ -0,0 +1,43 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
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
=FaL5
-----END PGP PUBLIC KEY BLOCK-----

View File

@ -1,7 +1,7 @@
# vim: set ts=4 sw=4 et:
#
# spec file for package ansifilter
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2013 Pascal Bleser.
#
# All modifications and additions to the file contributed by third parties
@ -17,118 +17,95 @@
#
%if 0%{?suse_version} > 1030
%define with_gui 1
%else
%define with_gui 0
%endif
%bcond_without gui
Name: ansifilter
Version: 1.7
Version: 2.5
Release: 0
Summary: ANSI Terminal Escape Code Converter
License: GPL-3.0+
Group: Development/Tools/Other
Url: http://www.andre-simon.de/
Source: http://www.andre-simon.de/zip/ansifilter-%{version}.tar.bz2
Source1: ansifilter.desktop
Patch0: ansifilter-compiler_flags.patch
Url: http://www.andre-simon.de/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: ImageMagick
BuildRequires: gcc
Source2: http://www.andre-simon.de/zip/ansifilter-%{version}.tar.bz2.asc
Source99: ansifilter.keyring
BuildRequires: gcc-c++
BuildRequires: glibc-devel
BuildRequires: libstdc++-devel
BuildRequires: make
BuildRequires: pkgconfig
BuildRequires: update-desktop-files
%if %with_gui
BuildRequires: libqt4-devel
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Ansifilter handles text files containing ANSI terminal escape codes.
The command sequences may be stripped or be interpreted to generate formatted
output (HTML, RTF, TeX, LaTeX).
output (HTML, RTF, TeX, LaTeX, BBCode).
%if %with_gui
%if %{with gui}
%package gui
Summary: ANSI Terminal Escape Code Converter
Summary: ANSI Terminal Escape Code Converter - Qt GUI
Group: Development/Tools/Other
BuildRequires: libqt5-qtbase-devel
BuildRequires: update-desktop-files
Requires: %{name} = %{version}-%{release}
%description gui
Ansifilter handles text files containing ANSI terminal escape codes.
The command sequences may be stripped or be interpreted to generate formatted
output (HTML, RTF, TeX, LaTeX).
This package provides a Qt4 Graphical User Interface to run %{name}.
This package provides a Qt Graphical User Interface to run %{name}.
%endif
%prep
%setup -q -n ansifilter
%patch0
convert src/qt-gui/ansifilter.{ico,png}
rm -rf src/.svn
%setup -q
%if %{with gui}
# Remove pre-configured files which may cause errors with Leap 42.x.
rm -v src/qt-gui/moc_*.cpp
rm -v src/qt-gui/Makefile*
%endif
%build
export RPM_OPT_FLAGS
%if %with_gui
moc -osrc/qt-gui/moc_mydialog.cpp src/qt-gui/mydialog.h
%endif
%__make %{?jobs:-j%{jobs}} \
CFLAGS="%{optflags}" \
QMAKE="%{_usr}/bin/qmake" \
PREFIX="%{_prefix}" \
man_dir="%{_mandir}/man1" \
doc_dir="%{_docdir}/%{name}" \
all \
%if %with_gui
all-gui
make \
CFLAGS="%{optflags} -std=c++11 -fPIC" \
CXXFLAGS="%{optflags} -std=c++11 -fPIC" \
QMAKE="qmake-qt5" \
all \
%if %{with gui}
all-gui \
%endif
%{?_smp_mflags}
%install
%__make \
DESTDIR="%{buildroot}" \
QMAKE="%{_usr}/bin/qmake" \
PREFIX="%{_prefix}" \
man_dir="%{_mandir}/man1" \
doc_dir="%{_docdir}/%{name}" \
install \
%if %with_gui
install-gui
make \
DESTDIR=%{buildroot} \
doc_dir="%{_docdir}/%{name}" \
install \
%if %{with gui}
install-gui
%endif
%__rm "%{buildroot}%{_docdir}/%{name}"/INSTALL
for f in "%{buildroot}%{_mandir}/man1"/*.gz; do
[ -e "$f" ] && %__gzip -d "$f"
done
%if %with_gui
%__install -D -m0644 "%{SOURCE1}" "%{buildroot}%{_datadir}/applications/ansifilter.desktop"
%__install -D -m0644 src/qt-gui/ansifilter.png "%{buildroot}%{_datadir}/pixmaps/ansifilter.png"
%__sed -i 's|^\(Icon=\).*$|\1ansifilter.png|g' "%{buildroot}%{_datadir}/applications/ansifilter.desktop"
%suse_update_desktop_file -r ansifilter Development Documentation
%if %{with gui}
%suse_update_desktop_file -i %{name}
install -D -m0644 src/qt-gui/ansifilter.xpm "%{buildroot}%{_datadir}/pixmaps/ansifilter.xpm"
%endif
%clean
%{?buildroot:%__rm -rf "%{buildroot}"}
%if %{with gui}
%post gui
%desktop_database_post
%postun gui
%desktop_database_postun
%endif
%files
%defattr(-,root,root)
%doc %dir %{_docdir}/%{name}
%doc %{_docdir}/%{name}/*
%dir %{_docdir}/%{name}
%exclude %{_docdir}/%{name}/INSTALL
%{_docdir}/%{name}/COPYING
%{_docdir}/%{name}/ChangeLog
%{_docdir}/%{name}/README
%{_bindir}/ansifilter
%doc %{_mandir}/man1/ansifilter.1%{ext_man}
%{_mandir}/man1/ansifilter.1%{ext_man}
%if %with_gui
%if %{with gui}
%files gui
%defattr(-,root,root)
%{_bindir}/ansifilter-gui
%{_datadir}/applications/ansifilter.desktop
%{_datadir}/pixmaps/ansifilter.png
%{_datadir}/pixmaps/ansifilter.xpm
%endif
%changelog