folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- add -I/usr/include/nptl, Conflicts: kernel <= 2.4.19. 

CVS patchset: 5950
CVS date: 2002/12/19 23:41:52
This commit is contained in:
jbj 2002-12-19 23:41:52 +00:00
parent e7615329e9
commit e7f55c20f5
28 changed files with 70 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -57,6 +57,9 @@
- re-enable CDB locking, removing "private" from %%__dbi_cdb macro.
- popt aliases for -U et al to achieve dynamic link with nptl.
- add --file{class,provide,require} popt aliases and header extensions.
- statically link against /usr/lib/nptl/libpthread.a, if present.
- remove popt aliases for -U et al.
- add -I/usr/include/nptl, Conflicts: kernel <= 2.4.19.
4.0.4 -> 4.1:
- loosely wire beecrypt library into rpm.

17
Makefile.am
View File

@ -26,13 +26,13 @@ INCLUDES = \
@WITH_LIBELF_INCLUDE@ \
@INCPATH@
myLDFLAGS = # @LDFLAGS_STATIC@
staticLDFLAGS = @LDFLAGS_STATIC@ @LDFLAGS_NPTL@
myLDFLAGS = # $(staticLDFLAGS)
# XXX libtool can/should generate dependent libs.
# XXX solaris2.6 cannot use *.la with --all-static (downrev binutils/egcs?)
# XXX top_builddir ldpaths are wrong building in tree
myLDADD = \
$(top_builddir)/build/librpmbuild.la \
$(top_builddir)/lib/librpm.la \
$(top_builddir)/rpmdb/librpmdb.la \
$(top_builddir)/rpmio/librpmio.la \
@ -43,7 +43,6 @@ myLDADD = \
@LIBMISC@
whyLDADD = \
$(top_builddir)/build/.libs/librpmbuild.a \
$(top_builddir)/lib/.libs/librpm.a \
$(top_builddir)/rpmdb/.libs/librpmdb.a \
$(top_builddir)/rpmio/.libs/librpmio.a \
@ -71,18 +70,14 @@ rpmpopt-$(VERSION): rpmpopt
noinst_HEADERS = build.h debug.h system.h
rpm_SOURCES =
rpm_LDFLAGS = @LDFLAGS_STATIC@ $(myLDFLAGS)
rpm_LDADD = rpm.o $(whyLDADD)
rpm_LDFLAGS = $(staticLDFLAGS)
rpm_LDADD = rpm.o $(top_builddir)/build/.libs/librpmbuild.a $(whyLDADD)
rpm.o: rpmqv.c
$(COMPILE) -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV -o $@ -c rpmqv.c
#rpm_SOURCES = rpm.c
#rpm_LDFLAGS = @LDFLAGS_STATIC@ $(myLDFLAGS)
#rpm_LDADD = $(myLDADD)
rpmb_SOURCES = build.c
rpmb_LDFLAGS = $(myLDFLAGS)
rpmb_LDADD = rpmb.o $(myLDADD)
rpmb_LDADD = rpmb.o $(top_builddir)/build/librpmbuild.la $(myLDADD)
rpmb.o: rpmqv.c
$(COMPILE) -DIAM_RPMBT -o $@ -c rpmqv.c
@ -106,7 +101,7 @@ rpmk.o: rpmqv.c
rpmq_SOURCES =
rpmq_LDFLAGS = $(myLDFLAGS)
rpmq_LDADD = rpmq.o $(myLDADD)
rpmq_LDADD = rpmq.o $(top_builddir)/build/librpmbuild.la $(myLDADD)
rpmq.o: rpmqv.c
$(COMPILE) -DIAM_RPMQV -o $@ -c rpmqv.c

10
configure.ac
View File

@ -143,6 +143,16 @@ LDFLAGS_STATIC="${LDFLAGS} ${LDFLAGS_STATIC}" # libtool format
AC_MSG_RESULT($LDFLAGS_STATIC)
AC_SUBST(LDFLAGS_STATIC)
dnl
dnl XXX Test for libpthread.a that is NPTL aware.
dnl
LDFLAGS_NPTL=
if test -f /usr/lib/nptl/libpthread.a ; then
LDFLAGS_NPTL="-L/usr/lib/nptl"
INCPATH="$INCPATH -I/usr/include/nptl"
fi
AC_SUBST(LDFLAGS_NPTL)
dnl
dnl look for POSIX chmod attributes
dnl

