OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 27-Mar-2006 19:55:50
Branch: HEAD Handle: 2006032718554900
Added files:
openpkg-src/mtools mtools.patch
Modified files:
openpkg-src/mtools mtools.spec
Log:
add support for configuration file and install a default one; add
missing newline in mdel(1) output
Summary:
Revision Changes Path
1.1 +30 -0 openpkg-src/mtools/mtools.patch
1.35 +12 -2 openpkg-src/mtools/mtools.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mtools/mtools.patch
============================================================================
$ cvs diff -u -r0 -r1.1 mtools.patch
--- /dev/null 2006-03-27 19:55:13 +0200
+++ mtools.patch 2006-03-27 19:55:50 +0200
@@ -0,0 +1,30 @@
+Index: config.c
+--- config.c.orig 2004-02-28 18:40:23 +0100
++++ config.c 2006-03-27 19:48:21 +0200
+@@ -679,13 +679,7 @@
+ memcpy(devices, const_devices,
+ nr_const_devices*sizeof(struct device));
+
+- (void) ((parse(CONF_FILE,1) |
+- parse(LOCAL_CONF_FILE,1) |
+- parse(SYS_CONF_FILE,1)) ||
+- (parse(OLD_CONF_FILE,1) |
+- parse(OLD_LOCAL_CONF_FILE,1)));
+- /* the old-name configuration files only get executed if none of the
+- * new-name config files were used */
++ (void) parse(SYS_CONF_FILE, 1);
+
+ homedir = get_homedir();
+ if ( homedir ){
+Index: mdel.c
+--- mdel.c.orig 2005-02-13 15:49:22 +0100
++++ mdel.c 2006-03-27 19:43:36 +0200
+@@ -125,7 +125,7 @@
+ fprintf(stderr,
+ "Mtools version %s, dated %s\n", mversion, mdate);
+ fprintf(stderr,
+- "Usage: %s [-v] msdosfile [msdosfiles...]", progname);
++ "Usage: %s [-v] msdosfile [msdosfiles...]\n", progname);
+ exit(1);
+ }
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mtools/mtools.spec
============================================================================
$ cvs diff -u -r1.34 -r1.35 mtools.spec
--- openpkg-src/mtools/mtools.spec 1 Jan 2006 13:17:01 -0000 1.34
+++ openpkg-src/mtools/mtools.spec 27 Mar 2006 17:55:49 -0000 1.35
@@ -33,10 +33,11 @@
Group: System
License: GPL
Version: 3.9.10
-Release: 20050303
+Release: 20060327
# list of sources
Source0: http://mtools.linux.lu/mtools-%{version}.tar.gz
+Patch0: mtools.patch
# build information
Prefix: %{l_prefix}
@@ -61,12 +62,14 @@
%prep
%setup -q
+ %patch -p0
%build
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
./configure \
--prefix=%{l_prefix} \
+ --sysconfdir=%{l_prefix}/etc/mtools \
--without-x
%{l_make} %{l_mflags -O}
@@ -78,7 +81,14 @@
exec_prefix=$RPM_BUILD_ROOT%{l_prefix}
rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
- %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/mtools
+ %{l_shtool} install -c -m 644 \
+ -e '1,3d' \
+ mtools.conf $RPM_BUILD_ROOT%{l_prefix}/etc/mtools/
+ %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
+ %{l_files_std} \
+ '%config %{l_prefix}/etc/mtools/*'
%files -f files
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
