From b7f9e516e1fadd765ff078375c1b2a5733e0022fb4a73ac9f1d31815ee36e03b Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 29 Jan 2010 00:21:44 +0000 Subject: [PATCH 1/3] little cleanup OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=6 --- mc.spec | 74 ++++++++++++++++++++++++++++++--------------------------- 1 file changed, 39 insertions(+), 35 deletions(-) diff --git a/mc.spec b/mc.spec index 23c25dd..299aae0 100644 --- a/mc.spec +++ b/mc.spec @@ -1,7 +1,7 @@ # -# spec file for package mc (Version 4.6.2) +# spec file for package mc # -# 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 @@ -17,21 +17,17 @@ # norootforbuild - 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 +Summary: Midnight Commander Group: Productivity/File utilities -PreReq: permissions -AutoReqProv: on +License: GPL v2 or later +Url: http://www.ibiblio.org/mc/ Version: 4.6.2 Release: 6 -Summary: Midnight Commander -Source: mc-4.6.2.tar.bz2 +Source: mc-%{version}.tar.bz2 Source1: x11_browser -Source2: %name.desktop -Source3: %name.png +Source2: %{name}.desktop +Source3: %{name}.png Patch0: mc-utf8.patch Patch1: 00-70-utf8-common.patch Patch2: 00-73-utf8-bottom-buttons-width.patch @@ -74,7 +70,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,9 +108,6 @@ 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 %prep @@ -186,56 +194,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 \ - --mandir=%{_mandir} \ - --prefix=%{_prefix} \ +%configure \ --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 -install -m 0644 lib/mc.sh lib/mc.csh %{buildroot}/etc/profile.d +mkdir -p %{buildroot}%{_sysconfdir}/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 -mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/ -install -m 644 %{S:3} $RPM_BUILD_ROOT/usr/share/pixmaps/%name.png +install -m 755 %{SOURCE1} %{buildroot}%{_datadir}/mc/bin +install -D -m 644 %{S:3} %{buildroot}%{_datadir}/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 -%verify(not mode) %{_prefix}/%{_lib}/mc/cons.saver +%dir %{_libexecdir}/mc +%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 -/usr/share/pixmaps/%name.png +%{_datadir}/applications/%{name}.desktop +%{_datadir}/pixmaps/%{name}.png %lang(es) %doc %{_mandir}/es %lang(hu) %doc %{_mandir}/hu %lang(it) %doc %{_mandir}/it From 994e3e4345831ddb16fc68326dcb10cf7c1e5e7ee0ad22dc2d21d71b42f96b2b Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 18 Mar 2010 07:35:23 +0000 Subject: [PATCH 2/3] - little cleanup OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=8 --- mc.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mc.changes b/mc.changes index 1d9b5d0..df221bd 100644 --- a/mc.changes +++ b/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 From 2215855ca5e457369e8152622f115d5876d6543c5e6e77c93c13b7c87daf882f Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 19 Mar 2010 08:44:13 +0000 Subject: [PATCH 3/3] Accepting request 35135 from Base:System checked in (request 35135) OBS-URL: https://build.opensuse.org/request/show/35135 OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=9 --- mc.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mc.spec b/mc.spec index 299aae0..9fb6ea0 100644 --- a/mc.spec +++ b/mc.spec @@ -1,5 +1,5 @@ # -# spec file for package mc +# spec file for package mc (Version 4.6.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,13 +17,14 @@ # norootforbuild + Name: mc Summary: Midnight Commander Group: Productivity/File utilities -License: GPL v2 or later +License: GPLv2+ Url: http://www.ibiblio.org/mc/ Version: 4.6.2 -Release: 6 +Release: 7 Source: mc-%{version}.tar.bz2 Source1: x11_browser Source2: %{name}.desktop @@ -108,8 +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. -%lang_package +%lang_package %prep %setup -q %patch0 -p 1