rpms/kdevelop/F-7 kdevelop-3.5.0-autosave.patch, NONE, 1.1 kdevelop-3.5.0-svn.patch, NONE, 1.1 .cvsignore, 1.31, 1.32 kdevelop.spec, 1.58, 1.59 sources, 1.34, 1.35

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdevelop/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22067

Modified Files:
	.cvsignore kdevelop.spec sources 
Added Files:
	kdevelop-3.5.0-autosave.patch kdevelop-3.5.0-svn.patch 
Log Message:
sync w/devel (kdevelop-3.5.0)


kdevelop-3.5.0-autosave.patch:

--- NEW FILE kdevelop-3.5.0-autosave.patch ---
--- branches/KDE/3.5/kdevelop/languages/cpp/cppsupportpart.cpp	2007/10/07 14:39:48	722530
+++ branches/KDE/3.5/kdevelop/languages/cpp/cppsupportpart.cpp	2007/10/23 22:58:44	728690
@@ -2533,6 +2533,9 @@
 				QStringList l = files.res;
 				while(!l.isEmpty() ) {
 					emit addedSourceInfo( l.front() );
+					emit aboutToRemoveSourceInfo( l.front() );
+					emit removedSourceInfo( l.front() );
+					emit addedSourceInfo( l.front() );
 					l.pop_front();
 				}
 
@@ -2542,9 +2545,11 @@
 				QStringList l = files.res;
 				while( !l.isEmpty() ) {
 					emit codeModelUpdated( l.front() );
+					emit aboutToRemoveSourceInfo( l.front() );
+					emit removedSourceInfo( l.front() );
+					emit addedSourceInfo( l.front() );
 					l.pop_front();
 				}
-				emit updatedSourceInfo();
 			}
 		}
 		kdDebug( 9007 ) << "files in code-model after parseEmit: " << codeModel()->fileList().count() << " before: " << oldFileCount << endl;

kdevelop-3.5.0-svn.patch:

--- NEW FILE kdevelop-3.5.0-svn.patch ---
diff -up kdevelop-3.5.0/vcs/subversion/configure.in.in.svn kdevelop-3.5.0/vcs/subversion/configure.in.in
--- kdevelop-3.5.0/vcs/subversion/configure.in.in.svn	2007-10-08 04:50:02.000000000 -0500
+++ kdevelop-3.5.0/vcs/subversion/configure.in.in	2007-10-13 21:00:21.000000000 -0500
@@ -117,7 +117,7 @@ if test "x$with_subversion" != xno; then
         AC_MSG_RESULT([not found])
         SVN_SUBDIR=
     fi
-    SVN_LIB="$SVN_LIB $APR_LIBS -lsvn_client-1"
+    SVN_LIB="$SVN_LIB $APR_LIBS -lsvn_client-1 -lsvn_fs-1"
     SVN_INCLUDE="$SVN_INCLUDE $APR_INCLUDE"
     SVN_CPPFLAGS="$APR_CPPFLAGS $SVN_CPPFLAGS"
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdevelop/F-7/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	14 Jun 2007 19:10:31 -0000	1.31
+++ .cvsignore	1 Nov 2007 18:03:33 -0000	1.32
@@ -1,16 +1,4 @@
 c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
-kdevelop-3.1.0.tar.bz2
-kdevelop-3.1.1.tar.bz2
-kdevelop-3.1.2.tar.bz2
-kdevelop-3.2.0-rc1.tar.bz2
-kdevelop-3.2.0.tar.bz2
-kdevelop-3.2.1.tar.bz2
-kdevelop-3.2.2.tar.bz2
-kdevelop-3.2.91.tar.bz2
-kdevelop-3.2.92.tar.bz2
-kdevelop-3.3.0.tar.bz2
-kdevelop-3.3.1.tar.bz2
-kdevelop-3.3.2.tar.bz2
-kdevelop-3.3.3.tar.bz2
 kdevelop-3.3.4.tar.bz2
 kdevelop-3.4.1.tar.bz2
+kdevelop-3.5.0.tar.bz2


Index: kdevelop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdevelop/F-7/kdevelop.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- kdevelop.spec	16 Jun 2007 20:59:55 -0000	1.58
+++ kdevelop.spec	1 Nov 2007 18:03:33 -0000	1.59
@@ -1,60 +1,78 @@
+
 %define debug 0
-%define final 0
+%define final 1 
 
-%define kde_version 3.5.7
+%define kde_version 3.5.8
 %define qt_version 3.3.8
