rpms/rpm/devel rpm-4.6.0-rc1-defaultdocdir.patch, NONE, 1.1 rpm-4.6.0-rc1-noarch-subpkg.patch, NONE, 1.1 rpm.spec, 1.302, 1.303
Panu Matilainen
pmatilai at fedoraproject.org
Sat Oct 25 05:10:28 UTC 2008
Author: pmatilai
Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6112
Modified Files:
rpm.spec
Added Files:
rpm-4.6.0-rc1-defaultdocdir.patch
rpm-4.6.0-rc1-noarch-subpkg.patch
Log Message:
- Make noarch sub-packages actually work
- Fix defaultdocdir logic in installplatform to avoid hardwiring mandir
rpm-4.6.0-rc1-defaultdocdir.patch:
--- NEW FILE rpm-4.6.0-rc1-defaultdocdir.patch ---
commit 927f384a9bc058eb6f954e93cc515cc1293fd2a3
Author: Panu Matilainen <pmatilai at redhat.com>
Date: Fri Oct 17 08:11:10 2008 +0300
Kick out the dumb defaultdocdir logic from installplatform
- defaultdocdir is simply %{_datadir}/doc
diff --git a/installplatform b/installplatform
index 8861df0..266d877 100755
--- a/installplatform
+++ b/installplatform
@@ -8,12 +8,6 @@ RPMRC="${1:-rpmrc}"
MACROS="${2:-macros}"
PLATFORM="${3:-platform}"
-if grep /share/ $PLATFORM > /dev/null 2>&1 ; then
- DEFAULTDOCDIR='%{_usr}/share/doc'
-else
- DEFAULTDOCDIR='%{_usr}/doc'
-fi
-
TEMPRC="/tmp/rpmrc.$$"
cat << E_O_F > $TEMPRC
include: $RPMRC
@@ -155,7 +149,6 @@ for SUBST in $SUBSTS ; do
-e "s, at RPMRC_GNU@,$RPMRC_GNU," \
-e "s, at LIB@,$LIB," \
-e "s, at ARCH_INSTALL_POST@,$ARCH_INSTALL_POST," \
- -e "s, at DEFAULTDOCDIR@,$DEFAULTDOCDIR," \
-e '/\${\w*:-/!s,\${,%{_,' \
-e "s, at ISANAME@,$ISANAME," \
-e "s, at ISABITS@,$ISABITS," \
diff --git a/platform.in b/platform.in
index 4b496a0..9768a8a 100644
--- a/platform.in
+++ b/platform.in
@@ -37,7 +37,7 @@
# Deprecated misspelling, present for backwards compatibility.
%_initrddir %{_initddir}
-%_defaultdocdir @DEFAULTDOCDIR@
+%_defaultdocdir %{_datadir}/doc
%_smp_mflags %([ -z "$RPM_BUILD_NCPUS" ] \\\
&& RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"; \\\
rpm-4.6.0-rc1-noarch-subpkg.patch:
--- NEW FILE rpm-4.6.0-rc1-noarch-subpkg.patch ---
commit a4825e488d44e01803c377ebc4fc054adcf42b3a
Author: Panu Matilainen <pmatilai at redhat.com>
Date: Thu Oct 23 07:47:25 2008 +0300
Make noarch subpackages actually work
- noarch subpackages get their arch tag from parsePreamble() already,
don't stomp over it later in parseSpec()
diff --git a/build/parseSpec.c b/build/parseSpec.c
index 098bd2b..11e0622 100644
--- a/build/parseSpec.c
+++ b/build/parseSpec.c
@@ -592,7 +592,10 @@ int parseSpec(rpmts ts, const char *specFile, const char *rootDir,
}
headerPutString(pkg->header, RPMTAG_OS, os);
- headerPutString(pkg->header, RPMTAG_ARCH, arch);
+ /* noarch subpackages already have arch set here, leave it alone */
+ if (!headerIsEntry(pkg->header, RPMTAG_ARCH)) {
+ headerPutString(pkg->header, RPMTAG_ARCH, arch);
+ }
headerPutString(pkg->header, RPMTAG_PLATFORM, platform);
pkg->ds = rpmdsThis(pkg->header, RPMTAG_REQUIRENAME, RPMSENSE_EQUAL);
Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.302
retrieving revision 1.303
diff -u -r1.302 -r1.303
--- rpm.spec 24 Oct 2008 13:12:58 -0000 1.302
+++ rpm.spec 25 Oct 2008 05:09:57 -0000 1.303
@@ -18,7 +18,7 @@
Summary: The RPM package management system
Name: rpm
Version: %{rpmver}
-Release: 0.%{snapver}.4
+Release: 0.%{snapver}.5
Group: System Environment/Base
Url: http://www.rpm.org/
Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -35,6 +35,8 @@
# Patches already in upstream
Patch200: rpm-4.6.0-rc1-permit-tab.patch
Patch201: rpm-4.6.0-rc1-skip-equal-nevr.patch
+Patch202: rpm-4.6.0-rc1-noarch-subpkg.patch
+Patch203: rpm-4.6.0-rc1-defaultdocdir.patch
# These are not yet upstream
Patch300: rpm-4.5.90-posttrans.patch
@@ -170,6 +172,8 @@
%patch200 -p1 -b .permit-tab
%patch201 -p1 -b .skip-equal-nevr
+%patch202 -p1 -b .noarch-subpkg
+%patch203 -p1 -b .defaultdocdir
# needs a bit of upstream love first...
#%patch300 -p1 -b .posttrans
@@ -193,7 +197,6 @@
--prefix=%{_usr} \
--sysconfdir=%{_sysconfdir} \
--localstatedir=%{_var} \
- --mandir=%{_mandir} \
--libdir=%{_libdir} \
%{!?with_int_bdb: --with-external-db} \
%{?with_sqlite: --enable-sqlite3} \
@@ -361,6 +364,10 @@
%doc doc/librpm/html/*
%changelog
+* Sat Oct 25 2008 Panu Matilainen <pmatilai at redhat.com>
+- Make noarch sub-packages actually work
+- Fix defaultdocdir logic in installplatform to avoid hardwiring mandir
+
* Fri Oct 24 2008 Jindrich Novy <jnovy at redhat.com>
- update compat-db dependencies (#459710)
More information about the fedora-extras-commits
mailing list