@@ -1,3 +1,4 @@

+# vim: set ts=4 sw=4 et:

 # Copyright (c) 2007 Herbert Graeber

 # Copyright (c) 2010 Axel Koellhofer 

 # This file and all modifications and additions to the pristine

@@ -5,35 +6,34 @@

 #

 # Please submit bugfixes or comments to herbert@links2linux.de or axel@links2linux.de

-# norootforbuild

-

 %define CImg_version 139

-Name:      wxcam

-Version:   1.0.7

-Release:   0

-Summary:   A webcam application for linux

-License:   GPL

-Group:     Productivity/Graphics/Other

-URL:       http://wxcam.sourceforge.net

-Source0:   http://downloads.sourceforge.net/wxcam/wxcam-%{version}.tar.bz2

+Name:           wxcam

+Version:        1.0.7

+Release:        0

+Summary:        Webcam application for linux

+License:        GNU General Public License version 2 or later (GPLv2 or later)

+Group:          Productivity/Graphics/Other

+URL:            http://wxcam.sourceforge.net

+Source0:        http://downloads.sourceforge.net/wxcam/wxcam-%{version}.tar.bz2

 # Header Cimg.h taken from version 1.3.9 of the CImg-library

 # This file is licensed under the "CeCILL free software license" 

 # See http://cimg.sourceforge.net/ for more information 

-Source1:   CImg-%{CImg_version}.h.bz2

-Source2:   Licence_CeCILL_V2-en.txt

-Source100: %{name}.changes

-Patch0:        wxcam-CImg.h.diff

-Patch1:        %{name}-%{version}-fix_no_return_in_nonvoid_function.patch

-Buildrequires: gcc-c++ pkg-config perl-XML-Parser update-desktop-files

-BuildRequires: gtk2-devel libglade2-devel libtiff-devel libjpeg-devel 

-Buildrequires: xvid-devel mjpegtools-devel intltool

-#%if 0%{?suse_version} >= 1130

-#BuildRequires:    wxGTK-devel wxGTK-gl wxGTK-compat

-#%else

-BuildRequires: wxWidgets-devel

-#%endif

-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root

+Source1:        CImg-%{CImg_version}.h.bz2

+Source2:        Licence_CeCILL_V2-en.txt

+Source100:      %{name}.changes

+Patch0:         wxcam-CImg.h.diff

+Patch1:         %{name}-%{version}-fix_no_return_in_nonvoid_function.patch

+Buildrequires:  gcc-c++ pkg-config perl-XML-Parser update-desktop-files

+BuildRequires:  gtk2-devel libglade2-devel libtiff-devel libjpeg-devel 

+Buildrequires:  xvid-devel mjpegtools-devel intltool

+%if 0%{?suse_version} > 1130

+BuildRequires:  wxWidgets-devel

+%else

+BuildRequires:  wxGTK-devel

+#wxGTK-gl wxGTK-compat

+%endif

+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root

 %description

 wxCam is a webcam application for linux. It supports video recording (in an

@@ -42,8 +42,6 @@

 It supports video4linux 1 drivers, so it should work on a very large number

 of devices. 

-

-

 %prep

 %setup -q

@@ -57,13 +55,13 @@

 chmod 0644 COPYING 

 %build

-%configure --docdir=%{_defaultdocdir} \

+%configure --docdir=%{_defaultdocdir}

-make %{?_smp_mflags}

+%__make %{?_smp_mflags} V=1

 %install

 %makeinstall

-%{__rm} -r %{buildroot}/usr/doc 

+%__rm -r "%{buildroot}/usr/doc"

 %suse_update_desktop_file -i -r -N "Webcam Application" -G "Webcam Application" %{name} Graphics Photography GTK

​