mpkg-commit Mailing List for Meta pkg

Brought to you by: lpenet, scaps

mpkg-commit — All cvs commit.

You can subscribe to this list here.

2001	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct (3)	_Nov (26)	_Dec (5)
2002	_Jan	_Feb	_Mar	_Apr (1)	_May	_Jun	_Jul (1)	_Aug	_Sep	_Oct	_Nov	_Dec

Flat | Threaded

1 2 > >> (Page 1 of 2)

[Mpkg-commit] CVS: mpkg/src rpm.c,1.6,1.7

From: Philippe F. <pfe...@us...> - 2002-07-04 17:38:57

Update of /cvsroot/mpkg/mpkg/src
In directory usw-pr-cvs1:/tmp/cvs-serv27616

Modified Files:
	rpm.c 
Log Message:
correct a bug when using pre-remove scripts

Index: rpm.c
===================================================================
RCS file: /cvsroot/mpkg/mpkg/src/rpm.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** rpm.c	30 Apr 2002 07:55:38 -0000	1.6
--- rpm.c	4 Jul 2002 17:38:54 -0000	1.7
***************
*** 255,261 ****
      }
  
!   for (i = dist->num_commands, c = dist->commands; i > 0; i--, c++)
!     if (c->type == COMMAND_PRE_REMOVE)
!       fprintf (fp, "%s\n", c->command);
  
    if (dist->num_commands)
--- 255,265 ----
      }
  
!   if (dist->num_commands)
!     {
!       fputs ("%preun\n", fp);
!       for (i = dist->num_commands, c = dist->commands; i > 0; i--, c++)
!         if (c->type == COMMAND_PRE_REMOVE)
!           fprintf (fp, "%s\n", c->command);
!    }
  
    if (dist->num_commands)

[Mpkg-commit] CVS: mpkg/src rpm.c,1.5,1.6

From: Philippe F. <pfe...@us...> - 2002-04-30 08:34:28

Update of /cvsroot/mpkg/mpkg/src
In directory usw-pr-cvs1:/tmp/cvs-serv28010/src

Modified Files:
	rpm.c 