2
po/cs.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"POT-Creation-Date: 2002-12-18 17:59-0500\n"
"POT-Creation-Date: 2002-12-19 18:36-0500\n"
"PO-Revision-Date: 2001-07-24 10:02+0100\n"
"Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
"Language-Team: Czech <cs@li.org>\n"

2
po/da.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"POT-Creation-Date: 2002-12-18 17:59-0500\n"
"POT-Creation-Date: 2002-12-19 18:36-0500\n"
"PO-Revision-Date: 2001-04-05 23:03GMT\n"
"Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
"Language-Team: Danish <dansk@klid.dk>\n"

2
po/de.po
View File

@ -37,7 +37,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"POT-Creation-Date: 2002-12-18 17:59-0500\n"
"POT-Creation-Date: 2002-12-19 18:36-0500\n"
"PO-Revision-Date: 1998-08-03 18:02+02:00\n"
"Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n"
"Language-Team: German <de@li.org>\n"

2
po/fi.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"POT-Creation-Date: 2002-12-18 17:59-0500\n"
"POT-Creation-Date: 2002-12-19 18:36-0500\n"
"PO-Revision-Date: 1998-05-02 21:41:47-0400\n"
"Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
"Language-Team: Finnish <linux@sot.com>\n"

2
po/fr.po
View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"POT-Creation-Date: 2002-12-18 17:59-0500\n"
"POT-Creation-Date: 2002-12-19 18:36-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

2
po/gl.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
"POT-Creation-Date: 2002-12-18 17:59-0500\n"
"POT-Creation-Date: 2002-12-19 18:36-0500\n"
"PO-Revision-Date: 2001-01-13 22:31+0100\n"
"Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
"Language-Team: Galician <trasno@ceu.fi.udc.es>\n"

2
po/is.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"POT-Creation-Date: 2002-12-18 17:59-0500\n"
"POT-Creation-Date: 2002-12-19 18:36-0500\n"
"PO-Revision-Date: 2001-07-12 13:25+0000\n"
"Last-Translator: Richard Allen <ra@hp.is>\n"
"Language-Team: is <kde-isl@mmedia.is>\n"

2
po/ja.po
View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"POT-Creation-Date: 2002-12-18 17:59-0500\n"
"POT-Creation-Date: 2002-12-19 18:36-0500\n"
"PO-Revision-Date: 1999-12-01 22:49 +JST\n"
"Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n"
"Language-Team: JRPM <jrpm@linux.or.jp>\n"

2
po/ko.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.4\n"
"POT-Creation-Date: 2002-12-18 17:59-0500\n"
"POT-Creation-Date: 2002-12-19 18:36-0500\n"
"PO-Revision-Date: 2002-03-04 17:17+0900\n"
"Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
"Language-Team: GNU Translation project <ko@li.org>\n"

2
po/no.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"POT-Creation-Date: 2002-12-18 17:59-0500\n"
"POT-Creation-Date: 2002-12-19 18:36-0500\n"
"PO-Revision-Date: 2001-06-27 12:24+0200\n"
"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
"Language-Team: Norwegian <no@li.org>\n"

2
po/pl.po
View File

@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"POT-Creation-Date: 2002-12-18 17:59-0500\n"
"POT-Creation-Date: 2002-12-19 18:36-0500\n"
"PO-Revision-Date: 1999-05-25 17:00+0100\n"
"Last-Translator: Pawe³ Dziekoñski <pdziekonski@mml.ch.pwr.wroc.pl>\n"
"Language-Team: Polish <pl@li.org>\n"

2
po/pt.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm\n"
"POT-Creation-Date: 2002-12-18 17:59-0500\n"
"POT-Creation-Date: 2002-12-19 18:36-0500\n"
"PO-Revision-Date: 2002-02-14 10:51+0000\n"
"Last-Translator: José Nuno Coelho Sanarra Pires <jncp@rnl.ist.utl.pt>\n"
"Language-Team: pt <morais@kde.org\n"

2
po/pt_BR.po
View File

@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"POT-Creation-Date: 2002-12-18 17:59-0500\n"
"POT-Creation-Date: 2002-12-19 18:36-0500\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"

