rpms/kdesvn/devel kdesvn.spec,1.8,1.9

[Orion Poplawski (orion)]

Author: orion

Update of /cvs/extras/rpms/kdesvn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29918

Modified Files:
	kdesvn.spec 
Log Message:
- Add missing files not detected by mock
- Add patch to fix gcc41 compile error



Index: kdesvn.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/devel/kdesvn.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kdesvn.spec	14 Dec 2005 23:07:40 -0000	1.8
+++ kdesvn.spec	19 Dec 2005 16:16:00 -0000	1.9
@@ -2,14 +2,15 @@
 
 Name:           kdesvn
 Version:        0.7.1
-Release:        2%{?dist}
-Summary:        A subversion client for KDE
+Release:        3%{?dist}
+Summary:        A subversion client for KDE with KIO integration
 
 Group:          Development/Tools
 License:        GPL
 URL:            http://www.alwins-world.de/programs/kdesvn/
 Source0:        http://www.alwins-world.de/programs/download/kdesvn/kdesvn-%{srcver}.tar.gz
 Patch0:         kdesvn-0.7.1-x.patch
+Patch1:         kdesvn-0.7.1-gcc41.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  subversion-devel, kdelibs-devel, neon-devel
@@ -32,6 +33,7 @@
 %prep
 %setup -q -n %{name}-%{srcver}
 %patch -p1 -b .x11
+%patch1 -p1 -b .gcc41
 
 
 %build
@@ -56,6 +58,8 @@
 %find_lang %{name} || touch %{name}.lang
 #Fix doc link
 ln -sf ../common $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/en/%{name}
+#Don't conflict with kdebase
+rm $RPM_BUILD_ROOT%{_datadir}/services/svn*.protocol
 
 
 %clean
@@ -84,19 +88,24 @@
 %doc AUTHORS ChangeLog COPYING GPL.txt
 %{_bindir}/kdesvn
 %{_bindir}/kdesvnaskpass
-%{_libdir}/kde3/libkdesvnpart.*
+%{_libdir}/kde3/*
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/apps/kdesvn/
 %{_datadir}/apps/kdesvnpart/
+%{_datadir}/apps/konqueror/servicemenus/kdesvn*.desktop
 %{_datadir}/config.kcfg/kdesvn_part.kcfg
 %{_datadir}/doc/HTML/en/kdesvn/
-%{_datadir}/icons/hicolor/16x16/apps/kdesvn.png
-%{_datadir}/icons/hicolor/32x32/apps/kdesvn.png
-%{_datadir}/icons/hicolor/48x48/apps/kdesvn.png
-%{_datadir}/icons/hicolor/64x64/apps/kdesvn.png
+%{_datadir}/icons/hicolor/*/*/*.png
+%{_datadir}/icons/hicolor/*/*/*.svgz
+%{_datadir}/services/kded/kdesvnd.desktop
+%{_datadir}/services/ksvn*.protocol
 
 
 %changelog
+* Fri Dec 16 2005 - Orion Poplawski <orion at cora.nwra.com> - 0.7.1-3
+- Add missing files not detected by mock
+- Add patch to fix gcc41 compile error
+
 * Tue Dec 13 2005 - Orion Poplawski <orion at cora.nwra.com> - 0.7.1-2
 - Specify apr-1-config and apu-1-config to configure