Log Message:
Supporting filename containing spaces (required to specify the filename between quotes

Index: rpm.c
===================================================================
RCS file: /cvsroot/mpkg/mpkg/src/rpm.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** rpm.c	29 Nov 2001 09:16:06 -0000	1.5
--- rpm.c	30 Apr 2002 07:55:38 -0000	1.6
***************
*** 50,54 ****
    struct group *grp;		/* Pointer to group record */
    char current[1024];		/* Current directory */
! 
  
    if (Verbosity)
--- 50,55 ----
    struct group *grp;		/* Pointer to group record */
    char current[1024];		/* Current directory */
!   char dst[1024];       /* Destination file */
!   int  dstlen;
  
    if (Verbosity)
***************
*** 268,291 ****
    fputs ("%files\n", fp);
    for (i = dist->num_files, file = dist->files; i > 0; i--, file++)
      switch (tolower (file->type))
        {
        case 'c':
  	fprintf (fp, "%%attr(%04o,%s,%s) %%config(noreplace) %s\n",
! 		 file->mode, file->user, file->group, file->dst);
  	break;
        case 'd':
  	fprintf (fp, "%%attr(%04o,%s,%s) %%dir %s\n", file->mode, file->user,
! 		 file->group, file->dst);
  	break;
        case 'f':
        case 'l':
  	fprintf (fp, "%%attr(%04o,%s,%s) %s\n", file->mode, file->user,
! 		 file->group, file->dst);
  	break;
        case 'i':
  	fprintf (fp, "%%attr(0555,root,root) %s/init.d/%s\n", SoftwareDir,
! 		 file->dst);
  	break;
        }
  
    fclose (fp);
--- 269,305 ----
    fputs ("%files\n", fp);
    for (i = dist->num_files, file = dist->files; i > 0; i--, file++)
+   {
+     if ( strchr(file->dst, ' ') != 0 )
+     { /* that file contains space characters */
+       dstlen = strlen(file->dst);
+       dst[0] = '\"';
+       strcpy(dst+1, file->dst);
+       dst[dstlen+1] = '\"';
+       dst[dstlen+2] = '\0';
+     }
+     else
+       strcpy(dst, file->dst);
+ 
      switch (tolower (file->type))
        {
        case 'c':
  	fprintf (fp, "%%attr(%04o,%s,%s) %%config(noreplace) %s\n",
! 		 file->mode, file->user, file->group, dst);
  	break;
        case 'd':
  	fprintf (fp, "%%attr(%04o,%s,%s) %%dir %s\n", file->mode, file->user,
! 		 file->group, dst);
  	break;
        case 'f':
        case 'l':
  	fprintf (fp, "%%attr(%04o,%s,%s) %s\n", file->mode, file->user,
! 		 file->group, dst);
  	break;
        case 'i':
  	fprintf (fp, "%%attr(0555,root,root) %s/init.d/%s\n", SoftwareDir,
! 		 dst);
  	break;
        }
+   }
  
    fclose (fp);

[Mpkg-commit] CVS: mpkg/lib/librpm Makefile.am,1.3,1.4 Makefile.in,1.3,1.4

From: Pascal B. <pb...@us...> - 2001-12-03 13:38:46

Update of /cvsroot/mpkg/mpkg/lib/librpm
In directory usw-pr-cvs1:/tmp/cvs-serv9235/lib/librpm

Modified Files:
	Makefile.am Makefile.in 
Log Message:
Regen.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/mpkg/mpkg/lib/librpm/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.am	2001/10/29 14:11:00	1.3
--- Makefile.am	2001/12/03 13:38:43	1.4
***************
*** 54,58 ****
  
  # We need to share data.
! pkgdata_DATA = rpmrc rpm.magic
  
  EXTRA_DIST = HOWTO_UPDATE \
--- 54,58 ----
  
  # We need to share data.
! #pkgdata_DATA = rpmrc rpm.magic
  
  EXTRA_DIST = HOWTO_UPDATE \

Index: Makefile.in
===================================================================
RCS file: /cvsroot/mpkg/mpkg/lib/librpm/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.in	2001/10/29 14:11:00	1.3
--- Makefile.in	2001/12/03 13:38:43	1.4
***************
*** 162,168 ****
  
  
- # We need to share data.
- pkgdata_DATA = rpmrc rpm.magic
  
  EXTRA_DIST = HOWTO_UPDATE \
  	rpmrc rpm.magic\
--- 162,168 ----
  
  
  
+ # We need to share data.
+ #pkgdata_DATA = rpmrc rpm.magic
  EXTRA_DIST = HOWTO_UPDATE \
  	rpmrc rpm.magic\
***************
*** 266,271 ****
  LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
  DIST_SOURCES = $(librpm_a_SOURCES)
- DATA = $(pkgdata_DATA)
- 
  HEADERS = $(noinst_HEADERS)
  
--- 266,269 ----
***************
*** 1360,1380 ****
  CCDEPMODE = @CCDEPMODE@
  uninstall-info-am:
- install-pkgdataDATA: $(pkgdata_DATA)
- 	@$(NORMAL_INSTALL)
- 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
- 	@list='$(pkgdata_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
- 	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
- 	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
- 	done
- 
- uninstall-pkgdataDATA:
- 	@$(NORMAL_UNINSTALL)
- 	@list='$(pkgdata_DATA)'; for p in $$list; do \
- 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
- 	  echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \
- 	  rm -f $(DESTDIR)$(pkgdatadir)/$$f; \
- 	done
  
  tags: TAGS
--- 1358,1361 ----
***************
*** 1434,1441 ****
  check-am: all-am
  check: check-am
! all-am: Makefile $(LIBRARIES) $(DATA) $(HEADERS)
  
  installdirs:
- 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
  
  install: install-am
--- 1415,1421 ----
  check-am: all-am
  check: check-am
! all-am: Makefile $(LIBRARIES) $(HEADERS)
  
  installdirs:
  
  install: install-am
***************
*** 1479,1483 ****
  info-am:
  
! install-data-am: install-pkgdataDATA
  
  install-exec-am:
--- 1459,1463 ----
  info-am:
  
! install-data-am:
  
  install-exec-am:
***************
*** 1497,1501 ****
  mostlyclean-am: mostlyclean-compile mostlyclean-generic
  
! uninstall-am: uninstall-info-am uninstall-pkgdataDATA
  
  .PHONY: GTAGS all all-am check check-am clean clean-generic \
--- 1477,1481 ----
  mostlyclean-am: mostlyclean-compile mostlyclean-generic
  
! uninstall-am: uninstall-info-am
  
  .PHONY: GTAGS all all-am check check-am clean clean-generic \
***************
*** 1504,1512 ****
  	dvi-am info info-am install install-am install-data \
  	install-data-am install-exec install-exec-am install-info \
! 	install-info-am install-man install-pkgdataDATA install-strip \
! 	installcheck installcheck-am installdirs maintainer-clean \
  	maintainer-clean-generic mostlyclean mostlyclean-compile \
  	mostlyclean-generic tags uninstall uninstall-am \
! 	uninstall-info-am uninstall-pkgdataDATA
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- 1484,1492 ----
  	dvi-am info info-am install install-am install-data \
  	install-data-am install-exec install-exec-am install-info \
! 	install-info-am install-man install-strip installcheck \
! 	installcheck-am installdirs maintainer-clean \
  	maintainer-clean-generic mostlyclean mostlyclean-compile \
  	mostlyclean-generic tags uninstall uninstall-am \
! 	uninstall-info-am
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.

[Mpkg-commit] CVS: mpkg/lib Makefile.in,1.3,1.4

From: Pascal B. <pb...@us...> - 2001-12-03 13:38:46

Update of /cvsroot/mpkg/mpkg/lib
In directory usw-pr-cvs1:/tmp/cvs-serv9235/lib

Modified Files:
	Makefile.in 
Log Message:
Regen.

Index: Makefile.in
===================================================================
RCS file: /cvsroot/mpkg/mpkg/lib/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.in	2001/11/27 14:30:45	1.3
--- Makefile.in	2001/12/03 13:38:43	1.4
***************
*** 119,123 ****
  	install-exec-recursive installdirs-recursive install-recursive \
  	uninstall-recursive check-recursive installcheck-recursive
! DIST_COMMON = Makefile.am Makefile.in
  DIST_SUBDIRS = $(SUBDIRS)
  all: all-recursive
--- 119,123 ----
  	install-exec-recursive installdirs-recursive install-recursive \
  	uninstall-recursive check-recursive installcheck-recursive
! DIST_COMMON = COPYING Makefile.am Makefile.in
  DIST_SUBDIRS = $(SUBDIRS)
  all: all-recursive

[Mpkg-commit] CVS: mpkg/doc mpkg.1,1.2,1.3 mpkg.info,1.2,1.3 mpkg.info-1,1.1.1.1,1.2 mpkg.info-2,1.2,1.3 version.texi,1.3,1.4

From: Pascal B. <pb...@us...> - 2001-12-03 13:38:45

Update of /cvsroot/mpkg/mpkg/doc
In directory usw-pr-cvs1:/tmp/cvs-serv9235/doc

Modified Files:
	mpkg.1 mpkg.info mpkg.info-1 mpkg.info-2 version.texi 
Log Message:
Regen.

Index: mpkg.1
===================================================================
RCS file: /cvsroot/mpkg/mpkg/doc/mpkg.1,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mpkg.1	2001/10/26 08:59:47	1.2
--- mpkg.1	2001/12/03 13:38:43	1.3
***************
*** 24,27 ****
--- 24,29 ----
  ] [ \-f
  .I format
+ ] [ \-\-output\-dir
+ .I directory
  ] [ \-g ] [ \-k ] [ \-n[mrs]
  ] [ \-v ] [
***************
*** 91,94 ****
--- 93,100 ----
  .br
  Generate a HP-UX software distribution.
+ .LP
+ To generate packages in particulary directory use \-\-output\-dir, this will
+ create output directory to put archives. Notice, all tempories files are 
+ generated in this directory.
  .LP
  Executable files in the distribution could be stripped of debugging

Index: mpkg.info
===================================================================
RCS file: /cvsroot/mpkg/mpkg/doc/mpkg.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mpkg.info	2001/10/29 13:21:38	1.2
--- mpkg.info	2001/12/03 13:38:43	1.3
***************
*** 1,3 ****
! This is mpkg.info, produced by makeinfo version 4.0b from mpkg.texi.
  
  START-INFO-DIR-ENTRY
--- 1,3 ----
! This is mpkg.info, produced by makeinfo version 4.0 from mpkg.texi.
  
  START-INFO-DIR-ENTRY
***************
*** 29,68 ****
  
  Indirect:
! mpkg.info-1: 1196
! mpkg.info-2: 43380
  
  Tag Table:
  (Indirect)
! Node: Top1196
! Node: Preface2069
! Node: Organization of this Manual2291
! Node: Notation Conventions2533
! Node: Abbreviations3431
! Node: References3741
! Node: What is MPKG?4297
! Node: History and Evolution5018
! Node: Existing Software Packaging Systems6466
! Node: Design Goals of MPKG9376
! Node: Resources10174
! Node: The Basics10928
! Node: Product Information11479
! Node: Files12465
! Node: Wildcards13281
! Node: Building a Software Distribution13511
! Node: Installing the Software Package15113
! Node: Including the Setup GUI15762
! Node: Including Other List Files16209
! Node: Conflicts16561
! Node: Scripts17664
! Node: Conditional Directives18997
! Node: Software Patches20566
! Node: Variables21227
! Node: Init Scripts22413
! Node: Copying This Manual23084
! Node: GNU Free Documentation License23307
! Node: Copying Meta pkg43171
! Node: Copying43380
! Node: List File Reference62559
! Node: Index72509
  
  End Tag Table
--- 29,68 ----
  
  Indirect:
! mpkg.info-1: 1195
! mpkg.info-2: 43453
  
  Tag Table:
  (Indirect)
! Node: Top1195
! Node: Preface2068
! Node: Organization of this Manual2290
! Node: Notation Conventions2532
! Node: Abbreviations3434
! Node: References3744
! Node: What is MPKG?4300
! Node: History and Evolution5021
! Node: Existing Software Packaging Systems6469
! Node: Design Goals of MPKG9379
! Node: Resources10177
! Node: The Basics10931
! Node: Product Information11482
! Node: Files12468
! Node: Wildcards13284
! Node: Building a Software Distribution13583
! Node: Installing the Software Package15185
! Node: Including the Setup GUI15834
! Node: Including Other List Files16281
! Node: Conflicts16633
! Node: Scripts17736
! Node: Conditional Directives19069
! Node: Software Patches20638
! Node: Variables21299
! Node: Init Scripts22485
! Node: Copying This Manual23156
! Node: GNU Free Documentation License23379
! Node: Copying Meta pkg43244
! Node: Copying43453
! Node: List File Reference62633
! Node: Index72583
  
  End Tag Table

Index: mpkg.info-1
===================================================================
RCS file: /cvsroot/mpkg/mpkg/doc/mpkg.info-1,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** mpkg.info-1	2001/10/24 12:16:46	1.1.1.1
--- mpkg.info-1	2001/12/03 13:38:43	1.2
***************
*** 1,3 ****
! This is mpkg.info, produced by makeinfo version 4.0b from mpkg.texi.
  
  START-INFO-DIR-ENTRY
--- 1,3 ----
! This is mpkg.info, produced by makeinfo version 4.0 from mpkg.texi.
  
  START-INFO-DIR-ENTRY
***************
*** 103,109 ****
  
                            Example Description
! "mpkg"  `mpkg(1)' The names of commands; the  first
! mention of a command or function in a chapter is followed by a  manual
! page section number.
  
     /VAR  /USR/BIN/MPKG File and directory names.
--- 103,110 ----
  
                            Example Description
! 
!    "mpkg"  `mpkg(1)' The names of commands; the  first mention of a
! command or function in a chapter is followed by a  manual page section
! number.
  
     /VAR  /USR/BIN/MPKG File and directory names.
***************
*** 393,396 ****
--- 394,399 ----
  f 0444 root sys /usr/share/doc/foo *.html
  
+    Note: Pattern matching works recursively on directories entries.
+ 
  
  File: mpkg.info,  Node: Building a Software Distribution,  Next: Installing the Software Package,  Prev: The Basics,  Up: Top
***************
*** 705,708 ****
--- 708,712 ----
  
                          Version 1.1, March 2000
+ 
       Copyright (C) 2000 Free Software Foundation, Inc.
       59 Temple Place, Suite 330, Boston, MA  02111-1307, USA

Index: mpkg.info-2
===================================================================
RCS file: /cvsroot/mpkg/mpkg/doc/mpkg.info-2,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mpkg.info-2	2001/10/29 13:21:38	1.2
--- mpkg.info-2	2001/12/03 13:38:43	1.3
***************
*** 1,3 ****
! This is mpkg.info, produced by makeinfo version 4.0b from mpkg.texi.
  
  START-INFO-DIR-ENTRY
--- 1,3 ----
! This is mpkg.info, produced by makeinfo version 4.0 from mpkg.texi.
  
  START-INFO-DIR-ENTRY
***************
*** 93,96 ****
--- 93,97 ----
  
      TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+ 
    0. This License applies to any program or other work which contains a
       notice placed by the copyright holder saying it may be distributed

Index: version.texi
===================================================================
RCS file: /cvsroot/mpkg/mpkg/doc/version.texi,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** version.texi	2001/10/29 14:11:00	1.3
--- version.texi	2001/12/03 13:38:43	1.4
***************
*** 1,4 ****
! @set UPDATED 29 October 2001
! @set UPDATED-MONTH October 2001
  @set EDITION 1.00b
  @set VERSION 1.00b
--- 1,4 ----
! @set UPDATED 3 December 2001
! @set UPDATED-MONTH December 2001
  @set EDITION 1.00b
  @set VERSION 1.00b

[Mpkg-commit] CVS: mpkg/doc mpkg.texi,1.3,1.4

From: Pascal B. <pb...@us...> - 2001-12-03 13:32:13

Update of /cvsroot/mpkg/mpkg/doc
In directory usw-pr-cvs1:/tmp/cvs-serv7884/doc

Modified Files:
	mpkg.texi 
Log Message:
        * src/dist.c (fnmatch.h): Include it, and check fnmatch presence.
        Delete patmatch.
        (add_depend): Tempory variable is no longer in register.
        New global variable dist.
        (add_command, add_depend, add_file, free_dist, sort_dist_files):
        Don't put dist in arguments.
        (read_dist): Change functions calls.
        (struct fileinfo): New.        

Index: mpkg.texi
===================================================================
RCS file: /cvsroot/mpkg/mpkg/doc/mpkg.texi,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mpkg.texi	2001/10/29 13:13:25	1.3
--- mpkg.texi	2001/12/03 13:32:09	1.4
***************
*** 196,205 ****
  Solaris Documentation On-Line.
  
- @c FIXME
- @c @chapter @anchor{INTRO}1 - Introduction to EPM
- 
- @c This chapter provides an introduction to the ESP Package Manager
- @c ("EPM").
- 
  @node What is MPKG?, History and Evolution, References, Top
  @section What is MPKG?
--- 196,199 ----
***************
*** 259,278 ****
  vendor-supplied packaging systems. Table 1.1 shows the results of our
  investigation.
- 
- @comment FIXME clean that.
- @c @anchor{TABLE_1_1} Table
- @c 1.1: Software Packaging Formats
- @c FormatOperating Systems1
- @c Binaries?Cross-
- @c Platform?Patches?Upgrades?Conflicts?Requires?Replaces?Config
- @c Files?Map Files?
- @c installpAIXYesNoNoNoYesYesNoNoNo
- @c pkg_addFreeBSD NetBSD OpenBSDYesYes2NoNoYesYesNoNoNo
- @c dpkgCorel Linux Debian GNU/LinuxYesYes2NoYesYesYesYesYesNo
- @c swinstallHP-UXYesNoYesYesYesYesNoYesYes
- @c instIRIXYesNoYesYesYesYesYesYesYes
- @c pkgaddSolarisYesNoYesNoYesYesNoYesYes
- @c rpmMandrake RedHat SuSE TurboLinuxYesYes2NoYesYesYesNoYesNo
- @c setldTru64 UNIXYesNoNoNoYesYesNoNoNo
   
  @enumerate
--- 253,256 ----
***************
*** 355,363 ****
  it!
  
- @c @chapter @anchor{PACKAGING}Packaging Your Software with EPM
- 
- @c This chapter describes how to use EPM to package your own software
- @c packages.
- 
  @node The Basics, Building a Software Distribution, Resources, Top
  @section The Basics
--- 333,336 ----
***************
*** 457,460 ****
--- 430,435 ----
  f 0444 root sys /usr/share/doc/foo *.html
  @end format
+ 
+ Note: Pattern matching works recursively on directories entries.
  
  @node Building a Software Distribution, Installing the Software Package, The Basics, Top

[Mpkg-commit] CVS: mpkg/src dist.c,1.8,1.9 file.c,1.3,1.4 mpkg.h,1.3,1.4

From: Pascal B. <pb...@us...> - 2001-12-03 13:32:13

Update of /cvsroot/mpkg/mpkg/src
In directory usw-pr-cvs1:/tmp/cvs-serv7884/src

Modified Files:
	dist.c file.c mpkg.h 
Log Message:
        * src/dist.c (fnmatch.h): Include it, and check fnmatch presence.
        Delete patmatch.
        (add_depend): Tempory variable is no longer in register.
        New global variable dist.
        (add_command, add_depend, add_file, free_dist, sort_dist_files):
        Don't put dist in arguments.
        (read_dist): Change functions calls.
        (struct fileinfo): New.        

Index: dist.c
===================================================================
RCS file: /cvsroot/mpkg/mpkg/src/dist.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** dist.c	2001/11/28 14:20:46	1.8
--- dist.c	2001/12/03 13:32:09	1.9
***************
*** 1,19 ****
! /*
!  *   Distribution functions for Meta pkg (mpkg).
!  *
!  *   Copyright 2001 by CubicSoft.
!  *   Copyright 1999-2001 by Easy Software Products.
!  *
!  *   This program is free software; you can redistribute it and/or modify
!  *   it under the terms of the GNU General Public License as published by
!  *   the Free Software Foundation; either version 2, or (at your option)
!  *   any later version.
!  *
!  *   This program is distributed in the hope that it will be useful,
!  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
!  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!  *   GNU General Public License for more details.
!  */
  
  #if defined HAVE_CONFIG_H
  # include <config.h>
--- 1,17 ----
! /*  Distribution functions for Meta pkg (mpkg).
  
+   Copyright 2001 by CubicSoft.
+   Copyright 1999-2001 by Easy Software Products.
+ 
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+ 
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.  */
+ 
  #if defined HAVE_CONFIG_H
  # include <config.h>
***************
*** 67,70 ****
--- 65,74 ----
  #endif
  
+ #if HAVE_FNMATCH_H
+ # include <fnmatch.h>
+ #else /* not HAVE_FNMATCH_H */
+ # include <libmisc/fnmatch.h>
+ #endif
+ 
  #if HAVE_UNISTD_H
  # include <unistd.h>
***************
*** 80,83 ****
--- 84,89 ----
  #include <stdio.h>
  
+ static dist_t *dist = NULL;  /* Distribution information.  */
+ 
  /* That's could be better to delete this in the future.  I prefere
     create a header.  */
***************
*** 94,98 ****
  			       int *skip));
  static int get_vernumber PARAMS ((const char *version));
