Walter Fey 2014-01-04 22:02:03 +00:00 committed by Git OBS Bridge
parent 3c4befda10
commit 5f0ce0b20e
7 changed files with 44 additions and 74 deletions

View File

@ -1,12 +0,0 @@
--- a/src/src.pro 2012-01-04 22:11:46.000000000 +0100
+++ b/src/src.pro 2012-11-04 18:38:43.245069169 +0100
@@ -74,7 +74,8 @@
gallerywidget.ui \
rxwidget.ui \
txwidget.ui \
- sweepform.ui
+ sweepform.ui \
+ plotform.ui
HEADERS += imageviewer.h \

View File

@ -1,24 +0,0 @@
diff -Naur qsstv_7.1.7.orig/src/configdialog.cpp qsstv_7.1.7/src/configdialog.cpp
--- qsstv_7.1.7.orig/src/configdialog.cpp 2011-12-29 05:06:12.000000000 -0600
+++ qsstv_7.1.7/src/configdialog.cpp 2012-08-06 13:40:42.420234818 -0500
@@ -100,7 +100,7 @@
txImagesPath=qSettings.value("txImagesPath",QString(getenv("HOME"))+"/").toString();
templatesPath=qSettings.value("templatesPath",QString(getenv("HOME"))+"/").toString();
audioPath=qSettings.value("audioPath",QString(getenv("HOME"))+"/").toString();
- docPath =qSettings.value("docPath",QString("/usr/share/doc/qsstv/")).toString();
+ docPath =qSettings.value("docPath",QString("/usr/share/doc/packages/qsstv/html/")).toString();
defaultImageFormat=qSettings.value("defaultImageFormat","png").toString();
samplingrate=qSettings.value("samplingrate",11025).toInt();
rxClock=qSettings.value("rxclock",11025.).toDouble();
diff -Naur qsstv_7.1.7.orig/src/src.pro qsstv_7.1.7/src/src.pro
--- qsstv_7.1.7.orig/src/src.pro 2012-01-04 15:11:46.000000000 -0600
+++ qsstv_7.1.7/src/src.pro 2012-08-06 13:38:58.357540295 -0500
@@ -180,7 +180,7 @@
QMAKE_EXTRA_TARGETS += dox
message(dox will be generated)
}
-dox.path=/usr/share/doc/$$TARGET
+dox.path=/usr/share/doc/packages/$$TARGET/html
dox.files= $$PWD/documentation/html/*
LIBS += -L/usr/lib64 \

View File

@ -1,14 +0,0 @@
Change target.path from /usr/local/bin to /usr/bin so that it complies with
our file system standard.
--- a/src/src.pro
+++ b/src/src.pro
@@ -190,7 +190,7 @@
-lasound \
-lhamlib
-target.path=/usr/local/bin
+target.path=/usr/bin
target.extra = strip $(TARGET); cp -f $(TARGET) $${PREFIX}/bin/$(TARGET)
INSTALLS +=target
INSTALLS +=dox

View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Sat Jan 4 16:28:20 UTC 2014 - p.drouand@gmail.com
- Update to version 8.1.12
+ http://users.telenet.be/on4qz/qsstv/manual/changelog.html for news
- Add SUSE header to specfile
- Remove patchs (fixed on upstream release)
+ Fix-mix-ui-form.patch
+ qsstv-fix-html-doc-path.patch
+ qsstv-fix-target-path.patch
- Adapt spec file to upstream changes
+ documentation is not provided anymore
+ src/src.pro has been removed
- Add BuildRequires: libjasper-devel; new dependency
-------------------------------------------------------------------
Sun Dec 16 18:08:58 UTC 2012 - p.drouand@gmail.com

View File

@ -1,21 +1,32 @@
# norootforbuild
#
# spec file for package qsstv
#
# Copyright (c) 2014 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
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: qsstv
Summary: Qt-based slow-scan TV and fax
Version: 7.1.7
Version: 8.1.12
Release: 0
License: GPL-3.0
Group: Productivity/Hamradio/Other
Url: http://users.telenet.be/on4qz/qsstv/
Source: %{name}_%{version}.tar.bz2
Source: http://users.telenet.be/on4qz/qsstv/downloads/%{name}_%{version}.tar.gz
Source1: qsstv.desktop
Source2: qsstv.1
Patch0: qsstv-fix-html-doc-path.patch
Patch1: qsstv-fix-target-path.patch
Patch2: qsstv-gcc47_unistd.patch
Patch3: Fix-mix-ui-form.patch
Patch4: fix-no-return-in-nonvoid-function-logging.cpp.patch
BuildRequires: fftw3-devel
BuildRequires: libjasper-devel
BuildRequires: libqt4-devel
BuildRequires: update-desktop-files
BuildRequires: alsa-devel
@ -32,25 +43,19 @@ receive images.
%prep
%setup -q -n %{name}_%{version}
%patch0 -p1 -b .docpath
%patch1 -p1 -b .targetpath
%patch2 -p1 -b .gcc47
%patch3 -p1
%patch4 -p1
# Don't strip the executable so debuginfo package can be built.
sed -i 's| strip $(TARGET);||g' src/src.pro
# Correct documentation directory
#sed -i 's|/usr/share/doc/$$TARGET|/usr/share/doc/packages/$$TARGET|g' %{name}_8.pro
%build
qmake -makefile %{name}_%{version}.pro PREFIX=%{_prefix} QMAKE_CFLAGS="%optflags" QMAKE_CXXFLAGS="%optflags"
qmake -makefile %{name}_8.pro PREFIX=%{_prefix} QMAKE_CFLAGS="%optflags" QMAKE_CXXFLAGS="%optflags"
%__make %{?_smp_mflags}
%install
mkdir -p %{buildroot}/%{_bindir}
cp -f src/%{name} %{buildroot}/%{_bindir}/%{name}
mkdir -p %{buildroot}%{_bindir}
cp -f %{name} %{buildroot}%{_bindir}/%{name}
# Remove redundant documentation files
%fdupes -s src/documentation/html/*
#%fdupes -s src/documentation/html/*
# Make suse_update_desktop_file be able to find the qsstv icon
cp src/icons/%{name}.png %_sourcedir
@ -63,7 +68,7 @@ install -pm 0644 %{SOURCE2} %{buildroot}%{_mandir}/man1/
%files
%defattr(-,root,root,-)
%doc COPYING src/documentation/html/*
%doc COPYING
%{_bindir}/*
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/applications/%{name}.desktop

View File

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

3
qsstv_8.1.12.tar.gz Normal file
View File

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