commit a6170fd49ca4d39dcc66baaf1b4b3092bc69e514
Author: Jan Rękorajski <[email protected]>
Date: Thu Jan 24 14:28:52 2013 +0100
- remove _docdir before packaging or fail if something already put
unexpected content there
rpm-clean-docdir.patch | 10 ++++++++++
rpm.spec | 4 +++-
2 files changed, 13 insertions(+), 1 deletion(-)
---
diff --git a/rpm.spec b/rpm.spec
index c94a844..f007ee4 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -52,7 +52,7 @@ Summary(ru.UTF-8): Менеджер пакетов от RPM
Summary(uk.UTF-8): Менеджер пакетів від RPM
Name: rpm
Version: 5.4.10
-Release: 38
+Release: 38.1
License: LGPL
Group: Base
# http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.10-0.20120706.src.rpm
@@ -151,6 +151,7 @@ Patch57: %{name}-db5.2.patch
Patch58: %{name}-preserve-iterator.patch
Patch59: %{name}-triggerin-compat.patch
Patch60: %{name}-python-sitescriptdir.patch
+Patch61: %{name}-clean-docdir.patch
# Patches imported from Mandriva
@@ -851,6 +852,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML
generowane ze
%patch58 -p1
%patch59 -p1
%patch60 -p1
+%patch61 -p1
%patch1000 -p1
%patch1001 -p1
diff --git a/rpm-clean-docdir.patch b/rpm-clean-docdir.patch
new file mode 100644
index 0000000..33af9d6
--- /dev/null
+++ b/rpm-clean-docdir.patch
@@ -0,0 +1,10 @@
+--- rpm-5.4.10/build/files.c~ 2013-01-24 14:24:39.161982722 +0100
++++ rpm-5.4.10/build/files.c 2013-01-24 14:27:50.620325354 +0100
+@@ -1048,6 +1048,7 @@
+ pkg->specialDoc = rpmiobAppend(pkg->specialDoc,
"DOCDIR=\"$RPM_BUILD_ROOT\"", 0);
+ pkg->specialDoc = rpmiobAppend(pkg->specialDoc, buf, 1);
+ pkg->specialDoc = rpmiobAppend(pkg->specialDoc, "export
DOCDIR", 1);
++ pkg->specialDoc = rpmiobAppend(pkg->specialDoc, "test -d
\"$DOCDIR\" && rmdir \"$DOCDIR\"", 1);
+ mkdir_p = rpmExpand("%{?__mkdir_p}%{!?__mkdir_p:mkdir -p}",
NULL);
+ if (!mkdir_p)
+ mkdir_p = xstrdup("mkdir -p");
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/a6170fd49ca4d39dcc66baaf1b4b3092bc69e514
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
