From d1732ead020cc4e0e1c357861edb9e5ea0f11213a9c8c5c8b5cd4bd472048027 Mon Sep 17 00:00:00 2001
From: Dmitry Roshchin <dmitry@roshchin.org>
Date: Sun, 3 Aug 2014 09:46:26 +0000
Subject: [PATCH] - Remove redefined cmake macros

OBS-URL: https://build.opensuse.org/package/show/electronics/pulseview?expand=0&rev=2
---
 pulseview.changes |  5 ++++
 pulseview.spec    | 60 ++++++++++++++---------------------------------
 2 files changed, 22 insertions(+), 43 deletions(-)

diff --git a/pulseview.changes b/pulseview.changes
index a3499c3..0877b5a 100644
--- a/pulseview.changes
+++ b/pulseview.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Aug  3 09:42:33 UTC 2014 - dmitry_r@opensuse.org
+
+- Remove redefined cmake macros
+
 -------------------------------------------------------------------
 Mon Jun  2 18:56:20 UTC 2014 - bugs@vdm-design.de
 
diff --git a/pulseview.spec b/pulseview.spec
index 5fea428..8a4f3fb 100644
--- a/pulseview.spec
+++ b/pulseview.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package libsigrok
+# spec file for package pulseview
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# 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
@@ -16,20 +16,20 @@
 #
 
 
-Summary:        Qt-based GUI for sigrok
 Name:           pulseview
 Version:        0.2.0
-Release:        1
+Release:        0
+Summary:        Qt-based GUI for sigrok
 License:        GPL-3.0+
 Group:          Productivity/Scientific/Electronics
 Url:            http://sigrok.org
-BuildRequires:  glib2-devel
-BuildRequires:  libsigrok-devel >= 0.3.0
-BuildRequires:  libsigrokdecode-devel >= 0.3.0
-BuildRequires:  qt-devel
+Source0:        http://sigrok.org/download/source/pulseview/%{name}-%{version}.tar.gz
 BuildRequires:  boost-devel
 BuildRequires:  cmake
-Source0:        http://sigrok.org/download/source/pulseview/%{name}-%{version}.tar.gz
+BuildRequires:  glib2-devel
+BuildRequires:  libqt4-devel
+BuildRequires:  libsigrok-devel >= 0.3.0
+BuildRequires:  libsigrokdecode-devel >= 0.3.0
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -39,48 +39,22 @@ logic analyzer hardware products.
 
 PulseView is a Qt-based GUI for sigrok.
 
-#
-# Macros for cmake
-# taken from macros.cmake in Intel:Moblin/cmake
-#
-%define _cmake_lib_suffix64 -DLIB_SUFFIX=64
-%define _cmake_skip_rpath -DCMAKE_SKIP_RPATH:BOOL=ON
-%define __cmake %{_bindir}/cmake
-
-%define cmake \
-  CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
-  CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
-  FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
-  %__cmake \\\
-        -DCMAKE_VERBOSE_MAKEFILE=ON \\\
-        -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\
-        -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \\\
-        -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\
-        -DLIB_INSTALL_DIR:PATH=%{_libdir} \\\
-        -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \\\
-        -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \\\
-%if "%{?_lib}" == "lib64" \
-        %{?_cmake_lib_suffix64} \\\
-%endif \
-        %{?_cmake_skip_rpath} \\\
-        -DBUILD_SHARED_LIBS:BOOL=ON -DENABLE_DECODE=ON
-
 %prep
 %setup -q
 
 %build
-export CXXFLAGS="%optflags -fpermissive"
-%cmake -DDISABLE_WERROR=TRUE .
-make %{?smp_mflags}
+export CXXFLAGS="%{optflags} -fpermissive"
+%cmake -DDISABLE_WERROR=TRUE ..
+make %{?_smp_mflags}
 
 %install
-make DESTDIR=%buildroot install
-rm -f %buildroot/%_libdir/*.la
+%cmake_install
+find %{buildroot} -type f -name "*.la" -delete -print
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING README HACKING
-%_bindir/*
-%_mandir/man1/pulseview.*
+%doc COPYING NEWS README HACKING
+%{_bindir}/*
+%{_mandir}/man1/pulseview.*
 
 %changelog