- removed obsolete beecrypt4 patch, updated doxygen_hack patch

- apidocs desc cleanup

Changed files:
    rpm.spec -> 1.613

diff --git a/rpm.spec b/rpm.spec
index 6b4c0fea743d3cbf1e0d390c7fc62fc278fe5206..8cee0c9bb9590d124312d167aa9dafc3605af7d4 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -94,7 +94,6 @@ Patch37:      %{name}-rpmsq.patch
 Patch40:       %{name}-epoch0.patch
 Patch43:       %{name}-perl_req-INC_dirs.patch
 Patch44:       %{name}-debuginfo.patch
-Patch45:       %{name}-beecrypt4.patch
 Patch46:       %{name}-doxygen_hack.patch
 Patch47:       %{name}-distver.patch
 Patch48:       %{name}-gcc4.patch
@@ -558,20 +557,18 @@ construir pacotes usando o RPM.
 ò¦ÚÎÏÍÁΦÔΦ ÄÏÐÏͦÖΦ ÓËÒÉÐÔÉ ÔÁ ÕÔÉ̦ÔÉ, Ñ˦ ×ÉËÏÒÉÓÔÏ×ÕÀÔØÓÑ ÄÌÑ
 ÐÏÂÕÄÏ×É RPM'¦×.
 
-%if %{with apidocs}
-%package       apidocs
-Summary:       rpm API documentation and guides
-Summary(pl):   Documentacja API rpm i przewodniki.
+%package apidocs
+Summary:       RPM API documentation and guides
+Summary(pl):   Documentacja API RPM-a i przewodniki
 Group:         Documentation   
 
 %description apidocs
-Documentation for rpm API and guides in html format generated
+Documentation for RPM API and guides in HTML format generated
 from rpm sources by doxygen.
 
 %description apidocs -l pl
-Dokumentacja API rpm oraz przewodniki w formacie html generowana
-ze ¼rode³ rpm przez doxygen.
-%endif
+Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane
+ze ¼rode³ RPM-a przez doxygen.
 
 %prep
 %setup -q -n %{name}
@@ -625,10 +622,7 @@ cat %{SOURCE11} >> macros.in
 %patch40 -p1
 %patch43 -p0
 %patch44 -p1
-# OBSOLETE
-#%patch45 -p1
-# NEEDS UPDATE
-# %patch46 -p1
+%patch46 -p1
 %{?with_distver:%patch47 -p1}
 %patch48 -p1
 # NEEDS UPDATE