Author: glen Date: Wed Dec 7 00:45:34 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- apply branch diff
- adapterized
- rel 3
---- Files affected:
SPECS:
kdebase.spec (1.476 -> 1.477)
---- Diffs:
================================================================
Index: SPECS/kdebase.spec
diff -u SPECS/kdebase.spec:1.476 SPECS/kdebase.spec:1.477
--- SPECS/kdebase.spec:1.476 Mon Nov 28 15:50:01 2005
+++ SPECS/kdebase.spec Wed Dec 7 01:45:28 2005
@@ -27,7 +27,7 @@
Summary(zh_CN): KDEşËĐÄ
Name: kdebase
Version: %{_ver}
-Release: 2
+Release: 3
Epoch: 9
License: GPL
Group: X11/Applications
@@ -46,7 +46,7 @@
# Source10-md5: 5b113fe35bd3a46de31e451e285e86d3
Source13:
ftp://ftp.pld-linux.org/software/kde/%{name}-konqsidebartng-PLD-entries-0.1.tar.bz2
# Source13-md5: c8b947bc3e8a2ac050d9e9548cf585fc
-#Patch100: %{name}-branch.diff
+Patch100: %{name}-branch.diff
Patch0: kde-common-PLD.patch
Patch1: %{name}-fontdir.patch
Patch2: %{name}-kcm_background.patch
@@ -115,7 +115,7 @@
BuildRequires: sed >= 4.0
#BuildRequires: unsermake >= 040511
BuildRequires: xcursor-devel >= 1.1.0
-BuildConflicts: kdebase-konqueror-libs
+BuildConflicts: kdebase-konqueror-libs
Conflicts: kdelibs < 9:3.1.94.040110-1
# TODO: sensors
#BuildRequires: sensors-devel
@@ -523,7 +523,7 @@
- Frontend dla programu "su".
%package desktop
-Summary: KDesktop - handling of desktop icons, popup menus etc.
+Summary: KDesktop - handling of desktop icons, popup menus etc
Summary(pl): KDesktop - obsługa ikon na pulpicie, menu itp.
Group: X11/Applications
Provides: kdebase-kicker
@@ -915,7 +915,7 @@
Summary: KDE Display Manager
Summary(pl): Zarządca ekranów KDE
Group: X11/Applications
-PreReq: rc-scripts
+Requires: rc-scripts
Requires(post,preun): /sbin/chkconfig
Requires: kde-kgreet
Requires: %{name}-core = %{epoch}:%{version}-%{release}
@@ -1025,7 +1025,7 @@
%prep
%setup -q
-#%patch100 -p0
+%patch100 -p0
%patch0 -p1
%patch1 -p1
%patch2 -p1
@@ -1051,9 +1051,9 @@
cd kcontrol/ebrowsing/plugins/ikws/searchproviders
for i in google*.desktop
-do
+do
url=`grep 'Query=' $i|sed -e 's,google.com,google.pl,g'|cut -c 7-`
- echo "Query[pl]=${url}" >> $i
+ echo "Query[pl]=${url}" >> $i
done
cd -
@@ -2860,6 +2860,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.477 2005/12/07 00:45:28 glen
+- apply branch diff
+- adapterized
+- rel 3
+
Revision 1.476 2005/11/28 14:50:01 qboosh
- acl-devel dep belongs to kdelibs
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/kdebase.spec?r1=1.476&r2=1.477&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
