rpms/kdelibs/FC-4 kdelibs-3.5.2-aspell.patch, NONE, 1.1 kdelibs-3.5.2-cupsdconf2-group.patch, NONE, 1.1 .cvsignore, 1.31, 1.32 kdelibs.spec, 1.103, 1.104 sources, 1.43, 1.44 kdelibs-3.5.2-cups-api.patch, 1.1, NONE kdelibs-3.5.2-kdeprint.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Jun 1 21:38:12 UTC 2006
Author: than
Update of /cvs/dist/rpms/kdelibs/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv8893
Modified Files:
.cvsignore kdelibs.spec sources
Added Files:
kdelibs-3.5.2-aspell.patch
kdelibs-3.5.2-cupsdconf2-group.patch
Removed Files:
kdelibs-3.5.2-cups-api.patch kdelibs-3.5.2-kdeprint.patch
Log Message:
3.5.3
kdelibs-3.5.2-aspell.patch:
ksconfig.cpp | 2 ++
1 files changed, 2 insertions(+)
--- NEW FILE kdelibs-3.5.2-aspell.patch ---
--- kdelibs-3.5.2/kdeui/ksconfig.cpp.orig 2006-05-11 10:51:32.000000000 +0200
+++ kdelibs-3.5.2/kdeui/ksconfig.cpp 2006-05-11 10:57:00.000000000 +0200
@@ -508,6 +508,8 @@
// ASPELL_DATADIR default.
QFileInfo dir ( ASPELL_DATADIR );
if (!dir.exists() || !dir.isDir())
+ dir.setFile ("/usr/lib/aspell");
+ if (!dir.exists() || !dir.isDir())
dir.setFile ("/usr/lib/aspell-0.60");
if (!dir.exists() || !dir.isDir())
dir.setFile ("/usr/local/lib/aspell");
kdelibs-3.5.2-cupsdconf2-group.patch:
cupsd.conf.template | 4 ++--
cupsdconf.cpp | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE kdelibs-3.5.2-cupsdconf2-group.patch ---
--- kdelibs-3.5.2/kdeprint/cups/cupsdconf2/cupsd.conf.template.tn 2006-05-22 14:51:46.000000000 +0200
+++ kdelibs-3.5.2/kdeprint/cups/cupsdconf2/cupsd.conf.template 2006-05-22 15:27:27.000000000 +0200
@@ -275,9 +275,9 @@
# must be <b>sys</b>, however you can configure things for another
# group as needed.</p>
# <p>
-# <i>ex</i>: sys</p>
+# <i>ex</i>: lp</p>
$$
-#Group sys
+#Group lp
@@
%%ripcache
--- kdelibs-3.5.2/kdeprint/cups/cupsdconf2/cupsdconf.cpp.tn 2006-05-22 15:26:15.000000000 +0200
+++ kdelibs-3.5.2/kdeprint/cups/cupsdconf2/cupsdconf.cpp 2006-05-22 15:26:32.000000000 +0200
@@ -115,7 +115,7 @@
maxjobsperprinter_ = 0;
maxjobsperuser_ = 0;
user_ = "lp";
- group_ = "sys";
+ group_ = "lp";
ripcache_ = "8m";
filterlimit_ = 0;
browsing_ = true;
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/FC-4/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore 27 Jan 2006 13:55:21 -0000 1.31
+++ .cvsignore 1 Jun 2006 21:38:09 -0000 1.32
@@ -7,3 +7,4 @@
kdelibs-3.4.2.tar.bz2
kdelibs-3.5.0.tar.bz2
kdelibs-3.5.1.tar.bz2
+kdelibs-3.5.3.tar.bz2
Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/FC-4/kdelibs.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- kdelibs.spec 11 May 2006 10:24:43 -0000 1.103
+++ kdelibs.spec 1 Jun 2006 21:38:09 -0000 1.104
@@ -2,27 +2,27 @@
%define redhatify 1
%define debug 0
-%define final 0
+%define final 1
%define qt_epoch 1
%define arts_epoch 8
%define cups_epoch 1
%define qt_version 3.3.4
-%define arts_version 1.5.2
+%define arts_version 1.5.3
%define kde_major_version 3
%define qtdocdir %{_docdir}/qt-devel-%{qt_version}
-%define make_cvs 1
+%define make_cvs 0
%define fam 1
%define dnotify 1
%define pcre 1
%define alsa 1
%define arts 1
-Version: 3.5.2
-Release: 0.2.fc4
+Version: 3.5.3
+Release: 0.1.fc4
Summary: K Desktop Environment - Libraries
Name: kdelibs
Url: http://www.kde.org/
@@ -49,10 +49,7 @@
Patch34: kdelibs-3.4.0-qtdoc.patch
Patch35: kdelibs-3.4.92-inttype.patch
Patch36: kdelibs-3.5.2-kdebug-kmail-quiet.patch
-
-# upstream patches
-Patch100: kdelibs-3.5.2-kdeprint.patch
-Patch101: kdelibs-3.5.2-cups-api.patch
+Patch37: kdelibs-3.5.2-cupsdconf2-group.patch
%if %{arts}
Requires: arts >= %{arts_epoch}:%{arts_version}
@@ -113,6 +110,7 @@
BuildRequires: autoconf automake
Buildrequires: libacl-devel
Buildrequires: libattr-devel
+Buildrequires: aspell-devel
Obsoletes: %{name}2
Obsoletes: kdesupport
@@ -142,6 +140,7 @@
Requires: libtiff-devel
Requires: libidn-devel
Requires: libacl-devel
+Requires: aspell-devel
%if %{fam}
Requires: fam-devel
@@ -174,10 +173,7 @@
%patch34 -p1 -b .qtdoc
%patch35 -p1 -b .inttype
%patch36 -p1 -b .kdebug-kmail-quiet
-
-# upstream patches
-%patch100 -p1 -b .kdeprint
-%patch101 -p1 -b .cups-api
+%patch37 -p1 -b .cupsdconf2-group
# add redhat into KDE_VERSION_STRING
%if %{redhatify}
@@ -385,6 +381,9 @@
%doc %{_docdir}/HTML/en/kdelibs*
%changelog
+* Thu Jun 01 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.1.fc4
+- update to 3.5.3
+
* Fri Apr 07 2006 Than Ngo <than at redhat.com> 6:3.5.2-0.1.fc4
- update to 3.5.2
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/FC-4/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources 7 Apr 2006 21:44:00 -0000 1.43
+++ sources 1 Jun 2006 21:38:10 -0000 1.44
@@ -1 +1 @@
-367738696dc468859cf90d5a6e8f18a9 kdelibs-3.5.2.tar.bz2
+972c2c6855f912179bd7830bf2ed91d8 kdelibs-3.5.3.tar.bz2
--- kdelibs-3.5.2-cups-api.patch DELETED ---
--- kdelibs-3.5.2-kdeprint.patch DELETED ---
More information about the fedora-cvs-commits
mailing list