rpms/kpackagekit/devel kpackagekit-fedora.patch, NONE, 1.1 kpackagekit.spec, 1.2, 1.3
Steven M. Parrish (tuxbrewr)
fedora-extras-commits at redhat.com
Fri Aug 1 13:17:30 UTC 2008
- Previous message (by thread): rpms/perl-CGI-Session/EL-5 .cvsignore, 1.2, 1.3 perl-CGI-Session.spec, 1.1, 1.2 sources, 1.2, 1.3
- Next message (by thread): rpms/perl-CGI-Session/devel .cvsignore, 1.3, 1.4 perl-CGI-Session.spec, 1.4, 1.5 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: tuxbrewr
Update of /cvs/pkgs/rpms/kpackagekit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30522
Modified Files:
kpackagekit.spec
Added Files:
kpackagekit-fedora.patch
Log Message:
Fixed spelling and wording issues
kpackagekit-fedora.patch:
--- NEW FILE kpackagekit-fedora.patch ---
diff -crB KPackageKit/gui/AddRm/PkReviewChanges.cpp KPackageKit-fedora/gui/AddRm/PkReviewChanges.cpp
*** KPackageKit/gui/AddRm/PkReviewChanges.cpp 2008-07-06 23:44:11.000000000 -0400
--- KPackageKit-fedora/gui/AddRm/PkReviewChanges.cpp 2008-08-01 08:24:50.000000000 -0400
***************
*** 45,51 ****
m_pbTimer = new QTimer(this);
connect(m_pbTimer, SIGNAL( timeout() ), this, SLOT( updateProgress() ));
! label->setText( i18n("You selected the folowwing packages to be INSTALLED/REMOVED, press ok to proceed:") );
}
void PkReviewChanges::updateProgress()
--- 45,51 ----
m_pbTimer = new QTimer(this);
connect(m_pbTimer, SIGNAL( timeout() ), this, SLOT( updateProgress() ));
! label->setText( i18n("The folowing packages will be INSTALLED/REMOVED, Apply to continue:") );
}
void PkReviewChanges::updateProgress()
***************
*** 123,129 ****
connect( m_transactionDep, SIGNAL( GotPackage(Package *) ), m_pkgModelDep, SLOT( addUniquePackage(Package *) ) );
connect( m_transactionDep, SIGNAL( Finished(Exit::Value, uint) ), this, SLOT( depFinished(Exit::Value, uint) ) );
// Create a KProgressDialog to don't upset the user
! m_waitPD = new KProgressDialog(this, i18n("Wait - KPackageKit"), i18n("Checking dependant packages") );
m_waitPD->progressBar()->setMinimum(0);
m_waitPD->progressBar()->setMaximum(0);
m_waitPD->setAutoClose(false);
--- 123,129 ----
connect( m_transactionDep, SIGNAL( GotPackage(Package *) ), m_pkgModelDep, SLOT( addUniquePackage(Package *) ) );
connect( m_transactionDep, SIGNAL( Finished(Exit::Value, uint) ), this, SLOT( depFinished(Exit::Value, uint) ) );
// Create a KProgressDialog to don't upset the user
! m_waitPD = new KProgressDialog(this, i18n("Wait - KPackageKit"), i18n("Checking for dependencies") );
m_waitPD->progressBar()->setMinimum(0);
m_waitPD->progressBar()->setMaximum(0);
m_waitPD->setAutoClose(false);
***************
*** 154,160 ****
delete m_waitPD;
m_waitPD = 0;
if ( m_pkgModelReq->rowCount( QModelIndex() ) > 0 ) {
! PkRequirements *requimentD = new PkRequirements( i18n("The following packages must also be removed"), m_pkgModelReq, this );
connect( requimentD, SIGNAL( okClicked() ), this, SLOT( removePackages() ) );
connect( requimentD, SIGNAL( cancelClicked() ), this, SLOT( close() ) );
requimentD->show();
--- 154,160 ----
delete m_waitPD;
m_waitPD = 0;
if ( m_pkgModelReq->rowCount( QModelIndex() ) > 0 ) {
! PkRequirements *requimentD = new PkRequirements( i18n("The following packages will also be removed for depenencies"), m_pkgModelReq, this );
connect( requimentD, SIGNAL( okClicked() ), this, SLOT( removePackages() ) );
connect( requimentD, SIGNAL( cancelClicked() ), this, SLOT( close() ) );
requimentD->show();
***************
*** 200,206 ****
delete m_waitPD;
m_waitPD = 0;
if ( m_pkgModelDep->rowCount( QModelIndex() ) > 0 ) {
! PkRequirements *requimentD = new PkRequirements( i18n("The following packages must also be installed"), m_pkgModelDep, this );
connect( requimentD, SIGNAL( okClicked() ), this, SLOT( installPackages() ) );
connect( requimentD, SIGNAL( cancelClicked() ), this, SLOT( close() ) );
requimentD->show();
--- 200,206 ----
delete m_waitPD;
m_waitPD = 0;
if ( m_pkgModelDep->rowCount( QModelIndex() ) > 0 ) {
! PkRequirements *requimentD = new PkRequirements( i18n("The following packages will also be installed as dependencies"), m_pkgModelDep, this );
connect( requimentD, SIGNAL( okClicked() ), this, SLOT( installPackages() ) );
connect( requimentD, SIGNAL( cancelClicked() ), this, SLOT( close() ) );
requimentD->show();
***************
*** 239,245 ****
void PkReviewChanges::remFinished(bool error)
{
if (error) {
! KMessageBox::error( this, i18n("Sorry an error ocoured"), i18n("Erro KPackageKit") );
setButtons( KDialog::Close );
}
else {
--- 239,245 ----
void PkReviewChanges::remFinished(bool error)
{
if (error) {
! KMessageBox::error( this, i18n("Sorry an error occured"), i18n("Erro KPackageKit") );
setButtons( KDialog::Close );
}
else {
***************
*** 251,257 ****
void PkReviewChanges::addFinished(bool error)
{
if (error) {
! KMessageBox::error( this, i18n("Sorry an error ocoured"), i18n("Erro KPackageKit") );
setButtons( KDialog::Close );
}
else {
--- 251,257 ----
void PkReviewChanges::addFinished(bool error)
{
if (error) {
! KMessageBox::error( this, i18n("Sorry an error occured"), i18n("Erro KPackageKit") );
setButtons( KDialog::Close );
}
else {
diff -crB KPackageKit/gui/Common/PkStrings.cpp KPackageKit-fedora/gui/Common/PkStrings.cpp
*** KPackageKit/gui/Common/PkStrings.cpp 2008-07-06 23:44:12.000000000 -0400
--- KPackageKit-fedora/gui/Common/PkStrings.cpp 2008-08-01 08:20:16.000000000 -0400
***************
*** 57,63 ****
case Status::Cleanup :
return i18n("Cleaning Up");
case Status::Obsolete :
! return i18n("Obsoletiong");
case Status::Dep_resolve :
return i18n("Resolving dependencies");
case Status::Rollback :
--- 57,63 ----
case Status::Cleanup :
return i18n("Cleaning Up");
case Status::Obsolete :
! return i18n("Obsoleting");
case Status::Dep_resolve :
return i18n("Resolving dependencies");
case Status::Rollback :
***************
*** 125,131 ****
case Error::Failed_initialization :
return i18n("Failed to initialize");
case Error::Failed_finalise :
! return i18n("Failed to finalise");
case Error::Failed_config_parsing :
return i18n("Reading the config file failed");
case Error::Cannot_cancel :
--- 125,131 ----
case Error::Failed_initialization :
return i18n("Failed to initialize");
case Error::Failed_finalise :
! return i18n("Failed to finalize");
case Error::Failed_config_parsing :
return i18n("Reading the config file failed");
case Error::Cannot_cancel :
diff -crB KPackageKit/gui/Updater/PkUpdate.ui KPackageKit-fedora/gui/Updater/PkUpdate.ui
*** KPackageKit/gui/Updater/PkUpdate.ui 2008-06-29 18:35:03.000000000 -0400
--- KPackageKit-fedora/gui/Updater/PkUpdate.ui 2008-08-01 08:10:11.000000000 -0400
***************
*** 42,48 ****
<item row="1" column="1" >
<widget class="QPushButton" name="refreshPB" >
<property name="text" >
! <string>Refresh</string>
</property>
</widget>
</item>
--- 42,48 ----
<item row="1" column="1" >
<widget class="QPushButton" name="refreshPB" >
<property name="text" >
! <string>Check for Updates</string>
</property>
</widget>
</item>
Index: kpackagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/devel/kpackagekit.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kpackagekit.spec 24 Jul 2008 19:08:19 -0000 1.2
+++ kpackagekit.spec 1 Aug 2008 13:17:00 -0000 1.3
@@ -2,13 +2,14 @@
Name: kpackagekit
Version: 0.1
-Release: 0.3.%{?betaversion}
+Release: 0.4%{?betaversion}
Summary: KDE interface for PackageKit
License: GPLv2+
Group: Applications/System
Source0: http://www.kde-apps.org/CONTENT/content-files/84745-kpackagekit-%{version}-%{betaversion}.tar.bz2
URL: http://www.kde-apps.org/content/show.php/KPackageKit?content=84745
+PATCH0: kpackagekit-fedora.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -25,6 +26,7 @@
%prep
%setup -q -n KPackageKit/gui
+%patch0 -p2 -b .generic
%build
%{cmake_kde4} .
@@ -45,12 +47,15 @@
%{_kde4_datadir}/kde4/services/kded/*.desktop
%changelog
-* Thu Jul 24 2008 Steven M. Parrish <smparrish at shallowcreek.net> 0.1-0.3.b3
+* Thu Jul 31 2008 Steven M. Parrish <smparrish at shallowcreek.net> 0.1-0.4b3
+- Changed wording on serveral windows to make them better understood
+
+* Thu Jul 24 2008 Steven M. Parrish <smparrish at shallowcreek.net> 0.1-0.3b3
- Removed additional uneeded BRs
-* Tue Jul 22 2008 Steven M. Parrish <smparrish at shallowcreek.net> 0.1-0.2.b3
+* Tue Jul 22 2008 Steven M. Parrish <smparrish at shallowcreek.net> 0.1-0.2b3
- Removed uneeded BRs
- Made use of predefined macros
-* Wed Jul 16 2008 Steven M. Parrish <smparrish at shallowcreek.net> 0.1-0.1.b3
+* Wed Jul 16 2008 Steven M. Parrish <smparrish at shallowcreek.net> 0.1-0.1b3
- Initial SPEC file
- Previous message (by thread): rpms/perl-CGI-Session/EL-5 .cvsignore, 1.2, 1.3 perl-CGI-Session.spec, 1.1, 1.2 sources, 1.2, 1.3
- Next message (by thread): rpms/perl-CGI-Session/devel .cvsignore, 1.3, 1.4 perl-CGI-Session.spec, 1.4, 1.5 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list