rpms/kdesdk/devel kdesdk-3.5.7-subversion.patch, NONE, 1.1 kdesdk.spec, 1.71, 1.72 kdesdk-3.4.0-db4.patch, 1.1, NONE

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdesdk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25776

Modified Files:
	kdesdk.spec 
Added Files:
	kdesdk-3.5.7-subversion.patch 
Removed Files:
	kdesdk-3.4.0-db4.patch 
Log Message:
* Wed Sep 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.7-10
- update %description to mention included apps
- move manpages to main pkg.
- Provides: cervisia umbrello
- kbugbuster kuiviewer: drop --add-only-show-in KDE
- kioslave/svn: --with-subversion, patch


kdesdk-3.5.7-subversion.patch:

--- NEW FILE kdesdk-3.5.7-subversion.patch ---
diff -up kdesdk-3.5.7/kioslave/svn/configure.in.in.svn kdesdk-3.5.7/kioslave/svn/configure.in.in
--- kdesdk-3.5.7/kioslave/svn/configure.in.in.svn	2005-10-10 09:58:25.000000000 -0500
+++ kdesdk-3.5.7/kioslave/svn/configure.in.in	2007-09-12 09:39:42.000000000 -0500
@@ -86,7 +86,7 @@ fi
 AC_SUBST(SVNCONFIG)
 if test -x "$SVNCONFIG"; then
 	SVNLD="`$SVNCONFIG --ldflags`"
-	SVN_LIB="`$SVNCONFIG --libs` -lsvn_client-1"
+	SVN_LIB="`$SVNCONFIG --libs` -lsvn_client-1 -lsvn_subr-1"
 	SVN_CPPFLAGS="`$SVNCONFIG --cppflags`"
 	dnl ugly hack for subversion svn-config problems in 0.14.x, to be removed when svn-config is fixed
 	SVN_INCLUDE="`$SVNCONFIG --includes` -I$_SVNCONFIG/include/subversion-1/"
