- new mc release 4.6.1
- sync extensions patch - fix several gcc4 signedness warnings
This commit is contained in:
Jindrich Novy
parent
556d3c027b
commit
29b4ad962a
@ -13,3 +13,4 @@ mc-4.6.1a-20050324.tar.bz2
|
||||
mc-4.6.1a-20050504.tar.bz2
|
||||
mc-4.6.1a-20050606.tar.bz2
|
||||
mc-4.6.1-pre5.tar.bz2
|
||||
mc-4.6.1.tar.bz2
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
--- mc-4.6.1-20041103/lib/mc.ext.in.extensions 2004-10-28 08:19:23.000000000 +0200
|
||||
+++ mc-4.6.1-20041103/lib/mc.ext.in 2004-11-03 13:20:09.889755600 +0100
|
||||
@@ -108,14 +108,25 @@
|
||||
--- mc-4.6.1/lib/mc.ext.in.extensions 2005-07-23 18:51:15.000000000 +0200
|
||||
+++ mc-4.6.1/lib/mc.ext.in 2005-07-25 09:53:08.367448216 +0200
|
||||
@@ -210,14 +210,25 @@ shell/.7z
|
||||
|
||||
# C
|
||||
shell/.c
|
||||
@ -28,22 +28,7 @@
|
||||
Open=%var{EDITOR:vi} %f
|
||||
|
||||
# Object
|
||||
@@ -123,14 +134,6 @@
|
||||
#Open=%var{PAGER:more} %f
|
||||
View=%view{ascii} file %f && nm %f
|
||||
|
||||
-# Asm
|
||||
-shell/.s
|
||||
- Open=%var{EDITOR:vi} %f
|
||||
-
|
||||
-# C++
|
||||
-regex/\.(C|cc|cpp)$
|
||||
- Open=%var{EDITOR:vi} %f
|
||||
-
|
||||
### Documentation ###
|
||||
|
||||
# Texinfo
|
||||
@@ -139,9 +142,11 @@
|
||||
@@ -242,9 +253,11 @@ regex/\.(te?xi|texinfo)$
|
||||
# GNU Info page
|
||||
type/^Info\ text
|
||||
Open=info -f %f
|
||||
@ -55,7 +40,7 @@
|
||||
|
||||
# Manual page
|
||||
# Exception - .so libraries are not manual pages
|
||||
@@ -210,6 +215,12 @@
|
||||
@@ -313,6 +326,12 @@ type/^PPM
|
||||
type/^Netpbm
|
||||
Include=image
|
||||
|
||||
@ -68,7 +53,7 @@
|
||||
shell/.xcf
|
||||
Open=gimp %f
|
||||
|
||||
@@ -221,7 +232,7 @@
|
||||
@@ -324,7 +343,7 @@ shell/.xpm
|
||||
View=sxpm %f
|
||||
|
||||
include/image
|
||||
@ -77,7 +62,7 @@
|
||||
View=%view{ascii} identify %f
|
||||
#View=%view{ascii} asciiview %f
|
||||
|
||||
@@ -239,8 +250,12 @@
|
||||
@@ -342,8 +361,12 @@ regex/\.([wW][aA][wW]22)$
|
||||
Open=vplay -s 22 %f
|
||||
|
||||
regex/\.([mM][pP]3)$
|
||||
@ -92,7 +77,7 @@
|
||||
|
||||
regex/\.([oO][gG][gG])$
|
||||
Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms %f &); fi
|
||||
@@ -253,6 +268,9 @@
|
||||
@@ -356,6 +379,9 @@ regex/\.([wW][mM][aA])$
|
||||
Open=mplayer -vo null %f
|
||||
View=%view{ascii} mplayer -quiet -slave -frames 0 -vo null -ao null -identify %f 2>/dev/null | tail +13 || file %f
|
||||
|
||||
@ -102,7 +87,7 @@
|
||||
|
||||
### Play lists ###
|
||||
|
||||
@@ -277,20 +295,28 @@
|
||||
@@ -380,20 +406,28 @@ regex/\.([mM][oO][vV]|[qQ][tT])$
|
||||
regex/\.([mM][pP]4|[mM][pP][eE]?[gG])$
|
||||
Include=video
|
||||
|
||||
|
||||
@ -4441,7 +4441,7 @@
|
||||
int is_password; /* Is this a password input line? */
|
||||
unsigned char *buffer; /* pointer to editing buffer */
|
||||
+#ifdef UTF8
|
||||
+ unsigned char charbuf[MB_LEN_MAX];
|
||||
+ char charbuf[MB_LEN_MAX];
|
||||
+#endif /* UTF8 */
|
||||
+ int charpoint;
|
||||
GList *history; /* The history */
|
||||
|
||||
13
mc.spec
13
mc.spec
@ -1,11 +1,11 @@
|
||||
Summary: User-friendly text console file manager and visual shell.
|
||||
Name: mc
|
||||
Version: 4.6.1a
|
||||
Release: 0.11
|
||||
Release: 0.12
|
||||
Epoch: 1
|
||||
License: GPL
|
||||
Group: System Environment/Shells
|
||||
Source0: http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/mc-4.6.1-pre5.tar.bz2
|
||||
Source0: http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/mc-4.6.1.tar.bz2
|
||||
URL: http://www.ibiblio.org/mc/
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
||||
BuildRequires: gpm-devel, slang-devel, glib2-devel
|
||||
@ -19,6 +19,7 @@ Patch3: mc-uglydir.patch
|
||||
Patch4: mc-fish-upload.patch
|
||||
Patch5: mc-userhost.patch
|
||||
Patch6: mc-64bit.patch
|
||||
Patch7: mc-gcc4.patch
|
||||
|
||||
%description
|
||||
Midnight Commander is a visual shell much like a file manager, only
|
||||
@ -28,7 +29,7 @@ best features are its ability to FTP, view tar and zip files, and to
|
||||
poke into RPMs for specific files.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-4.6.1-pre5
|
||||
%setup -q -n %{name}-4.6.1
|
||||
|
||||
%patch0 -p1 -b .utf8
|
||||
%patch1 -p1 -b .extensions
|
||||
@ -37,6 +38,7 @@ poke into RPMs for specific files.
|
||||
%patch4 -p1 -b .fish-upload
|
||||
%patch5 -p1 -b .userhost
|
||||
%patch6 -p1 -b .64bit
|
||||
%patch7 -p1 -b .gcc4
|
||||
|
||||
# convert files in /lib to UTF-8
|
||||
pushd lib
|
||||
@ -171,6 +173,11 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%dir %{_datadir}/mc
|
||||
|
||||
%changelog
|
||||
* Mon Jul 25 2005 Jindrich Novy <jnovy@redhat.com> 4.6.1a-0.12
|
||||
- new mc release 4.6.1
|
||||
- sync extensions patch
|
||||
- fix several gcc4 signedness warnings
|
||||
|
||||
* Fri Jul 08 2005 Jindrich Novy <jnovy@redhat.com> 4.6.1a-0.11
|
||||
- update to mc-4.6.1-pre5
|
||||
- sync .utf8, .userhost patch
|
||||
|
||||
Loading…
Reference in New Issue
Block a user