diff --git a/rpm.spec b/rpm.spec index 75c9b54..e10fecf 100644 --- a/rpm.spec +++ b/rpm.spec @@ -1,9 +1,9 @@ -%define with_python_subpackage 1 -%define with_python_version 2.2 -%define with_perl_subpackage 0 -%define with_bzip2 1 %{nil} -%define with_apidocs 1 %{nil} -%define with_internal_db 1 %{nil} +%define with_python_subpackage 1%{nil} +%define with_python_version 2.2%{nil} +%define with_perl_subpackage 1 +%define with_bzip2 1%{nil} +%define with_apidocs 1%{nil} +%define with_internal_db 1%{nil} %define strip_binaries 1 # XXX enable at your own risk, CDB access to rpmdb isn't cooked yet. @@ -15,12 +15,12 @@ %define __prefix /usr %{expand: %%define __share %(if [ -d %{__prefix}/share/man ]; then echo /share ; else echo %%{nil} ; fi)} -Summary: The Red Hat package management system. +Summary: The RPM package management system. Name: rpm %define version 4.0.4 Version: %{version} %{expand: %%define rpm_version %{version}} -Release: 0.7 +Release: 0.11 Group: System Environment/Base Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz Copyright: GPL @@ -57,18 +57,18 @@ BuildRoot: %{_tmppath}/%{name}-root %description The RPM Package Manager (RPM) is a powerful command line driven package management system capable of installing, uninstalling, -verifying, querying, and updating software packages. Each software +verifying, querying, and updating software packages. Each software package consists of an archive of files along with information about the package like its version, a description, etc. %package devel -Summary: Development files for applications which will manipulate RPM packages. +Summary: Development files for manipulating RPM packages. Group: Development/Libraries Requires: rpm = %{rpm_version}, popt = 1.6.4 %description devel -This package contains the RPM C library and header files. These -development files will simplify the process of writing programs which +This package contains the RPM C library and header files. These +development files will simplify the process of writing programs that manipulate RPM packages and databases. These files are intended to simplify the process of creating graphical package managers or any other tools that need an intimate knowledge of RPM packages in order @@ -83,8 +83,8 @@ Group: Development/Tools Requires: rpm = %{rpm_version} %description build -This package contains scripts and executable programs that are used to -build packages using RPM. +The rpm-build package contains the scripts and executable programs +that are used to build packages using the RPM Package Manager. %if %{with_python_subpackage} %package python @@ -95,14 +95,14 @@ Requires: python >= %{with_python_version} Requires: popt = 1.6.4 %description python -The rpm-python package contains a module which permits applications +The rpm-python package contains a module that permits applications written in the Python programming language to use the interface -supplied by RPM (RPM Package Manager) libraries. +supplied by the RPM Package Manager libraries. This package should be installed if you want to develop Python programs that will manipulate RPM packages and databases. -%endif +%endif %if %{with_perl_subpackage} %package perl Summary: Native bindings to the RPM API for Perl. @@ -129,30 +129,26 @@ implementations. At this time, the interface only provides access to the database of installed packages, and header data retrieval for RPM and SRPM files -is not yet installed. Error management and the export of most defined +is not yet installed. Error management and the export of most defined constants, through RPM::Error and RPM::Constants, respectively, are also available. %endif - %package -n popt Summary: A C library for parsing command line parameters. Group: Development/Libraries Version: 1.6.4 %description -n popt -Popt is a C library for parsing command line parameters. Popt was +Popt is a C library for parsing command line parameters. Popt was heavily influenced by the getopt() and getopt_long() functions, but it -improves on them by allowing more powerful argument expansion. Popt +improves on them by allowing more powerful argument expansion. Popt can parse arbitrary argv[] style arrays and automatically set -variables based on command line arguments. Popt allows command line +variables based on command line arguments. Popt allows command line arguments to be aliased via configuration files and includes utility functions for parsing arbitrary strings into argv[] arrays using shell-like rules. -Install popt if you're a C programmer and you'd like to use its -capabilities. - %prep %setup -q @@ -175,7 +171,8 @@ make { cd Perl-RPM CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL export SUBDIR="%{_builddir}/%{buildsubdir}" - make INC="-I. -I$SUBDIR/lib -I$SUBDIR/rpmio -I$SUBDIR/popt" %{?_smp_mflags} + make INC="-I. -I$SUBDIR/lib -I$SUBDIR/rpmdb -I$SUBDIR/rpmio -I$SUBDIR/popt" \ + LDDLFLAGS="-shared -L$SUBDIR/lib/.libs -L$SUBDIR/rpmdb/.libs -L$SUBDIR/rpmio/.libs -L$SUBDIR/popt/.libs" %{?_smp_mflags} } %endif @@ -222,7 +219,10 @@ gzip -9n apidocs/man/man*/* || : eval `perl '-V:installsitearch'` eval `perl '-V:installarchlib'` mkdir -p $RPM_BUILD_ROOT/$installarchlib - make PREFIX=$RPM_BUILD_ROOT/usr install + make PREFIX=${RPM_BUILD_ROOT}%{__prefix} \ + INSTALLMAN1DIR=${RPM_BUILD_ROOT}%{__prefix}%{__share}/man/man1 \ + INSTALLMAN3DIR=${RPM_BUILD_ROOT}%{__prefix}%{__share}/man/man3 \ + install rm -f $RPM_BUILD_ROOT/$installarchlib/perllocal.pod rm -f $RPM_BUILD_ROOT/$installsitearch/auto/RPM/.packlist cd .. @@ -450,7 +450,7 @@ fi %files python %defattr(-,root,root) %{__prefix}/lib/python%{with_python_version}/site-packages/rpmmodule.so -%{__prefix}/lib/python%{with_python_version}/site-packages/poptmodule.so +#%{__prefix}/lib/python%{with_python_version}/site-packages/poptmodule.so %endif %if %{with_perl_subpackage} @@ -512,6 +512,20 @@ fi %{__prefix}/include/popt.h %changelog +* Fri Jan 11 2002 Jeff Johnson +- permit subset installs for %lang colored hardlink file sets. + +* Thu Jan 10 2002 Jeff Johnson +- fix: signing multiple times dinna work, discard immutable region. +- remove poptmodule.so for separate packaging. + +* Wed Jan 9 2002 Jeff Johnson +- permit gpg/pgp/pgp5 execs to be reconfigured. + +* Tue Jan 8 2002 Jeff Johnson +- use db-4.0.14 final internally. +- make rpm-perl package self-hosting (#57748). + * Mon Jan 7 2002 Jeff Johnson - Depends should use CDB if configured. - autodetect python 1.5/2.2. diff --git a/sources b/sources index 39a4093..501f095 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f530afa166ebfa5bf06e6face2e57f9b rpm-4.0.4.tar.gz +89952d0cea09b6987ad0f25cc1ed13ac rpm-4.0.4.tar.gz