commit 0a1ccab0f0501b2e304b03cbff81ce8a8f3860bf
Author: Jan Rękorajski <[email protected]>
Date: Wed Sep 5 22:23:20 2012 +0200
- removed obsolete paches
- enabled apidocs build
rpm-configure-autoconf.patch | 11 -----------
rpm-doxygen_hack.patch | 10 ----------
rpm.spec | 6 +-----
3 files changed, 1 insertion(+), 26 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index 0da76b6..9e7145b 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -18,7 +18,7 @@
#
# Conditional build:
%bcond_with static # build static rpm+rpmi
-%bcond_with apidocs # don't generate documentation with doxygen
+%bcond_without apidocs # don't generate documentation with doxygen
%bcond_without python # don't build python bindings
%bcond_without selinux # build without selinux support
%bcond_without suggest_tags # build without Suggest tag (bootstrapping)
@@ -112,7 +112,6 @@ Patch27: %{name}-hack-norpmlibdep.patch
Patch34: %{name}-epoch0.patch
Patch35: %{name}-perl_req-INC_dirs.patch
Patch36: %{name}-debuginfo.patch
-Patch37: %{name}-doxygen_hack.patch
Patch41: vendor-pld.patch
@@ -126,7 +125,6 @@ Patch59: %{name}-libtool-deps.patch
Patch60: %{name}-mimetype.patch
Patch61: %{name}-sparc64.patch
Patch62: %{name}-gendiff.patch
-Patch70: %{name}-configure-autoconf.patch
Patch72: openmp.patch
Patch73: %{name}-URPM-build-fix.patch
Patch74: %{name}-db5.3.patch
@@ -777,7 +775,6 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML
generowane ze
%patch34 -p1
%patch35 -p0
%patch36 -p1
-####%patch37 -p1
%patch41 -p1
%patch42 -p1
%patch47 -p1
@@ -790,7 +787,6 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML
generowane ze
%patch61 -p1
%endif
%patch62 -p1
-####%patch70 -p1
%patch72 -p1 -b .wiget
%patch73 -p1
%patch74 -p1
diff --git a/rpm-configure-autoconf.patch b/rpm-configure-autoconf.patch
deleted file mode 100644
index 5b2bf1c..0000000
--- a/rpm-configure-autoconf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- rpm-5.3.11/configure.ac~ 2011-10-06 18:37:01.000000000 +0300
-+++ rpm-5.3.11/configure.ac 2011-10-06 18:37:39.605688527 +0300
-@@ -8,7 +8,7 @@
-
- AC_PREREQ(2.63)
- m4_define([PACKAGE_BUGREPORT_DEFAULT], [[email protected]])
--AC_INIT([rpm],[5.4.10],[PACKAGE_BUGREPORT_DEFAULT])
-+AC_INIT([rpm],[5.4.10],PACKAGE_BUGREPORT_DEFAULT)
- PACKAGE_TIMESTAMP="2012-07-06" dnl # YYYY[-MM[-DD[ HH[:MM]]]]
- AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION])
-
diff --git a/rpm-doxygen_hack.patch b/rpm-doxygen_hack.patch
deleted file mode 100644
index 1cff510..0000000
--- a/rpm-doxygen_hack.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- rpm-5.1b2/Doxyfile.in~ 2008-04-13 19:14:33.000000000 +0300
-+++ rpm-5.1b2/Doxyfile.in 2008-04-13 19:15:06.904571320 +0300
-@@ -503,7 +503,6 @@
- @top_srcdir@/doc/manual/spec \
- @top_srcdir@/doc/manual/triggers \
- @top_srcdir@/doc/manual/tsort \
-- @top_srcdir@/file/src/tar.h \
- @top_srcdir@/lib/depends.c \
- @top_srcdir@/lib/formats.c \
- @top_srcdir@/lib/fs.c \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/0a1ccab0f0501b2e304b03cbff81ce8a8f3860bf
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
