[packages/pulseview] - updated to 0.2.0 - removed obsolete boost-link patch

qboosh qboosh at pld-linux.org
Fri Jul 25 19:50:26 CEST 2014


commit fb1b86d830e81c8e30569f2a10df2acb8d68c224
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Jul 25 19:55:44 2014 +0200

    - updated to 0.2.0
    - removed obsolete boost-link patch

 boost-link.patch | 11 -----------
 pulseview.spec   | 51 ++++++++++++++++++++++++++++++---------------------
 2 files changed, 30 insertions(+), 32 deletions(-)
---
diff --git a/pulseview.spec b/pulseview.spec
index 5737176..570df0d 100644
--- a/pulseview.spec
+++ b/pulseview.spec
@@ -1,40 +1,47 @@
 #
-%bcond_without	tests
+# Conditional build:
+%bcond_without	tests	# "make test" call
 #
 Summary:	Qt based logic analyzer GUI for sigrok
+Summary(pl.UTF-8):	Oparty na Qt graficzny interfejs analizatora logicznego dla szkieletu sigrok
 Name:		pulseview
-Version:	0.1.0
-Release:	3
-License:	GPL
+Version:	0.2.0
+Release:	1
+License:	GPL v3+
 Group:		X11/Applications/Graphics
-Source0:	http://www.sigrok.org/download/source/pulseview/%{name}-%{version}.tar.gz
-# Source0-md5:	0b462664854f4186c67ce1aae78b6d06
-Patch0:		boost-link.patch
+Source0:	http://sigrok.org/download/source/pulseview/%{name}-%{version}.tar.gz
+# Source0-md5:	fe5586212671226afafe9d8d80ed10c6
 URL:		http://sigrok.org/wiki/PulseView
-BuildRequires:	boost-devel
-%{?with_tests:BuildRequires:	boost-test}
-BuildRequires:	boost-thread
-BuildRequires:	cmake
-BuildRequires:	glib2-devel
-BuildRequires:	libsigrok-devel >= 0.2.0-1
-BuildRequires:	libsigrokdecode-devel >= 0.1.0
+BuildRequires:	QtCore-devel >= 4
+BuildRequires:	QtGui-devel >= 4
+BuildRequires:	boost-devel >= 1.42
+%{?with_tests:BuildRequires:	boost-test >= 1.42}
+BuildRequires:	cmake >= 2.8.3
+BuildRequires:	glib2-devel >= 2.0
+BuildRequires:	libsigrok-devel >= 0.3.0
+BuildRequires:	libsigrokdecode-devel >= 0.3.0
 BuildRequires:	pkgconfig
+BuildRequires:	qt4-qmake >= 4
+Requires:	libsigrok >= 0.3.0
+Requires:	libsigrokdecode >= 0.3.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 Qt based logic analyzer GUI for sigrok.
 
+%description -l pl.UTF-8
+Oparty na Qt graficzny interfejs analizatora logicznego dla szkieletu
+sigrok.
+
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 install -d build
 cd build
-%cmake \
+%cmake .. \
 	-DDISABLE_WERROR=ON \
-	%{?with_tests:-DENABLE_TESTS=ON} \
-	../
+	%{?with_tests:-DENABLE_TESTS=ON}
 
 %{__make}
 
@@ -42,19 +49,21 @@ cd build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 install -d $RPM_BUILD_ROOT%{_mandir}/man1
 
 %{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install doc/pulseview.1 $RPM_BUILD_ROOT%{_mandir}/man1
+install -D contrib/pulseview.desktop $RPM_BUILD_ROOT%{_desktopdir}/pulseview.desktop
+install -D icons/sigrok-logo-notext.png $RPM_BUILD_ROOT%{_pixmapsdir}/sigrok-logo-notext.png
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc HACKING README
+%doc NEWS README
 %attr(755,root,root) %{_bindir}/pulseview
 %{_mandir}/man1/pulseview.1*
+%{_desktopdir}/pulseview.desktop
+%{_pixmapsdir}/sigrok-logo-notext.png
diff --git a/boost-link.patch b/boost-link.patch
deleted file mode 100644
index 20e8622..0000000
--- a/boost-link.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pulseview-0.1.0/test/CMakeLists.txt~	2013-05-04 23:05:32.000000000 +0200
-+++ pulseview-0.1.0/test/CMakeLists.txt	2014-02-03 11:38:35.814716407 +0100
-@@ -22,7 +22,7 @@
- # This will set ${CMAKE_THREAD_LIBS_INIT} to the correct, OS-specific value.
- find_package(Threads)
- 
--find_package(Boost 1.46 COMPONENTS unit_test_framework REQUIRED)
-+find_package(Boost 1.46 COMPONENTS system unit_test_framework REQUIRED)
- 
- set(pulseview_TEST_SOURCES
- 	${PROJECT_SOURCE_DIR}/pv/data/analogsnapshot.cpp
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/pulseview.git/commitdiff/fb1b86d830e81c8e30569f2a10df2acb8d68c224



More information about the pld-cvs-commit mailing list