From 9a61eb16d990e0bfc3571295bece6c4add3f36adcc55d266ffedf0adfc2d5ebd Mon Sep 17 00:00:00 2001 From: Christian Wittmer Date: Mon, 24 Jan 2011 09:43:10 +0000 Subject: [PATCH 1/3] Accepting request 58961 from home:sbrabec:branches:network:telephony Thank you OBS-URL: https://build.opensuse.org/request/show/58961 OBS-URL: https://build.opensuse.org/package/show/network:telephony/sffview?expand=0&rev=6 --- sffview.changes | 5 +++++ sffview.spec | 17 ++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/sffview.changes b/sffview.changes index f6961f5..1e92a7c 100644 --- a/sffview.changes +++ b/sffview.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jan 21 13:52:17 CET 2011 - sbrabec@suse.cz + +- Fixed build for older distributions. + ------------------------------------------------------------------- Wed Dec 29 15:04:12 CET 2010 - sbrabec@suse.cz diff --git a/sffview.spec b/sffview.spec index aaa4a05..5b5ec07 100644 --- a/sffview.spec +++ b/sffview.spec @@ -19,7 +19,12 @@ Name: sffview -BuildRequires: SDL-devel boost-devel gcc-c++ libtiff-devel update-desktop-files wxWidgets-devel xorg-x11 +BuildRequires: SDL-devel boost-devel gcc-c++ libtiff-devel update-desktop-files xorg-x11 +%if %suse_version > 1130 +BuildRequires: wxWidgets-devel +%else +BuildRequires: wxGTK-devel +%endif License: MIT License (or similar) Group: Hardware/ISDN AutoReqProv: on @@ -31,23 +36,25 @@ Url: http://sfftools.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Patch0: %{name}-%{version}.diff Patch1: %{name}-gcc43.diff +%if %suse_version > 1130 %define _use_internal_dependency_generator 0 %define __find_requires %wx_requires +%endif %description The CAPI interface for programming ISDN hardware expects and gives you faxes in the "Structured Fax File" (SFF) format. SffView is a viewer for SFF-files. SffView is written in C++ using the -wxWindows/wxGTK toolkit and is therefore available for Linux and -Windows (wxWindows is a platform independent toolkit and wxGTK is a -unix implementation based on GTK+, see wxWindows homepage). +wxWidgets/wxGTK toolkit and is therefore available for Linux and +Windows (wxWidgets is a platform independent toolkit and wxGTK is a +unix implementation based on GTK+, see wxWidgets homepage). Authors: -------- - Peter Schäfer + Peter Schäfer %prep %setup From 6540947a6d8c30bc65255ac13620f298185ca9a8e7518ffe1f0b08a8d13a8e57 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 14 Apr 2011 12:51:31 +0000 Subject: [PATCH 2/3] Accepting request 67001 from network:telephony baserev update by copy to link target OBS-URL: https://build.opensuse.org/request/show/67001 OBS-URL: https://build.opensuse.org/package/show/network:telephony/sffview?expand=0&rev=8 --- sffview.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sffview.spec b/sffview.spec index 5b5ec07..2c5c028 100644 --- a/sffview.spec +++ b/sffview.spec @@ -1,7 +1,7 @@ # -# spec file for package sffview (Version 0.4) +# spec file for package sffview # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,7 +29,7 @@ License: MIT License (or similar) Group: Hardware/ISDN AutoReqProv: on Version: 0.4 -Release: 252 +Release: 260 Summary: Simple viewer for Structured Fax Files (.sff) used by ISDN applications Source: %{name}-%{version}.tar.bz2 Url: http://sfftools.sourceforge.net/ From 8c4cd5d5183969d9fc832ed9b9c7663206b101f21840af9065bf1992370a2b2e Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 12 Aug 2016 20:51:05 +0000 Subject: [PATCH 3/3] - Remove archaic specfile contraptions. Fix rpmlint "spurious-executable-permissions" warning. OBS-URL: https://build.opensuse.org/package/show/network:telephony/sffview?expand=0&rev=9 --- sffview.changes | 6 ++++++ sffview.spec | 43 +++++++++++++++---------------------------- 2 files changed, 21 insertions(+), 28 deletions(-) diff --git a/sffview.changes b/sffview.changes index 1e92a7c..b004984 100644 --- a/sffview.changes +++ b/sffview.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Aug 12 20:47:27 UTC 2016 - jengelh@inai.de + +- Remove archaic specfile contraptions. + Fix rpmlint "spurious-executable-permissions" warning. + ------------------------------------------------------------------- Fri Jan 21 13:52:17 CET 2011 - sbrabec@suse.cz diff --git a/sffview.spec b/sffview.spec index 2c5c028..df53b24 100644 --- a/sffview.spec +++ b/sffview.spec @@ -1,7 +1,7 @@ # # spec file for package sffview # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -15,31 +15,27 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: sffview -BuildRequires: SDL-devel boost-devel gcc-c++ libtiff-devel update-desktop-files xorg-x11 -%if %suse_version > 1130 +BuildRequires: SDL-devel +BuildRequires: boost-devel +BuildRequires: gcc-c++ +BuildRequires: libtiff-devel +BuildRequires: update-desktop-files BuildRequires: wxWidgets-devel -%else -BuildRequires: wxGTK-devel -%endif -License: MIT License (or similar) -Group: Hardware/ISDN -AutoReqProv: on +BuildRequires: xorg-x11 Version: 0.4 -Release: 260 +Release: 0 Summary: Simple viewer for Structured Fax Files (.sff) used by ISDN applications +License: MIT +Group: Hardware/ISDN Source: %{name}-%{version}.tar.bz2 Url: http://sfftools.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Patch0: %{name}-%{version}.diff Patch1: %{name}-gcc43.diff -%if %suse_version > 1130 %define _use_internal_dependency_generator 0 %define __find_requires %wx_requires -%endif %description The CAPI interface for programming ISDN hardware expects and gives you @@ -50,28 +46,19 @@ wxWidgets/wxGTK toolkit and is therefore available for Linux and Windows (wxWidgets is a platform independent toolkit and wxGTK is a unix implementation based on GTK+, see wxWidgets homepage). - - -Authors: --------- - Peter Schäfer - %prep %setup %patch0 -p1 %patch1 %build -%{__make} %{?jobs:-j%jobs} +make %{?_smp_mflags} %install -install -d $RPM_BUILD_ROOT/usr/bin -install sffview $RPM_BUILD_ROOT/usr/bin -install -d $RPM_BUILD_ROOT/%{_defaultdocdir}/sffview -install doc/readme doc/copying testfax.sff $RPM_BUILD_ROOT/%{_defaultdocdir}/sffview - -%clean -rm -rf $RPM_BUILD_ROOT +install -d "%buildroot/%_bindir" +install sffview "%buildroot/%_bindir/" +install -d "%buildroot/%_defaultdocdir/sffview" +install -pm0644 doc/readme doc/copying testfax.sff "%buildroot/%_defaultdocdir/sffview/" %files %defattr(-,root,root,-)