Accepting request 290667 from devel:libraries:c_c++

- Cleanup few conditions for better readability

OBS-URL: https://build.opensuse.org/request/show/290667
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/v4l-utils?expand=0&rev=21

v4l-utils.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Mar 13 14:55:11 UTC 2015 - tchvatal@suse.com
+
+- Cleanup few conditions for better readability
+
 -------------------------------------------------------------------
 Sun Feb  1 20:34:52 UTC 2015 - asterios.dramis@gmail.com
 

v4l-utils.spec

@@ -31,21 +31,15 @@ Source100:      baselibs.conf
 BuildRequires:  alsa-devel
 %if 0%{?suse_version} < 1230
 BuildRequires:  autoconf
-%endif
-%if 0%{?suse_version} > 1210
-BuildRequires:  desktop-file-utils
-%else
-BuildRequires:  update-desktop-files
+BuildRequires:  libtool
 %endif
 BuildRequires:  doxygen
 BuildRequires:  kernel-headers
 BuildRequires:  libjpeg-devel
 BuildRequires:  libqt4-devel
-%if 0%{?suse_version} < 1230
-BuildRequires:  libtool
-%endif
 BuildRequires:  pkg-config
 BuildRequires:  udev
+BuildRequires:  update-desktop-files
 Requires:       libv4l = %{version}
 Requires:       udev
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -180,24 +174,20 @@ qv4l2 is a test control and streaming test application for video4linux.
 %if 0%{?suse_version} < 1230
 autoreconf -vif
 %endif
-%configure --disable-static --disable-silent-rules --with-udevdir=%{_udevdir}
+%configure \
+    --disable-static \
+    --disable-silent-rules \
+    --with-udevdir=%{_udevdir}
 make %{?_smp_mflags}
 
 %install
 make DESTDIR=%{buildroot} install
-
-# Remove libtool config files
 find %{buildroot}%{_libdir} -name '*.la' -exec rm -f {} ';'
 
 # Not needed (links to plugins in libv4l subdir)
 rm %{buildroot}%{_libdir}/{v4l1compat.so,v4l2convert.so}
 
-%if 0%{?suse_version} > 1210
-desktop-file-edit --set-name="QV4l2" --set-generic-name="V4L2 Test Utility" \
- --add-category=Qt --add-category=Video --add-category=TV %{buildroot}%{_datadir}/applications/qv4l2.desktop
-%else
 %suse_update_desktop_file -N "QV4l2" -G "V4L2 Test Utility" -r qv4l2 Qt AudioVideo Video TV
-%endif
 
 %post -n libdvbv5-%{so_ver} -p /sbin/ldconfig