- static int patmatch PARAMS ((const char *, const char *));
  
  #define SKIP_SYSTEM	1	/* Not the right system */
--- 100,103 ----
***************
*** 111,116 ****
  /* Add a command to the distribution.  */
  void
! add_command (dist_t * dist,	/* I - Distribution */
! 	     FILE * fp,		/* I - Distribution file */
  	     char type,		/* I - Command type */
  	     const char *command)	/* I - Command string */
--- 116,120 ----
  /* Add a command to the distribution.  */
  void
! add_command (FILE * fp,		/* I - Distribution file */
  	     char type,		/* I - Command type */
  	     const char *command)	/* I - Command string */
***************
*** 166,171 ****
  /* Add a dependency to the distribution.  */
  void
! add_depend (dist_t *dist,	/* I - Distribution */
! 	    char type,		/* I - Type of dependency */
  	    const char *line)	/* I - Line from file */
  {
--- 170,174 ----
  /* Add a dependency to the distribution.  */
  void
! add_depend (char type,		/* I - Type of dependency */
  	    const char *line)	/* I - Line from file */
  {
***************
*** 204,208 ****
      line++;
  
!   LOGVERBOSE (printf (stderr, "Add dependency <%s>(%u).\n", 
  		      (char *)temp->product, (int)dist->num_depends));
  
--- 207,211 ----
      line++;
  
!   LOGVERBOSE (fprintf (stderr, "Add dependency <%s>(%u).\n", 
  		      (char *)temp->product, (int)dist->num_depends));
  
***************
*** 265,281 ****
  /* Add a file to the distribution.  */
  file_t *			/* O - New file */
! add_file (dist_t *dist)		/* I - Distribution */
  {
    file_t *file;			/* New file */
  
!   if (dist->num_files == 0)
!     dist->files = (file_t *) malloc (sizeof (file_t));
    else
!     dist->files = (file_t *) realloc (dist->files, sizeof (file_t) *
! 				      (dist->num_files + 1));
  
!   file = dist->files + dist->num_files;
!   dist->num_files++;
  
    return (file);
  }
--- 268,290 ----
  /* Add a file to the distribution.  */
  file_t *			/* O - New file */
! add_file (dist_t *ldist)       	/* I - Distribution */
  {
    file_t *file;			/* New file */
+   dist_t *mdist;
  
!   if (ldist)
!     mdist = ldist;
    else
!     mdist = dist;
  
!   if (mdist->num_files == 0)
!     mdist->files = (file_t *) malloc (sizeof (file_t));
!   else
!     mdist->files = (file_t *) realloc (mdist->files, sizeof (file_t) *
! 				      (mdist->num_files + 1));
  
+   file = mdist->files + mdist->num_files;
+   mdist->num_files++;
+ 
    return (file);
  }
***************
*** 284,307 ****
  /* Free memory used by a distribution.  */
  void
! free_dist (dist_t * dist)	/* I - Distribution to free */
  {
    int i;			/* Looping var */
  
  
!   if (dist->num_files > 0)
!     free (dist->files);
  
!   free_strings (dist->num_descriptions, dist->descriptions);
  
!   for (i = 0; i < dist->num_commands; i++)
!     free (dist->commands[i].command);
  
!   if (dist->num_commands)
!     free (dist->commands);
  
!   if (dist->num_depends)
!     free (dist->depends);
  
!   free (dist);
  }
  
--- 293,316 ----
  /* Free memory used by a distribution.  */
  void
! free_dist (dist_t *ldist)	/* I - Distribution to free */
  {
    int i;			/* Looping var */
  
  
!   if (ldist->num_files > 0)
!     free (ldist->files);
  
!   free_strings (ldist->num_descriptions, ldist->descriptions);
  
!   for (i = 0; i < ldist->num_commands; i++)
!     free (ldist->commands[i].command);
  
!   if (ldist->num_commands)
!     free (ldist->commands);
  
!   if (ldist->num_depends)
!     free (ldist->depends);
  
!   free (ldist);
  }
  
***************
*** 404,408 ****
--- 413,481 ----
  }
  
+ /* Produce pattern matching for general informations like `toto/*'.  */
+ struct fileinfo
+ {
+   char type;
+   int  mode;
+   const char *group;
+   const char *user;
+ };
+ 
+ int
+ explore_dir (const struct fileinfo *finfo, char *temp, const char *src,
+ 	     const char *pattern, const char *dst)
+ {
+   DIR *dir;
+   DIRENT *dent;
+   struct stat fileinfo;
+   file_t *file;
  
+   if (temp == src)
+     dir = opendir (".");
+   else
+     dir = opendir (src);
+ 
+   if (dir == NULL)
+     {
+       fprintf (stderr,
+ 	       "mpkg: Unable to open directory \"%s\" - %s\n",
+ 	       src, strerror (errno));
+       return 1;
+     }
+   else
+     {
+       /* Make sure we have a directory separator.  */
+       if (temp > src)
+ 	temp[-1] = '/';
+ 
+       while ((dent = readdir (dir)) != NULL)
+ 	{
+ 	  strcpy (temp, dent->d_name);
+ 	  if (stat (src, &fileinfo))
+ 	    continue;	/* Skip files we can't read.  */
+ 
+ 	  if (S_ISDIR (fileinfo.st_mode))
+ 	    continue;	/* Skip directories.  */
+ 
+ 	  if (!fnmatch (dent->d_name, pattern, 0))
+ 	    continue;
+ 
+ 	  file = add_file (NULL);
+ 
+ 	  file->type = finfo->type;
+ 	  file->mode = finfo->mode;
+ 	  strcpy (file->src, src);
+ 	  strcpy (file->dst, dst);
+ 	  strncat (file->dst, dent->d_name,
+ 		   sizeof (file->dst) - 1);
+ 	  strcpy (file->user, finfo->user);
+ 	  strcpy (file->group, finfo->group);
+ 	}
+ 
+       closedir (dir);
+     }
+   return 0;
+ }
+ 
  /* Read a software distribution.  */
  
***************
*** 429,437 ****
    int mode;			/* File permissions */
    int skip;			/* 1 = skip files, 0 = archive files */
-   dist_t *dist;			/* Distribution data */
    file_t *file;			/* Distribution file */
-   struct stat fileinfo;		/* File information */
-   DIR *dir;			/* Directory */
-   DIRENT *dent;			/* Directory entry */
    struct passwd *pwd;		/* Password entry */
  
--- 502,506 ----
***************
*** 439,442 ****
--- 508,513 ----
    /* Create a new, blank distribution.  */
    LOGVERBOSE (fprintf (stderr, "Alloc new distribution.\n"));
+   /* This is not very secure to alloc dist here, but this a better 
+      performance issue.  */
    dist = (dist_t *) calloc (sizeof (dist_t), 1);
  
***************
*** 493,516 ****
  			      listfiles[listlevel], temp);
  	      else if (strcmp (line, "%preinstall") == 0)