-%define qt_epoch 1
-%define kdelibs_epoch 6
 
 %define make_cvs 1
 
-Name: kdevelop
+%if 0%{?fedora} > 7
+# make -libs subpkg
+%define libs 1
+%endif
+
+Name:    kdevelop
 Summary: Integrated Development Environment for C++/C
-Version: 3.4.1
-Release: 1%{?dist}
-Epoch: 9
+Epoch:   9
+Version: 3.5.0
+Release: 4%{?dist}
+
+License: GPLv2
 URL: http://www.kdevelop.org/
 Group: Development/Tools
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-License: GPL
 
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Source1: ftp://129.187.206.68/pub/unix/ide/KDevelop/c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
 
 Patch1: c_cpp_reference-2.0.2-config.patch
 Patch2: kdevelop-2.1.5_for_KDE_3.1-doc.patch
+Patch3: kdevelop-3.5.0-svn.patch
+
+#upstream patches
+Patch500: kdevelop-3.5.0-autosave.patch
+
+Provides: kdevelop3 = %{version}-%{release}
 
-Requires(post): /sbin/ldconfig desktop-file-utils
-Requires(postun): /sbin/ldconfig desktop-file-utils
-Requires: kdelibs-devel >= %{kdelibs_epoch}:%{kde_version}
-Requires: kdelibs-apidocs
+%if 0%{?libs}
+Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+%else
+Obsoletes: %{name}-libs < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:  %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+%endif
+
+
+Requires: kdelibs3-devel >= %{kde_version}
 Requires: make
 Requires: perl
-Requires: libtool
-Requires: automake
-Requires: autoconf
+Requires: automake libtool 
 Requires: flex >= 2.5.4
-Requires: qt-designer >= %{qt_epoch}:%{qt_version}
-Requires: qt-devel-docs
+Requires: qt-designer
 Requires: gettext
 Requires: ctags
+## Skip these, for now -- Rex
+#Requires(hint): htdig
+#Source3: kdevelop-htdig.conf
+#Requires(hint): kdelibs3-apidocs
+#Requires(hint): ark
 
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: libtool
-BuildRequires: kdelibs-devel >= %{kde_version}
+%if %{make_cvs}
+BuildRequires: automake libtool
+%endif
+BuildRequires: kdelibs3-devel >= %{kde_version}
+BuildRequires: kdelibs3-apidocs qt-devel-docs
+%global qt_ver %(pkg-config --modversion qt-mt 2>/dev/null || echo %{qt_version})
 BuildRequires: db4-devel
 BuildRequires: flex
-BuildRequires: qt-devel-docs
-BuildRequires: kdelibs-apidocs
-BuildRequires: apr-util-devel
-BuildRequires: apr-devel
-BuildRequires: subversion-devel
-BuildRequires: qt-devel-docs
-BuildRequires: kdelibs-apidocs
-BuildRequires: neon-devel
+# for cvs plugin
+BuildRequires: kdesdk3-devel
+BuildRequires: subversion-devel neon-devel
 
-Obsoletes: kdevelop-c_c++_ref
+## ancient, deprecated?  -- Rex
+#Obsoletes: kdevelop-c_c++_ref
 
 %description
 The KDevelop Integrated Development Environment provides many features
@@ -80,14 +98,37 @@
 development by adding it to the "Tools"-menu according to your
 individual needs.
 
+%package devel
+Summary: Development files for %{name}
+Group: Development/Libraries
+Provides: kdevelop3-devel = %{version}-%{release}
+Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: kdelibs3-devel
+%description devel
+%{summary}.
+
+%if 0%{?libs}
+%package libs
+Summary: %{name} runtime libraries
+Group:   System Environment/Libraries
+Requires: kdelibs3 >= %{version}
+# helps multilib upgrades
+Obsoletes: %{name} < %{?epoch:%{epoch}:}%{version}-%{release}
+# include to be paranoid, installing libs-only is still mostly untested -- Rex
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+%description libs
+%{summary}.
+%endif
+
+
+
 %prep
 
 %setup -q -a1
 %patch1 -p0 -b .config
 %patch2 -p1 -b .doc
-
-%build
-QTDIR="" && source /etc/profile.d/qt.sh
+%patch3 -p1 -b .svn
+%patch500 -p4 -b .autosave
 
 %if %{make_cvs}
   rm -rf c_cpp_reference-2.0.2_for_KDE_3.0/admin
@@ -96,6 +137,10 @@
   make -f admin/Makefile.common cvs
 %endif
 
