Accepting request 35135 from Base:System

Copy from Base:System/mc based on submit request 35135 from user coolo

OBS-URL: https://build.opensuse.org/request/show/35135
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mc?expand=0&rev=20

mc.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Mar 18 07:35:09 UTC 2010 - prusnak@suse.cz
+
+- little cleanup
+
 -------------------------------------------------------------------
 Sun Oct 11 10:16:07 UTC 2009 - mseben@novell.com
 

mc.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package mc (Version 4.6.2)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 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
@@ -19,19 +19,16 @@
 
 
 Name:           mc
-BuildRequires:  audiofile-devel docbook-toys e2fsprogs-devel fdupes glib2-devel gpm indent jpeg libjpeg-devel libpng-devel readline-devel recode slang-devel update-desktop-files xorg-x11-devel
-%define _prefix  /usr
-License:        GPL v2 or later
-Group:          Productivity/File utilities
-PreReq:         permissions
-AutoReqProv:    on
-Version:        4.6.2
-Release:        6
 Summary:        Midnight Commander
-Source:         mc-4.6.2.tar.bz2
+Group:          Productivity/File utilities
+License:        GPLv2+
+Url:            http://www.ibiblio.org/mc/
+Version:        4.6.2
+Release:        7
+Source:         mc-%{version}.tar.bz2
 Source1:        x11_browser
-Source2:        %name.desktop
+Source2:        %{name}.desktop
-Source3:        %name.png
+Source3:        %{name}.png
 Patch0:         mc-utf8.patch
 Patch1:         00-70-utf8-common.patch
 Patch2:         00-73-utf8-bottom-buttons-width.patch
@@ -74,7 +71,22 @@ Patch44:        mc-port-number-bnc483249.patch
 Patch45:        mc-mkdir_mc_home.patch
 #
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Url:            http://www.ibiblio.org/mc/
+BuildRequires:  audiofile-devel
+BuildRequires:  docbook-toys
+BuildRequires:  e2fsprogs-devel
+BuildRequires:  fdupes
+BuildRequires:  glib2-devel
+BuildRequires:  gpm
+BuildRequires:  indent
+BuildRequires:  jpeg
+BuildRequires:  libjpeg-devel
+BuildRequires:  libpng-devel
+BuildRequires:  readline-devel
+BuildRequires:  recode
+BuildRequires:  slang-devel
+BuildRequires:  update-desktop-files
+BuildRequires:  xorg-x11-devel
+Requires(pre):  permissions
 Recommends:     %{name}-lang = %{version}
 
 %description
@@ -97,11 +109,8 @@ directory. This is where most of the commands are found. For certain
 commands, like copy and move, the second directory is used as the
 target directory.
 
-%define INSTALL      install -m755 -s
-%define INSTALL_DIR  install -d -m755
-%define INSTALL_DATA install -m644
-%lang_package
 
+%lang_package
 %prep
 %setup -q
 %patch0 -p 1
@@ -186,56 +195,52 @@ popd
 autoreconf --force --install
 %define warn_flags -W -Wall -Wstrict-prototypes -Wpointer-arith -Wformat-security -Wno-unused-parameter
 export CFLAGS="$RPM_OPT_FLAGS %{warn_flags}"
-./configure \
+%configure \
-    --mandir=%{_mandir} \
-    --prefix=%{_prefix} \
     --localstatedir=/var/lib \
-    --libexecdir=%{_libdir} \
-    --libdir=%{_libdir} \
     --enable-charset \
     --with-samba
 make %{?jobs:-j%{jobs}}
 
 %install
-make    DESTDIR=%{buildroot} install
+make DESTDIR=%{buildroot} install
 # clean up this setuid problem for now
-chmod 755 %{buildroot}/%{_libdir}/mc/cons.saver
+chmod 755 %{buildroot}/%{_libexecdir}/mc/cons.saver
 # copy Korean mc hint message,
 # install -m 0644 %{SOURCE3} %{datadir}/mc/
 #install the shell functions for bourne shell and csh
-mkdir -p %{buildroot}/etc/profile.d
+mkdir -p %{buildroot}%{_sysconfdir}/profile.d
-install -m 0644 lib/mc.sh lib/mc.csh %{buildroot}/etc/profile.d
+install -m 0644 lib/mc.sh lib/mc.csh %{buildroot}%{_sysconfdir}/profile.d
 #support script for calling available GUI webbrosers
-install -m 755 %{SOURCE1} %{buildroot}/usr/share/mc/bin
+install -m 755 %{SOURCE1} %{buildroot}%{_datadir}/mc/bin
-mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/
+install -D -m 644 %{S:3} %{buildroot}%{_datadir}/pixmaps/%{name}.png
-install -m 644 %{S:3} $RPM_BUILD_ROOT/usr/share/pixmaps/%name.png
 %suse_update_desktop_file -i %name System FileManager
 %{find_lang} %{name}
-%fdupes -s $RPM_BUILD_ROOT/usr
+%fdupes -s %{buildroot}%{_prefix}
 
 %clean
 rm -rf %{buildroot}
 
 %post
 %run_permissions
+
 %verifyscript
-%verify_permissions -e /usr/lib/mc/cons.saver
+%verify_permissions -e %{_libexecdir}/mc/cons.saver
 
 %files
 %defattr(-, root, root)
 %doc ABOUT-NLS COPYING NEWS README
-%config /etc/profile.d/*
+%config %{_sysconfdir}/profile.d/*
 %{_bindir}/mc*
-%dir %{_prefix}/%{_lib}/mc
+%dir %{_libexecdir}/mc
-%verify(not mode) %{_prefix}/%{_lib}/mc/cons.saver
+%verify(not mode) %{_libexecdir}/mc/cons.saver
 %{_mandir}/man1/*
 #%{_mandir}/man3/*
 %{_datadir}/mc
 %exclude %{_datadir}/mc/mc.hint.*
 %exclude %{_datadir}/mc/mc.hlp.*
 %exclude %{_datadir}/mc/mc.menu.*
-/usr/share/applications/%name.desktop
+%{_datadir}/applications/%{name}.desktop
-/usr/share/pixmaps/%name.png
+%{_datadir}/pixmaps/%{name}.png
 %lang(es) %doc %{_mandir}/es
 %lang(hu) %doc %{_mandir}/hu
 %lang(it) %doc %{_mandir}/it