openSUSE Commits
Threads by month
- ----- 2024 -----
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
November 2010
- 1 participants
- 1023 discussions
Hello community,
here is the log from the commit of package klamav for openSUSE:Factory
checked in at Mon Nov 15 23:52:00 CET 2010.
--------
--- KDE/klamav/klamav.changes 2009-11-20 21:06:19.000000000 +0100
+++ klamav/klamav.changes 2010-11-15 16:08:05.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Nov 15 15:06:24 UTC 2010 - wstephenson(a)novell.com
+
+- Add patches from Debian to disable functions not working under
+ KDE 4 and disable auto-update (bnc#426963)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
01_kdepot.patch
03_no_update_software_config_section.patch
04_fix_french_translation.patch
08-use-default-database-path.patch
09-disable-autoscan.patch
10-fix-window-size.patch
11_desktop_directory.diff
12_no_mediaslave.diff
13_ltmail.sh_fix.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ klamav.spec ++++++
--- /var/tmp/diff_new_pack.pvJyf5/_old 2010-11-15 18:40:00.000000000 +0100
+++ /var/tmp/diff_new_pack.pvJyf5/_new 2010-11-15 18:40:00.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package klamav (Version 0.46)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -24,16 +24,25 @@
BuildRequires: fdupes
%endif
Url: http://klamav.sourceforge.net/
-License: GPL v2 or later
+License: GPLv2+
Group: Productivity/Security
Summary: Frontend for clamav
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Version: 0.46
-Release: 3
+Release: 10
Source0: klamav-%{version}-source.tar.bz2
Patch4: external-sqlite.diff
Patch7: build-c.diff
Patch8: klamav-gcc43.diff
+Patch9: 01_kdepot.patch
+Patch10: 03_no_update_software_config_section.patch
+Patch11: 04_fix_french_translation.patch
+Patch12: 08-use-default-database-path.patch
+Patch13: 09-disable-autoscan.patch
+Patch14: 10-fix-window-size.patch
+Patch15: 11_desktop_directory.diff
+Patch16: 12_no_mediaslave.diff
+Patch17: 13_ltmail.sh_fix.diff
%description
A KDE front-end for the Clam AntiVirus antivirus toolkit.
@@ -49,6 +58,15 @@
%patch4
%patch7
%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
. /etc/opt/kde3/common_options
rm -rf src/klamd src/sqlite
update_admin
++++++ 01_kdepot.patch ++++++
diff -Nur -x '*.orig' -x '*~' klamav-0.44/admin/cvs.sh klamav-0.44.new/admin/cvs.sh
--- klamav-0.44/admin/cvs.sh 2008-07-06 08:05:42.000000000 -0400
+++ klamav-0.44.new/admin/cvs.sh 2008-07-07 12:57:21.000000000 -0400
@@ -537,6 +537,8 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS
+kdepotpath=/usr/include/kde/kde.pot
+
for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir"
(cd $subdir
@@ -554,7 +556,6 @@
fi
perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
- kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
if ! test -f $kdepotpath; then
kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
fi
++++++ 03_no_update_software_config_section.patch ++++++
diff -Nur -x '*.orig' -x '*~' klamav-0.44/src/freshklam.cpp klamav-0.44.new/src/freshklam.cpp
--- klamav-0.44/src/freshklam.cpp 2008-07-06 08:05:42.000000000 -0400
+++ klamav-0.44.new/src/freshklam.cpp 2008-07-07 13:03:56.000000000 -0400
@@ -113,51 +113,51 @@
KDialog::spacingHint(), "vbox");
//Proxy Widget
- QGroupBox *software_group = new QGroupBox(i18n("Software Updates"), this);
- vbox->addWidget(software_group);
+// QGroupBox *software_group = new QGroupBox(i18n("Software Updates"), this);
+// vbox->addWidget(software_group);
- QGridLayout *software_layout = new QGridLayout( software_group, 5, 2, KDialog::spacingHint(),
- KDialog::spacingHint(), "software_layout");
- software_layout->addRowSpacing(0, software_group->fontMetrics().height());
- software_layout->setColStretch(0, 1);
- software_layout->setColStretch(1, 1);
+// QGridLayout *software_layout = new QGridLayout( software_group, 5, 2, KDialog::spacingHint(),
+// KDialog::spacingHint(), "software_layout");
+// software_layout->addRowSpacing(0, software_group->fontMetrics().height());
+// software_layout->setColStretch(0, 1);
+// software_layout->setColStretch(1, 1);
//Dazuko
- QWidget *dazuko_hlp = new QWidget( software_group );
- software_layout->addMultiCellWidget(dazuko_hlp, 1,2, 0,2);
- QGridLayout *dazuko_dir_layout = new QGridLayout(dazuko_hlp,2,2, KDialog::spacingHint() );
-
-
- clamav_box = new QCheckBox(i18n("Update ClamAV Automatically"), dazuko_hlp);
- clamav_box->setMinimumWidth(clamav_box->sizeHint().width());
- dazuko_dir_layout->addWidget(clamav_box,0,0);
-
- klamav_box = new QCheckBox(i18n("Update KlamAV Automatically"), dazuko_hlp);
- klamav_box->setMinimumWidth(klamav_box->sizeHint().width());
- dazuko_dir_layout->addWidget(klamav_box,0,1);
+// QWidget *dazuko_hlp = new QWidget( software_group );
+// software_layout->addMultiCellWidget(dazuko_hlp, 1,2, 0,2);
+// QGridLayout *dazuko_dir_layout = new QGridLayout(dazuko_hlp,2,2, KDialog::spacingHint() );
+
+
+// clamav_box = new QCheckBox(i18n("Update ClamAV Automatically"), dazuko_hlp);
+// clamav_box->setMinimumWidth(clamav_box->sizeHint().width());
+// dazuko_dir_layout->addWidget(clamav_box,0,0);
+
+// klamav_box = new QCheckBox(i18n("Update KlamAV Automatically"), dazuko_hlp);
+// klamav_box->setMinimumWidth(klamav_box->sizeHint().width());
+// dazuko_dir_layout->addWidget(klamav_box,0,1);
- clamav_options = new QPushButton (i18n( "Upgrade ClamAV Now" ), dazuko_hlp);
- dazuko_dir_layout->addWidget(clamav_options,1,0);
- clamav_options->setFixedSize(clamav_options->sizeHint());
- connect( clamav_options, SIGNAL( clicked() ), this,
- SLOT( checkForNewClamAVNow() ) );
-
- klamav_options = new QPushButton (i18n( "Upgrade KlamAV Now" ), dazuko_hlp);
- dazuko_dir_layout->addWidget(klamav_options,1,1);
- klamav_options->setFixedSize(klamav_options->sizeHint());
- connect( klamav_options, SIGNAL( clicked() ), this,
- SLOT( checkForNewKlamAVNow() ) );
-
-#ifdef DISABLE_UPDATES
- clamav_box->setEnabled(false);
- klamav_box->setEnabled(false);
- clamav_options->setEnabled(false);
- klamav_options->setEnabled(false);
-#endif
+// clamav_options = new QPushButton (i18n( "Upgrade ClamAV Now" ), dazuko_hlp);
+// dazuko_dir_layout->addWidget(clamav_options,1,0);
+// clamav_options->setFixedSize(clamav_options->sizeHint());
+// connect( clamav_options, SIGNAL( clicked() ), this,
+// SLOT( checkForNewClamAVNow() ) );
+
+// klamav_options = new QPushButton (i18n( "Upgrade KlamAV Now" ), dazuko_hlp);
+// dazuko_dir_layout->addWidget(klamav_options,1,1);
+// klamav_options->setFixedSize(klamav_options->sizeHint());
+// connect( klamav_options, SIGNAL( clicked() ), this,
+// SLOT( checkForNewKlamAVNow() ) );
+
+//#ifdef DISABLE_UPDATES
+// clamav_box->setEnabled(false);
+// klamav_box->setEnabled(false);
+// clamav_options->setEnabled(false);
+// klamav_options->setEnabled(false);
+//#endif
//Virus Database Directory
QGroupBox *group = new QGroupBox(i18n("Virus Database Directory"), this);
vbox->addWidget(group);
@@ -361,18 +361,18 @@
pos2 = item2.find('\n',pos);
QString version = item2.mid((pos+20),pos2 - (pos+20)).stripWhiteSpace();
- if ((clamav_box->isChecked())){
+// if ((clamav_box->isChecked())){
- int result = KMessageBox::warningContinueCancel(this, i18n( "It looks like your version of the ClamAV engine is out of date! ClamAV-%1 is the most recent version of ClamAV available. Would you like to KlamAV to download and compile it for you?").arg(version),i18n( "Download and Install ClamAV-%1" ).arg(version),i18n( "Download and Install ClamAV-%1" ).arg(version));
+ //int result = KMessageBox::warningContinueCancel(this, i18n( "It looks like your version of the ClamAV engine is out of date! ClamAV-%1 is the most recent version of ClamAV available. Would you like to KlamAV to download and compile it for you?").arg(version),i18n( "Download and Install ClamAV-%1" ).arg(version),i18n( "Download and Install ClamAV-%1" ).arg(version));
- switch (result) {
- case 2 :
- break;
- case 5 :
- updater->downloadComponent("clamav",version,"tar.gz");
- }
- }else if (!(clamav_box->isChecked()))
- KNotifyClient::event(kmain->_tray->winId(),"ClamAVOutDated", QString("Your copy of ClamAV is out of date! Please Upgrade to ClamAV %1!").arg(version));
+// switch (result) {
+// case 2 :
+// break;
+// case 5 :
+// updater->downloadComponent("clamav",version,"tar.gz");
+// }
+// }else if (!(clamav_box->isChecked()))
+// KNotifyClient::event(kmain->_tray->winId(),"ClamAVOutDated", QString("Your copy of ClamAV is out of date! Please Upgrade to ClamAV %1!").arg(version));
}
@@ -722,20 +722,20 @@
check_combo->setEnabled(false);
}
- if ((config->readEntry("AutoUpdateClamAV")) == "Yes"){
- clamav_box->setChecked(true);
- }else{
- clamav_box->setChecked(false);
- }
+// if ((config->readEntry("AutoUpdateClamAV")) == "Yes"){
+// clamav_box->setChecked(true);
+// }else{
+// clamav_box->setChecked(false);
+// }
+
+// if ((config->readEntry("AutoUpdateKlamAV")) == "Yes"){
+// klamav_box->setChecked(true);
+// }else{
+// klamav_box->setChecked(false);
+// }
- if ((config->readEntry("AutoUpdateKlamAV")) == "Yes"){
- klamav_box->setChecked(true);
- }else{
- klamav_box->setChecked(false);
- }
-
- connect( clamav_box, SIGNAL(toggled(bool)), SLOT(handleChecks()) );
- connect( klamav_box, SIGNAL(toggled(bool)), SLOT(handleChecks()) );
+// connect( clamav_box, SIGNAL(toggled(bool)), SLOT(handleChecks()) );
+// connect( klamav_box, SIGNAL(toggled(bool)), SLOT(handleChecks()) );
connect( daemon_box, SIGNAL(toggled(bool)), SLOT(handleChecks()) );
connect( check_combo, SIGNAL(activated(int)), SLOT(handleChecks()) );
@@ -758,17 +758,17 @@
}
config->writeEntry("NoOfUpdates", check_combo->currentText());
- if (clamav_box->isChecked()){
- config->writeEntry("AutoUpdateClamAV","Yes");
- }else{
- config->writeEntry("AutoUpdateClamAV","No");
- }
-
- if (klamav_box->isChecked()){
- config->writeEntry("AutoUpdateKlamAV","Yes");
- }else{
- config->writeEntry("AutoUpdateKlamAV","No");
- }
+// if (clamav_box->isChecked()){
+// config->writeEntry("AutoUpdateClamAV","Yes");
+// }else{
+// config->writeEntry("AutoUpdateClamAV","No");
+// }
+
+// if (klamav_box->isChecked()){
+// config->writeEntry("AutoUpdateKlamAV","Yes");
+// }else{
+// config->writeEntry("AutoUpdateKlamAV","No");
+// }
config->sync();
}
@@ -923,17 +923,17 @@
}
-void Freshklam::checkForNewClamAVNow()
-{
-
- updater->checkForNewClamAVDirectly();
-}
-
-void Freshklam::checkForNewKlamAVNow()
-{
-
- updater->checkForNewKlamAVDirectly();
-}
+//void Freshklam::checkForNewClamAVNow()
+//{
+//
+// updater->checkForNewClamAVDirectly();
+//}
+
+//void Freshklam::checkForNewKlamAVNow()
+//{
+//
+// updater->checkForNewKlamAVDirectly();
+//}
void
Freshklam::checkInternet() //SLOT
@@ -963,11 +963,11 @@
Freshklam::resolved( KResolverResults result) // SLOT
{
- if ((!( result.error() != KResolver::NoError || result.isEmpty() ))
- && klamav_box->isChecked()){
- updater->checkForNewKlamAV();
- }else
- kdDebug() << "network error or not set to check for new klamav" << endl;
+// if ((!( result.error() != KResolver::NoError || result.isEmpty() ))
+// && klamav_box->isChecked()){
+// updater->checkForNewKlamAV();
+// }else
+// kdDebug() << "network error or not set to check for new klamav" << endl;
}
@@ -1025,8 +1025,8 @@
void Freshklam::toggleUpgradeButtons(bool state)
{
- klamav_options->setEnabled(state);
- clamav_options->setEnabled(state);
+// klamav_options->setEnabled(state);
+// clamav_options->setEnabled(state);
}
diff -Nur -x '*.orig' -x '*~' klamav-0.44/src/freshklam.h klamav-0.44.new/src/freshklam.h
--- klamav-0.44/src/freshklam.h 2008-07-06 08:05:42.000000000 -0400
+++ klamav-0.44.new/src/freshklam.h 2008-07-07 13:03:56.000000000 -0400
@@ -112,7 +112,7 @@
public slots:
void slotSearch();
void slotCancel();
- void checkForNewClamAVNow();
+ //void checkForNewClamAVNow();
void getCurrentVersionOfClamAV( );
void toggleUpgradeButtons(bool);
private slots:
@@ -128,7 +128,7 @@
void clamavInstallationExited(KProcess *arkollonproc);*/
//void newItems( const KFileItemList& );
void resolved(KResolverResults result);
- void checkForNewKlamAVNow();
+ //void checkForNewKlamAVNow();
void readVersionLine(KProcIO *);
/* void parseSFPage();
void parseSFPageHack();*/
diff -Nur -x '*.orig' -x '*~' klamav-0.44/src/klamav.cpp klamav-0.44.new/src/klamav.cpp
--- klamav-0.44/src/klamav.cpp 2008-07-06 08:05:42.000000000 -0400
+++ klamav-0.44.new/src/klamav.cpp 2008-07-07 13:03:56.000000000 -0400
@@ -151,7 +151,7 @@
freshklam->slotSearch();
}
if (downloadClamAVForWizard)
- freshklam->checkForNewClamAVNow();
+// freshklam->checkForNewClamAVNow();
//klamdb->shouldIShow();
CollectionDB::instance()->insertEvent("Launch","KlamAV Launched");
++++++ 04_fix_french_translation.patch ++++++
diff -Nur -x '*.orig' -x '*~' klamav-0.44/po/fr.po klamav-0.44.new/po/fr.po
--- klamav-0.44/po/fr.po 2008-07-06 08:05:42.000000000 -0400
+++ klamav-0.44.new/po/fr.po 2008-07-07 13:04:30.000000000 -0400
@@ -554,7 +554,7 @@
"<p>This wizard will help you setup KlamAV in one simple step. Click <i>Next</i> to begin, or if you do not like wizards, click <i>Skip</i>.</p>\n"
"\n"
msgstr ""
-"<h1>Bienvenu à KlamAV!</h1>\n"
+"<h1>Bienvenue dans KlamAV!</h1>\n"
"<p>KlamAV vise à être facile et intuitif à utiliser. Cependant, avant que vous ne démarriez, vous avez besoin de spécifier à KlamAV où vous voulez sauvegarder deux choses.</p>\n"
"<p align=\"right\"><i>\"KlamAV est un programme en cours de développement!\"</i> - L'auteur</p>\n"
"<h2>Qu'est ce que ClamAV?</h2>\n"
@@ -1687,7 +1687,7 @@
#: sigtool.cpp:84
msgid "This will help you configure your email client to scan incoming and outgoing mail with KlamAV. Not all mail clients are fully supported yet. Infected mail is clearly marked as such and is wrapped in another email from KlamAV telling you the name of the virus and other relevant details."
-msgstr "Ceci vous aidera à configurer votre client email à scanner les emails entrants et sortants avec KlamAV. Tous les clients email ne sont pas encore totalement supportés. Un email infecté est clairement marqué comme tel et est incorporé dans un autre email provenant de KlamAV qui vous donne le nom du virus et d'autres détails pertinents."
+msgstr "Vous pourrez ici configurer votre client email pour scanner les emails entrants et sortants avec KlamAV. Le support de tous les clients mail n'est pas encore total. Un email contenant un virus sera sera inclus dans un autre email provenant de KlamAV qui vous donne le nom du virus et d'autres informations pertinentes."
#: sigtool.cpp:86
msgid "Notes"
++++++ 08-use-default-database-path.patch ++++++
# Patch from Atomo64.
# Thanks to him.
diff -Nur -x '*.orig' -x '*~' klamav-0.44/src/firstrunwizard.ui klamav-0.44.new/src/firstrunwizard.ui
--- klamav-0.44/src/firstrunwizard.ui 2008-07-06 08:05:42.000000000 -0400
+++ klamav-0.44.new/src/firstrunwizard.ui 2008-07-07 13:13:06.000000000 -0400
@@ -152,50 +152,6 @@
</rect>
</property>
</spacer>
- <widget class="QCheckBox">
- <property name="name">
- <cstring>CheckForDatabaseUpdates</cstring>
- </property>
- <property name="geometry">
- <rect>
- <x>16</x>
- <y>300</y>
- <width>430</width>
- <height>30</height>
- </rect>
- </property>
- <property name="text">
- <string>Check for &updates to the signature database now.</string>
- </property>
- <property name="accel">
- <string>Alt+U</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
- <widget class="QCheckBox">
- <property name="name">
- <cstring>CheckForClamAVUpdates</cstring>
- </property>
- <property name="geometry">
- <rect>
- <x>466</x>
- <y>300</y>
- <width>340</width>
- <height>30</height>
- </rect>
- </property>
- <property name="text">
- <string>Check for updates &to ClamAV now.</string>
- </property>
- <property name="accel">
- <string>Alt+T</string>
- </property>
- <property name="checked">
- <bool>false</bool>
- </property>
- </widget>
<widget class="QGroupBox">
<property name="name">
<cstring>groupBox1</cstring>
@@ -357,10 +313,55 @@
<enum>AtWordBoundary</enum>
</property>
</widget>
+ <widget class="QCheckBox">
+ <property name="name">
+ <cstring>CheckForDatabaseUpdates</cstring>
+ </property>
+ <property name="geometry">
+ <rect>
+ <x>16</x>
+ <y>300</y>
+ <width>430</width>
+ <height>30</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>Check for &updates to the signature database now.</string>
+ </property>
+ <property name="accel">
+ <string>Alt+U</string>
+ </property>
+ <property name="checked">
+ <bool>false</bool>
+ </property>
+ </widget>
+ <widget class="QCheckBox">
+ <property name="name">
+ <cstring>CheckForClamAVUpdates</cstring>
+ </property>
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="geometry">
+ <rect>
+ <x>466</x>
+ <y>300</y>
+ <width>340</width>
+ <height>30</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>Check for updates &to ClamAV now.</string>
+ </property>
+ <property name="accel">
+ <string>Alt+T</string>
+ </property>
+ <property name="checked">
+ <bool>false</bool>
+ </property>
+ </widget>
</widget>
</widget>
-<customwidgets>
-</customwidgets>
<includes>
<include location="local" impldecl="in implementation">firstrunwizard.ui.h</include>
</includes>
diff -Nur -x '*.orig' -x '*~' klamav-0.44/src/firstrunwizard.ui.h klamav-0.44.new/src/firstrunwizard.ui.h
--- klamav-0.44/src/firstrunwizard.ui.h 2008-07-06 08:05:42.000000000 -0400
+++ klamav-0.44.new/src/firstrunwizard.ui.h 2008-07-07 13:13:06.000000000 -0400
@@ -33,7 +33,7 @@
helpButton()->hide();
QString homepath = getenv("HOME");
- databasepath = homepath + "/.klamav/database";
+ databasepath = "/var/lib/clamav";
DatabaseLocation->setURL(databasepath);
quarantinepath = homepath + "/.klamav/quarantine";
diff -Nur -x '*.orig' -x '*~' klamav-0.44/src/freshklam.cpp klamav-0.44.new/src/freshklam.cpp
--- klamav-0.44/src/freshklam.cpp 2008-07-07 13:13:05.000000000 -0400
+++ klamav-0.44.new/src/freshklam.cpp 2008-07-07 13:13:06.000000000 -0400
@@ -261,6 +261,11 @@
if (!(config->readEntry("NoOfUpdates").isEmpty()))
check_combo->setCurrentText(config->readEntry("NoOfUpdates"));
check_combo->adjustSize();
+ // Debian patch
+ // If /var/lib/clamav is the signatures directory, disable the update options
+ // because it is more likely the user doesn't have write access to those files
+ if (strcmp(lastDownloadPaths[0].ascii(),"/var/lib/clamav")==0||strcmp(lastDownloadPaths[0].ascii(),"/var/lib/clamav/")==0)
+ check_combo->setEnabled(false);
//check_combo->setFixedSize(check_combo->size());
daemon_check_layout->addWidget(check_combo);
@@ -276,7 +281,14 @@
vbox->addWidget(actionbox, 2, 0);
actionbox->addStretch();
search_button = actionbox->addButton(i18n("&Update Now"));
- search_button->setDefault(true);
+
+ // Debian patch
+ // If /var/lib/clamav is the signatures directory, disable the update options
+ // because it is more likely the user doesn't have write access to those files
+ if (strcmp(lastDownloadPaths[0].ascii(),"/var/lib/clamav")==0||strcmp(lastDownloadPaths[0].ascii(),"/var/lib/clamav/")==0) {
+ search_button->setDefault(false);
+ search_button->setEnabled(false);
+ } else search_button->setDefault(true);
cancel_button = actionbox->addButton(i18n("Cancel"));
cancel_button->setEnabled(false);
actionbox->addStretch();
++++++ 09-disable-autoscan.patch ++++++
diff -Nur -x '*.orig' -x '*~' klamav-0.45/src/configdialog.cpp klamav-0.45.new/src/configdialog.cpp
--- klamav-0.45/src/configdialog.cpp 2009-02-17 15:51:40.000000000 -0500
+++ klamav-0.45.new/src/configdialog.cpp 2009-02-18 15:11:45.000000000 -0500
@@ -61,7 +61,7 @@
addPage( m_archivelimits, i18n( "Archive Limits" ), "ark", i18n( "Configure Archive Limits" ) );
addPage( m_archivetypes, i18n( "Archive Types" ), "tgz", i18n( "Configure Archive Types" ) );
addPage( m_specialfiletypes, i18n( "File Types" ), "folder", i18n( "Configure File Types" ) );
- addPage( m_autoscanoptions, i18n( "Auto-Scan" ), "filefind", i18n( "Configure Auto-Scan" ) );
+ //addPage( m_autoscanoptions, i18n( "Auto-Scan" ), "filefind", i18n( "Configure Auto-Scan" ) );
addPage( m_logoptions, i18n( "Event Logging" ), "kate", i18n( "Configure Events to Log" ) );
QObjectList *list = queryList( "QLabel", "infoPixmap" );
diff -Nur -x '*.orig' -x '*~' klamav-0.45/src/klamav.cpp klamav-0.45.new/src/klamav.cpp
--- klamav-0.45/src/klamav.cpp 2009-02-18 15:11:44.000000000 -0500
+++ klamav-0.45.new/src/klamav.cpp 2009-02-18 15:18:36.000000000 -0500
@@ -52,24 +52,24 @@
connect(_tray,SIGNAL(quitSelected()),SLOT(shuttingDown()));
KPopupMenu *conf_menu = _tray->contextMenu();
- EnableKlamd = new KAction(i18n("&Enable Auto-Scan"), "klamav_on_acc_enabled", 0,this, SLOT(contextEnable()),actionCollection(),"klamd_enable");
- DisableKlamd = new KAction(i18n("&Disable Auto-Scan"),"klamav_on_acc_disabled", 0,this, SLOT(contextDisable()),actionCollection(),"klamd_disable");
+ //EnableKlamd = new KAction(i18n("&Enable Auto-Scan"), "klamav_on_acc_enabled", 0,this, SLOT(contextEnable()),actionCollection(),"klamd_enable");
+ //DisableKlamd = new KAction(i18n("&Disable Auto-Scan"),"klamav_on_acc_disabled", 0,this, SLOT(contextDisable()),actionCollection(),"klamd_disable");
EnableFreshklam = new KAction(i18n("&Enable Auto-Updates"), "klamav", 0,this, SLOT(contextEnableFK()),actionCollection(),"fk_enable");
DisableFreshklam = new KAction(i18n("&Disable Auto-Updates"),"klamavbw", 0,this, SLOT(contextDisableFK()),actionCollection(),"fk_disable");
EnableFreshklam->plug(conf_menu);
DisableFreshklam->plug(conf_menu);
- EnableKlamd->plug(conf_menu);
- DisableKlamd->plug(conf_menu);
+ //EnableKlamd->plug(conf_menu);
+ //DisableKlamd->plug(conf_menu);
QToolTip::add( _tray, i18n( "KlamAV - Virus Protection for KDE" ) );
_tray->show();
DisableFreshklam->setEnabled(FALSE);
EnableFreshklam->setEnabled(TRUE);
- DisableKlamd->setEnabled(FALSE);
- EnableKlamd->setEnabled(TRUE);
+ //DisableKlamd->setEnabled(FALSE);
+ //EnableKlamd->setEnabled(TRUE);
KConfig* config = KGlobal::config();
config->setGroup("Freshklam");
@@ -88,11 +88,11 @@
klamscan = new Klamscan(this);
tab->addTab(klamscan, i18n("&Scan"));
- klamd = new Klamd(this);
- tab->addTab(klamd, i18n("&Auto-Scan"));
+ //klamd = new Klamd(this);
+ //tab->addTab(klamd, i18n("&Auto-Scan"));
- connect(klamd->search_button,SIGNAL(clicked()),SLOT(contextEnable()));
- connect(klamd->cancel_button,SIGNAL(clicked()),SLOT(contextDisable()));
+ //connect(klamd->search_button,SIGNAL(clicked()),SLOT(contextEnable()));
+ //connect(klamd->cancel_button,SIGNAL(clicked()),SLOT(contextDisable()));
freshklam = new Freshklam(this);
@@ -172,14 +172,15 @@
}
bool Klamav::queryClose() {
- if ((klamd->isKlamdAlive()) || (freshklam->isFreshklamAlive())){
+/* if (freshklam->isFreshklamAlive()){
KMessageBox::information (this,i18n("<p>KlamAV will stay open in the system tray. <br><br>"
- " <b>Remember</b> - you can't close KlamAV while <br> auto-scanning "
- " and/or auto-updating are still running!</p>"),"KlamAV","dontshow");
+ " <b>Remember</b> - you can't close KlamAV while <br> "
+ " auto-updating is still running!</p>"),"KlamAV","dontshow");
hide();
return false;
}
+*/
return true;
}
@@ -213,8 +214,8 @@
_tray->setPixmap(KSystemTray::loadIcon("klamavbwdl"));
else*/
_tray->setPixmap(KSystemTray::loadIcon("klamav_on_acc_disabled"));
- DisableKlamd->setEnabled(FALSE);
- EnableKlamd->setEnabled(TRUE);
+ //DisableKlamd->setEnabled(FALSE);
+ //EnableKlamd->setEnabled(TRUE);
}
diff -Nur -x '*.orig' -x '*~' klamav-0.45/src/klamd.cpp klamav-0.45.new/src/klamd.cpp
--- klamav-0.45/src/klamd.cpp 2009-02-17 15:51:40.000000000 -0500
+++ klamav-0.45.new/src/klamd.cpp 2009-02-18 15:11:45.000000000 -0500
@@ -912,8 +912,8 @@
}
bool Klamd::isKlamdAlive(){
- if (klamdAlive)
- return true;
+ //if (klamdAlive)
+ // return true;
return false;
}
++++++ 10-fix-window-size.patch ++++++
diff -Nur -x '*.orig' -x '*~' klamav-0.44/src/archivelimits.ui klamav-0.44.new/src/archivelimits.ui
--- klamav-0.44/src/archivelimits.ui 2008-07-06 08:05:42.000000000 -0400
+++ klamav-0.44.new/src/archivelimits.ui 2008-07-07 13:14:05.000000000 -0400
@@ -8,7 +8,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>388</width>
+ <width>474</width>
<height>377</height>
</rect>
</property>
@@ -46,9 +46,9 @@
</property>
<property name="geometry">
<rect>
- <x>11</x>
- <y>11</y>
- <width>366</width>
+ <x>10</x>
+ <y>10</y>
+ <width>430</width>
<height>230</height>
</rect>
</property>
@@ -63,7 +63,7 @@
<rect>
<x>11</x>
<y>34</y>
- <width>350</width>
+ <width>400</width>
<height>160</height>
</rect>
</property>
diff -Nur -x '*.orig' -x '*~' klamav-0.44/src/archivetypes.ui klamav-0.44.new/src/archivetypes.ui
--- klamav-0.44/src/archivetypes.ui 2008-07-06 08:05:42.000000000 -0400
+++ klamav-0.44.new/src/archivetypes.ui 2008-07-07 13:14:05.000000000 -0400
@@ -35,7 +35,7 @@
<x>20</x>
<y>30</y>
<width>330</width>
- <height>284</height>
+ <height>320</height>
</rect>
</property>
<grid>
@@ -44,7 +44,7 @@
</property>
<widget class="QCheckBox" row="6" column="0">
<property name="name">
- <cstring>kcfg_ScanDeb</cstring>
+ <cstring>kcfg_ScanDeb</cstring>
</property>
<property name="text">
<string>Scan Deb files using</string>
@@ -55,7 +55,7 @@
</widget>
<widget class="QCheckBox" row="5" column="0">
<property name="name">
- <cstring>kcfg_ScanJar</cstring>
+ <cstring>kcfg_ScanJar</cstring>
</property>
<property name="text">
<string>Scan Jar files using</string>
@@ -66,7 +66,7 @@
</widget>
<widget class="QCheckBox" row="7" column="0">
<property name="name">
- <cstring>kcfg_ScanTar</cstring>
+ <cstring>kcfg_ScanTar</cstring>
</property>
<property name="text">
<string>Scan Tar files using</string>
@@ -77,7 +77,7 @@
</widget>
<widget class="QCheckBox" row="4" column="0">
<property name="name">
- <cstring>kcfg_ScanLzh</cstring>
+ <cstring>kcfg_ScanLzh</cstring>
</property>
<property name="text">
<string>Scan Lzh files using</string>
@@ -88,12 +88,12 @@
</widget>
<widget class="KURLComboRequester" row="7" column="1">
<property name="name">
- <cstring>kcfg_TarUsing</cstring>
+ <cstring>kcfg_TarUsing</cstring>
</property>
</widget>
<widget class="QCheckBox" row="3" column="0">
<property name="name">
- <cstring>kcfg_ScanZoo</cstring>
+ <cstring>kcfg_ScanZoo</cstring>
</property>
<property name="text">
<string>Scan Zoo files using</string>
@@ -104,22 +104,22 @@
</widget>
<widget class="KURLComboRequester" row="3" column="1">
<property name="name">
- <cstring>kcfg_ZooUsing</cstring>
+ <cstring>kcfg_ZooUsing</cstring>
</property>
</widget>
<widget class="KURLComboRequester" row="4" column="1">
<property name="name">
- <cstring>kcfg_LzhUsing</cstring>
+ <cstring>kcfg_LzhUsing</cstring>
</property>
</widget>
<widget class="KURLComboRequester" row="0" column="1">
<property name="name">
- <cstring>kcfg_ZipUsing</cstring>
+ <cstring>kcfg_ZipUsing</cstring>
</property>
</widget>
<widget class="QCheckBox" row="1" column="0">
<property name="name">
- <cstring>kcfg_ScanRar</cstring>
+ <cstring>kcfg_ScanRar</cstring>
</property>
<property name="text">
<string>Scan Rar files using</string>
@@ -130,7 +130,7 @@
</widget>
<widget class="QCheckBox" row="0" column="0">
<property name="name">
- <cstring>kcfg_ScanZip</cstring>
+ <cstring>kcfg_ScanZip</cstring>
</property>
<property name="text">
<string>Scan &Zip files using</string>
@@ -141,27 +141,27 @@
</widget>
<widget class="KURLComboRequester" row="5" column="1">
<property name="name">
- <cstring>kcfg_JarUsing</cstring>
+ <cstring>kcfg_JarUsing</cstring>
</property>
</widget>
<widget class="KURLComboRequester" row="1" column="1">
<property name="name">
- <cstring>kcfg_RarUsing</cstring>
+ <cstring>kcfg_RarUsing</cstring>
</property>
</widget>
<widget class="KURLComboRequester" row="6" column="1">
<property name="name">
- <cstring>kcfg_DebUsing</cstring>
+ <cstring>kcfg_DebUsing</cstring>
</property>
</widget>
<widget class="KURLComboRequester" row="8" column="1">
<property name="name">
- <cstring>kcfg_TgzUsing</cstring>
+ <cstring>kcfg_TgzUsing</cstring>
</property>
</widget>
<widget class="QCheckBox" row="8" column="0">
<property name="name">
- <cstring>kcfg_ScanTgz</cstring>
+ <cstring>kcfg_ScanTgz</cstring>
</property>
<property name="text">
<string>Scan Tgz files using</string>
@@ -172,12 +172,12 @@
</widget>
<widget class="KURLComboRequester" row="2" column="1">
<property name="name">
- <cstring>kcfg_ArjUsing</cstring>
+ <cstring>kcfg_ArjUsing</cstring>
</property>
</widget>
<widget class="QCheckBox" row="2" column="0">
<property name="name">
- <cstring>kcfg_ScanArj</cstring>
+ <cstring>kcfg_ScanArj</cstring>
</property>
<property name="text">
<string>Scan Arj files using</string>
diff -Nur -x '*.orig' -x '*~' klamav-0.44/src/autoscanoptions.ui klamav-0.44.new/src/autoscanoptions.ui
--- klamav-0.44/src/autoscanoptions.ui 2008-07-06 08:05:42.000000000 -0400
+++ klamav-0.44.new/src/autoscanoptions.ui 2008-07-07 13:14:05.000000000 -0400
@@ -8,7 +8,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>391</width>
+ <width>529</width>
<height>386</height>
</rect>
</property>
@@ -48,7 +48,7 @@
<rect>
<x>10</x>
<y>10</y>
- <width>370</width>
+ <width>460</width>
<height>180</height>
</rect>
</property>
@@ -113,7 +113,7 @@
<rect>
<x>10</x>
<y>25</y>
- <width>340</width>
+ <width>440</width>
<height>130</height>
</rect>
</property>
diff -Nur -x '*.orig' -x '*~' klamav-0.44/src/logoptions.ui klamav-0.44.new/src/logoptions.ui
--- klamav-0.44/src/logoptions.ui 2008-07-06 08:05:42.000000000 -0400
+++ klamav-0.44.new/src/logoptions.ui 2008-07-07 13:14:05.000000000 -0400
@@ -38,7 +38,7 @@
<rect>
<x>12</x>
<y>69</y>
- <width>161</width>
+ <width>330</width>
<height>21</height>
</rect>
</property>
@@ -48,13 +48,52 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
+ <cstring>layout5</cstring>
+ </property>
+ <property name="geometry">
+ <rect>
+ <x>12</x>
+ <y>17</y>
+ <width>350</width>
+ <height>40</height>
+ </rect>
+ </property>
+ <grid>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QSpinBox" row="0" column="1">
+ <property name="name">
+ <cstring>kcfg_ExpireDays</cstring>
+ </property>
+ </widget>
+ <widget class="QLabel" row="0" column="0">
+ <property name="name">
+ <cstring>MaxMBsEx</cstring>
+ </property>
+ <property name="text">
+ <string>Expire events after</string>
+ </property>
+ </widget>
+ <widget class="QLabel" row="0" column="2">
+ <property name="name">
+ <cstring>MaxMBsEx_2</cstring>
+ </property>
+ <property name="text">
+ <string>day(s)</string>
+ </property>
+ </widget>
+ </grid>
+ </widget>
+ <widget class="QLayoutWidget">
+ <property name="name">
<cstring>layout4</cstring>
</property>
<property name="geometry">
<rect>
<x>11</x>
<y>91</y>
- <width>300</width>
+ <width>350</width>
<height>210</height>
</rect>
</property>
@@ -141,45 +180,6 @@
</widget>
</vbox>
</widget>
- <widget class="QLayoutWidget">
- <property name="name">
- <cstring>layout5</cstring>
- </property>
- <property name="geometry">
- <rect>
- <x>12</x>
- <y>17</y>
- <width>300</width>
- <height>40</height>
- </rect>
- </property>
- <grid>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <widget class="QSpinBox" row="0" column="1">
- <property name="name">
- <cstring>kcfg_ExpireDays</cstring>
- </property>
- </widget>
- <widget class="QLabel" row="0" column="0">
- <property name="name">
- <cstring>MaxMBsEx</cstring>
- </property>
- <property name="text">
- <string>Expire events after</string>
- </property>
- </widget>
- <widget class="QLabel" row="0" column="2">
- <property name="name">
- <cstring>MaxMBsEx_2</cstring>
- </property>
- <property name="text">
- <string>day(s)</string>
- </property>
- </widget>
- </grid>
- </widget>
</widget>
</widget>
<layoutdefaults spacing="6" margin="11"/>
diff -Nur -x '*.orig' -x '*~' klamav-0.44/src/specialfiletypes.ui klamav-0.44.new/src/specialfiletypes.ui
--- klamav-0.44/src/specialfiletypes.ui 2008-07-06 08:05:42.000000000 -0400
+++ klamav-0.44.new/src/specialfiletypes.ui 2008-07-07 13:14:05.000000000 -0400
@@ -8,7 +8,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>399</width>
+ <width>540</width>
<height>385</height>
</rect>
</property>
@@ -34,7 +34,7 @@
<rect>
<x>20</x>
<y>30</y>
- <width>330</width>
+ <width>480</width>
<height>210</height>
</rect>
</property>
++++++ 11_desktop_directory.diff ++++++
--- klamav/src/Makefile.am 2008-07-06 13:05:42.000000000 +0100
+++ klamav/src/Makefile.am 2008-10-15 16:23:57.000000000 +0100
@@ -45,8 +45,7 @@
KDE_ICON = klamav
# this is where the kdelnk file will go
-kdelnkdir = $(kde_appsdir)/Utilities
-kdelnk_DATA = klamav.desktop
+xdg_apps_DATA = klamav.desktop
# this is where the servicemenu file will go
konqservice_DATA = klamav-dropdown.desktop
++++++ 12_no_mediaslave.diff ++++++
diff -Nur -x '*.orig' -x '*~' klamav-0.44/src/directorylist.cpp klamav-0.44.new/src/directorylist.cpp
--- klamav-0.44/src/directorylist.cpp 2008-07-06 08:05:42.000000000 -0400
+++ klamav-0.44.new/src/directorylist.cpp 2008-10-16 09:51:48.000000000 -0400
@@ -68,7 +68,7 @@
reinterpret_cast<QWidget*>(m_view->header())->hide();
new Item( m_view, i18n( "System Folder" ), "/", "folder_red" );
new Item( m_view, i18n( "Home Folder" ), QDir::homeDirPath(), "folder_home" );
- new DeviceItem( m_view );
+// new DeviceItem( m_view ); //
setSpacing( 6 );
}
++++++ 13_ltmail.sh_fix.diff ++++++
diff -Nur -x '*.orig' -x '*~' klamav-0.46/admin/ltmain.sh klamav-0.46.new/admin/ltmain.sh
--- klamav-0.46/admin/ltmain.sh 2009-02-28 05:27:28.000000000 -0500
+++ klamav-0.46.new/admin/ltmain.sh 2009-10-26 16:01:42.000000000 -0400
@@ -4134,7 +4134,7 @@
rpath=
hardcode_libdirs=
for libdir in $compile_rpath $finalize_rpath; do
- if test -n "$hardcode_libdir_flag_spec"; then
+ if test -n ""; then
if test -n "$hardcode_libdir_separator"; then
if test -z "$hardcode_libdirs"; then
hardcode_libdirs="$libdir"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package licq for openSUSE:Factory
checked in at Mon Nov 15 18:39:47 CET 2010.
--------
--- KDE/licq/licq.changes 2010-09-18 17:03:07.000000000 +0200
+++ licq/licq.changes 2010-11-06 17:23:20.000000000 +0100
@@ -1,0 +2,7 @@
+Sat Nov 6 15:44:57 UTC 2010 - cstender(a)novell.com
+
+- updated to final version 1.5.0
+ * removed broken-translations.diff
+ * added licq-1.5.0-removed_second_desktop_file.patch
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
broken-translations.diff
licq-1.5.0-rc1.tar.bz2
New:
----
licq-1.5.0-remove_desktop_file.patch
licq-1.5.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ licq.spec ++++++
--- /var/tmp/diff_new_pack.JH9IiF/_old 2010-11-15 18:39:36.000000000 +0100
+++ /var/tmp/diff_new_pack.JH9IiF/_new 2010-11-15 18:39:36.000000000 +0100
@@ -24,13 +24,13 @@
Group: Productivity/Networking/ICQ
AutoReqProv: on
Version: 1.5.0
-Release: 1
+Release: 2
Summary: Linux ICQ Client
-Source: %{name}-%{version}-rc1.tar.bz2
+Source: %{name}-%{version}.tar.bz2
Source2: licq.png
Recommends: sox
Patch1: fix-cmake.diff
-Patch2: broken-translations.diff
+Patch2: licq-1.5.0-remove_desktop_file.patch
Url: http://www.licq.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -94,9 +94,9 @@
%prep
-%setup -n %{name}-%{version}-rc1
+%setup
%patch1
-%patch2
+%patch2 -p1
# disabled for now (deps missing)
rm -r plugins/aosd plugins/jabber
++++++ licq-1.5.0-remove_desktop_file.patch ++++++
Index: licq-1.5.0/plugins/qt4-gui/share/misc/CMakeLists.txt
===================================================================
--- licq-1.5.0.orig/plugins/qt4-gui/share/misc/CMakeLists.txt
+++ licq-1.5.0/plugins/qt4-gui/share/misc/CMakeLists.txt
@@ -1,5 +1 @@
-if (WITH_KDE)
- install(FILES licq.desktop DESTINATION share/applications/kde4)
-else (WITH_KDE)
- install(FILES licq.desktop DESTINATION share/applications)
-endif (WITH_KDE)
+install(FILES licq.desktop DESTINATION share/applications)
++++++ licq-1.5.0-rc1.tar.bz2 -> licq-1.5.0.tar.bz2 ++++++
++++ 13679 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package mercurial for openSUSE:Factory
checked in at Mon Nov 15 18:39:17 CET 2010.
--------
--- mercurial/mercurial.changes 2010-10-11 11:05:01.000000000 +0200
+++ mercurial/mercurial.changes 2010-11-11 00:16:59.000000000 +0100
@@ -1,0 +2,95 @@
+Tue Nov 9 22:22:27 UTC 2010 - wr(a)rosenauer.org
+
+- Update to version 1.7
+ * new build and runtime requirement python-xml (hgcia extension)
+ * added docutils to BuildRequires
+ Core
+ filelog: improve cmp performances (issue2273)
+ patch: don't strip '#' lines from patch descriptions (issue2417)
+ patch: when native patching fails (ui.patch is not set), don't
+ retry with an external tool
+ setup/hg: always load Mercurial from where it was installed.
+ setup: user-friendly error message if Python headers are missing
+ store: new unsupported and experimental parentdelta format
+ (see UpgradeNotes)
+ store: encode first period or space in filenames (issue1713)
+ url: expand environment variables in [auth] settings (issue2328)
+ url: check validity (notBefore/notAfter) using OpenSSL (issue2407)
+ Commands
+ addremove: use similarity 100 by default
+ alias: add support for shell command aliases starting with
+ '!' (see [alias] in hgrc(5))
+ backout: add --tool argument for specifying merge tool
+ backout: backout linearly by default instead of branching and
+ merging (use --merge to get the former behaviour)
+ dispatch: properly handle relative path aliases used with -R
+ (issue2376)
+ init: expand destination url as a configured paths
+ log: do not --follow file that is deleted and recreated
+ later (issue732)
+ merge: don't detect copies as "divergent renames", make
+ diagnostic message more helpful
+ merge: add --tool argument to merge and resolve
+ merge: handle no file parent in backwards merge (issue2364)
+ tags: do not fail if tags.cache is corrupted (issue2444)
+ templater: add "hex" filter and "children" keywords
+ (see hg help templating)
+ Subrepos
+ support remapping of subrepository source paths
+ (see [subpaths] in hgrc(5))
+ make add, diff, incoming, outgoing and status commands
+ recurse into subrepos with --subrepos/-S
+ subrepo: add support for 'hg archive'
+ subrepo: fix status check on SVN subrepos (issue2445)
+ Revsets
+ add id() and rev() to allow explicit references to changes
+ by hash or rev (see hg help revsets)
+ add min() function to complement max()
+ add present() function to avoid lookup errors on possibly
+ missing changesets
+ rename tagged() to tag() and allow it to take an optional tag name
+ strip: add revsets support
+ add revsets support to bisect and update (issue1993)
+ bookmarks: add a bookmark([name]) revset for referencing
+ bookmarks
+ transplant: add a transplanted(set) revset to get transplanted
+ revisions
+ hgweb
+ add a help view for accessing the built-in documentation
+ (see help link in hg serve)
+ let HTTPS serve use more compatible but less secure encryption
+ support very simple caching model (issue1845)
+ Extensions
+ color: better support for branches and mq guards
+ convert: handle closed branch heads in hg-hg conversion
+ (issue2185)
+ convert: support darcs changelogs with bytes 0x7F-0xFF
+ (issue2411)
+ convert: deprecate --authors in preference for --authormap
+ graphlog: support header and footer templates when using styles
+ (issue2395)
+ keyword: do not expand at all during diff
+ keyword: support copy and rename
+ mq: extend support for the --mq argument to extension commands
+ mq: save qrefresh message for easy recovery in case it fails
+ (issue2062)
+ mq: support hg qimport --existing --name renametothis
+ thatexistingpatch, fix --force case on Windows
+ mq/qqueue: support renaming of active queue
+ mq/qqueue: add --purge option to delete a queue and its patches
+ pager: add global --pager=<auto/boolean> option
+ patchbomb: add --confirm option to show series details and ask
+ for confirmation
+ patchbomb: let diffstat prompt only once with complete summary
+ progress: support rebase and patchbomb
+ rebase: re-add patches to mq repo after rebase
+ strip: add --keep flag to avoid modifying working directory
+ during strip
+ strip: rename --nobackup option to --no-backup (issue2377)
+ strip: support stripping multiple revisions
+ contrib
+ mergetools.hgrc: add vimdiff
+ zsh completion: support bookmarks and patchbomb extensions
+ zsh completion: add qpush --move option
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
mercurial-1.6.4.tar.bz2
New:
----
mercurial-1.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mercurial.spec ++++++
--- /var/tmp/diff_new_pack.sArZxr/_old 2010-11-15 18:36:43.000000000 +0100
+++ /var/tmp/diff_new_pack.sArZxr/_new 2010-11-15 18:36:43.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package mercurial (Version 1.6.4)
+# spec file for package mercurial (Version 1.7)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -28,16 +28,16 @@
%endif
Name: mercurial
-BuildRequires: gcc python-devel
+BuildRequires: gcc python-devel python-xml
%if 0%{?with_doc}
-BuildRequires: asciidoc sgml-skel xmlto
+BuildRequires: asciidoc docutils sgml-skel xmlto
%endif
BuildRequires: perl
%if 0%{?suse_version} > 1020
BuildRequires: fdupes
%endif
Summary: Scalable Distributed SCM
-Version: 1.6.4
+Version: 1.7
Release: 1
License: GPLv2+
Group: Development/Tools/Version Control
@@ -48,6 +48,8 @@
Source99: rpmlintrc
Patch: mercurial-hgk-path-fix.diff
Patch1: mercurial-sle10-inotify-fixes.diff
+# hgext/hgcia needs python-xml
+Requires: python-xml
# require rcs for 3-way "merge" command.
Requires: rcs
%if 0%{?with_lang}
@@ -60,6 +62,7 @@
designed for efficient handling of very large distributed projects.
+
%lang_package
%prep
%setup -q
@@ -76,7 +79,7 @@
%if 0%{?with_doc}
doc \
%endif
- PREFIX="{_prefix}"
+ PREFIX="%{_prefix}"
%install
%__python setup.py install --prefix=%{_prefix} --root="$RPM_BUILD_ROOT" \
@@ -95,7 +98,7 @@
done
popd
%endif
-# install programs in contrib
+# install stuff in contrib
install -c -m 0755 contrib/hgk $RPM_BUILD_ROOT%{_bindir}
install -c -m 0755 contrib/convert-repo $RPM_BUILD_ROOT%{_bindir}
install -c -m 0755 contrib/shrink-revlog.py $RPM_BUILD_ROOT%{_bindir}
@@ -104,14 +107,19 @@
mkdir -p $RPM_BUILD_ROOT/etc/bash_completion.d
install -c -m 0644 contrib/bash_completion $RPM_BUILD_ROOT/etc/bash_completion.d/mercurial.sh
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/zsh/site-functions
+install -c -m 0644 contrib/zsh_completion $RPM_BUILD_ROOT%{_datadir}/zsh/site-functions/_mercurial
mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
install -c -m 0644 contrib/*.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
mkdir -p $RPM_BUILD_ROOT%{_datadir}/xemacs/site-lisp
install -c -m 0644 contrib/*.el $RPM_BUILD_ROOT%{_datadir}/xemacs/site-lisp
mkdir -p $RPM_BUILD_ROOT/etc/mercurial/hgrc.d
+install -c -m 0644 contrib/mergetools.hgrc $RPM_BUILD_ROOT%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc
%if 0%{?suse_version} > 1020
%fdupes -s "%{buildroot}%{_datadir}"
+%fdupes -s "%{buildroot}%{_libdir}"
%endif
+chmod 644 $RPM_BUILD_DIR/%{name}-%{version}/hgweb.cgi
if [ "%{python_sitelib}" != "%{python_sitearch}" ]; then
%__install -d "%{buildroot}%{python_sitelib}/mercurial"
@@ -144,13 +152,16 @@
%{_bindir}/*
#%{python_sitelib}
/etc/bash_completion.d/*
+%{_datadir}/zsh/
%dir /etc/mercurial
%dir /etc/mercurial/hgrc.d
+%config /etc/mercurial/hgrc.d/mergetools.rc
%{_datadir}/emacs
%{_datadir}/xemacs
%{_mandir}/man1/hg.1%{ext_man}
%{_mandir}/man5/hgignore.5%{ext_man}
%{_mandir}/man5/hgrc.5%{ext_man}
+
%if 0%{?with_lang}
%files lang -f %{name}.lang
++++++ mercurial-1.6.4.tar.bz2 -> mercurial-1.7.tar.bz2 ++++++
++++ 250636 lines of diff (skipped)
++++++ mercurial-sle10-inotify-fixes.diff ++++++
--- /var/tmp/diff_new_pack.sArZxr/_old 2010-11-15 18:36:44.000000000 +0100
+++ /var/tmp/diff_new_pack.sArZxr/_new 2010-11-15 18:36:44.000000000 +0100
@@ -19,6 +19,6 @@
+#define IN_MASK_ADD 0x20000000
+#endif
+
- static PyObject *init(PyObject *self, PyObject *args)
- {
- PyObject *ret = NULL;
+ #include <util.h>
+
+ /* Variables used in the event string representation */
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package mkvtoolnix for openSUSE:Factory
checked in at Mon Nov 15 18:36:08 CET 2010.
--------
--- mkvtoolnix/mkvtoolnix.changes 2010-11-02 11:48:32.000000000 +0100
+++ mkvtoolnix/mkvtoolnix.changes 2010-11-10 23:48:45.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Nov 10 22:42:59 UTC 2010 - reddwarf(a)opensuse.org
+
+- Own nl and zh_CN man dirs in >11.2
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mkvtoolnix.spec ++++++
--- /var/tmp/diff_new_pack.nY5fDm/_old 2010-11-15 18:35:52.000000000 +0100
+++ /var/tmp/diff_new_pack.nY5fDm/_new 2010-11-15 18:35:52.000000000 +0100
@@ -19,7 +19,7 @@
Name: mkvtoolnix
Version: 4.4.0
-Release: 1
+Release: 2
License: GPLv2+
Summary: Tools to Create, Alter, and Inspect Matroska Files
Url: http://www.bunkus.org/videotools/mkvtoolnix/
@@ -93,9 +93,7 @@
%{_mandir}/man1/mkvmerge.1%{ext_man}
%{_mandir}/man1/mmg.1%{ext_man}
%{_mandir}/man1/mkvpropedit.1%{ext_man}
-%if 0%{?suse_version} <= 1120
%{_mandir}/nl
%{_mandir}/zh_CN
-%endif
%changelog
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package mlterm for openSUSE:Factory
checked in at Mon Nov 15 18:35:32 CET 2010.
--------
--- mlterm/mlterm.changes 2010-09-09 20:42:43.000000000 +0200
+++ mlterm/mlterm.changes 2010-11-11 15:55:26.000000000 +0100
@@ -1,0 +2,22 @@
+Thu Nov 11 14:34:51 CET 2010 - pgajdos(a)suse.cz
+
+- updated to version 3.0.1:
+ * fixed infinite loop. when a sequence-like input was actually
+ so looooong, mlterm should assume it was just not properly
+ terminated (Thanks to shinichiro.h).
+ * should not loop forever when window was too narrow.
+ * Check if button is pressed before win->button_motion is called.
+ * Changed font and color configuration protocol numbers(not
+ compatible with cvs-2009/10/20 or before.)
+ * Modifier keys with Del/Home/End are distinguished.
+ The keypad middle key (XK_Begin, XK_KP_Begin) is mapped to
+ ^[[E, ^[[1;5E etc.
+ * The default value of button3_behavior option is changed
+ from "menu1" to "xterm".
+ * "ESC[9Nm" and "ESC[10Nm" sequences are supported.
+- removed unneeded
+ * scim.patch
+ * cross-compile-not-needed.patch
+ * uim-build-fix.diff
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
cross-compile-not-needed.patch
mlterm-2.9.4.tar.bz2
mlterm-scim.patch
mlterm-uim-build-fix.diff
New:
----
mlterm-3.0.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mlterm.spec ++++++
--- /var/tmp/diff_new_pack.vPmhu0/_old 2010-11-15 18:29:54.000000000 +0100
+++ /var/tmp/diff_new_pack.vPmhu0/_new 2010-11-15 18:29:54.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package mlterm (Version 2.9.4)
+# spec file for package mlterm (Version 3.0.1)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -29,8 +29,8 @@
Group: System/X11/Terminals
AutoReqProv: on
Provides: locale(xorg-x11:ja;ko;zh;ar;he)
-Version: 2.9.4
-Release: 10
+Version: 3.0.1
+Release: 1
Url: http://mlterm.sourceforge.net/
# Source0: http://prdownloads.sourceforge.net/mlterm/mlterm-2.7.0.tar.bz2
# cvs -d :pserver:anonymous@mlterm.cvs.sourceforge.net:/cvsroot/mlterm login
@@ -43,16 +43,13 @@
Source11: %name.png
Patch0: etc.patch
Patch1: kiklib-configure.diff
-Patch3: cross-compile-not-needed.patch
Patch5: mlterm-po.patch
Patch6: mlterm-gettext-version.patch
Patch7: norootforbuild.patch
Patch8: cast-from-pointer-to-integer-of-different-size.patch
Patch9: mlconfig_fixdups.diff
Patch11: mlterm-pkgconfig.patch
-Patch12: mlterm-scim.patch
Patch15: mlterm-configure.patch
-Patch17: mlterm-uim-build-fix.diff
Patch18: mlterm-fribidi-link-fix.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Multilingual Terminal Emulator for X
@@ -149,16 +146,13 @@
%setup0 -q
%patch0
%patch1
-%patch3
%patch5 -b .po
%patch6 -b .gettext-version
%patch7 -b .norootforbuild
%patch8
#%patch9 -p1
%patch11
-%patch12
%patch15
-%patch17
%patch18
GETTEXT_VERSION=$(gettext --version | head -n 1 | awk '{print $NF}')
perl -pi'*.orig' -e "s/AM_GNU_GETTEXT_VERSION\\([0-9.]+\\)/AM_GNU_GETTEXT_VERSION(${GETTEXT_VERSION})/g" configure.in
@@ -170,7 +164,7 @@
autoreconf --force --install
export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fno-strict-aliasing $(/usr/bin/freetype-config --cflags)"
#export CFLAGS="-g -O0 -D_GNU_SOURCE -fno-strict-aliasing $(/usr/bin/freetype-config --cflags)"
-%configure --disable-static \
+%configure --enable-static=no \
--libexecdir=%{_libdir}/mlterm \
--sysconfdir=/etc/X11 \
--enable-utmp \
@@ -208,6 +202,7 @@
rm -f $RPM_BUILD_ROOT%{_libdir}/mlterm/*.*a
# ditto for libkik and libmkf
rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.*a
+rm -r $RPM_BUILD_ROOT%{_libdir}/mkf/*.*a
# install terminfo entry-description
#mkdir -p $RPM_BUILD_ROOT/usr/share/terminfo/m
#tic -o $RPM_BUILD_ROOT/usr/share/terminfo/ doc/term/mlterm.ti
@@ -226,6 +221,7 @@
%attr(555,root,tty) /usr/bin/mlterm
/usr/share/applications/%name.desktop
/usr/bin/mlclient
+/usr/bin/mlclientx
/usr/bin/mlcc
/usr/bin/mlterm-zoom
# %{_bindir}/*
@@ -240,6 +236,8 @@
%{_libdir}/mlterm/libnext.so
%{_libdir}/mlterm/libsample.so
%{_libdir}/mlterm/libsample2.so
+%dir %{_libdir}/mkf/
+%{_libdir}/mkf/*.so
%{_libdir}/mlterm/mlconfig
%{_libdir}/mlterm/mlterm-menu
%dir /etc/X11/mlterm/
++++++ cast-from-pointer-to-integer-of-different-size.patch ++++++
--- /var/tmp/diff_new_pack.vPmhu0/_old 2010-11-15 18:29:54.000000000 +0100
+++ /var/tmp/diff_new_pack.vPmhu0/_new 2010-11-15 18:29:54.000000000 +0100
@@ -1,8 +1,8 @@
Index: mlterm/ml_config_proto.c
===================================================================
---- mlterm/ml_config_proto.c.orig 2004-12-07 04:37:00.000000000 +0100
-+++ mlterm/ml_config_proto.c 2009-11-30 19:38:50.783443000 +0100
-@@ -122,7 +122,7 @@ ml_gen_proto_challenge(void)
+--- mlterm/ml_config_proto.c.orig
++++ mlterm/ml_config_proto.c
+@@ -128,7 +128,7 @@ ml_gen_proto_challenge(void)
return 0 ;
}
++++++ etc.patch ++++++
--- /var/tmp/diff_new_pack.vPmhu0/_old 2010-11-15 18:29:54.000000000 +0100
+++ /var/tmp/diff_new_pack.vPmhu0/_new 2010-11-15 18:29:54.000000000 +0100
@@ -1,28 +1,36 @@
Index: etc/aafont
===================================================================
---- etc/aafont.orig 2003-10-01 08:09:45.000000000 +0200
-+++ etc/aafont 2009-11-30 19:38:48.874588000 +0100
-@@ -1,35 +1,33 @@
--#ISO8859_1=Courier 10 Pitch-iso10646-1;
--#ISO8859_2=Thryomanes-iso10646-1;
--#ISO8859_3=Thryomanes-iso10646-1;
--#ISO8859_4=Thryomanes-iso10646-1;
--#ISO8859_5=Thryomanes-iso10646-1;
--#ISO8859_7=Thryomanes-iso10646-1;
--#ISO8859_9=Thryomanes-iso10646-1;
--#ISO8859_10=Thryomanes-iso10646-1;
--#ISO8859_13=Thryomanes-iso10646-1;
--#ISO8859_14=Thryomanes-iso10646-1;
--#ISO8859_15=Thryomanes-iso10646-1;
--#KOI8_R=Nimbus Mono L-iso10646-1;
--#KOI8_U=Nimbus Mono L-iso10646-1;
--#JISX0208_1978=Kochi Gothic-iso10646-1;
--#JISX0208_1983=Kochi Gothic-iso10646-1;
--#JISX0208_1990=Kochi Gothic-iso10646-1;
--#KSX1001_1997=dotum-iso10646-1;
--#BIG5=AR PL Mingti2L Big5-iso10646-1;
--#GB2312_80=AR PL SungtiL GB-iso10646-1;
--#GBK=AR PL SungtiL GB-iso10646-1;
+--- etc/aafont.orig
++++ etc/aafont
+@@ -1,37 +1,37 @@
+ #DEFAULT=Kochi Gothic
+
+-#ISO8859_1=Courier 10 Pitch
+-#ISO8859_2=Thryomanes
+-#ISO8859_3=Thryomanes
+-#ISO8859_4=Thryomanes
+-#ISO8859_5=Thryomanes
+-#ISO8859_7=Thryomanes
+-#ISO8859_9=Thryomanes
+-#ISO8859_10=Thryomanes
+-#ISO8859_13=Thryomanes
+-#ISO8859_14=Thryomanes
+-#ISO8859_15=Thryomanes
+-#KOI8_R=Nimbus Mono L
+-#KOI8_U=Nimbus Mono L
+-#JISX0208_1978=Kochi Gothic
+-#JISX0208_1983=Kochi Gothic
+-#JISX0208_1990=Kochi Gothic
+-#KSX1001_1997=dotum
+-#BIG5=AR PL Mingti2L Big5
+-#GB2312_80=AR PL SungtiL GB
+-#GBK=AR PL SungtiL GB
+-
+-#ISO10646_UCS4_1=Courier 10 Pitch
+-#ISO10646_UCS4_1=Thryomanes
+-
+-# Japanese speakers may want to enable the following setting.
+-#ISO10646_UCS4_1_BIWIDTH=Kochi Gothic
+US_ASCII=Luxi Mono--iso10646-1;
+ISO8859_1=Luxi Mono-iso10646-1;
+ISO8859_2=Luxi Mono-iso10646-1;
@@ -33,31 +41,19 @@
+ISO8859_10=Luxi Mono-iso10646-1;
+ISO8859_13=Luxi Mono-iso10646-1;
+ISO8859_15=Luxi Mono-iso10646-1;
-
--#ISO10646_UCS4_1=Courier 10 Pitch-iso10646-1;
--#ISO10646_UCS4_1=Thryomanes-iso10646-1;
++
+JISX0201_ROMAN=Sazanami Gothic-iso10646-1;
+JISX0201_KATA=Sazanami Gothic-iso10646-1;
+JISX0208_1983=Sazanami Gothic-iso10646-1;
+JISX0208_1983_BOLD=Sazanami Gothic-iso10646-1;
-
--# Japanese speakers may want to enable the following setting.
--#ISO10646_UCS4_1_BIWIDTH=Kochi Gothic-iso10646-1;
++
+GB2312_80=AR PL SungtiL GB-iso10646-1;
+GBK=AR PL SungtiL GB-iso10646-1;
+BIG5=AR PL Mingti2L Big5-iso10646-1;
+HKSCS=AR PL Mingti2L Big5-iso10646-1;
+KSC5601_1987=Baekmuk unigulir-iso10646-1;
+KSX1001_1997=Baekmuk unigulir-iso10646-1;
-
--# Korean speakers may want to enable the following setting.
--#ISO10646_UCS4_1_BIWIDTH=dotum-iso10646-1;
--
--# Traditional Chinese speakers may want to enable the following setting.
--#ISO10646_UCS4_1_BIWIDTH=AR PL Mingti2L Big5-iso10646-1;
--
--# Simplified Chinese speakers may want to enable the following setting.
--#ISO10646_UCS4_1_BIWIDTH=AR PL SungtiL GB-iso10646-1;
++
+ISO10646_UCS2_1 = Luxi Mono-iso10646-1;
+ISO10646_UCS2_1_BIWIDTH = Sazanami Gothic-iso10646-1;
+#ISO10646_UCS2_1_BIWIDTH = Bitstream Cyberbit-iso10646-1;
@@ -68,18 +64,28 @@
+#ISO10646_UCS4_1_BIWIDTH = Bitstream Cyberbit-iso10646-1;
+#ISO10646_UCS4_1 = Arial Unicode MS-iso10646-1;
+#ISO10646_UCS4_1_BIWIDTH = Arial Unicode MS-iso10646-1;
+
+-# Korean speakers may want to enable the following setting.
+-#ISO10646_UCS4_1_BIWIDTH=dotum
+
+-# Traditional Chinese speakers may want to enable the following setting.
+-#ISO10646_UCS4_1_BIWIDTH=AR PL Mingti2L Big5
+-
+-# Simplified Chinese speakers may want to enable the following setting.
+-#ISO10646_UCS4_1_BIWIDTH=AR PL SungtiL GB
Index: etc/font
===================================================================
---- etc/font.orig 2002-02-23 07:07:07.000000000 +0100
-+++ etc/font 2009-11-30 19:38:48.880589000 +0100
-@@ -1,5 +1,5 @@
+--- etc/font.orig
++++ etc/font
+@@ -1,6 +1,6 @@
+ #DEFAULT = -kochi-mincho-medium-*--%d-*-
#DEC_SPECIAL = 10,a10;12,6x12;14,7x14;16,8x16;
-#ISO8859_1 = -kochi-mincho-medium-*--%d-*-iso8859-1;10,a10;12,6x12;
+#ISO8859_1 = -misc-sazanami gothic-medium-*-%d-*-iso8859-1;10,a10;12,6x12;
#ISO8859_1_BOLD = 10,a10B;14,7x14bold;
#JISX0201_KATA = 10,r10;12,r12;14,r14;16,r16;
#JISX0201_KATA_BOLD = 10,r10;
-@@ -7,3 +7,54 @@
+@@ -8,3 +8,54 @@
#JISX0208_1983 = 10,k10;12,k12;14,k14;16,kanji16;
#JISX0208_1983_BOLD = 10,k10B;
#TCVN5712 = 14,-*-.vntime-*--14-*-iso8859-1;
@@ -136,8 +142,8 @@
+#ISO10646_UCS2_1_BIWIDTH = -misc-sazanami gothic-medium-r-normal-*-%d-*-*-*-*-*-iso10646-1;10,-efont-fixed-medium-r-normal--10-100-75-75-c-100-iso10646-1;12,-efont-fixed-medium-r-normal-*-12-120-75-75-c-120-iso10646-1;13,-misc-fixed-medium-r-normal-*-13-120-75-75-c-120-iso10646-1;14,-efont-fixed-medium-r-normal-*-14-140-75-75-c-140-iso10646-1;16,-efont-fixed-medium-r-normal-*-16-160-75-75-c-160-iso10646-1;18,-misc-fixed-medium-r-normal-*-18-120-100-100-c-180-iso10646-1;20,-misc-fixed-medium-r-normal-*-18-120-100-100-c-180-iso10646-1;24,-efont-fixed-medium-r-normal-*-24-240-75-75-c-240-iso10646-1;
Index: etc/key
===================================================================
---- etc/key.orig 2004-10-10 14:48:42.000000000 +0200
-+++ etc/key 2009-11-30 19:38:48.886587000 +0100
+--- etc/key.orig
++++ etc/key
@@ -12,3 +12,7 @@
# Control+F6="proto:font_size=12;encoding=utf8"
# Control+F7="proto:input_method=iiimf:ja"
@@ -148,8 +154,8 @@
+KP_Begin="\e[E"
Index: etc/main
===================================================================
---- etc/main.orig 2003-03-08 13:19:27.000000000 +0100
-+++ etc/main 2009-11-30 19:38:48.891587000 +0100
+--- etc/main.orig
++++ etc/main
@@ -1 +1,25 @@
-scrollbar_view_name = sample
+use_login_shell=false
@@ -176,44 +182,73 @@
+sb_bg_color=gray
+geometry=80x25
+mod_meta_mode=esc
-+conf_menu_path_2=/usr/X11R6/bin/mlterm-zoom
++conf_menu_path_2=/usr/bin/mlterm-zoom
Index: etc/termcap
===================================================================
---- etc/termcap.orig 2002-09-06 17:25:19.000000000 +0200
-+++ etc/termcap 2009-11-30 19:38:48.896587000 +0100
+--- etc/termcap.orig
++++ etc/termcap
@@ -1,5 +1,7 @@
mlterm:\
kD=\E[3~:kb=^?
+kterm:\
+ kD=\E[3~:kb=^?
xterm|rxvt:\
- kD=^?:kb=^H:ut
+ kD=^?:kb=^H:kh=\E[H:@7=\E[F:ut
*:\
+Index: etc/xim
+===================================================================
+--- etc/xim.orig
++++ etc/xim
+@@ -1,6 +1,13 @@
+-Ami=ko_KR.eucKR
+ kinput2=ja_JP.eucJP
+-xcin=zh_TW.Big5
+-xcin-zh_CN.GB2312=zh_CN.GB2312
+ skkinput=ja_JP.eucJP
++SCIM=zh_CN.UTF-8
++nicolatter=ja_JP.eucJP
++jmode=ja_JP.eucJP
++htt=ja_JP.eucJP
++Ami=ko_KR.eucKR
++xcin-zh_TW=zh_TW.Big5
++xcin-zh_CN=zh_CN.GB2312
++local=en_GB.UTF-8 # for compose or dead-keys
++uim=ja_JP.UTF-8
++
+
Index: etc/vaafont
===================================================================
---- etc/vaafont.orig 2003-10-01 08:09:45.000000000 +0200
-+++ etc/vaafont 2009-11-30 19:38:48.901587000 +0100
-@@ -1,35 +1,33 @@
--#ISO8859_1=Courier 10 Pitch-iso10646-1;
--#ISO8859_2=Thryomanes-iso10646-1;
--#ISO8859_3=Thryomanes-iso10646-1;
--#ISO8859_4=Thryomanes-iso10646-1;
--#ISO8859_5=Thryomanes-iso10646-1;
--#ISO8859_7=Thryomanes-iso10646-1;
--#ISO8859_9=Thryomanes-iso10646-1;
--#ISO8859_10=Thryomanes-iso10646-1;
--#ISO8859_13=Thryomanes-iso10646-1;
--#ISO8859_14=Thryomanes-iso10646-1;
--#ISO8859_15=Thryomanes-iso10646-1;
--#KOI8_R=Nimbus Mono L-iso10646-1;
--#KOI8_U=Nimbus Mono L-iso10646-1;
--#JISX0208_1978=Kochi Gothic-iso10646-1;
--#JISX0208_1983=Kochi Gothic-iso10646-1;
--#JISX0208_1990=Kochi Gothic-iso10646-1;
--#KSX1001_1997=dotum-iso10646-1;
--#BIG5=AR PL Mingti2L Big5-iso10646-1;
--#GB2312_80=AR PL SungtiL GB-iso10646-1;
--#GBK=AR PL SungtiL GB-iso10646-1;
+--- etc/vaafont.orig
++++ etc/vaafont
+@@ -1,37 +1,37 @@
+ #DEFAULT=Kochi Gothic
+
+-#ISO8859_1=Courier 10 Pitch
+-#ISO8859_2=Thryomanes
+-#ISO8859_3=Thryomanes
+-#ISO8859_4=Thryomanes
+-#ISO8859_5=Thryomanes
+-#ISO8859_7=Thryomanes
+-#ISO8859_9=Thryomanes
+-#ISO8859_10=Thryomanes
+-#ISO8859_13=Thryomanes
+-#ISO8859_14=Thryomanes
+-#ISO8859_15=Thryomanes
+-#KOI8_R=Nimbus Mono L
+-#KOI8_U=Nimbus Mono L
+-#JISX0208_1978=Kochi Gothic
+-#JISX0208_1983=Kochi Gothic
+-#JISX0208_1990=Kochi Gothic
+-#KSX1001_1997=dotum
+-#BIG5=AR PL Mingti2L Big5
+-#GB2312_80=AR PL SungtiL GB
+-#GBK=AR PL SungtiL GB
+-
+-#ISO10646_UCS4_1=Courier 10 Pitch
+-#ISO10646_UCS4_1=Thryomanes
+-
+-# Japanese speakers may want to enable the following setting.
+-#ISO10646_UCS4_1_BIWIDTH=Kochi Gothic
+US_ASCII=Luxi Sans--iso10646-1;
+ISO8859_1=Luxi Sans-iso10646-1;
+ISO8859_2=Luxi Sans-iso10646-1;
@@ -223,31 +258,20 @@
+ISO8859_10=Luxi Sans-iso10646-1;
+ISO8859_13=Luxi Sans-iso10646-1;
+ISO8859_15=Luxi Sans-iso10646-1;
-
--#ISO10646_UCS4_1=Courier 10 Pitch-iso10646-1;
--#ISO10646_UCS4_1=Thryomanes-iso10646-1;
++
+JISX0201_ROMAN=Sazanami Gothic-iso10646-1;
+JISX0201_KATA=Sazanami Gothic-iso10646-1;
+JISX0208_1983=Sazanami Gothic-iso10646-1;
+JISX0208_1983_BOLD=Sazanami Gothic-iso10646-1;
-
--# Japanese speakers may want to enable the following setting.
--#ISO10646_UCS4_1_BIWIDTH=Kochi Gothic-iso10646-1;
++
+GB2312_80=AR PL SungtiL GB-iso10646-1;
+GBK=AR PL SungtiL GB-iso10646-1;
+BIG5=AR PL Mingti2L Big5-iso10646-1;
+HKSCS=AR PL Mingti2L Big5-iso10646-1;
-
--# Korean speakers may want to enable the following setting.
--#ISO10646_UCS4_1_BIWIDTH=dotum-iso10646-1;
++
+KSC5601_1987=Baekmuk unigulir-iso10646-1;
+KSX1001_1997=Baekmuk unigulir-iso10646-1;
-
--# Traditional Chinese speakers may want to enable the following setting.
--#ISO10646_UCS4_1_BIWIDTH=AR PL Mingti2L Big5-iso10646-1;
--
--# Simplified Chinese speakers may want to enable the following setting.
--#ISO10646_UCS4_1_BIWIDTH=AR PL SungtiL GB-iso10646-1;
++
+ISO10646_UCS2_1 = Luxi Sans-iso10646-1;
+ISO10646_UCS2_1_BIWIDTH = Sazanami Gothic-iso10646-1;
+#ISO10646_UCS2_1_BIWIDTH = Bitstream Cyberbit-iso10646-1;
@@ -258,24 +282,12 @@
+#ISO10646_UCS4_1_BIWIDTH = Bitstream Cyberbit-iso10646-1;
+#ISO10646_UCS4_1 = Arial Unicode MS-iso10646-1;
+#ISO10646_UCS4_1_BIWIDTH = Arial Unicode MS-iso10646-1;
-Index: etc/xim
-===================================================================
---- etc/xim.orig 2004-09-19 15:24:49.000000000 +0200
-+++ etc/xim 2009-11-30 19:38:48.905589000 +0100
-@@ -1,6 +1,13 @@
--Ami=ko_KR.eucKR
- kinput2=ja_JP.eucJP
--xcin=zh_TW.Big5
--xcin-zh_CN.GB2312=zh_CN.GB2312
- skkinput=ja_JP.eucJP
-+SCIM=zh_CN.UTF-8
-+nicolatter=ja_JP.eucJP
-+jmode=ja_JP.eucJP
-+htt=ja_JP.eucJP
-+Ami=ko_KR.eucKR
-+xcin-zh_TW=zh_TW.Big5
-+xcin-zh_CN=zh_CN.GB2312
-+local=en_GB.UTF-8 # for compose or dead-keys
-+uim=ja_JP.UTF-8
-+
+-# Korean speakers may want to enable the following setting.
+-#ISO10646_UCS4_1_BIWIDTH=dotum
+
+-# Traditional Chinese speakers may want to enable the following setting.
+-#ISO10646_UCS4_1_BIWIDTH=AR PL Mingti2L Big5
+-
+-# Simplified Chinese speakers may want to enable the following setting.
+-#ISO10646_UCS4_1_BIWIDTH=AR PL SungtiL GB
++++++ kiklib-configure.diff ++++++
--- /var/tmp/diff_new_pack.vPmhu0/_old 2010-11-15 18:29:54.000000000 +0100
+++ /var/tmp/diff_new_pack.vPmhu0/_new 2010-11-15 18:29:54.000000000 +0100
@@ -1,26 +1,18 @@
Index: kiklib/configure.in
===================================================================
---- kiklib/configure.in.orig 2006-10-20 11:04:01.000000000 +0200
-+++ kiklib/configure.in 2009-11-30 19:38:49.631587000 +0100
+--- kiklib/configure.in.orig
++++ kiklib/configure.in
@@ -1,4 +1,4 @@
-AC_INIT()
+AC_INIT(configure.in)
AC_CONFIG_HEADER(src/kik_config.h)
AC_CONFIG_AUX_DIR(script)
-@@ -10,6 +10,7 @@ AC_PROG_CC
+@@ -13,6 +13,7 @@ AC_PROG_CC
# if --with-libtool is specified, cpp isn't detected.
AC_PROG_CPP
AC_PROG_INSTALL
+AC_HEADER_STDC
- #
- # --- libtool ---
-@@ -31,7 +32,6 @@ AC_SUBST(LIBTOOL)
- # --- Checks for header files ---
- #
- # NOTE: if --with-libtool is specified, stdc header isn't detected.
--AC_HEADER_STDC
- AC_CHECK_HEADERS(langinfo.h dlfcn.h dl.h stropts.h sys/stropts.h stdint.h)
-
- #
+ #detect glibc
+ AC_TRY_COMPILE([#include <features.h>],
++++++ mlterm-2.9.4.tar.bz2 -> mlterm-3.0.1.tar.bz2 ++++++
++++ 1589042 lines of diff (skipped)
++++++ mlterm-configure.patch ++++++
--- /var/tmp/diff_new_pack.vPmhu0/_old 2010-11-15 18:29:56.000000000 +0100
+++ /var/tmp/diff_new_pack.vPmhu0/_new 2010-11-15 18:29:56.000000000 +0100
@@ -4,13 +4,22 @@
Index: configure.in
===================================================================
---- configure.in.orig 2009-11-30 19:38:51.008420000 +0100
-+++ configure.in 2009-11-30 19:38:51.474420000 +0100
-@@ -607,7 +607,6 @@ AC_SUBST(OUTPUT_FILES)
- AC_SUBST(PLATFORM_LIB_LDFLAGS)
+--- configure.in.orig
++++ configure.in
+@@ -697,7 +697,6 @@ if test "$optimize_redrawing" = "yes" ;
+ fi
# gettext
--AM_INIT_AUTOMAKE(mlterm,2.9.4)
+-AM_INIT_AUTOMAKE(mlterm,3.0.1)
AM_GNU_GETTEXT([external])
AM_GNU_GETTEXT_VERSION(0.12)
+@@ -747,7 +746,7 @@ if test "${SUBDIRS}" != "" ; then
+ AC_CONFIG_SUBDIRS(${SUBDIRS})
+ fi
+
+-MAKE_DIRS="mlterm xwindow man etc ${MAKE_DIRS}"
++MAKE_DIRS="${MAKE_DIRS} mlterm xwindow man etc"
+ OUTPUT_FILES="Makefile mlterm/Makefile xwindow/Makefile man/Makefile etc/Makefile ${OUTPUT_FILES}"
+
+ AC_SUBST(MAKE_DIRS)
++++++ mlterm-fribidi-link-fix.diff ++++++
--- /var/tmp/diff_new_pack.vPmhu0/_old 2010-11-15 18:29:56.000000000 +0100
+++ /var/tmp/diff_new_pack.vPmhu0/_new 2010-11-15 18:29:56.000000000 +0100
@@ -4,20 +4,22 @@
Index: xwindow/Makefile.in
===================================================================
---- xwindow/Makefile.in.orig 2005-01-13 18:19:37.000000000 +0100
-+++ xwindow/Makefile.in 2009-11-30 19:38:51.951329000 +0100
-@@ -42,10 +42,10 @@ CFLAGS=$(CFLAGS_LOCAL) @AA_CFLAGS@ @KIK_
- -DLIBEXECDIR=\"$(LIBEXECDIR)\" -DDATADIR=\"$(DATADIR)\"\
+--- xwindow/Makefile.in.orig
++++ xwindow/Makefile.in
+@@ -49,13 +49,11 @@ CFLAGS = $(CFLAGS_LOCAL) @AA_CFLAGS@ @KI
+ -DLIBEXECDIR=\"$(LIBEXECDIR)\" -DXDATADIR=\"$(XDATADIR)\"\
-I$(top_srcdir)/mlterm -I${top_builddir}/xwindow -I/usr/local/include
--LIBS=$(LIBS_LOCAL) @IND_LIBS@ @FRIBIDI_LIBS@ @IMAGELIB_LIBS@ @AA_LIBS@ \
+-LIBS1 = $(LIBS_LOCAL) $(LMLTERM) $(LMKF) $(LKIK) \
+- -L/usr/local/lib -R/usr/local/lib @FRIBIDI_LIBS@
++LIBS1 = $(LIBS_LOCAL) $(LMLTERM) $(LMKF) $(LKIK)
+
+ LIBS2 = @IND_LIBS@ @IMAGELIB_LIBS@ @AA_LIBS@ \
- @DL_LIBS_IM@ @DL_LIBS_SB@ \
-- @X_LIBS@ @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@ $(LMLTERM) $(LMKF) $(LKIK) \
-- -L/usr/local/lib -R/usr/local/lib
-+LIBS=$(LIBS_LOCAL) $(LMLTERM) $(LMKF) $(LKIK) \
-+ @IND_LIBS@ @IMAGELIB_LIBS@ @AA_LIBS@ \
-+ @DL_LIBS_IM@ @DL_LIBS_SB@ @FRIBIDI_LIBS@ \
+- @X_LIBS@ -lX11 @X_EXTRA_LIBS@
+-# @X_LIBS@ @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@
++ @DL_LIBS_IM@ @DL_LIBS_SB@ @FRIBIDI_LIBS@\
+ @X_LIBS@ @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@
- PROG = mlterm
- INSTALL_OPT = @INSTALL_OPT@
+ LIBS2_win32 = -mwindows -limm32 @SUBSYSTEM@
+
++++++ mlterm-gettext-version.patch ++++++
--- /var/tmp/diff_new_pack.vPmhu0/_old 2010-11-15 18:29:56.000000000 +0100
+++ /var/tmp/diff_new_pack.vPmhu0/_new 2010-11-15 18:29:56.000000000 +0100
@@ -1,10 +1,10 @@
Index: configure.in
===================================================================
---- configure.in.orig 2009-11-30 19:38:49.867505000 +0100
-+++ configure.in 2009-11-30 19:38:50.349505000 +0100
-@@ -608,6 +608,7 @@ AC_SUBST(PLATFORM_LIB_LDFLAGS)
+--- configure.in.orig
++++ configure.in
+@@ -698,6 +698,7 @@ fi
# gettext
- AM_INIT_AUTOMAKE(mlterm,2.9.4)
+ AM_INIT_AUTOMAKE(mlterm,3.0.1)
AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION(0.12)
++++++ mlterm-pkgconfig.patch ++++++
--- /var/tmp/diff_new_pack.vPmhu0/_old 2010-11-15 18:29:56.000000000 +0100
+++ /var/tmp/diff_new_pack.vPmhu0/_new 2010-11-15 18:29:56.000000000 +0100
@@ -1,12 +1,12 @@
Index: configure.in
===================================================================
---- configure.in.orig 2009-11-30 19:38:50.549505000 +0100
-+++ configure.in 2009-11-30 19:38:51.008420000 +0100
-@@ -47,6 +47,7 @@ AC_CHECK_LIB(socket,connect,SOCK_LIBS=-l
+--- configure.in.orig
++++ configure.in
+@@ -51,6 +51,7 @@ AC_CHECK_LIB(socket,connect,SOCK_LIBS=-l
AC_SUBST(SOCK_LIBS)
AC_PATH_XTRA
+PKG_PROG_PKG_CONFIG
- # Li18nux Xlib-I18N defines X_HAVE_UTF8_STRING but has no Xutf8LookupString.
- ldflags="$LDFLAGS" cflags="$CFLAGS"
+ AC_ARG_WITH(gui,
+ [ --with-gui@<:@=ARG@:>@ gui library(xlib|win32)],
++++++ norootforbuild.patch ++++++
--- /var/tmp/diff_new_pack.vPmhu0/_old 2010-11-15 18:29:56.000000000 +0100
+++ /var/tmp/diff_new_pack.vPmhu0/_new 2010-11-15 18:29:56.000000000 +0100
@@ -1,8 +1,8 @@
Index: configure.in
===================================================================
---- configure.in.orig 2009-11-30 19:38:50.349505000 +0100
-+++ configure.in 2009-11-30 19:38:50.549505000 +0100
-@@ -208,7 +208,7 @@ if test "$utmp" = "yes" ; then
+--- configure.in.orig
++++ configure.in
+@@ -313,7 +313,7 @@ if test "$utmp" = "yes" ; then
UTMP_CFLAGS="-DUSE_UTMP"
has_utmp=`grep utmp /etc/group 2>/dev/null`
if test "$has_utmp" ; then
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package ntop for openSUSE:Factory
checked in at Mon Nov 15 18:29:32 CET 2010.
--------
--- ntop/ntop.changes 2010-11-08 14:43:28.000000000 +0100
+++ ntop/ntop.changes 2010-11-10 16:13:29.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Nov 10 15:13:21 UTC 2010 - coolo(a)novell.com
+
+- own parent directories
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ntop.spec ++++++
--- /var/tmp/diff_new_pack.GOtAof/_old 2010-11-15 18:28:11.000000000 +0100
+++ /var/tmp/diff_new_pack.GOtAof/_new 2010-11-15 18:28:11.000000000 +0100
@@ -75,7 +75,7 @@
%endif
%endif
Version: 4.0
-Release: 2
+Release: 3
License: GPLv2+
Group: Productivity/Networking/Diagnostic
#
@@ -200,7 +200,7 @@
%dir %{_libdir}/ntop
%{_libdir}/ntop/plugins
%{_mandir}/man8/ntop.8.*
-%{_localstatedir}/adm/fillup-templates/sysconfig.ntop
+%{_localstatedir}/adm
%dir %attr(-,%{pkg_user},%{pkg_user}) %{pkg_home}
%dir %attr(-,%{pkg_user},%{pkg_user}) %{pkg_home}/rrd
%dir %{_sysconfdir}/ntop
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package python-zdaemon for openSUSE:Factory
checked in at Mon Nov 15 18:27:33 CET 2010.
--------
--- python-zdaemon/python-zdaemon.changes 2010-06-22 16:43:45.000000000 +0200
+++ python-zdaemon/python-zdaemon.changes 2010-11-10 13:50:15.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Nov 10 12:50:06 UTC 2010 - coolo(a)novell.com
+
+- fix file list
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-zdaemon.spec ++++++
--- /var/tmp/diff_new_pack.vTs5fN/_old 2010-11-15 18:26:46.000000000 +0100
+++ /var/tmp/diff_new_pack.vTs5fN/_new 2010-11-15 18:26:46.000000000 +0100
@@ -20,7 +20,7 @@
Name: python-zdaemon
Version: 2.0.4
-Release: 1
+Release: 4
Summary: Daemon process control library and tools
Url: http://pypi.python.org/pypi/zdaemon
License: BSD
@@ -45,7 +45,7 @@
python setup.py build
%install
-python setup.py install --prefix=%{_prefix} --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES
+python setup.py install --prefix=%{_prefix} --root=$RPM_BUILD_ROOT --record-rpm=INSTALLED_FILES
%clean
rm -rf %{buildroot}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package python-zope-event for openSUSE:Factory
checked in at Mon Nov 15 18:26:26 CET 2010.
--------
--- python-zope-event/python-zope-event.changes 2010-09-16 10:28:52.000000000 +0200
+++ python-zope-event/python-zope-event.changes 2010-11-10 16:03:29.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Nov 10 15:03:24 UTC 2010 - coolo(a)novell.com
+
+- fix file list
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-zope-event.spec ++++++
--- /var/tmp/diff_new_pack.NmhlN0/_old 2010-11-15 18:25:58.000000000 +0100
+++ /var/tmp/diff_new_pack.NmhlN0/_new 2010-11-15 18:25:58.000000000 +0100
@@ -20,7 +20,7 @@
Name: python-zope-event
Version: 3.5.0
-Release: 5
+Release: 6
Summary: Very basic event publishing system
Url: http://pypi.python.org/pypi/zope.event
License: BSD
@@ -45,7 +45,7 @@
python setup.py build
%install
-python setup.py install --prefix=%{_prefix} --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES
+python setup.py install --prefix=%{_prefix} --root=$RPM_BUILD_ROOT --record-rpm=INSTALLED_FILES
%if "%{_lib}"=="lib64"
mkdir -p $RPM_BUILD_ROOT/usr/lib64/python%{py_ver}/
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package python-zope-proxy for openSUSE:Factory
checked in at Mon Nov 15 18:25:39 CET 2010.
--------
--- python-zope-proxy/python-zope-proxy.changes 2010-06-22 11:00:26.000000000 +0200
+++ python-zope-proxy/python-zope-proxy.changes 2010-11-10 13:50:33.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Nov 10 12:50:28 UTC 2010 - coolo(a)novell.com
+
+- fix file list
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-zope-proxy.spec ++++++
--- /var/tmp/diff_new_pack.S0o2U2/_old 2010-11-15 18:25:13.000000000 +0100
+++ /var/tmp/diff_new_pack.S0o2U2/_new 2010-11-15 18:25:13.000000000 +0100
@@ -20,7 +20,7 @@
Name: python-zope-proxy
Version: 3.6.0
-Release: 1
+Release: 4
Summary: Generic Transparent Proxies
Url: http://pypi.python.org/pypi/zope.proxy
License: Zope Public License
@@ -44,7 +44,7 @@
python setup.py build
%install
-python setup.py install --prefix=%{_prefix} --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES
+python setup.py install --prefix=%{_prefix} --root=$RPM_BUILD_ROOT --record-rpm=INSTALLED_FILES
%clean
rm -rf %{buildroot}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package rfc for openSUSE:Factory
checked in at Mon Nov 15 18:24:51 CET 2010.
--------
--- AUTO/all/rfc/rfc.changes 2010-11-10 05:44:06.000000000 +0100
+++ rfc/rfc.changes 2010-11-13 00:46:52.000000000 +0100
@@ -2 +2 @@
-Wed Nov 10 05:44:06 CET 2010 - autobuild(a)suse.de
+Sat Nov 13 00:46:51 CET 2010 - autobuild(a)suse.de
@@ -4 +4 @@
-- automated update on 2010-11-10
+- automated update on 2010-11-13
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rfc.spec ++++++
--- /var/tmp/diff_new_pack.ZOnax3/_old 2010-11-15 18:24:39.000000000 +0100
+++ /var/tmp/diff_new_pack.ZOnax3/_new 2010-11-15 18:24:39.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package rfc (Version 2010.11.10)
+# spec file for package rfc (Version 2010.11.12)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -25,7 +25,7 @@
Summary: The RFCs (Request For Comments)
Source: rfc.tgz
BuildArch: noarch
-Version: 2010.11.10
+Version: 2010.11.12
Release: 1
Url: ftp://ftp.isi.edu/in-notes
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ rfc.tgz ++++++
AUTO/all/rfc/rfc.tgz rfc/rfc.tgz differ: char 5, line 1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0