rpms/kdeutils/FC-4 kdeutils.spec,1.36,1.37 sources,1.28,1.29
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Apr 12 10:07:01 UTC 2006
Author: than
Update of /cvs/dist/rpms/kdeutils/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv14746
Modified Files:
kdeutils.spec sources
Log Message:
update to 3.5.2
Index: kdeutils.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeutils/FC-4/kdeutils.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- kdeutils.spec 1 Feb 2006 20:57:04 -0000 1.36
+++ kdeutils.spec 12 Apr 2006 10:06:58 -0000 1.37
@@ -6,13 +6,17 @@
%define redhatify 1
%define qt_version 3.3.4
+%define kdelibs_epoch 6
+%define kdebase_epoch 6
+
+%define appdir %{_datadir}/applications/kde
%define disable_gcc_check_and_hidden_visibility 1
-Version: 3.5.1
+Version: 3.5.2
Release: 0.1.fc4
Name: kdeutils
-Prefix: /usr
+Prefix: %{_prefix}
Summary: K Desktop Environment - Utilities
Epoch: 6
License: GPL
@@ -24,8 +28,8 @@
Patch1: kdf-3.0.2-label.patch
Patch2: kde-libtool.patch
-Requires: kdelibs >= 6:%{version}
-Requires: kdebase >= 6:%{version}
+Requires: kdelibs >= %{kdelibs_epoch}:%{version}
+Requires: kdebase >= %{kdebase_epoch}:%{version}
Prereq: /sbin/ldconfig
@@ -50,6 +54,8 @@
Obsoletes: kregexpeditor
Obsoletes: kregexpeditor-devel
Obsoletes: ktimer
+Obsoletes: superkaramba
+Provides: superkaramba
%description
Utilities for the K Desktop Environment.
@@ -99,7 +105,7 @@
%package -n kcharselect
Summary: Character Selector
Group: User Interface/Desktops
-Requires: kdebase >= 3.0.4
+Requires: kdebase >= %{version}
Obsoletes: kdeutils
%description -n kcharselect
@@ -243,10 +249,6 @@
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
-export KDEDIR=%{prefix}
-export CXXFLAGS="$RPM_OPT_FLAGS"
-export CFLAGS="$RPM_OPT_FLAGS"
-
%if %{make_cvs}
make -f admin/Makefile.common cvs
%endif
@@ -277,28 +279,28 @@
make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
# Show only in KDE
for i in kcalc kregexpeditor Kjots ktimer kdf kcmdf ksim KFloppy KEdit \
- KCharSelect ark kwalletmanager kwalletconfig \
- irkick kcmlirc laptop pcmcia kvaio thinkpad ; do
- if [ -f $RPM_BUILD_ROOT%{_datadir}/applications/kde/$i.desktop ] ; then
- echo "OnlyShowIn=KDE;" >> $RPM_BUILD_ROOT%{_datadir}/applications/kde/$i.desktop
+ KCharSelect ark kwalletmanager kwalletconfig \
+ irkick kcmlirc laptop pcmcia kvaio thinkpad kwikdisk ; do
+ if [ -f %{buildroot}%{appdir}/$i.desktop ] ; then
+ echo "OnlyShowIn=KDE;" >> %{buildroot}%{appdir}/$i.desktop
fi
done
# Make symlinks relative
-pushd $RPM_BUILD_ROOT%{_docdir}/HTML/en
+pushd %{buildroot}%{_docdir}/HTML/en
for i in *; do
[ -d $i -a -L $i/common ] && ln -sf ../common $i
done
popd
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%post -p /sbin/ldconfig
@@ -327,6 +329,9 @@
%{_includedir}/kde/*
%changelog
+* Wed Apr 12 2006 Than Ngo <than at redhat.com> 6:3.5.2-0.1.fc4
+- update to 3.5.2
+
* Wed Feb 01 2006 Than Ngo <than at redhat.com> 6:3.5.1-0.1.fc4
- 3.5.1
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeutils/FC-4/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources 1 Feb 2006 20:57:04 -0000 1.28
+++ sources 12 Apr 2006 10:06:58 -0000 1.29
@@ -1 +1 @@
-1286c6a09b04452adfe492de2fad79bd kdeutils-3.5.1.tar.bz2
+08c01d6ceb8fb2173463838e43f986f5 kdeutils-3.5.2.tar.bz2
More information about the fedora-cvs-commits
mailing list