rpms/kdesdk/F-7 .cvsignore, 1.32, 1.33 kdesdk.spec, 1.63, 1.64 sources, 1.34, 1.35

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore kdesdk.spec sources 
Log Message:
* Mon Apr 30 2007 Than Ngo <than at redhat.com> - 3.5.6-2.fc7
- shouldn't own /usr/share/doc/HTML/en/common



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/F-7/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	10 Aug 2006 15:58:34 -0000	1.32
+++ .cvsignore	11 Jun 2007 19:53:29 -0000	1.33
@@ -1,13 +1 @@
-kdesdk-3.3.0.tar.bz2
-kdesdk-3.3.1.tar.bz2
-kdesdk-3.3.2.tar.bz2
-kdesdk-3.4.0-rc1.tar.bz2
-kdesdk-3.4.0.tar.bz2
-kdesdk-3.4.1.tar.bz2
-kdesdk-3.4.2.tar.bz2
-kdesdk-3.4.91.tar.bz2
-kdesdk-3.4.92.tar.bz2
-kdesdk-3.5.0.tar.bz2
-kdesdk-3.5.1.tar.bz2
-kdesdk-3.5.3.tar.bz2
-kdesdk-3.5.4.tar.bz2
+kdesdk-3.5.7.tar.bz2


Index: kdesdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/F-7/kdesdk.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- kdesdk.spec	30 Apr 2007 15:22:58 -0000	1.63
+++ kdesdk.spec	11 Jun 2007 19:53:29 -0000	1.64
@@ -1,7 +1,8 @@
+
 %define debug 0
 %define final 0
 
-%define qt_version 3.3.7
+%define qt_version 3.3.8
 %define qt_epoch 1
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
@@ -11,13 +12,14 @@
 
 %define appdir %{_datadir}/applications/kde
 
-Name: kdesdk
-Version: 3.5.6
-Release: 2%{?dist}
+Name:    kdesdk
 Summary: The KDE Software Development Kit (SDK)
-URL: http://www.kde.org/
+Version: 3.5.7
+Release: 1%{?dist}
+
 License: GPL
 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
@@ -26,10 +28,9 @@
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: libtool
-BuildRequires: qt-devel >= %{qt_epoch}:%{qt_version}
+%if %{make_cvs}
+BuildRequires: automake libtool
+%endif
 BuildRequires: kdelibs-devel >= %{kdelibs_epoch}:%{version}
 BuildRequires: db4-devel
 BuildRequires: desktop-file-utils
@@ -51,23 +52,24 @@
 Development files for kdesdk. Install kdesdk-devel if you wish
 to develop or compile KDE sdk applications.
 
+
 %prep
 %setup -q
 %patch1 -p1 -b .db4
 %patch2 -p1 -b .multilib
 
-%build
-unset QTDIR && . /etc/profile.d/qt.sh
-
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
 %endif
 
+
+%build
+unset QTDIR && . /etc/profile.d/qt.sh
+
 %configure \
    --enable-new-ldflags \
    --disable-dependency-tracking \
    --disable-rpath \
-   --disable-gcc-hidden-visibility \
 %if %{arts} == 0
    --without-arts \
 %endif
@@ -78,11 +80,11 @@
 %if %{final}
    --enable-final \
 %endif
-   --with-qt-libraries=$QTDIR/lib \
    --includedir=%{_includedir}/kde
 
 make %{?_smp_mflags}
 
+
 %install
 rm -rf %{buildroot} 
 
@@ -114,17 +116,14 @@
 done
 popd
 
-<<<<<<< kdesdk.spec
-rm -f %{buildroot}/%{_datadir}/apps/kapptemplate/admin/Makefile
-      %{buildroot}/%{_datadir}/apps/kapptemplate/admin/Makefile.in
-=======
 rm -f %{buildroot}/%{_datadir}/apps/kapptemplate/admin/Makefile \
       %{buildroot}/%{_datadir}/apps/kapptemplate/admin/Makefile.in
->>>>>>> 1.62
+
 
 %clean
 rm -rf %{buildroot}
 
+
 %post
 /sbin/ldconfig
 for f in crystalsvg hicolor locolor ; do
@@ -141,6 +140,7 @@
 done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
+
 %files
 %defattr(-,root,root)
 %exclude %{_docdir}/HTML/en/common
@@ -166,6 +166,7 @@
 %{_libdir}/*.a
 %{_mandir}/man1/*
 
+
 %changelog
 * Mon Apr 30 2007 Than Ngo <than at redhat.com> - 3.5.6-2.fc7
 - shouldn't own /usr/share/doc/HTML/en/common


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/F-7/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	7 Feb 2007 23:09:27 -0000	1.34
+++ sources	11 Jun 2007 19:53:29 -0000	1.35
@@ -1 +1 @@
-1462e1a884fdaa070ed493c10a336728  kdesdk-3.5.6.tar.bz2
+6a8f7b7fea753e2a4517301dee76d84a  kdesdk-3.5.7.tar.bz2