diff options
| -rw-r--r-- | CHANGES | 9 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | Makefile.inc.in | 2 | ||||
| -rw-r--r-- | README.amiga | 8 | ||||
| -rw-r--r-- | popt/Makefile.in | 9 | ||||
| -rwxr-xr-x | popt/configure.in | 2 | ||||
| -rw-r--r-- | popt/popt.c | 18 | ||||
| -rw-r--r-- | popt/popt.h | 2 | ||||
| -rw-r--r-- | popt/popt.spec | 7 | ||||
| -rw-r--r-- | rpm.spec | 2 | ||||
| -rw-r--r-- | rpmpopt | 2 |
11 files changed, 45 insertions, 18 deletions
@@ -1,4 +1,7 @@ -2.4.100 -> 2.4.102: +2.4.102 -> 2.4.103: + - need to create popt/configure during make archive + +2.4.101 -> 2.4.102: - fixed spelling of "instchangelog" in lib-rpmrc.in - fixed memory leak in headerSprintf() extension cache - fixed memory allocation for header formatting extension cache @@ -14,6 +17,10 @@ are not net shared - changed --setugids to use separate chown and chgrp programs, for better portability + - popt moved to autoconf + - Makefiles changed to allow building in a different directory then + the source code resides in + - finally fixed the Build Host spacing in rpmpopt 2.4.100 -> 2.4.101: - handle files with spaces (put double quotes around them) diff --git a/Makefile.in b/Makefile.in index a19ab0ddd..6bbb4b4be 100644 --- a/Makefile.in +++ b/Makefile.in @@ -191,6 +191,8 @@ archive: @rm /tmp/rpm-$(VERSION)/popt/popt.spec @cd /tmp/rpm-$(VERSION); \ autoconf + @cd /tmp/rpm-$(VERSION)/popt; \ + autoconf @cd /tmp; tar czSpf rpm-$(VERSION).tar.gz rpm-$(VERSION) @rm -rf /tmp/rpm-$(VERSION) @cp /tmp/rpm-$(VERSION).tar.gz . diff --git a/Makefile.inc.in b/Makefile.inc.in index fd7cee9e5..52b8af4c4 100644 --- a/Makefile.inc.in +++ b/Makefile.inc.in @@ -16,6 +16,6 @@ CFLAGS = @CFLAGS@ @INCPATH@ $(WARNINGS) $(OPTS) -I$(topdir) -I$(topsrcdir)\ -I$(topsrcdir)/lib -I$(topsrcdir)/misc -Wall -Wstrict-prototypes LDFLAGS = @LDFLAGS@ -L$(topdir)/lib -L$(topdir)/build -L$(topdir)/misc \ -L$(topdir)/popt -VERSION = 2.4.102 +VERSION = 2.4.103 CC = @CC@ diff --git a/README.amiga b/README.amiga index a8c639c73..11b66e987 100644 --- a/README.amiga +++ b/README.amiga @@ -19,11 +19,11 @@ These are the things you'll have to do to install this package. * cd <your-build-directory> * tar -xzvf rpm-2.2.9-src.tar.gz * cd rpm-2.2.9 - * configure --prefix=/ade + * configure --prefix=/gg * make * make install -Now it's time to edit the file "ade:lib/rpmrc" to correspond to your +Now it's time to edit the file "gg:lib/rpmrc" to correspond to your system setup. Change the following entry: * topdir: /place/to/store/RPM/packages Make sure <tmppath> points to a _harddisk_ directory (the ram disk doesn't @@ -42,8 +42,8 @@ Now create the following directories in <topdir>: * SRPMS * SPECS -Create the "rpm" directory in "ade:lib". - makedir ade:lib/rpm +Create the "rpm" directory in "gg:lib". + makedir gg:lib/rpm Now it's time to initialise the rpm database with: rpm --initdb diff --git a/popt/Makefile.in b/popt/Makefile.in index a44efdec4..5c2a94a6e 100644 --- a/popt/Makefile.in +++ b/popt/Makefile.in @@ -7,12 +7,14 @@ WARNINGS = -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes SOURCES = $(addprefix $(srcdir)/,$(subst .o,.c,$(LIBOBJECTS))) LIBPOPT = libpopt.a -LIBS=/usr/lib -INCLUDE=/usr/include + +prefix=@prefix@ +LIBS=$(prefix)/lib +INCLUDE=$(prefix)/include # ----------------------------------------------------------------------- -CFLAGS = @CFLAGS@ $(WARNINGS) $(OPTS) +CFLAGS = @CFLAGS@ @DEFS@ $(WARNINGS) $(OPTS) ifeq ($(RANLIB),) RANLIB=ranlib @@ -28,6 +30,7 @@ $(LIBPOPT): $(LIBPOPT)($(LIBOBJECTS)) $(RANLIB) $@ distclean: clean + rm -f Makefile config.h config.cache config.status config.log clean: rm -f *.a *.o *~ $(PROGS) test.out tagtable.c diff --git a/popt/configure.in b/popt/configure.in index 0b6122593..a3eea0a1f 100755 --- a/popt/configure.in +++ b/popt/configure.in @@ -3,6 +3,8 @@ AC_INIT(popt.h) AC_PROG_CC AC_GCC_TRADITIONAL +AC_CHECK_HEADER(unistd.h) AC_CHECK_FUNCS(mmap) +AC_CHECK_FUNCS(strerror) AC_OUTPUT(Makefile) diff --git a/popt/popt.c b/popt/popt.c index d75a5e12e..8029d6027 100644 --- a/popt/popt.c +++ b/popt/popt.c @@ -24,7 +24,7 @@ struct poptContext_s { char ** leftovers; int numLeftovers; int nextLeftover; - struct poptOption * options; + const struct poptOption * options; int restLeftover; char * appName; struct poptAlias * aliases; @@ -32,8 +32,20 @@ struct poptContext_s { int flags; }; +#ifndef HAVE_STRERROR +static char * strerror(int errno) { + extern int sys_nerr; + extern char * sys_errlist[]; + + if ((0 <= errno) && (errno < sys_nerr)) + return sys_errlist[errno]; + else + return "unknown errno"; +} +#endif + poptContext poptGetContext(char * name ,int argc, char ** argv, - struct poptOption * options, int flags) { + const struct poptOption * options, int flags) { poptContext con = malloc(sizeof(*con)); con->os = con->optionStack; @@ -84,7 +96,7 @@ int poptGetNextOpt(poptContext con) { char * origOptString; long aLong; char * end; - struct poptOption * opt = NULL; + const struct poptOption * opt = NULL; int done = 0; int i; diff --git a/popt/popt.h b/popt/popt.h index c341a8380..2d9c52542 100644 --- a/popt/popt.h +++ b/popt/popt.h @@ -38,7 +38,7 @@ struct poptAlias { typedef struct poptContext_s * poptContext; poptContext poptGetContext(char * name, int argc, char ** argv, - struct poptOption * options, int flags); + const struct poptOption * options, int flags); void poptResetContext(poptContext con); /* returns 'val' element, -1 on last item, POPT_ERROR_* on error */ diff --git a/popt/popt.spec b/popt/popt.spec index 738b3cec7..7175dc40c 100644 --- a/popt/popt.spec +++ b/popt/popt.spec @@ -1,10 +1,11 @@ Summary: C library for parsing command line parameters Name: popt -Version: 1.0 +%define version 1.1 +Version: %{version} Release: 1 Copyright: LGPL Group: Utilities/System -Source: ftp://ftp.redhat.com/pub/redhat/code/popt/popt-1.0.tar.gz +Source: ftp://ftp.redhat.com/pub/redhat/code/popt/popt-%{version}.tar.gz BuildRoot: /var/tmp/popt.root %description @@ -17,7 +18,7 @@ files and includes utility functions for parsing arbitrary strings into argv[] arrays using shell-like rules. %prep -%setup -n popt +%setup %build make CFLAGS="$RPM_OPT_FLAGS" @@ -1,6 +1,6 @@ Summary: Red Hat Package Manager Name: rpm -%define version 2.4.99 +%define version 2.4.103 Version: %{version} Release: 1 Group: Utilities/System @@ -35,7 +35,7 @@ rpm alias -R --requires rpm alias --info --qf 'Name : %-27{NAME} Distribution: %{DISTRIBUTION}\n\ Version : %-27{VERSION} Vendor: %{VENDOR}\n\ Release : %-27{RELEASE} Build Date: %{BUILDTIME:date}\n\ -Install date: %|INSTALLTIME?{%-27{INSTALLTIME:date}}:{(not installed) }| Build Host: %{BUILDHOST}\n\ +Install date: %|INSTALLTIME?{%-27{INSTALLTIME:date}}:{(not installed) }| Build Host: %{BUILDHOST}\n\ Group : %-27{GROUP} Source RPM: %{SOURCERPM}\n\ Size : %{SIZE}\n\ %|PACKAGER?{Packager : %{PACKAGER}\n}|\ |