rpms/klamav/F-12 klamav-0.46-fix-docpath.patch, NONE, 1.1 klamav.spec, 1.36, 1.37

[Andy Shevchenko]

Author: andriy

Update of /cvs/extras/rpms/klamav/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv826

Modified Files:
	klamav.spec 
Added Files:
	klamav-0.46-fix-docpath.patch 
Log Message:
Fix #553807, #553811

klamav-0.46-fix-docpath.patch:
 klamav.desktop |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE klamav-0.46-fix-docpath.patch ---
diff -up klamav-0.46/src/klamav.desktop.orig klamav-0.46/src/klamav.desktop
--- klamav-0.46/src/klamav.desktop.orig	2009-02-28 12:27:28.000000000 +0200
+++ klamav-0.46/src/klamav.desktop	2010-01-30 12:55:58.000000000 +0200
@@ -4,7 +4,7 @@ Name=KlamAV
 Exec=klamav %i %m -caption "%c"
 Icon=klamav
 Type=Application
-DocPath=klamav/klamav.html
+DocPath=klamav/index.html
 Comment=An Anti-Virus Manager
 Comment[cs]=An Anti-Virus Manager
 Comment[da]=An Anti-Virus Manager


Index: klamav.spec
===================================================================
RCS file: /cvs/extras/rpms/klamav/F-12/klamav.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- klamav.spec	25 Jul 2009 04:38:42 -0000	1.36
+++ klamav.spec	30 Jan 2010 11:13:32 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: Clam Anti-Virus on the KDE Desktop
 Name: klamav
 Version: 0.46
-Release: 3%{?dist}
+Release: 4%{?dist}
 Source0: http://downloads.sourceforge.net/klamav/%{name}-%{version}.tar.bz2
 Patch0: klamav-0.46-suse-clamav-path.patch
 # Upstream notified via mailing list:
@@ -9,6 +9,8 @@ Patch0: klamav-0.46-suse-clamav-path.pat
 Patch1: klamav-0.41.1-pwd-echo.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=483518
 Patch2: klamav-0.44-no-kde3-mediamanager.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=553811
+Patch3: klamav-0.46-fix-docpath.patch
 URL: http://klamav.sourceforge.net
 Group: Applications/System
 License: GPLv2+
@@ -34,6 +36,15 @@ ClamAV Anti-Virus protection for the KDE
 %patch0 -p1 -b .suse-clamav-path
 %patch1 -p1 -b .pwd-echo
 %patch2 -p1 -b .no-kde3-mediamanager
+%patch3 -p1 -b .fix-docpath
+
+# Remove staled files (#553807)
+%{__rm} -f po/*.gmo
+
+# Fix documentation module name (#553811)
+find doc \
+    -name 'Makefile.*' -o -name 'index.docbook' \
+    -type f | xargs %{__sed} -i -e 's,klamav02,klamav,g'
 
 %build
 %configure --disable-rpath --without-included-sqlite --with-disableupdates
@@ -43,9 +54,6 @@ make %{?_smp_mflags}
 %{__rm} -rf "${RPM_BUILD_ROOT}"
 make DESTDIR="${RPM_BUILD_ROOT}" install
 
-# Fix absolute link
-ln -sf ../common ${RPM_BUILD_ROOT}%{_datadir}/doc/HTML/en/klamav02/
-
 # Fix Terminal value in desktop-file
 %{__sed} -i.orig -e '/^Terminal/s|^.*$|Terminal=false|' \
     ${RPM_BUILD_ROOT}%{_datadir}/applnk/Utilities/%{name}.desktop
@@ -75,7 +83,7 @@ touch --no-create %{_datadir}/icons/hico
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog COPYING README TODO
-%{_datadir}/doc/HTML/en/klamav02
+%{_datadir}/doc/HTML/en/klamav
 %{_bindir}/klamav
 %{_bindir}/klammail
 %{_bindir}/klamarkollon
@@ -87,6 +95,10 @@ touch --no-create %{_datadir}/icons/hico
 %{_datadir}/icons/*/*x*/apps/klamav.png
 
 %changelog
+* Sat Jan 30 2010 Andy Shevchenko <andy at smile.org.ua> - 0.46-4
+- remove staled files to build translations properly (#553807)
+- rename module in documentation and fix *.desktop file (#553811)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.46-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild