From 17fd327cf961560097517b630279d477f244a519fcab0f1b5e7c74d70e35431c Mon Sep 17 00:00:00 2001 From: Karsten Keil Date: Fri, 27 Jan 2017 19:38:46 +0000 Subject: [PATCH] Accepting request 453028 from home:kkeil:Factory - use wxWidgets-3_0 - import man page from debian project - Update to version 0.5 OBS-URL: https://build.opensuse.org/request/show/453028 OBS-URL: https://build.opensuse.org/package/show/network:telephony/sffview?expand=0&rev=11 --- sffview-0.4.diff | 39 --------------------------------------- sffview-0.4.tar.bz2 | 3 --- sffview-0.5.diff | 22 ++++++++++++++++++++++ sffview-0.5.tar.xz | 3 +++ sffview-gcc43.diff | 26 -------------------------- sffview.1 | 43 +++++++++++++++++++++++++++++++++++++++++++ sffview.changes | 11 +++++++++++ sffview.spec | 14 ++++++++------ 8 files changed, 87 insertions(+), 74 deletions(-) delete mode 100644 sffview-0.4.diff delete mode 100644 sffview-0.4.tar.bz2 create mode 100644 sffview-0.5.diff create mode 100644 sffview-0.5.tar.xz delete mode 100644 sffview-gcc43.diff create mode 100644 sffview.1 diff --git a/sffview-0.4.diff b/sffview-0.4.diff deleted file mode 100644 index dd0f6d6..0000000 --- a/sffview-0.4.diff +++ /dev/null @@ -1,39 +0,0 @@ -Index: sffview-0.4/Makefile -=================================================================== ---- sffview-0.4.orig/Makefile -+++ sffview-0.4/Makefile -@@ -19,10 +19,10 @@ PROGRAM = sffview - OBJECTS = $(PROGRAM).o common.o codes.o decoder.o sfffile.o sffapp.o sffdoc.o - - #WXCONFIG_CPP = `wxgtk2-2.5-config --cflags` --WXCONFIG_CPP = `wx-config --cflags` -+WXCONFIG_CPP = `wx-config --unicode=yes --cflags` - - #WXCONFIG_LD = `wxgtk2-2.5-config --libs --static` --WXCONFIG_LD = `wx-config --libs` -+WXCONFIG_LD = `wx-config --unicode=yes --libs` - - # /usr/lib/libglib-2.0.a \ - # /usr/lib/libgobject-2.0.a \ -@@ -53,7 +53,7 @@ WXCONFIG_LD_STATIC = -L/usr/X11R6/lib \ - .SUFFIXES: .o .cpp - - .cpp.o : -- $(CC) -g -march=i686 -Os -c $(WXCONFIG_CPP) -o $@ $< -+ $(CC) -g $(RPM_OPT_FLAGS) -fno-strict-aliasing -c $(WXCONFIG_CPP) -o $@ $< - - all: $(PROGRAM) - -Index: sffview-0.4/sffview.cpp -=================================================================== ---- sffview-0.4.orig/sffview.cpp -+++ sffview-0.4/sffview.cpp -@@ -205,7 +205,7 @@ SffCanvas::SffCanvas(wxView *v, wxFrame - wxScrolledWindow(frame, -1, pos, size, wxSUNKEN_BORDER) - { - view = v; -- SetBackgroundColour("WHITE"); -+ SetBackgroundColour(_T("WHITE")); - } - - // Define the repainting behaviour diff --git a/sffview-0.4.tar.bz2 b/sffview-0.4.tar.bz2 deleted file mode 100644 index 4d4f20a..0000000 --- a/sffview-0.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3fdb273d1ecbff1f189d6b30d3d3fe4c88018c4ecb996321e7374d2ed1edb8cf -size 58199 diff --git a/sffview-0.5.diff b/sffview-0.5.diff new file mode 100644 index 0000000..1609b5b --- /dev/null +++ b/sffview-0.5.diff @@ -0,0 +1,22 @@ +Index: sffview-0.5/Makefile +=================================================================== +--- sffview-0.5.orig/Makefile ++++ sffview-0.5/Makefile +@@ -18,14 +18,14 @@ CC = g++ + PROGRAM = sffview + OBJECTS = $(PROGRAM).o common.o codes.o decoder.o sfffile.o sffapp.o sffdoc.o + +-WXCONFIG_CPP = `wx-config --cflags` ++WXCONFIG_CPP = `wx-config --unicode=yes --cflags` + +-WXCONFIG_LD = `wx-config --libs` ++WXCONFIG_LD = `wx-config --unicode=yes --libs` + + .SUFFIXES: .o .cpp + + .cpp.o : +- $(CC) -g -Os -c $(WXCONFIG_CPP) -o $@ $< ++ $(CC) -g $(RPM_OPT_FLAGS) -fno-strict-aliasing -c $(WXCONFIG_CPP) -o $@ $< + + all: $(PROGRAM) + diff --git a/sffview-0.5.tar.xz b/sffview-0.5.tar.xz new file mode 100644 index 0000000..b8f95c8 --- /dev/null +++ b/sffview-0.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e6e579de5a96be532635abaf54ba516ca51dd8e12206bf365e1864c69f952198 +size 57300 diff --git a/sffview-gcc43.diff b/sffview-gcc43.diff deleted file mode 100644 index 4c36ec6..0000000 --- a/sffview-gcc43.diff +++ /dev/null @@ -1,26 +0,0 @@ -Index: sfffile.cpp -=================================================================== ---- sfffile.cpp.orig 2006-10-29 17:45:44.000000000 +0100 -+++ sfffile.cpp 2009-02-26 18:48:42.000000000 +0100 -@@ -33,6 +33,8 @@ - - #include - #include -+#include -+#include - - #include "sfftypes.h" - #include "common.h" -Index: common.cpp -=================================================================== ---- common.cpp.orig 2006-10-29 17:45:44.000000000 +0100 -+++ common.cpp 2009-02-26 18:49:32.000000000 +0100 -@@ -34,7 +34,7 @@ - #include "sfftypes.h" - #include "common.h" - #include "errno.h" -- -+#include - #include - #if defined(_MSC_VER) - #include diff --git a/sffview.1 b/sffview.1 new file mode 100644 index 0000000..1aca717 --- /dev/null +++ b/sffview.1 @@ -0,0 +1,43 @@ +.\" This manpage has been automatically generated by docbook2man +.\" from a DocBook document. This tool can be found at: +.\" +.\" Please send any bug reports, improvements, comments, patches, +.\" etc. to Steve Cheng . +.TH "SFFVIEW" "1" "27 Januar 2017" "" "" + +.SH NAME +sffview \- X11 viewer for structured fax files (SFF) +.SH SYNOPSIS + +\fBsffview\fR + +.SH "DESCRIPTION" +.PP +This manual page documents briefly the +\fBsffview\fR command. +.PP +This manual page was written for the Debian distribution +because the original program does not have a manual page. +.PP +\fBsffview\fR is a tool to view +"structured fax files" in X11. +"Structured fax file" (SFF) is the file format that ISDN +cards with CAPI interface expect and create. +.SH "OPTIONS" +.PP +NONE +.SH "BUGS" +.PP +Only German localisation +.SH "SEE ALSO" +.PP +sfftobmp (1). +.SH "AUTHOR" +.PP +This manual page was written by Achim Bohnet for +the Debian system (but may be used by others). Permission is +granted to copy, distribute and/or modify this document under +the terms of the GNU Free Documentation +License, Version 1.1 or any later version published by the Free +Software Foundation; with no Invariant Sections, no Front-Cover +Texts and no Back-Cover Texts. diff --git a/sffview.changes b/sffview.changes index b004984..dafe12a 100644 --- a/sffview.changes +++ b/sffview.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Jan 27 18:31:50 UTC 2017 - keil@b1-systems.de + +- use wxWidgets-3_0 +- import man page from debian project + +------------------------------------------------------------------- +Fri Jan 27 15:53:03 UTC 2017 - keil@b1-systems.de + +- Update to version 0.5 + ------------------------------------------------------------------- Fri Aug 12 20:47:27 UTC 2016 - jengelh@inai.de diff --git a/sffview.spec b/sffview.spec index df53b24..7950f00 100644 --- a/sffview.spec +++ b/sffview.spec @@ -1,7 +1,7 @@ # # spec file for package sffview # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,18 +22,18 @@ BuildRequires: boost-devel BuildRequires: gcc-c++ BuildRequires: libtiff-devel BuildRequires: update-desktop-files -BuildRequires: wxWidgets-devel +BuildRequires: wxWidgets-3_0-devel BuildRequires: xorg-x11 -Version: 0.4 +Version: 0.5 Release: 0 Summary: Simple viewer for Structured Fax Files (.sff) used by ISDN applications License: MIT Group: Hardware/ISDN -Source: %{name}-%{version}.tar.bz2 +Source: %{name}-%{version}.tar.xz +Source2: %{name}.1 Url: http://sfftools.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Patch0: %{name}-%{version}.diff -Patch1: %{name}-gcc43.diff %define _use_internal_dependency_generator 0 %define __find_requires %wx_requires @@ -49,7 +49,6 @@ unix implementation based on GTK+, see wxWidgets homepage). %prep %setup %patch0 -p1 -%patch1 %build make %{?_smp_mflags} @@ -59,10 +58,13 @@ install -d "%buildroot/%_bindir" install sffview "%buildroot/%_bindir/" install -d "%buildroot/%_defaultdocdir/sffview" install -pm0644 doc/readme doc/copying testfax.sff "%buildroot/%_defaultdocdir/sffview/" +install -d "%{buildroot}/%{_mandir}/man1" +install -pm0644 %{S:2} "%{buildroot}/%{_mandir}/man1/" %files %defattr(-,root,root,-) /usr/bin/sffview %doc %{_defaultdocdir}/sffview +%doc %{_mandir}/man1/sffview.1.gz %changelog