! 		add_command (dist, listfiles[listlevel], COMMAND_PRE_INSTALL,
! 			     temp);
  	      else if (strcmp (line, "%install") == 0
  		       || strcmp (line, "%postinstall") == 0)
! 		add_command (dist, listfiles[listlevel], COMMAND_POST_INSTALL,
! 			     temp);
  	      else if (strcmp (line, "%remove") == 0
  		       || strcmp (line, "%preremove") == 0)
! 		add_command (dist, listfiles[listlevel], COMMAND_PRE_REMOVE,
! 			     temp);
  	      else if (strcmp (line, "%postremove") == 0)
! 		add_command (dist, listfiles[listlevel], COMMAND_POST_REMOVE,
! 			     temp);
  	      else if (strcmp (line, "%prepatch") == 0)
! 		add_command (dist, listfiles[listlevel], COMMAND_PRE_PATCH,
! 			     temp);
  	      else if (strcmp (line, "%patch") == 0
  		       || strcmp (line, "%postpatch") == 0)
! 		add_command (dist, listfiles[listlevel], COMMAND_POST_PATCH,
! 			     temp);
  	      else if (strcmp (line, "%product") == 0)
  		{
--- 564,581 ----
  			      listfiles[listlevel], temp);
  	      else if (strcmp (line, "%preinstall") == 0)
! 		add_command (listfiles[listlevel], COMMAND_PRE_INSTALL, temp);			     
  	      else if (strcmp (line, "%install") == 0
  		       || strcmp (line, "%postinstall") == 0)
! 		add_command (listfiles[listlevel], COMMAND_POST_INSTALL, temp);
  	      else if (strcmp (line, "%remove") == 0
  		       || strcmp (line, "%preremove") == 0)
! 		add_command (listfiles[listlevel], COMMAND_PRE_REMOVE, temp);			     
  	      else if (strcmp (line, "%postremove") == 0)
! 		add_command (listfiles[listlevel], COMMAND_POST_REMOVE, temp);			     
  	      else if (strcmp (line, "%prepatch") == 0)
! 		add_command (listfiles[listlevel], COMMAND_PRE_PATCH, temp);
  	      else if (strcmp (line, "%patch") == 0
  		       || strcmp (line, "%postpatch") == 0)
! 		add_command (listfiles[listlevel], COMMAND_POST_PATCH, temp);			     
  	      else if (strcmp (line, "%product") == 0)
  		{
***************
*** 603,613 ****
  		}
  	      else if (strcmp (line, "%incompat") == 0)
! 		add_depend (dist, DEPEND_INCOMPAT, temp);
  	      else if (strcmp (line, "%provides") == 0)
! 		add_depend (dist, DEPEND_PROVIDES, temp);
  	      else if (strcmp (line, "%replaces") == 0)
! 		add_depend (dist, DEPEND_REPLACES, temp);
  	      else if (strcmp (line, "%requires") == 0)
! 		add_depend (dist, DEPEND_REQUIRES, temp);
  	      else
  		{
--- 668,678 ----
  		}
  	      else if (strcmp (line, "%incompat") == 0)
! 		add_depend (DEPEND_INCOMPAT, temp);
  	      else if (strcmp (line, "%provides") == 0)
! 		add_depend (DEPEND_PROVIDES, temp);
  	      else if (strcmp (line, "%replaces") == 0)
! 		add_depend (DEPEND_REPLACES, temp);
  	      else if (strcmp (line, "%requires") == 0)
! 		add_depend (DEPEND_REQUIRES, temp);
  	      else
  		{
***************
*** 683,686 ****
--- 748,753 ----
  	      if (*temp)
  		{
+ 		  struct fileinfo finfo;
+ 
  		  /* Add using wildcards.  */
  		  if ((temp = strrchr (src, '/')) == NULL)
***************
*** 694,744 ****
  		  if (dst[strlen (dst) - 1] != '/')
  		    strncat (dst, "/", sizeof (dst) - 1);
- 
- 		  if (temp == src)
- 		    dir = opendir (".");
- 		  else
- 		    dir = opendir (src);
  
! 		  if (dir == NULL)
! 		    fprintf (stderr,
! 			     "mpkg: Unable to open directory \"%s\" - %s\n",
! 			     src, strerror (errno));
! 		  else
! 		    {
! 		      /* Make sure we have a directory separator.  */
! 		      if (temp > src)
! 			temp[-1] = '/';
! 
! 		      while ((dent = readdir (dir)) != NULL)
! 			{
! 			  strcpy (temp, dent->d_name);
! 			  if (stat (src, &fileinfo))
! 			    continue;	/* Skip files we can't read.  */
! 
! 			  if (S_ISDIR (fileinfo.st_mode))
! 			    continue;	/* Skip directories.  */
! 
! 			  if (!patmatch (dent->d_name, pattern))
! 			    continue;
! 
! 			  file = add_file (dist);
! 
! 			  file->type = type;
! 			  file->mode = mode;
! 			  strcpy (file->src, src);
! 			  strcpy (file->dst, dst);
! 			  strncat (file->dst, dent->d_name,
! 				   sizeof (file->dst) - 1);
! 			  strcpy (file->user, user);
! 			  strcpy (file->group, group);
! 			}
! 
! 		      closedir (dir);
! 		    }
  		}
  	      else
  		{
  		  /* Add single file.  */
! 		  file = add_file (dist);
  
  		  file->type = type;
--- 761,776 ----
  		  if (dst[strlen (dst) - 1] != '/')
  		    strncat (dst, "/", sizeof (dst) - 1);
  
! 		  finfo.type = type;
! 		  finfo.mode = mode;
! 		  finfo.group = group;
! 		  finfo.user = user;
! 		  if (explore_dir (&finfo, temp, src, pattern, dst))
! 		    return NULL;
  		}
  	      else
  		{
  		  /* Add single file.  */
! 		  file = add_file (NULL);
  
  		  file->type = type;
***************
*** 770,774 ****
      }
  
!   sort_dist_files (dist);
  
    return (dist);
--- 802,806 ----
      }
  
!   sort_dist_files (NULL);
  
    return (dist);
***************
*** 778,798 ****
  /* Sort the files in the distribution.  */
  void