@@ -141,7 +141,7 @@ dnl		AC_MSG_ERROR([Subversion headers ar
 		SVN_SUBDIR=
 	fi
 fi
-SVN_LIB="$SVN_LIB $APR_LIBS -lsvn_client-1"
+SVN_LIB="$SVN_LIB $APR_LIBS -lsvn_client-1 -lsvn_subr-1"
 SVN_INCLUDE="$SVN_INCLUDE $APR_INCLUDE"
 SVN_CPPFLAGS="$APR_CPPFLAGS $SVN_CPPFLAGS"
 


Index: kdesdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/devel/kdesdk.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- kdesdk.spec	29 Aug 2007 12:07:57 -0000	1.71
+++ kdesdk.spec	12 Sep 2007 15:18:18 -0000	1.72
@@ -1,24 +1,20 @@
 
-%define debug 0
-%define final 0
+%define _with_subversion --with-subversion --with-apr-config=apr-1-config --with-apu-config=apu-1-config
 
-%define arts 1
-
-%define make_cvs 1
-
-%define appdir %{_datadir}/applications/kde
+%define make_cvs 1 
 
 Name:    kdesdk
 Summary: The KDE Software Development Kit (SDK)
 Version: 3.5.7
-Release: 9%{?dist}.1
+Release: 10%{?dist}
 
 License: GPLv2
 Group: User Interface/Desktops
 URL: http://www.kde.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-Patch1: kdesdk-3.4.0-db4.patch
+
+Patch1: kdesdk-3.5.7-subversion.patch
 Patch2: kdesdk-3.5.4-multilib.patch
 
 Provides: kdesdk3 = %{version}-%{release}
@@ -42,29 +38,42 @@
 BuildRequires: binutils-devel
 %endif
 BuildRequires: perl
-BuildRequires: subversion-devel >= 1.0, neon-devel
+%{?_with_subversion:BuildRequires: subversion-devel neon-devel}
+
+# Obsoletes/Provides
+%define cervisia_ver 2.4.7
+Provides: cervisia = %{cervisia_ver}-%{release}
+
+%define umbrello_ver 1.5.7
+Obsoletes: umbrello < %{umbrello_ver}-%{release}
+Provides:  umbrello = %{umbrello_ver}-%{release}
+
 
 %description
-A collection of applications and tools used by KDE developers.
-Among other things, kdesdk provides tools for working on the KDE CVS
-repository.
+A collection of applications and tools used by developers, including:
+* cervisia: a CVS frontend
+* kbabel: PO file management
+* kbugbuster: a tool to manage the KDE bug report system
+* kcachegrind: a browser for data produced by profiling tools (e.g. cachegrind)
+* kompare: diff tool
+* kuiviewer: displays designer's UI files
+* umbrello: UML modeller and UML diagram tool
+
 
 %package devel
-Summary: Development files for kdesdk
+Summary: Development files for %{name}
 Group: Development/Libraries
 Provides: kdesdk3-devel = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 Requires: kdelibs3-devel
-
 %description devel
-Development files for kdesdk. Install kdesdk-devel if you wish
-to develop or compile KDE sdk applications.
+%{summary}.
 
 
 %prep
 %setup -q
 
-%patch1 -p1 -b .db4
+%patch1 -p1 -b .subversion
 %patch2 -p1 -b .multilib
 
 %if %{make_cvs}
@@ -76,20 +85,12 @@
 unset QTDIR && . /etc/profile.d/qt.sh
 
 %configure \
-   --enable-new-ldflags \
-   --disable-dependency-tracking \
-   --disable-rpath \
-%if %{arts} == 0
-   --without-arts \
-%endif
-%if %{debug} == 0
-   --disable-debug \
-   --disable-warnings \
-%endif
-%if %{final}
-   --enable-final \
-%endif
-   --includedir=%{_includedir}/kde
+  --includedir=%{_includedir}/kde \
+  --disable-rpath \
+  --enable-new-ldflags \
+  --disable-debug --disable-warnings \
+  --disable-dependancy-tracking --enable-final \
+  %{?_with_subversion}
 
 make %{?_smp_mflags}
 
@@ -99,11 +100,9 @@
 
 make install DESTDIR=%{buildroot}
 
-desktop-file-install --vendor "" --delete-original \
-  --dir %{buildroot}%{appdir} \
-  --add-only-show-in KDE \
-  %{buildroot}%{appdir}/kbugbuster.desktop \
-  %{buildroot}%{appdir}/kuiviewer.desktop
+desktop-file-install --vendor "" \
+  --dir %{buildroot}%{_datadir}/applications/kde \
+  %{buildroot}%{_datadir}/applications/kde/*.desktop \
 
 # make symlinks relative
 mkdir -p %{buildroot}%{_docdir}/HTML/en/common
@@ -149,12 +148,8 @@
 
 %files
 %defattr(-,root,root,-)
-%{_docdir}/HTML/en/*
 %{_bindir}/*
-%{_libdir}/kde3/*
-%{_libdir}/*.so.*
-%{_libdir}/libkdeinit_*.so
-%{_libdir}/*.la
+%{_docdir}/HTML/en/*
 %{_datadir}/apps/*
 %{_datadir}/mimelnk/application/*
 %{_datadir}/services/*
@@ -164,17 +159,28 @@
 %{_datadir}/icons/locolor/*/*/*
 %{_datadir}/applications/kde/*
 %{_datadir}/config.kcfg/*
+%{_libdir}/kde3/*
+%{_libdir}/lib*.so.*
+%{_libdir}/lib*.la
+%{_libdir}/libkdeinit_*.so
+%{_mandir}/man1/*
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/kde/*
-%{_libdir}/*.so
+%{_libdir}/lib*.so
 %exclude %{_libdir}/libkdeinit_*.so
-%{_libdir}/*.a
-%{_mandir}/man1/*
+%{_libdir}/libktrace_s.a
 
 
 %changelog
+* Wed Sep 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.7-10
+- update %%description to mention included apps
+- move manpages to main pkg.
+- Provides: cervisia umbrello
+- kbugbuster kuiviewer: drop --add-only-show-in KDE
+- kioslave/svn: --with-subversion, patch
+
 * Wed Aug 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.7-9
 - License: GPLv2
 - (Build)Requires: kdelibs3(-devel) kdepim3-devel


--- kdesdk-3.4.0-db4.patch DELETED ---