2
po/ro.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"POT-Creation-Date: 2002-12-18 17:59-0500\n"
"POT-Creation-Date: 2002-12-19 18:36-0500\n"
"PO-Revision-Date: 1999-04-10 12:00+EST\n"
"Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
"Language-Team: Romanian <ro@li.org>\n"

2
po/rpm.pot
View File

@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2002-12-18 17:59-0500\n"
"POT-Creation-Date: 2002-12-19 18:36-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

2
po/ru.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"POT-Creation-Date: 2002-12-18 17:59-0500\n"
"POT-Creation-Date: 2002-12-19 18:36-0500\n"
"PO-Revision-Date: 2002-08-27 13:36-0400\n"
"Last-Translator: Eugene Kanter, <eugene@blackcatlinux.com>\n"
"Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"

2
po/sk.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"POT-Creation-Date: 2002-12-18 17:59-0500\n"
"POT-Creation-Date: 2002-12-19 18:36-0500\n"
"PO-Revision-Date: 1999-04-08 21:37+02:00\n"
"Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
"Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"

4
po/sl.po
View File

@ -1,12 +1,12 @@
# -*- mode:po; coding:iso-latin-2; -*- Slovenian messages for Redhat pkg. mngr.
# Copyright (C) 2000 Free Software Foundation, Inc.
# Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2000.
# $Id: sl.po,v 1.338 2002/12/18 23:00:36 jbj Exp $
# $Id: sl.po,v 1.339 2002/12/19 23:42:37 jbj Exp $
#
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"POT-Creation-Date: 2002-12-18 17:59-0500\n"
"POT-Creation-Date: 2002-12-19 18:36-0500\n"
"PO-Revision-Date: 2000-10-08 19:05+0200\n"
"Last-Translator: Grega Fajdiga <gregor.fajdiga@telemach.net>\n"
"Language-Team: Slovenian <sl@li.org>\n"

2
po/sr.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"POT-Creation-Date: 2002-12-18 17:59-0500\n"
"POT-Creation-Date: 2002-12-19 18:36-0500\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-2\n"
"Content-Transfer-Encoding: 8bit\n"

2
po/sv.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.1\n"
"POT-Creation-Date: 2002-12-18 17:59-0500\n"
"POT-Creation-Date: 2002-12-19 18:36-0500\n"
"PO-Revision-Date: 2002-08-19 22:26+0200\n"
"Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n"
"Language-Team: Swedish <sv@li.org>\n"

2
po/tr.po
View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"POT-Creation-Date: 2002-12-18 17:59-0500\n"
"POT-Creation-Date: 2002-12-19 18:36-0500\n"
"PO-Revision-Date: 2001-07-05 08:02+300\n"
"Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
"Language-Team: Turkish <tr@li.org>\n"

23
rpm.spec.in
View File

@ -2,7 +2,6 @@
%define with_python_version @WITH_PYTHON_VERSION@%{nil}
%define with_bzip2 @WITH_BZIP2@%{nil}
%define with_apidocs @WITH_APIDOCS@%{nil}
%define with_internal_db @WITH_INTERNAL_DB@%{nil}
# XXX legacy requires './' payload prefix to be omitted from rpm packages.
%define _noPayloadPrefix 1
@ -17,7 +16,7 @@ Name: rpm
%define version @VERSION@
Version: %{version}
%{expand: %%define rpm_version %{version}}
Release: 0.29nptl
Release: 0.31
Group: System Environment/Base
Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz
Copyright: GPL
@ -28,17 +27,14 @@ Prereq: gawk fileutils textutils mktemp shadow-utils
Requires: popt = 1.8
Obsoletes: rpm-perl < %{version}
# XXX necessary only to drag in /usr/lib/libelf.a
BuildRequires: elfutils-devel >= 0.63
# XXX necessary only to drag in /usr/lib/libelf.a, otherwise internal elfutils.
BuildRequires: elfutils-libelf
%if !%{with_internal_db}
BuildRequires: db3-devel
%endif
# XXX /dev/futex support needed:
# XXX /dev/futex kernel support needed:
Conflicts: kernel <= 2.4.19
Requires: kernel >= 2.4.20-0.pp.9
# XXX NPTL support needed.
# XXX NPTL glibc support needed.
Requires: glibc >= 2.3.1-16nptl
BuildRequires: zlib-devel
@ -461,9 +457,14 @@ exit 0
%{__prefix}/include/popt.h
%changelog
* Thu Dec 19 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.31
- statically link against /usr/lib/nptl/libpthread.a, if present.
- remove popt aliases for -U et al.
- add -I/usr/include/nptl, Conflicts: kernel <= 2.4.19.
* Wed Dec 18 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.29nptl
- popt aliases for -U et al to achieve dynamic link with nptl.
- add --file{class,provide,require} popt aliases and header extensions
- add --file{class,provide,require} popt aliases and header extensions.
* Tue Dec 17 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.28nptl
- re-enable CDB locking, removing "private" from %%__dbi_cdb macro.