! sort_dist_files (dist_t * dist)	/* I - Distribution to sort */
  {
    int i;			/* Looping var */
    file_t *file;			/* File in distribution */
  
  
    /* Sort the files.  */
!   if (dist->num_files > 1)
!     qsort (dist->files, dist->num_files, sizeof (file_t),
  	   (int (*)(const void *, const void *)) compare_files);
  
    /* Remove duplicates.  */
!   for (i = dist->num_files - 1, file = dist->files; i > 0; i--, file++)
      if (strcmp (file[0].dst, file[1].dst) == 0)
        {
  	memcpy (file, file + 1, i * sizeof (file_t));
! 	dist->num_files--;
  	file--;
        }
--- 810,832 ----
  /* Sort the files in the distribution.  */
  void
! sort_dist_files (dist_t *ldist)	/* I - Distribution to sort */
  {
    int i;			/* Looping var */
    file_t *file;			/* File in distribution */
+   dist_t *mdist;
  
+   mdist = (ldist ? ldist : dist);
  
    /* Sort the files.  */
!   if (mdist->num_files > 1)
!     qsort (mdist->files, mdist->num_files, sizeof (file_t),
  	   (int (*)(const void *, const void *)) compare_files);
  
    /* Remove duplicates.  */
!   for (i = mdist->num_files - 1, file = mdist->files; i > 0; i--, file++)
      if (strcmp (file[0].dst, file[1].dst) == 0)
        {
  	memcpy (file, file + 1, i * sizeof (file_t));
! 	mdist->num_files--;
  	file--;
        }
***************
*** 1032,1036 ****
  _get_line (FILE *fp, char *buffer, int size)
  {
!   register char c = 0;
    register int fd = fileno(fp);
    char *tmp = buffer;
--- 1066,1070 ----
  _get_line (FILE *fp, char *buffer, int size)
  {
!   char c = 0;
    register int fd = fileno(fp);
    char *tmp = buffer;
***************
*** 1461,1550 ****
  }
  
- 
- /* Pattern matching.  */
- 
- /* FIXME : Substitute this function to `fnmatch', which is standard on
-    GNU system, and it is presente in `deb' library.    -- Pascal.  */
- 
- static int			/* O - 1 if match, 0 if no match */
- patmatch (const char *s,	/* I - String to match against */
- 	  const char *pat)	/* I - Pattern to match against */
- {
-   /* Range check the input.  */
-   if (s == NULL || pat == NULL)
-     return (0);
- 
-   /*
-    * Loop through the pattern and match strings, and stop if we come to a
-    * point where the strings don't match or we find a complete match.
-    */
- 
-   while (*s != '\0' && *pat != '\0')
-     {
-       if (*pat == '*')
- 	{
- 	  /* Wildcard - 0 or more characters.  */
- 	  pat++;
- 	  if (*pat == '\0')
- 	    return (1);	/* Last pattern char is *, so everything matches now. */
- 
- 	  /* Test all remaining combinations until we get to the end of the 
- 	     string.  */
- 
- 	  while (*s != '\0')
- 	    {
- 	      if (patmatch (s, pat))
- 		return (1);
- 
- 	      s++;
- 	    }
- 	}
-       else if (*pat == '?')
- 	{
- 	  /* Wildcard - 1 character.  */
- 	  pat++;
- 	  s++;
- 	  continue;
- 	}
-       else if (*pat == '[')
- 	{
- 	  /* Match a character from the input set [chars].  */
- 	  pat++;
- 	  while (*pat != ']' && *pat != '\0')
- 	    if (*s == *pat)
- 	      break;
- 	    else if (pat[1] == '-' && *s >= pat[0] && *s <= pat[2])
- 	      break;
- 	    else
- 	      pat++;
- 
- 	  if (*pat == ']' || *pat == '\0')
- 	    return (0);
- 
- 	  while (*pat != ']' && *pat != '\0')
- 	    pat++;
- 
- 	  if (*pat == ']')
- 	    pat++;
- 
- 	  s++;
- 
- 	  continue;
- 	}
-       else if (*pat == '\\')
- 	{
- 	  /* Handle quoted characters.  */
- 	  pat++;
- 	}
- 
-       /* Stop if the pattern and string don't match.  */
-       if (*pat++ != *s++)
- 	return (0);
-     }
- 
-   /*
-    * Done parsing the pattern and string; return 1 if the last character matches
-    * and 0 otherwise...
-    */
-   return (*s == *pat);
- }
--- 1495,1496 ----

Index: file.c
===================================================================
RCS file: /cvsroot/mpkg/mpkg/src/file.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** file.c	2001/10/25 16:18:40	1.3
--- file.c	2001/12/03 13:32:09	1.4
***************
*** 1,30 ****
! /*
!  *   File functions for Mete pkg (mpkg).
!  *
!  *   Copyright 2001 by CubicSoft.
!  *   Copyright 1999-2001 by Easy Software Products.
!  *
!  *   This program is free software; you can redistribute it and/or modify
!  *   it under the terms of the GNU General Public License as published by
!  *   the Free Software Foundation; either version 2, or (at your option)
!  *   any later version.
!  *
!  *   This program is distributed in the hope that it will be useful,
!  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
!  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!  *   GNU General Public License for more details.
!  *
!  * Contents:
!  *
!  *   copy_file()      - Copy a file...
!  *   make_directory() - Make a directory.
!  *   make_link()      - Make a symbolic link.
!  *   strip_execs()    - Strip symbols from executable files in the
!  *                      distribution.
!  */
  
! /*
!  * Include necessary headers...
!  */
  
  #include "mpkg.h"
--- 1,16 ----
! /* File functions for Mete pkg (mpkg).
  
!   Copyright 2001 by CubicSoft.
!   Copyright 1999-2001 by Easy Software Products.
! 
!   This program is free software; you can redistribute it and/or modify
!   it under the terms of the GNU General Public License as published by
!   the Free Software Foundation; either version 2, or (at your option)
!   any later version.
! 
!   This program is distributed in the hope that it will be useful,
!   but WITHOUT ANY WARRANTY; without even the implied warranty of
!   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!   GNU General Public License for more details.  */
  
  #include "mpkg.h"
***************
*** 41,49 ****
  #endif
  
- 
- /*
-  * 'copy_file()' - Copy a file...
-  */
- 
  int				/* O - 0 on success, -1 on failure */
  copy_file (const char *dst,	/* I - Destination file */
--- 27,30 ----
***************
*** 60,67 ****
  
  
!   /*
!    * Check that the destination directory exists...
!    */
! 
    strcpy (buffer, dst);
    if ((slash = strrchr (buffer, '/')) != NULL)
--- 41,45 ----
  
  
!   /* Check that the destination directory exists.  */
    strcpy (buffer, dst);
    if ((slash = strrchr (buffer, '/')) != NULL)
***************
*** 71,78 ****
      make_directory (buffer, 0755, owner, group);
  
!   /*
!    * Open files...
!    */
! 
    unlink (dst);
  
--- 49,53 ----
      make_directory (buffer, 0755, owner, group);
  
!   /* Open files.  */
    unlink (dst);
  
***************
*** 94,101 ****
      }
  
!   /*
!    * Copy from src to dst...
!    */
! 
    while ((bytes = fread (buffer, 1, sizeof (buffer), srcfile)) > 0)
      if (fwrite (buffer, 1, bytes, dstfile) < bytes)
--- 69,73 ----
      }
  
!   /* Copy from src to dst.  */
    while ((bytes = fread (buffer, 1, sizeof (buffer), srcfile)) > 0)
      if (fwrite (buffer, 1, bytes, dstfile) < bytes)
***************
*** 111,118 ****
        }
  
!   /*
!    * Close files, change permissions, and return...
!    */
! 
    fclose (srcfile);
    fclose (dstfile);
--- 83,87 ----
        }
  
!   /* Close files, change permissions, and return.  */
    fclose (srcfile);
    fclose (dstfile);
***************
*** 124,132 ****
  }
  
- 
- /*
-  * 'make_directory()' - Make a directory.
-  */
- 
  int				/* O - 0 = success, -1 = error */
  make_directory (const char *directory,	/* I - Directory */
--- 93,96 ----
***************
*** 169,176 ****
  
  
! /*
!  * 'make_link()' - Make a symbolic link.
!  */
! 
  int				/* O - 0 = success, -1 = error */
  make_link (const char *dst,	/* I - Destination file */
--- 133,137 ----
  
  
! /* 'make_link()' - Make a symbolic link.  */
  int				/* O - 0 = success, -1 = error */
  make_link (const char *dst,	/* I - Destination file */
***************
*** 200,207 ****
  
  
! /*
!  * 'strip_execs()' - Strip symbols from executable files in the distribution.
!  */
! 
  void
  strip_execs (dist_t * dist)	/* I - Distribution to strip... */
--- 161,165 ----
  
  
! /* 'strip_execs()' - Strip symbols from executable files in the distribution.  */
  void
  strip_execs (dist_t * dist)	/* I - Distribution to strip... */

Index: mpkg.h
===================================================================
RCS file: /cvsroot/mpkg/mpkg/src/mpkg.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mpkg.h	2001/11/28 14:20:46	1.3
--- mpkg.h	2001/12/03 13:32:09	1.4
***************
*** 235,242 ****
   */
  
! void	add_command PARAMS ((dist_t *dist, FILE *fp, char type,
  			     const char *command));
! void	add_depend PARAMS ((dist_t *dist, char type, const char *line));
! file_t	*add_file PARAMS ((dist_t *dist));
  int	copy_file PARAMS ((const char *dst, const char *src,
  			   int mode, int owner, int group));
--- 235,242 ----
   */
  
! void	add_command PARAMS ((FILE *fp, char type,
  			     const char *command));
! void	add_depend PARAMS ((char type, const char *line));
! file_t	*add_file PARAMS ((dist_t*));
  int	copy_file PARAMS ((const char *dst, const char *src,
  			   int mode, int owner, int group));
***************
*** 287,291 ****
  			    const char *format));
  int	run_command PARAMS ((const char *directory, const char *command, ...));
! void	sort_dist_files PARAMS ((dist_t *dist));
  void	strip_execs PARAMS ((dist_t *dist));
  
--- 287,291 ----
  			    const char *format));
  int	run_command PARAMS ((const char *directory, const char *command, ...));
! void	sort_dist_files PARAMS ((dist_t*));
  void	strip_execs PARAMS ((dist_t *dist));

[Mpkg-commit] CVS: mpkg TODO,1.10,1.11

From: Pascal B. <pb...@us...> - 2001-11-29 17:19:06

Update of /cvsroot/mpkg/mpkg
In directory usw-pr-cvs1:/tmp/cvs-serv20604

Modified Files:
	TODO 
Log Message:
TODO

Index: TODO
===================================================================
RCS file: /cvsroot/mpkg/mpkg/TODO,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** TODO	2001/11/14 09:50:17	1.10
--- TODO	2001/11/29 17:19:03	1.11
***************
*** 51,53 ****
  
  * Leave Package Administrator to choose the destination directory, to do this
! we should introduce parameter %basedir.
\ No newline at end of file
--- 51,55 ----
  
  * Leave Package Administrator to choose the destination directory, to do this
! we should introduce parameter %basedir.
! 
! * Try to kill file rpmrc.
\ No newline at end of file

[Mpkg-commit] CVS: mpkg/lib/librpm/lib rpmrc.c,1.5,1.6

From: Pascal B. <pb...@us...> - 2001-11-29 16:59:32

Update of /cvsroot/mpkg/mpkg/lib/librpm/lib
In directory usw-pr-cvs1:/tmp/cvs-serv15790/lib/librpm/lib

Modified Files:
	rpmrc.c 
Log Message:


Index: rpmrc.c
===================================================================
RCS file: /cvsroot/mpkg/mpkg/lib/librpm/lib/rpmrc.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** rpmrc.c	2001/11/29 16:40:57	1.5
--- rpmrc.c	2001/11/29 16:59:28	1.6
***************
*** 16,20 ****
  #include "debug.h"
  
! static const char *defrcfiles = "rpmrc:/etc/rpmrc:~/.rpmrc";
  
  const char * macrofiles = MACROFILES;
--- 16,20 ----
  #include "debug.h"
  
! static const char *defrcfiles = LIBRPMRC_FILENAME ":/etc/rpmrc:~/.rpmrc";
  
  const char * macrofiles = MACROFILES;

[Mpkg-commit] CVS: mpkg/lib/librpm/lib rpmrc.c,1.4,1.5

From: Pascal B. <pb...@us...> - 2001-11-29 16:41:02

Update of /cvsroot/mpkg/mpkg/lib/librpm/lib
In directory usw-pr-cvs1:/tmp/cvs-serv10814/lib

Modified Files:
	rpmrc.c 
Log Message:


Index: rpmrc.c
===================================================================
RCS file: /cvsroot/mpkg/mpkg/lib/librpm/lib/rpmrc.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** rpmrc.c	2001/11/29 16:35:44	1.4
--- rpmrc.c	2001/11/29 16:40:57	1.5
***************
*** 16,20 ****
  #include "debug.h"
  