+
+%build
+QTDIR="" && source /etc/profile.d/qt.sh
+
 # c references
 pushd c_cpp_reference-2.0.2_for_KDE_3.0
 %configure \
@@ -107,7 +152,6 @@
 %configure \
    --enable-new-ldflags \
    --disable-dependency-tracking \
-   --disable-gcc-hidden-visibility \
    --disable-rpath \
 %if %{debug} == 0
    --disable-debug \
@@ -116,14 +160,14 @@
 %if %{final}
   --enable-final \
 %endif
-  --with-qtdoc-dir=%{_docdir}/qt-devel-%{qt_version}/html/ \
+  --with-qtdoc-dir=%{_docdir}/qt-devel-%{qt_ver}/html/ \
   --with-kdelibsdoc-dir=%{_docdir}/HTML/en/kdelibs-apidocs/ \
-  --with-qt-libraries=$QTDIR/lib \
   --with-extra-libs=%{_libdir}
 
 make %{?_smp_mflags}
 make %{?_smp_mflags} -C c_cpp_reference-2.0.2_for_KDE_3.0
 
+
 %install
 rm -rf %{buildroot}
 
@@ -133,7 +177,9 @@
 # remove useless files
 rm -rf %{buildroot}%{_prefix}/kdevbdb
 
+
 %post
+%{!?libs:/sbin/ldconfig}
 for f in hicolor locolor ; do
   touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
   gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
@@ -141,34 +187,86 @@
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun
+%{!?libs:/sbin/ldconfig}
 for f in hicolor locolor ; do
   touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
   gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
 done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
+%if 0%{?libs}
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+%endif
+
+
 %clean
 rm -rf %{buildroot}
 
+
 %files
-%defattr(-,root,root)
-%doc %{_docdir}/HTML/en/*
+%defattr(-,root,root,-)
+%{_docdir}/HTML/en/*
 %{_bindir}/*
 %{_libdir}/kde3/*
-%{_libdir}/lib*
 %{_libdir}/kconf_update_bin/*
-%{_includedir}/*
 %{_datadir}/applications/kde/*
 %{_datadir}/apps/*
-%config %{_datadir}/config/*
+%{_datadir}/config/*
 %{_datadir}/desktop-directories/*
-%{_datadir}/icons/*/*/*/*
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/icons/locolor/*/*/*
 %{_datadir}/mimelnk/application/*
 %{_datadir}/mimelnk/text/*
 %{_datadir}/services/*
 %{_datadir}/servicetypes/*
 
+%if 0%{?libs}
+%files libs
+%defattr(-,root,root,-)
+%endif
+%{_libdir}/lib*.so.*
+%{_libdir}/lib*.la
+
+%files devel
+%defattr(-,root,root,-)
+%{_libdir}/lib*.so
+%{_includedir}/*
+
+
 %changelog
+* Tue Oct 31 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 9:3.5.0-4
+- %%post/%%postun libs -p /sbin/ldconfig
+- -libs conditional (f8+)
+
+* Tue Oct 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 9:3.5.0-3
+- -devel, -libs subpkgs, multiarch conflicts (#341791)
+
+* Thu Oct 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 9:3.5.0-2
+- autosave patch
+
+* Sat Oct 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 9:3.5.0-1
+- kdevelop-3.5.0 (kde-3.5.8)
+
+* Mon Sep 03 2007 Than Ngo <than at redhat.com> - 9:3.4.1-5
+- rebuilt against apr
+
+* Wed Aug 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 9:3.4.1-4
+- License: GPLv2
+- (Build)Requires: kdelibs3-devel kdesdk3-devel
+- svn patch (#265481)
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 9:3.4.1-3
+- Rebuild for selinux ppc32 issue.
+
+* Sun Jun 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 9:3.4.1-2
+- merge missed changes from F-7 branch
+- make qt-devel-doc/qt_ver detection more robust
+
+* Sun Jun 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 9:3.4.1-1
+- cleanup 
+
 * Thu Jun 14 2007 Than Ngo <than at redhat.com> - 9:3.4.1-1.fc7
 - 3.4.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdevelop/F-7/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	14 Jun 2007 19:10:31 -0000	1.34
+++ sources	1 Nov 2007 18:03:33 -0000	1.35
@@ -1,2 +1,2 @@
 5777e4d2dbfc3e6c2ba9f0ed6ea457f9  c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
-abc6cc2831ad4c0f4da9fba9e38edce1  kdevelop-3.4.1.tar.bz2
+1101077b3a0164da463f60cad4f13e25  kdevelop-3.5.0.tar.bz2