16
rpmpopt.in
View File

@ -187,14 +187,14 @@ rpm exec -V rpmv -V
rpm exec -y rpmv -y
rpm exec --verify rpmv --verify
rpm exec -i rpmi -i
rpm exec --install rpmi --install
rpm exec -U rpmi -U
rpm exec --upgrade rpmi --upgrade
rpm exec -F rpmi -F
rpm exec --freshen rpmi --freshen
rpm exec -e rpmi -e
rpm exec --erase rpmi --erase
#rpm exec -i rpmi -i
#rpm exec --install rpmi --install
#rpm exec -U rpmi -U
#rpm exec --upgrade rpmi --upgrade
#rpm exec -F rpmi -F
#rpm exec --freshen rpmi --freshen
#rpm exec -e rpmi -e
#rpm exec --erase rpmi --erase
rpm alias --with --define "_with_!#:+ --with-!#:+" \
--POPTdesc=$"enable configure <option> for build" \

4
rpmqv.c
View File

@ -263,13 +263,13 @@ int main(int argc, const char ** argv)
default:
break;
}
#endif
/* XXX Eliminate query linkage loop */
/*@-type@*/ /* FIX: casts? */
parseSpecVec = parseSpec;
freeSpecVec = freeSpec;
/*@=type@*/
#endif
#if defined(ENABLE_NLS)
/* set up the correct locale */
@ -876,7 +876,6 @@ exit:
}
/* keeps memory leak checkers quiet */
freeNames();
freeFilesystems();
/*@i@*/ urlFreeCache();
rpmlogClose();
@ -887,6 +886,7 @@ exit:
#endif
#ifdef IAM_RPMBT
freeNames();
ba->buildRootOverride = _free(ba->buildRootOverride);
ba->targets = _free(ba->targets);
#endif

12
tools/Makefile.am
View File

@ -23,6 +23,8 @@ LDADD = \
$(top_builddir)/lib/librpm.la \
@INTLLIBS@
staticLDFLAGS = @LDFLAGS_STATIC@ @LDFLAGS_NPTL@
noinst_PROGRAMS = \
convertdb1 dump dumpdb rpmarchive rpmheader rpmlead rpmsignature
@ -38,19 +40,19 @@ debugedit_SOURCES = debugedit.c hashtab.c
javadeps_SOURCES = javadeps.c
rpmcache_SOURCES = rpmcache.c
#rpmcache_LDFLAGS = @LDFLAGS_STATIC@
#rpmcache_LDFLAGS = $(staticLDFLAGS)
rpmdeps_SOURCES = rpmdeps.c
rpmdeps_LDADD = $(top_builddir)/build/librpmbuild.la
#rpmdeps_LDFLAGS = @LDFLAGS_STATIC@
#rpmdeps_LDFLAGS = $(staticLDFLAGS)
rpmgraph_SOURCES = rpmgraph.c
#rpmgraph_LDFLAGS = @LDFLAGS_STATIC@
#rpmgraph_LDFLAGS = $(staticLDFLAGS)
rpminject_SOURCES = rpminject.c
rpminject_LDFLAGS = @LDFLAGS_STATIC@
rpminject_LDFLAGS = $(staticLDFLAGS)
rpmsort_SOURCES = rpmsort.c
rpmsort_LDFLAGS = @LDFLAGS_STATIC@
rpmsort_LDFLAGS = $(staticLDFLAGS)
$(PROGRAMS): $(LDADD)