! static const char *defrcfiles = LIBRPMRC_FILENAME ":/etc/rpmrc:~/.rpmrc:rpmrc";
  
  const char * macrofiles = MACROFILES;
--- 16,20 ----
  #include "debug.h"
  
! static const char *defrcfiles = "rpmrc:/etc/rpmrc:~/.rpmrc";
  
  const char * macrofiles = MACROFILES;

[Mpkg-commit] CVS: mpkg/lib/librpm/lib rpmrc.c,1.3,1.4

From: Pascal B. <pb...@us...> - 2001-11-29 16:35:47

Update of /cvsroot/mpkg/mpkg/lib/librpm/lib
In directory usw-pr-cvs1:/tmp/cvs-serv8985/lib

Modified Files:
	rpmrc.c 
Log Message:


Index: rpmrc.c
===================================================================
RCS file: /cvsroot/mpkg/mpkg/lib/librpm/lib/rpmrc.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** rpmrc.c	2001/11/29 16:28:23	1.3
--- rpmrc.c	2001/11/29 16:35:44	1.4
***************
*** 16,20 ****
  #include "debug.h"
  
! static const char *defrcfiles = LIBRPMRC_FILENAME ":/etc/rpmrc:~/.rpmrc:.";
  
  const char * macrofiles = MACROFILES;
--- 16,20 ----
  #include "debug.h"
  
! static const char *defrcfiles = LIBRPMRC_FILENAME ":/etc/rpmrc:~/.rpmrc:rpmrc";
  
  const char * macrofiles = MACROFILES;

[Mpkg-commit] CVS: mpkg ChangeLog,1.27,1.28

From: Pascal B. <pb...@us...> - 2001-11-29 16:28:42

Update of /cvsroot/mpkg/mpkg
In directory usw-pr-cvs1:/tmp/cvs-serv7001

Modified Files:
	ChangeLog 
Log Message:



Index: ChangeLog
===================================================================
RCS file: /cvsroot/mpkg/mpkg/ChangeLog,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** ChangeLog	2001/11/29 09:29:33	1.27
--- ChangeLog	2001/11/29 16:28:40	1.28
***************
*** 1,4 ****
--- 1,8 ----
  2001-11-29  Pascal Bart  <pas...@ep...>
  
+ 	* lib/librpm/lib/rpmrc.c: Look for rpmrc file in current directory.
+ 	
+ 2001-11-29  Pascal Bart  <pas...@ep...>
+ 
  	* lib/librpm/lib/rpmrc.c: Don't put output rpms in a subdirectory.

[Mpkg-commit] CVS: mpkg/lib/librpm/lib rpmrc.c,1.2,1.3

From: Pascal B. <pb...@us...> - 2001-11-29 16:28:29

Update of /cvsroot/mpkg/mpkg/lib/librpm/lib
In directory usw-pr-cvs1:/tmp/cvs-serv6949/lib/librpm/lib

Modified Files:
	rpmrc.c 
Log Message:
Look for rpmrc file in current directory.

Index: rpmrc.c
===================================================================
RCS file: /cvsroot/mpkg/mpkg/lib/librpm/lib/rpmrc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** rpmrc.c	2001/11/29 09:29:33	1.2
--- rpmrc.c	2001/11/29 16:28:23	1.3
***************
*** 16,20 ****
  #include "debug.h"
  
! static const char *defrcfiles = LIBRPMRC_FILENAME ":/etc/rpmrc:~/.rpmrc";
  
  const char * macrofiles = MACROFILES;
--- 16,20 ----
  #include "debug.h"
  
! static const char *defrcfiles = LIBRPMRC_FILENAME ":/etc/rpmrc:~/.rpmrc:.";
  
  const char * macrofiles = MACROFILES;

[Mpkg-commit] CVS: mpkg/lib/librpm/lib rpmrc.c,1.1.1.1,1.2

From: Pascal B. <pb...@us...> - 2001-11-29 09:29:36

Update of /cvsroot/mpkg/mpkg/lib/librpm/lib
In directory usw-pr-cvs1:/tmp/cvs-serv1831/lib/librpm/lib

Modified Files:
	rpmrc.c 
Log Message:
* lib/librpm/lib/rpmrc.c: Don't put output rpms in a subdirectory.


