diff --git a/mc.changes b/mc.changes index a24563a..fdbf7ae 100644 --- a/mc.changes +++ b/mc.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Aug 11 10:49:20 CEST 2007 - olh@suse.de + +- remove umode_t checks + use offsetof() in vfs-impl.h + build parallel + move iconv updates to build section to fix quilt setup -v *.spec + ------------------------------------------------------------------- Tue Aug 7 23:54:20 CEST 2007 - maw@suse.de diff --git a/mc.spec b/mc.spec index e748c91..bbe94a7 100644 --- a/mc.spec +++ b/mc.spec @@ -18,7 +18,7 @@ Group: Productivity/File utilities PreReq: permissions Autoreqprov: on Version: 4.6.1 -Release: 116 +Release: 118 Summary: Midnight Commander Source: mc-4.6.1.tar.bz2 Source1: x11_browser @@ -52,6 +52,8 @@ Patch28: mc-4.6.1-syntax-hpp.patch Patch29: mc-utf8-nlink.patch Patch30: mc-4.6.1-bash-all.patch Patch31: mc-4.6.1-esc-seq.patch +Patch32: mc.umode_t.patch +Patch33: mc.vfs_dirent-offsetof.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build URL: http://www.ibiblio.org/mc/ Requires: %{name}-lang = %{version} @@ -145,9 +147,14 @@ Authors: %patch29 %patch30 %patch31 -cd po +%patch32 -p1 +%patch33 -p1 + +%build +pushd po rename no nb no.* -cd ../lib +popd +pushd lib iconv -f iso8859-1 -t utf-8 -o mc.hint.tmp mc.hint && mv mc.hint.tmp mc.hint iconv -f iso8859-1 -t utf-8 -o mc.hint.es.tmp mc.hint.es && mv mc.hint.es.tmp mc.hint.es iconv -f iso8859-1 -t utf-8 -o mc.hint.it.tmp mc.hint.it && mv mc.hint.it.tmp mc.hint.it @@ -158,9 +165,10 @@ iconv -f iso8859-2 -t utf-8 -o mc.hint.pl.tmp mc.hint.pl && mv mc.hint.pl.tmp mc iconv -f koi8-r -t utf8 -o mc.hint.ru.tmp mc.hint.ru && mv mc.hint.ru.tmp mc.hint.ru iconv -f koi8-u -t utf8 -o mc.hint.uk.tmp mc.hint.uk && mv mc.hint.uk.tmp mc.hint.uk iconv -f big5 -t utf8 -o mc.hint.zh.tmp mc.hint.zh && mv mc.hint.zh.tmp mc.hint.zh +popd # convert docs to utf-8 -cd ../doc +pushd doc pushd es iconv -f iso8859-1 -t utf-8 -o mc.1.in.tmp mc.1.in && mv mc.1.in.tmp mc.1.in iconv -f iso8859-1 -t utf-8 -o xnc.hlp.tmp xnc.hlp && mv xnc.hlp.tmp xnc.hlp @@ -181,8 +189,7 @@ pushd ru iconv -f koi8-r -t utf-8 -o mc.1.in.tmp mc.1.in && mv mc.1.in.tmp mc.1.in iconv -f koi8-r -t utf-8 -o xnc.hlp.tmp xnc.hlp && mv xnc.hlp.tmp xnc.hlp popd - -%build +popd autoreconf --force --install %define warn_flags -W -Wall -Wstrict-prototypes -Wpointer-arith -Wformat-security -Wno-unused-parameter %if %suse_version > 1000 @@ -199,7 +206,7 @@ export CFLAGS #LIBS _libdir --libdir=%{_libdir} \ --enable-charset \ --with-samba -make +make %{?jobs:-j%{jobs}} %install make DESTDIR=%{buildroot} install @@ -245,6 +252,11 @@ rm -rf %{buildroot} %files lang -f %{name}.lang %changelog +* Sat Aug 11 2007 - olh@suse.de +- remove umode_t checks + use offsetof() in vfs-impl.h + build parallel + move iconv updates to build section to fix quilt setup -v *.spec * Tue Aug 07 2007 - maw@suse.de - Use %%fdupes - Split off a -lang subpackage. diff --git a/mc.umode_t.patch b/mc.umode_t.patch new file mode 100644 index 0000000..0c33d07 --- /dev/null +++ b/mc.umode_t.patch @@ -0,0 +1,229 @@ +--- + acinclude.m4 | 10 ------ + config.h.in | 2 - + configure | 85 ---------------------------------------------------------- + configure.ac | 1 + src/achown.c | 1 + src/chmod.c | 1 + src/file.c | 1 + vfs/undelfs.c | 6 ---- + 8 files changed, 3 insertions(+), 104 deletions(-) + +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -12,12 +12,7 @@ AC_DEFUN([MC_UNDELFS_CHECKS], [ + AC_CHECK_HEADERS([ext2fs/ext2fs.h], [ext2fs_ext2fs_h=yes], , + [ + #include +-#ifdef HAVE_EXT2FS_EXT2_FS_H + #include +-#else +-#undef umode_t +-#include +-#endif + ]) + if test x$ext2fs_ext2fs_h = xyes; then + AC_DEFINE(USE_EXT2FSLIB, 1, +@@ -32,12 +27,7 @@ AC_DEFUN([MC_UNDELFS_CHECKS], [ + #include + #include + #include +-#ifdef HAVE_EXT2FS_EXT2_FS_H + #include +-#else +-#undef umode_t +-#include +-#endif + #include + ]) + fi +--- a/config.h.in ++++ b/config.h.in +@@ -689,5 +689,3 @@ + don't define. */ + #undef uintmax_t + +-/* Define to `int' if does not define. */ +-#undef umode_t +--- a/configure ++++ b/configure +@@ -13667,71 +13667,6 @@ _ACEOF + + fi + +-echo "$as_me:$LINENO: checking for umode_t" >&5 +-echo $ECHO_N "checking for umode_t... $ECHO_C" >&6 +-if test "${ac_cv_type_umode_t+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-if ((umode_t *) 0) +- return 0; +-if (sizeof (umode_t)) +- return 0; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_type_umode_t=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_type_umode_t=no +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-echo "$as_me:$LINENO: result: $ac_cv_type_umode_t" >&5 +-echo "${ECHO_T}$ac_cv_type_umode_t" >&6 +-if test $ac_cv_type_umode_t = yes; then +- : +-else +- +-cat >>confdefs.h <<_ACEOF +-#define umode_t int +-_ACEOF +- +-fi + + echo "$as_me:$LINENO: checking for off_t" >&5 + echo $ECHO_N "checking for off_t... $ECHO_C" >&6 +@@ -18590,12 +18525,7 @@ cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + + #include +-#ifdef HAVE_EXT2FS_EXT2_FS_H + #include +-#else +-#undef umode_t +-#include +-#endif + + + #include <$ac_header> +@@ -18666,12 +18596,7 @@ cat >>conftest.$ac_ext <<_ACEOF + #include + #include + #include +-#ifdef HAVE_EXT2FS_EXT2_FS_H + #include +-#else +-#undef umode_t +-#include +-#endif + #include + + +@@ -18984,12 +18909,7 @@ cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + + #include +-#ifdef HAVE_EXT2FS_EXT2_FS_H + #include +-#else +-#undef umode_t +-#include +-#endif + + + #include <$ac_header> +@@ -19060,12 +18980,7 @@ cat >>conftest.$ac_ext <<_ACEOF + #include + #include + #include +-#ifdef HAVE_EXT2FS_EXT2_FS_H + #include +-#else +-#undef umode_t +-#include +-#endif + #include + + +--- a/configure.ac ++++ b/configure.ac +@@ -210,7 +210,6 @@ dnl Missing typedefs and replacements + dnl + + AC_TYPE_MODE_T +-AC_CHECK_TYPE(umode_t, int) + AC_CHECK_TYPE(off_t, long) + AC_TYPE_PID_T + AC_TYPE_UID_T +--- a/src/achown.c ++++ b/src/achown.c +@@ -19,6 +19,7 @@ + #include + /* Needed for the extern declarations of integer parameters */ + #include ++#include + #include + #ifdef HAVE_UNISTD_H + # include +--- a/src/chmod.c ++++ b/src/chmod.c +@@ -22,6 +22,7 @@ + #include /* For errno on SunOS systems */ + /* Needed for the extern declarations of integer parameters */ + #include ++#include + #include + #ifdef HAVE_UNISTD_H + # include +--- a/src/file.c ++++ b/src/file.c +@@ -43,6 +43,7 @@ + #define WITH_FULL_PATHS 1 + + #include ++#include + #include + #include + #include +--- a/vfs/undelfs.c ++++ b/vfs/undelfs.c +@@ -39,13 +39,7 @@ + #include + #include + +-#ifdef HAVE_EXT2FS_EXT2_FS_H + #include +-#else +-/* asm/types.h defines its own umode_t */ +-#undef umode_t +-#include +-#endif + + #include + #include diff --git a/mc.vfs_dirent-offsetof.patch b/mc.vfs_dirent-offsetof.patch new file mode 100644 index 0000000..bec1be7 --- /dev/null +++ b/mc.vfs_dirent-offsetof.patch @@ -0,0 +1,23 @@ +--- + vfs/vfs-impl.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/vfs/vfs-impl.h ++++ b/vfs/vfs-impl.h +@@ -2,6 +2,7 @@ + #define MC_VFS_IMPL_H + + #ifdef USE_VFS ++#include + + typedef void *vfsid; + struct vfs_stamping; +@@ -85,7 +86,7 @@ struct vfs_class { + */ + union vfs_dirent { + struct dirent dent; +- char _extra_buffer[((int) &((struct dirent *) 0)->d_name) + ++ char _extra_buffer[offsetof(struct dirent, d_name) + + MC_MAXPATHLEN + 1]; + }; +