Accepting request 294740 from home:jubalh:branches:utilities

Cleanup of spec file and making it work under SLE11 as well.

OBS-URL: https://build.opensuse.org/request/show/294740
OBS-URL: https://build.opensuse.org/package/show/utilities/vifm?expand=0&rev=12

vifm.changes

@@ -1,3 +1,35 @@
+-------------------------------------------------------------------
+Tue Apr  7 12:01:51 UTC 2015 - g.bluehut@gmail.com
+
+- Use suse_update_desktop_file only when on suse.
+- Ran spec-cleaner
+
+-------------------------------------------------------------------
+Tue Apr  7 08:12:15 UTC 2015 - g.bluehut@gmail.com
+
+- Add BuildRoot
+
+-------------------------------------------------------------------
+Thu Apr  2 16:20:40 UTC 2015 - g.bluehut@gmail.com
+
+- Dont use the make_install macro so it works for older systems too
+
+-------------------------------------------------------------------
+Thu Apr  2 13:39:09 UTC 2015 - g.bluehut@gmail.com
+
+- Use pkgconfig(x11) instead libX11-devel so it is adaptable to name changes
+- In case of versions older or equal to 1110 we have to use the old xorg-x11-devel package
+
+-------------------------------------------------------------------
+Thu Apr  2 10:28:09 UTC 2015 - g.bluehut@gmail.com
+
+- Use libX11-devel instead of xorg-x11-devel meta package as dependency
+
+-------------------------------------------------------------------
+Thu Apr  2 09:41:26 UTC 2015 - g.bluehut@gmail.com
+
+- Install the COPYING file too
+
 -------------------------------------------------------------------
 Wed Mar 25 10:51:12 UTC 2015 - g.bluehut@gmail.com
 

vifm.spec

@@ -28,7 +28,15 @@ BuildRequires:  file-devel
 BuildRequires:  groff
 BuildRequires:  ncurses-devel
 BuildRequires:  pkgconfig
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%if 0%{?suse_version}
+BuildRequires:  update-desktop-files
+%endif
+%if 0%{?suse_version} > 1110
+BuildRequires:  pkgconfig(x11)
+%else
 BuildRequires:  xorg-x11-devel
+%endif
 
 %description
 Vifm is a ncurses based file manager with vi like keybindings that allow complete
@@ -51,12 +59,15 @@ gzip -9c ChangeLog > ChangeLog.gz
 
 
 %install
-%make_install
+make install DESTDIR="%{?buildroot}"
+%if 0%{?suse_version}
+%suse_update_desktop_file %{name}
+%endif
 
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS BUGS ChangeLog.* README TODO
+%doc AUTHORS BUGS ChangeLog.* COPYING README TODO
 %{_bindir}/*
 %doc %{_datadir}/%{name}/%{name}-help.txt
 %doc %{_datadir}/%{name}/vim-doc