Index: rpmrc.c
===================================================================
RCS file: /cvsroot/mpkg/mpkg/lib/librpm/lib/rpmrc.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** rpmrc.c	2001/10/24 12:16:35	1.1.1.1
--- rpmrc.c	2001/11/29 09:29:33	1.2
***************
*** 498,502 ****
  
      setVarDefault(-1,			"_rpmfilename",
! 	"%%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm",NULL);
  
      setVarDefault(RPMVAR_OPTFLAGS,	"optflags",
--- 498,502 ----
  
      setVarDefault(-1,			"_rpmfilename",
! 	"%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm",NULL);
  
      setVarDefault(RPMVAR_OPTFLAGS,	"optflags",

[Mpkg-commit] CVS: mpkg ChangeLog,1.26,1.27

From: Pascal B. <pb...@us...> - 2001-11-29 09:29:36

Update of /cvsroot/mpkg/mpkg
In directory usw-pr-cvs1:/tmp/cvs-serv1831

Modified Files:
	ChangeLog 
Log Message:
* lib/librpm/lib/rpmrc.c: Don't put output rpms in a subdirectory.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/mpkg/mpkg/ChangeLog,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** ChangeLog	2001/11/28 18:15:51	1.26
--- ChangeLog	2001/11/29 09:29:33	1.27
***************
*** 1,2 ****
--- 1,6 ----
+ 2001-11-29  Pascal Bart  <pas...@ep...>
+ 
+ 	* lib/librpm/lib/rpmrc.c: Don't put output rpms in a subdirectory.
+ 
  2001-11-28  Pascal Bart  <pas...@ep...>

[Mpkg-commit] CVS: mpkg/src rpm.c,1.4,1.5

From: Pascal B. <pb...@us...> - 2001-11-29 09:16:11

Update of /cvsroot/mpkg/mpkg/src
In directory usw-pr-cvs1:/tmp/cvs-serv29455

Modified Files:
	rpm.c 
Log Message:
Typpo.


Index: rpm.c
===================================================================
RCS file: /cvsroot/mpkg/mpkg/src/rpm.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** rpm.c	2001/11/28 15:29:12	1.4
--- rpm.c	2001/11/29 09:16:06	1.5
***************
*** 300,307 ****
    for (i = dist->num_files, file = dist->files; i > 0; i--, file++)
      {
!       /*
!        * Find the username and groupname IDs...
!        */
! 
        pwd = getpwnam (file->user);
        grp = getgrnam (file->group);
--- 300,304 ----
    for (i = dist->num_files, file = dist->files; i > 0; i--, file++)
      {
!       /* Find the username and groupname IDs.  */
        pwd = getpwnam (file->user);
        grp = getgrnam (file->group);
***************
*** 310,317 ****
        endgrent ();
  
!       /*
!        * Copy the file or make the directory or make the symlink as needed...
!        */
! 
        switch (tolower (file->type))
  	{
--- 307,311 ----
        endgrent ();
  
!       /* Copy the file or make the directory or make the symlink as needed.  */
        switch (tolower (file->type))
  	{
***************
*** 363,369 ****
      }
  
!   /*
!    * Build the distribution from the spec file...
!    */
    if (Verbosity)
      puts ("Building RPM binary distribution.");
--- 357,361 ----
      }
  
!   /* Build the distribution from the spec file.  */
    if (Verbosity)
      puts ("Building RPM binary distribution.");
***************
*** 405,406 ****
--- 397,399 ----
    return 0;
  }
+

[Mpkg-commit] CVS: mpkg/src pkg.c,1.3,1.4

From: Pascal B. <pb...@us...> - 2001-11-28 18:15:54

Update of /cvsroot/mpkg/mpkg/src
In directory usw-pr-cvs1:/tmp/cvs-serv25210/src

Modified Files:
	pkg.c 
Log Message:
* src/pkg.c (make_pkg): Forbid to have name more than 9 char, when build
a Solaris package.


Index: pkg.c
===================================================================
RCS file: /cvsroot/mpkg/mpkg/src/pkg.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** pkg.c	2001/11/28 14:20:46	1.3
--- pkg.c	2001/11/28 18:15:51	1.4
***************
*** 1,21 ****
! /*
!  *
!  *   AT&T package gateway for Meta pkg (mpkg).
!  *
!  *   Copyright 2001 by CubicSoft.
!  *   Copyright 1999-2001 by Easy Software Products.
!  *
!  *   This program is free software; you can redistribute it and/or modify
!  *   it under the terms of the GNU General Public License as published by
!  *   the Free Software Foundation; either version 2, or (at your option)
!  *   any later version.
!  *
!  *   This program is distributed in the hope that it will be useful,
!  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
!  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!  *   GNU General Public License for more details.
!  *
!  */
  
  #include "mpkg.h"
  
--- 1,16 ----
! /* AT&T package gateway for Meta pkg (mpkg).
  
+   Copyright 2001 by CubicSoft.
+   Copyright 1999-2001 by Easy Software Products.
+ 
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+ 
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.  */
  #include "mpkg.h"
  
***************
*** 102,106 ****
    curtime = time (NULL);
    curdate = gmtime (&curtime);
! 
    fprintf (fp, "PKG=%s\n", prodname);
    fprintf (fp, "NAME=%s\n", dist->product);
--- 97,107 ----
    curtime = time (NULL);
    curdate = gmtime (&curtime);
!   
!   if (strlen(prodname) > 9)
!     {
!       fprintf (stderr, "%s: The package name (%s) must have less than 9 chars.\n",
! 	       prodname);
!       return 1;
!     }
    fprintf (fp, "PKG=%s\n", prodname);
    fprintf (fp, "NAME=%s\n", dist->product);

[Mpkg-commit] CVS: mpkg ChangeLog,1.25,1.26

From: Pascal B. <pb...@us...> - 2001-11-28 18:15:54

Update of /cvsroot/mpkg/mpkg
In directory usw-pr-cvs1:/tmp/cvs-serv25210

Modified Files:
	ChangeLog 
Log Message:
* src/pkg.c (make_pkg): Forbid to have name more than 9 char, when build
a Solaris package.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/mpkg/mpkg/ChangeLog,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** ChangeLog	2001/11/28 15:29:11	1.25
--- ChangeLog	2001/11/28 18:15:51	1.26
***************
*** 1,4 ****
--- 1,9 ----
  2001-11-28  Pascal Bart  <pas...@ep...>
  
+ 	* src/pkg.c (make_pkg): Forbid to have name more than 9 char, when build
+ 	a Solaris package.
+ 	
+ 2001-11-28  Pascal Bart  <pas...@ep...>
+ 
  	* src/rpm.c (make_rpm): Only generate tag pre, post preun and postun
  	when necessary, this generated any dependencies.

[Mpkg-commit] CVS: mpkg NEWS,1.7,1.8

From: Pascal B. <pb...@us...> - 2001-11-28 15:37:19

Update of /cvsroot/mpkg/mpkg
In directory usw-pr-cvs1:/tmp/cvs-serv7268

Modified Files:
	NEWS 
Log Message:
More NEWS


Index: NEWS
===================================================================
RCS file: /cvsroot/mpkg/mpkg/NEWS,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** NEWS	2001/10/31 10:39:16	1.7
--- NEWS	2001/11/28 15:37:14	1.8
***************
*** 4,7 ****
--- 4,11 ----
  Changes in version 1.0b:
  
+ * New verbose level (4) for parser debuging.
+ 
+ * Better support for dependency.
+ 
  * Compile with Windows Cygwin (Unix emulation).

[Mpkg-commit] CVS: mpkg/src rpm.c,1.3,1.4

From: Pascal B. <pb...@us...> - 2001-11-28 15:29:15

Update of /cvsroot/mpkg/mpkg/src
In directory usw-pr-cvs1:/tmp/cvs-serv5092/src

Modified Files:
	rpm.c 
Log Message:
* src/rpm.c (make_rpm): Only generate tag pre, post preun and postun
when necessary, this generated any dependencies.


Index: rpm.c
===================================================================
RCS file: /cvsroot/mpkg/mpkg/src/rpm.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** rpm.c	2001/11/28 14:33:29	1.3
--- rpm.c	2001/11/28 15:29:12	1.4
***************
*** 131,144 ****
      fprintf (fp, "%s\n", dist->descriptions[i]);
  
!   fputs ("%pre\n", fp);
!   for (i = dist->num_commands, c = dist->commands; i > 0; i--, c++)
!     if (c->type == COMMAND_PRE_INSTALL)
!       fprintf (fp, "%s\n", c->command);
  
!   fputs ("%post\n", fp);
!   for (i = dist->num_commands, c = dist->commands; i > 0; i--, c++)
!     if (c->type == COMMAND_POST_INSTALL)
!       fprintf (fp, "%s\n", c->command);
  
    for (i = dist->num_files, file = dist->files; i > 0; i--, file++)
      if (tolower (file->type) == 'i')
--- 131,157 ----
      fprintf (fp, "%s\n", dist->descriptions[i]);
  
!   /* The probleme with tags %pre %post %preun and %postun, it's that
!      they automaticly generate dependency with /bin/sh.
!      Well if we could try to limit dependency, that's will be good.
! 						-- Pascal	*/
  
!   if (dist->num_commands)
!     {
!       /* Only put `pre', if user asks for script.  */
!       fputs ("%pre\n", fp);
!       for (i = dist->num_commands, c = dist->commands; i > 0; i--, c++)
! 	if (c->type == COMMAND_PRE_INSTALL)
! 	  fprintf (fp, "%s\n", c->command);
!     }
  
+   if (dist->num_commands)
+     {
+       /* Only put `post', if user asks for script.  */
+       fputs ("%post\n", fp);
+       for (i = dist->num_commands, c = dist->commands; i > 0; i--, c++)
+ 	if (c->type == COMMAND_POST_INSTALL)
+ 	  fprintf (fp, "%s\n", c->command);
+     }
+ 
    for (i = dist->num_files, file = dist->files; i > 0; i--, file++)
      if (tolower (file->type) == 'i')
***************
*** 147,151 ****
    if (i)
      {
!       fputs ("echo Setting up init scripts...\n", fp);
  
        /*
--- 160,164 ----
    if (i)
      {
!       fputs ("echo Setting up init scripts.\n", fp);
  
        /*
***************
*** 198,205 ****
      }
  
!   fputs ("%preun\n", fp);
!   for (i = dist->num_files, file = dist->files; i > 0; i--, file++)
!     if (tolower (file->type) == 'i')
!       break;
  
    if (i)
--- 211,221 ----
      }
  
!   if (dist->num_files && (file = dist->files) && tolower (file->type) == 'i')
!     {
!       fputs ("%preun\n", fp);
!       for (i = dist->num_files; i > 0; i--, file++)
! 	if (tolower (file->type) == 'i')
! 	  break;
!     }
  
    if (i)
***************
*** 242,249 ****
        fprintf (fp, "%s\n", c->command);
  
!   fputs ("%postun\n", fp);
!   for (i = dist->num_commands, c = dist->commands; i > 0; i--, c++)
!     if (c->type == COMMAND_POST_REMOVE)
!       fprintf (fp, "%s\n", c->command);
  
    fputs ("%files\n", fp);
--- 258,268 ----
        fprintf (fp, "%s\n", c->command);
  
!   if (dist->num_commands)
!     {
!       fputs ("%postun\n", fp);
!       for (i = dist->num_commands, c = dist->commands; i > 0; i--, c++)
! 	if (c->type == COMMAND_POST_REMOVE)
! 	  fprintf (fp, "%s\n", c->command);
!     }
  
    fputs ("%files\n", fp);

[Mpkg-commit] CVS: mpkg ChangeLog,1.24,1.25

From: Pascal B. <pb...@us...> - 2001-11-28 15:29:15

Update of /cvsroot/mpkg/mpkg
In directory usw-pr-cvs1:/tmp/cvs-serv5092

Modified Files:
	ChangeLog 
Log Message:
* src/rpm.c (make_rpm): Only generate tag pre, post preun and postun
when necessary, this generated any dependencies.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/mpkg/mpkg/ChangeLog,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** ChangeLog	2001/11/28 14:33:29	1.24
--- ChangeLog	2001/11/28 15:29:11	1.25
***************
*** 1,7 ****
  2001-11-28  Pascal Bart  <pas...@ep...>
  
  	* src/deb.c: Clean verbose messages.
  	* src/rpm.c: Likewise.
! 	
  	* src/rpm.c (make_rpm): Don't show spec name.
  	
--- 1,12 ----
  2001-11-28  Pascal Bart  <pas...@ep...>
  
+ 	* src/rpm.c (make_rpm): Only generate tag pre, post preun and postun
+ 	when necessary, this generated any dependencies.
+ 	
+ 2001-11-28  Pascal Bart  <pas...@ep...>
+ 
  	* src/deb.c: Clean verbose messages.
  	* src/rpm.c: Likewise.
! 
  	* src/rpm.c (make_rpm): Don't show spec name.

[Mpkg-commit] CVS: mpkg/src deb.c,1.4,1.5 rpm.c,1.2,1.3

From: Pascal B. <pb...@us...> - 2001-11-28 14:33:32

Update of /cvsroot/mpkg/mpkg/src
In directory usw-pr-cvs1:/tmp/cvs-serv21366/src

Modified Files:
	deb.c rpm.c 
Log Message:
* src/deb.c: Clean verbose messages.
* src/rpm.c: Likewise.
* src/rpm.c (make_rpm): Don't show spec name.


Index: deb.c
===================================================================
RCS file: /cvsroot/mpkg/mpkg/src/deb.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** deb.c	2001/11/28 14:20:46	1.4
--- deb.c	2001/11/28 14:33:29	1.5
***************
*** 1,22 ****
! /*
!  *   Debian package gateway for Meta pkg (mpkg).
!  *
!  *   Copyright 2001 by CubicSoft.
!  *   Copyright 1999-2001 by Easy Software Products.
!  *
!  *   This program is free software; you can redistribute it and/or modify
!  *   it under the terms of the GNU General Public License as published by
!  *   the Free Software Foundation; either version 2, or (at your option)
!  *   any later version.
!  *
!  *   This program is distributed in the hope that it will be useful,
!  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
!  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!  *   GNU General Public License for more details.
!  *
!  * Contents:
!  *
!  *   make_deb() - Make a Debian software distribution package.
!  */
  #include "mpkg.h"
  #include <libdeb/libdeb.h>
--- 1,16 ----
! /* Debian package gateway for Meta pkg (mpkg).
! 
!   Copyright 2001 by CubicSoft.
!   Copyright 1999-2001 by Easy Software Products.
! 
!   This program is free software; you can redistribute it and/or modify
!   it under the terms of the GNU General Public License as published by
!   the Free Software Foundation; either version 2, or (at your option)
!   any later version.
! 
!   This program is distributed in the hope that it will be useful,
!   but WITHOUT ANY WARRANTY; without even the implied warranty of
!   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!   GNU General Public License for more details.  */
  #include "mpkg.h"
  #include <libdeb/libdeb.h>
***************
*** 91,95 ****
  
    if (Verbosity)
!     puts ("Creating Debian distribution...");
  
    if (dist->relnumber)
--- 85,89 ----
  
    if (Verbosity)
!     puts ("Creating Debian distribution.");
  
    if (dist->relnumber)
***************
*** 113,117 ****
  
    if (Verbosity)
!     puts ("Creating control file...");
  
    snprintf (filename, sizeof (filename), "%s/%s", directory, name);
--- 107,111 ----
  
    if (Verbosity)
!     puts ("Creating control file.");
  
    snprintf (filename, sizeof (filename), "%s/%s", directory, name);
***************
*** 194,198 ****
      {
        if (Verbosity)
! 	puts ("Creating preinst script...");
  
        snprintf (filename, sizeof (filename), "%s/%s/DEBIAN/preinst",
--- 188,192 ----
      {
        if (Verbosity)
! 	puts ("Creating preinst script.");
  
        snprintf (filename, sizeof (filename), "%s/%s/DEBIAN/preinst",
***************
*** 234,238 ****
      {
        if (Verbosity)
! 	puts ("Creating postinst script...");
  
        snprintf (filename, sizeof (filename), "%s/%s/DEBIAN/postinst",
--- 228,232 ----
      {
        if (Verbosity)
! 	puts ("Creating postinst script.");
  
        snprintf (filename, sizeof (filename), "%s/%s/DEBIAN/postinst",
***************
*** 282,286 ****
      {
        if (Verbosity)
! 	puts ("Creating prerm script...");
  
        snprintf (filename, sizeof (filename), "%s/%s/DEBIAN/prerm", directory,
--- 276,280 ----
      {
        if (Verbosity)
! 	puts ("Creating prerm script.");
  
        snprintf (filename, sizeof (filename), "%s/%s/DEBIAN/prerm", directory,
***************
*** 328,332 ****
      {
        if (Verbosity)
! 	puts ("Creating postrm script...");
  
        snprintf (filename, sizeof (filename), "%s/%s/DEBIAN/postrm", directory,
--- 322,326 ----
      {
        if (Verbosity)
! 	puts ("Creating postrm script.");
  
        snprintf (filename, sizeof (filename), "%s/%s/DEBIAN/postrm", directory,
***************
*** 357,361 ****
  
    if (Verbosity)
!     puts ("Creating conffiles...");
  
    snprintf (filename, sizeof (filename), "%s/%s/DEBIAN/conffiles", directory,
--- 351,355 ----
  
    if (Verbosity)
!     puts ("Creating conffiles.");
  
    snprintf (filename, sizeof (filename), "%s/%s/DEBIAN/conffiles", directory,
***************
*** 382,386 ****
  
    if (Verbosity)
!     puts ("Copying temporary distribution files...");
  
    for (i = dist->num_files, file = dist->files; i > 0; i--, file++)
--- 376,380 ----
  
    if (Verbosity)
!     puts ("Copying temporary distribution files.");
  
    for (i = dist->num_files, file = dist->files; i > 0; i--, file++)
***************
*** 454,458 ****
  
    if (Verbosity)
!     puts ("Building Debian binary distribution...");
  
    assert (name != NULL);
--- 448,452 ----
  
    if (Verbosity)
!     puts ("Building Debian binary distribution.");
  
    assert (name != NULL);
***************
*** 495,499 ****
  	fprintf (stderr, "Removing temporary distribution files.\n");
  
!       /* FIXME: Use `unlink' could be serouisly better.  */
        run_command (NULL, "/bin/rm -rf %s", name);
        if (directory != NULL)
--- 489,493 ----
  	fprintf (stderr, "Removing temporary distribution files.\n");
  
!       /* FIXME: Use `unlink' could be seriously better.  */
        run_command (NULL, "/bin/rm -rf %s", name);
        if (directory != NULL)

Index: rpm.c
===================================================================
RCS file: /cvsroot/mpkg/mpkg/src/rpm.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** rpm.c	2001/11/28 14:20:46	1.2
--- rpm.c	2001/11/28 14:33:29	1.3
***************
*** 1,24 ****
! /*
!  *
!  *   Red Hat package gateway for Meta pkg (mpkg).
!  *
!  *   Copyright 2001 by CubicSoft.
!  *   Copyright 1999-2001 by Easy Software Products.
!  *
!  *   This program is free software; you can redistribute it and/or modify
!  *   it under the terms of the GNU General Public License as published by
!  *   the Free Software Foundation; either version 2, or (at your option)
!  *   any later version.
!  *
!  *   This program is distributed in the hope that it will be useful,
!  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
!  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!  *   GNU General Public License for more details.
!  *
!  * Contents:
!  *
!  *   make_rpm() - Make a Red Hat software distribution package.
!  */
  
  #include "mpkg.h"
  #include <build/rpmbuild.h>
--- 1,16 ----
! /* Red Hat package gateway for Meta pkg (mpkg).
  
+   Copyright 2001 by CubicSoft.
+   Copyright 1999-2001 by Easy Software Products.
+ 
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+ 
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.  */
  #include "mpkg.h"
  #include <build/rpmbuild.h>
***************
*** 61,65 ****
  
    if (Verbosity)
!     puts ("Creating RPM distribution...");
  
    getcwd (current, sizeof (current));
--- 53,57 ----
  
    if (Verbosity)
!     puts ("Creating RPM distribution.");
  
    getcwd (current, sizeof (current));
***************
*** 85,89 ****
  
    if (Verbosity)
!     puts ("Creating spec file...");
  
    snprintf (specname, sizeof (specname), "%s/%s.spec", directory, prodname);
--- 77,81 ----
  
    if (Verbosity)
!     puts ("Creating spec file.");
  
    snprintf (specname, sizeof (specname), "%s/%s.spec", directory, prodname);
***************
*** 285,289 ****
  
    if (Verbosity)
!     puts ("Copying temporary distribution files...");
  
    for (i = dist->num_files, file = dist->files; i > 0; i--, file++)
--- 277,281 ----
  
    if (Verbosity)
!     puts ("Copying temporary distribution files.");
  
    for (i = dist->num_files, file = dist->files; i > 0; i--, file++)
***************
*** 355,361 ****
     * Build the distribution from the spec file...
     */
-   puts (specname);
    if (Verbosity)
!     puts ("Building RPM binary distribution...");
  
    {
--- 347,352 ----
     * Build the distribution from the spec file...
     */
    if (Verbosity)
!     puts ("Building RPM binary distribution.");
  
    {
***************
*** 387,391 ****
      {
        if (Verbosity)
! 	puts ("Removing temporary distribution files...");
  
        run_command (NULL, "/bin/rm -rf %s/buildroot", directory);
--- 378,382 ----
      {
        if (Verbosity)
! 	puts ("Removing temporary distribution files.");
  
        run_command (NULL, "/bin/rm -rf %s/buildroot", directory);

[Mpkg-commit] CVS: mpkg ChangeLog,1.23,1.24

From: Pascal B. <pb...@us...> - 2001-11-28 14:33:32

Update of /cvsroot/mpkg/mpkg
In directory usw-pr-cvs1:/tmp/cvs-serv21366

Modified Files:
	ChangeLog 
Log Message:
* src/deb.c: Clean verbose messages.
* src/rpm.c: Likewise.
* src/rpm.c (make_rpm): Don't show spec name.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/mpkg/mpkg/ChangeLog,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** ChangeLog	2001/11/28 14:20:46	1.23
--- ChangeLog	2001/11/28 14:33:29	1.24
***************
*** 1,6 ****
--- 1,14 ----
  2001-11-28  Pascal Bart  <pas...@ep...>
  
+ 	* src/deb.c: Clean verbose messages.
+ 	* src/rpm.c: Likewise.
+ 	
+ 	* src/rpm.c (make_rpm): Don't show spec name.
+ 	
+ 2001-11-28  Pascal Bart  <pas...@ep...>
+ 
  	* src/rpm.c (make_rpm): Change dependancy description, with min
  	and max dependancy.
+ 
  	* src/deb.c (make_deb): Likewise.
  	(make_deb): Only show max number version dependency, when necessary.

[Mpkg-commit] CVS: mpkg/doc .cvsignore,1.1,1.2

From: Pascal B. <pb...@us...> - 2001-11-28 14:21:34

Update of /cvsroot/mpkg/mpkg/doc
In directory usw-pr-cvs1:/tmp/cvs-serv18035/doc

Modified Files:
	.cvsignore 
Log Message:
More cvsignore


Index: .cvsignore
===================================================================
RCS file: /cvsroot/mpkg/mpkg/doc/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** .cvsignore	2001/10/24 15:11:17	1.1
--- .cvsignore	2001/11/28 14:21:31	1.2
***************
*** 4,6 ****
  *.log *.aux *.cp *.cps
  *.dvi *.fn *.ky *.toc 
! *.tp *.vr *.pg
\ No newline at end of file
--- 4,7 ----
  *.log *.aux *.cp *.cps
  *.dvi *.fn *.ky *.toc 
! *.tp *.vr *.pg 
! *.pdf *.dvi
\ No newline at end of file

[Mpkg-commit] CVS: mpkg ChangeLog,1.22,1.23

From: Pascal B. <pb...@us...> - 2001-11-28 14:20:50

Update of /cvsroot/mpkg/mpkg
In directory usw-pr-cvs1:/tmp/cvs-serv17747

Modified Files:
	ChangeLog 
Log Message:
* src/rpm.c (make_rpm): Change dependancy description, with min
and max dependancy.
* src/deb.c (make_deb): Likewise.
(make_deb): Only show max number version dependency, when necessary.
* src/rpm.c (make_rpm): Likewise.
* src/rpm.c (make_rpm): Add tag `prefix' in specification file.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/mpkg/mpkg/ChangeLog,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** ChangeLog	2001/11/27 14:27:08	1.22
--- ChangeLog	2001/11/28 14:20:46	1.23
***************
*** 1,2 ****
--- 1,12 ----
+ 2001-11-28  Pascal Bart  <pas...@ep...>
+ 
+ 	* src/rpm.c (make_rpm): Change dependancy description, with min
+ 	and max dependancy.
+ 	* src/deb.c (make_deb): Likewise.
+ 	(make_deb): Only show max number version dependency, when necessary.
+ 	* src/rpm.c (make_rpm): Likewise.
+ 	
+ 	* src/rpm.c (make_rpm): Add tag `prefix' in specification file.
+ 
  2001-11-27  Pascal Bart  <pas...@ep...>

Flat | Threaded

1 2 > >> (Page 1 of 2)

2001	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (3)	Nov (26)	Dec (5)
2002	Jan	Feb	Mar	Apr (1)	May	Jun	Jul (1)	Aug	Sep	Oct	Nov	Dec