rpms/kdesdk/FC-5 kdesdk.spec,1.54,1.55 sources,1.32,1.33
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Aug 14 13:49:30 UTC 2006
Author: than
Update of /cvs/dist/rpms/kdesdk/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv5034
Modified Files:
kdesdk.spec sources
Log Message:
3.5.4
Index: kdesdk.spec
===================================================================
RCS file: /cvs/dist/rpms/kdesdk/FC-5/kdesdk.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- kdesdk.spec 9 Jun 2006 17:15:10 -0000 1.54
+++ kdesdk.spec 14 Aug 2006 13:49:27 -0000 1.55
@@ -1,38 +1,41 @@
%define debug 0
%define final 0
-%define qt_version 3.3.5
+%define qt_version 3.3.6
%define qt_epoch 1
%define kdelibs_epoch 6
%define kdebase_epoch 6
-%define arts 1
%define make_cvs 0
%define appdir %{_datadir}/applications/kde
-%define disable_gcc_check_and_hidden_visibility 1
-
Name: kdesdk
-Version: 3.5.3
+Version: 3.5.4
Release: 0.1.fc5
Summary: The KDE Software Development Kit (SDK)
URL: http://www.kde.org/
License: GPL
Group: User Interface/Desktops
-Prefix: %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
Patch1: kde-libtool.patch
Patch2: kdesdk-3.4.0-db4.patch
Patch3: kdesdk-3.4.92-misc.patch
-Requires(post,postun): /sbin/ldconfig
-
-BuildPrereq: qt-devel >= %{qt_epoch}:%{qt_version}
-BuildPrereq: kdelibs-devel >= %{kdelibs_epoch}:%{version}
-BuildPrereq: db4-devel
-BuildPrereq: /usr/bin/desktop-file-install
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
+
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
+BuildRequires: qt-devel >= %{qt_epoch}:%{qt_version}
+BuildRequires: kdelibs-devel >= %{kdelibs_epoch}:%{version}
+BuildRequires: db4-devel
+BuildRequires: desktop-file-utils
+BuildRequires: flex
%description
A collection of applications and tools used by KDE developers.
@@ -49,86 +52,6 @@
Development files for kdesdk. Install kdesdk-devel if you wish
to develop or compile KDE sdk applications.
-%package -n cervisia
-Summary: Graphical CVS client
-Group: Development/Tools
-Epoch: 2
-License: QPL
-
-%description -n cervisia
-Cervisia is a KDE graphical frontend for the the CVS client. It
-features checking out a module from a repository, updating or
-retrieving the status of a working directory or single files, common
-operations like add, remove and commit, diff against the repository
-and between different revisions, annotated view of a file, view of the
-log messages in tree and list form as well as resolving of conflicts
-in a file.
-
-%package kbabel
-Summary: Translator tools
-Group: Development/Tools
-Obsoletes: kbabel ktranslator
-
-%description kbabel
-Translator tools.
-kbabel includes a .po file editor, a catalog manager, message extraction
-tools, and po file thumbnail views for Konqueror (the KDE file manager).
-
-%package kbugbuster
-Summary: KBugBuster - debugging tools
-Group: Development/Tools
-
-%description kbugbuster
-Debugging tools
-
-%package gimp
-Summary: KDE palette for GIMP
-Requires: gimp >= 1.2
-Group: Applications/Multimedia
-
-%description gimp
-The standard KDE palette in GIMP format. This allows you to create/edit
-low-color KDE icons using the GIMP.
-
-%package kapptemplate
-Summary: Tool for creating a skeleton KDE application
-Group: Development/Tools
-
-%description kapptemplate
-kapptemplate creates a skeleton KDE application (configure stuff, automake
-stuff, etc.), allowing you to start writing the relevant code instead of
-bothering with things that have already been done.
-
-kapptemplate supports both standalone applications and plugins utilizing
-KParts technology.
-
-%package kmtrace
-Summary: Malloc debugger for KDE
-Group: Development/Tools
-
-%description kmtrace
-KMtrace is a malloc (memory allocation) debugger for KDE.
-
-%package kompare
-Summary: File comparison tool for KDE
-Group: Applications/File
-
-%description kompare
-A file comparison tool for KDE
-
-%package kspy
-Summary: Qt/KDE application state examination tool
-Group: Development/Tools
-
-%description kspy
-KSpy is a utility intended to help developers examine the internal
-state of a Qt/KDE application. KSpy graphically displays all the
-QObjects in use, and allows you to browse their properties. Using KSpy
-is very simple, include kspy.h and call KSpy::invoke() when you want
-to looks inside your app. The KSpy function is inline and the main
-part of KSpy is dynamically loaded, so you may even want to leave this
-in the release build of an application.
-
%prep
%setup -q
%patch1 -p1 -b .libtool
@@ -137,9 +60,6 @@
%build
unset QTDIR && . /etc/profile.d/qt.sh
-FLAGS="$RPM_OPT_FLAGS"
-export CFLAGS="$FLAGS"
-export CXXFLAGS="$FLAGS"
%if %{make_cvs}
make -f admin/Makefile.common cvs
@@ -149,12 +69,7 @@
--enable-new-ldflags \
--disable-dependency-tracking \
--disable-rpath \
-%if %{disable_gcc_check_and_hidden_visibility}
--disable-gcc-hidden-visibility \
-%endif
-%if %{arts} == 0
- --without-arts \
-%endif
%if %{debug} == 0
--disable-debug \
--disable-warnings \
@@ -168,19 +83,19 @@
make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
desktop-file-install --vendor "" --delete-original \
- --dir $RPM_BUILD_ROOT%{appdir} \
+ --dir %{buildroot}%{appdir} \
--add-only-show-in KDE \
- $RPM_BUILD_ROOT%{appdir}/kbugbuster.desktop \
- $RPM_BUILD_ROOT%{appdir}/kuiviewer.desktop
+ %{buildroot}%{appdir}/kbugbuster.desktop \
+ %{buildroot}%{appdir}/kuiviewer.desktop
# make symlinks relative
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/HTML/en/common
-pushd $RPM_BUILD_ROOT%{_docdir}/HTML/en
+mkdir -p %{buildroot}%{_docdir}/HTML/en/common
+pushd %{buildroot}%{_docdir}/HTML/en
for i in *; do
if [ -d $i -a -L $i/common ]; then
rm -f $i/common
@@ -190,20 +105,32 @@
popd
# workaround, rpm cannot replace a directory with a symlink
-rm -f $RPM_BUILD_ROOT%{_docdir}/HTML/en/cervisia/common
-mkdir $RPM_BUILD_ROOT%{_docdir}/HTML/en/cervisia/common
-pushd $RPM_BUILD_ROOT%{_docdir}/HTML/en/cervisia/common
+rm -f %{buildroot}%{_docdir}/HTML/en/cervisia/common
+mkdir %{buildroot}%{_docdir}/HTML/en/cervisia/common
+pushd %{buildroot}%{_docdir}/HTML/en/cervisia/common
for i in %{_docdir}/HTML/en/common/* ; do
ln -s ../../common/$(basename $i) .
done
popd
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+for f in crystalsvg 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 || :
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
+for f in crystalsvg 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 || :
%files
%defattr(-,root,root)
@@ -227,6 +154,9 @@
%{_mandir}/man1/*
%changelog
+* Mon Aug 14 2006 Than Ngo <than at redhat.com> 3.5.4-0.1.fc5
+- 3.5.4
+
* Fri Jun 09 2006 Than Ngo <than at redhat.com> 3.5.3-0.1.fc5
- update to 3.5.3
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdesdk/FC-5/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources 9 Jun 2006 17:15:10 -0000 1.32
+++ sources 14 Aug 2006 13:49:27 -0000 1.33
@@ -1 +1 @@
-75450d8905a2cc612df00927c7f81af9 kdesdk-3.5.3.tar.bz2
+2150e6a4ce5e42886a4afc6c0198c30c kdesdk-3.5.4.tar.bz2
More information about the fedora-cvs-commits
mailing list