September 2010 - openSUSE Commits - openSUSE Mailing Lists

commit python-qt4 for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '10

03 Sep '10

Hello community, here is the log from the commit of package python-qt4 for openSUSE:Factory checked in at Fri Sep 3 14:21:38 CEST 2010. -------- --- python-qt4/python-qt4.changes 2010-06-08 16:53:37.000000000 +0200 +++ python-qt4/python-qt4.changes 2010-09-01 10:46:24.000000000 +0200 @@ -1,0 +2,23 @@ +Wed Sep 1 10:45:09 CEST 2010 - dmueller(a)suse.de + +- update to 4.7.5: + - Added QStringRef.__str__() and QStringRef.__unicode__() to the QString v1 + API. + - The destruction by Qt of internally constructed QObject instances is now + automatically detected. + - A signal defined with pyqtSignal() can now be used with methods that make + an internal call to QObject::connect(), e.g. QTimer.singleShot(). + - Added the --from-imports command line argument to pyuic4 and the + from_imports argument to PyQt4.uic.compileUi(). + - Added support for Python v3.2. + - The Windows installer now includes qcollectiongenerator.exe and + qhelpgenerator.exe. + - Any class with a count() method now supports the len() builtin. + - Added the missing == and != operators to QItemSelection. + - Added readQVariantHash(), readQVariantList(), readQVariantMap, + writeQVariantHash(), writeQVariantList() and writeQVariantMap() to + QDataStream. + - Added the ErrorPageExtensionOption and ErrorPageExtensionReturn classes, + and the ErrorDomain enum to QWebPage. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- PyQt-x11-gpl-4.7.3.tar.bz2 New: ---- PyQt-x11-gpl-4.7.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-qt4.spec ++++++ --- /var/tmp/diff_new_pack.P0y7cw/_old 2010-09-03 14:20:05.000000000 +0200 +++ /var/tmp/diff_new_pack.P0y7cw/_new 2010-09-03 14:20:05.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package python-qt4 (Version 4.7.3) +# spec file for package python-qt4 (Version 4.7.5) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -33,7 +33,7 @@ License: GPLv2 Group: Development/Libraries/Python Summary: PyQt - python bindings for Qt 4 -Version: 4.7.3 +Version: 4.7.5 Release: 1 %define rversion %version Url: http://www.riverbankcomputing.com/software/pyqt/intro ++++++ PyQt-x11-gpl-4.7.3.tar.bz2 -> PyQt-x11-gpl-4.7.5.tar.bz2 ++++++ python-qt4/PyQt-x11-gpl-4.7.3.tar.bz2 python-qt4/PyQt-x11-gpl-4.7.5.tar.bz2 differ: char 11, line 1 ++++++ build-compare.diff ++++++ --- /var/tmp/diff_new_pack.P0y7cw/_old 2010-09-03 14:20:05.000000000 +0200 +++ /var/tmp/diff_new_pack.P0y7cw/_new 2010-09-03 14:20:05.000000000 +0200 @@ -1,8 +1,6 @@ -Index: pyuic/uic/__init__.py -=================================================================== ---- pyuic/uic/__init__.py.orig +--- pyuic/uic/__init__.py +++ pyuic/uic/__init__.py -@@ -7,8 +7,7 @@ _header = """# -*- coding: utf-8 -*- +@@ -7,8 +7,7 @@ # Form implementation generated from reading ui file '%s' # @@ -12,12 +10,12 @@ # # WARNING! All changes made in this file will be lost! -@@ -123,7 +122,7 @@ def compileUi(uifile, pyfile, execute=Fa +@@ -125,7 +124,7 @@ indenter.indentwidth = indent - pyfile.write(_header % (uifname, ctime(), PYQT_VERSION_STR)) + pyfile.write(_header % (uifname, PYQT_VERSION_STR)) - winfo = compiler.UICompiler().compileUi(uifile, pyfile) + winfo = compiler.UICompiler().compileUi(uifile, pyfile, from_imports) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit kdebase4 for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '10

03 Sep '10

Hello community, here is the log from the commit of package kdebase4 for openSUSE:Factory checked in at Fri Sep 3 14:21:26 CEST 2010. -------- --- KDE/kdebase4/kdebase4.changes 2010-08-04 11:10:14.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase4/kdebase4.changes 2010-08-27 13:53:39.000000000 +0200 @@ -1,0 +2,11 @@ +Fri Aug 27 13:53:32 CEST 2010 - dmueller(a)suse.de + +- update to 4.5.1 + * see http://kde.org/announcements/changelogs/changelog4_5_0to4_5_1.php for details + +------------------------------------------------------------------- +Sun Aug 22 18:32:37 UTC 2010 - ctrippe(a)gmx.net + +- Change installation directory of konsole - Super User Icon (bnc#633082) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdebase-4.5.0.tar.bz2 New: ---- kdebase-4.5.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.3tcGny/_old 2010-09-03 14:20:46.000000000 +0200 +++ /var/tmp/diff_new_pack.3tcGny/_new 2010-09-03 14:20:46.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4 (Version 4.5.0) +# spec file for package kdebase4 (Version 4.5.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -33,7 +33,7 @@ Group: System/GUI/KDE Summary: The Base KDE Apps Url: http://www.kde.org/ -Version: 4.5.0 +Version: 4.5.1 Release: 1 Source0: kdebase-%version.tar.bz2 Source1: baselibs.conf @@ -107,12 +107,12 @@ sed -ri s,.*/usr/share/kde4/apps/konsole/Shell.profile,, filelists/konsole %create_exclude_filelist install -D -m 0644 %SOURCE4 %SOURCE5 $RPM_BUILD_ROOT/usr/share/applications/kde4/ - install -D -m 0644 %SOURCE21 $RPM_BUILD_ROOT/usr/share/icons/hicolor/16x16/utilities-terminal-su.png - install -D -m 0644 %SOURCE22 $RPM_BUILD_ROOT/usr/share/icons/hicolor/22x22/utilities-terminal-su.png - install -D -m 0644 %SOURCE23 $RPM_BUILD_ROOT/usr/share/icons/hicolor/32x32/utilities-terminal-su.png - install -D -m 0644 %SOURCE24 $RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/utilities-terminal-su.png - install -D -m 0644 %SOURCE25 $RPM_BUILD_ROOT/usr/share/icons/hicolor/64x64/utilities-terminal-su.png - install -D -m 0644 %SOURCE26 $RPM_BUILD_ROOT/usr/share/icons/hicolor/128x128/utilities-terminal-su.png + install -D -m 0644 %SOURCE21 $RPM_BUILD_ROOT/usr/share/icons/hicolor/16x16/apps/utilities-terminal_su.png + install -D -m 0644 %SOURCE22 $RPM_BUILD_ROOT/usr/share/icons/hicolor/22x22/apps/utilities-terminal_su.png + install -D -m 0644 %SOURCE23 $RPM_BUILD_ROOT/usr/share/icons/hicolor/32x32/apps/utilities-terminal_su.png + install -D -m 0644 %SOURCE24 $RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/apps/utilities-terminal_su.png + install -D -m 0644 %SOURCE25 $RPM_BUILD_ROOT/usr/share/icons/hicolor/64x64/apps/utilities-terminal_su.png + install -D -m 0644 %SOURCE26 $RPM_BUILD_ROOT/usr/share/icons/hicolor/128x128/apps/utilities-terminal_su.png %suse_update_desktop_file konqbrowser WebBrowser %suse_update_desktop_file konquerorsu System FileManager %suse_update_desktop_file dolphin System FileManager @@ -162,7 +162,7 @@ %defattr(-,root,root) %doc COPYING COPYING.DOC README %_kde4_applicationsdir/konsolesu.desktop -%_kde4_iconsdir/hicolor/*/utilities-terminal-su.png +%_kde4_iconsdir/hicolor/*/apps/utilities-terminal_su.png %package -n dolphin License: GPLv2+ ++++++ kdebase-4.5.0.tar.bz2 -> kdebase-4.5.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/CMakeLists.txt new/kdebase-4.5.1/apps/CMakeLists.txt --- old/kdebase-4.5.0/apps/CMakeLists.txt 2010-07-28 23:04:48.000000000 +0200 +++ new/kdebase-4.5.1/apps/CMakeLists.txt 2010-08-27 10:10:18.000000000 +0200 @@ -4,8 +4,8 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ) #search packages used by KDE -set(KDE_MIN_VERSION "4.5.0") -find_package(KDE4 4.5.0 REQUIRED) +set(KDE_MIN_VERSION "4.5.1") +find_package(KDE4 4.5.1 REQUIRED) find_package(Strigi REQUIRED) find_package(ZLIB REQUIRED) include (KDE4Defaults) Files old/kdebase-4.5.0/apps/doc/dolphin/index.cache.bz2 and new/kdebase-4.5.1/apps/doc/dolphin/index.cache.bz2 differ Files old/kdebase-4.5.0/apps/doc/kdepasswd/index.cache.bz2 and new/kdebase-4.5.1/apps/doc/kdepasswd/index.cache.bz2 differ Files old/kdebase-4.5.0/apps/doc/kfind/index.cache.bz2 and new/kdebase-4.5.1/apps/doc/kfind/index.cache.bz2 differ Files old/kdebase-4.5.0/apps/doc/konqueror/index.cache.bz2 and new/kdebase-4.5.1/apps/doc/konqueror/index.cache.bz2 differ Files old/kdebase-4.5.0/apps/doc/konsole/index.cache.bz2 and new/kdebase-4.5.1/apps/doc/konsole/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/doc/konsole/index.docbook new/kdebase-4.5.1/apps/doc/konsole/index.docbook --- old/kdebase-4.5.0/apps/doc/konsole/index.docbook 2010-08-04 21:13:56.000000000 +0200 +++ new/kdebase-4.5.1/apps/doc/konsole/index.docbook 2010-08-27 10:10:17.000000000 +0200 @@ -510,7 +510,7 @@ <varlistentry> <term><menuchoice> <shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>[</keycap></keycombo></shortcut> -<guimenu>View</guimenu><guisubmenu>Shrink View</guisubmenu><guimenuitem>Shrink View</guimenuitem></menuchoice> +<guimenu>View</guimenu><guisubmenu>Split View</guisubmenu><guimenuitem>Shrink View</guimenuitem></menuchoice> </term> <listitem><para><action>Makes the current view smaller</action> </para></listitem> Files old/kdebase-4.5.0/apps/doc/kwrite/index.cache.bz2 and new/kdebase-4.5.1/apps/doc/kwrite/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/dolphin/src/dolphincolumnviewcontainer.cpp new/kdebase-4.5.1/apps/dolphin/src/dolphincolumnviewcontainer.cpp --- old/kdebase-4.5.0/apps/dolphin/src/dolphincolumnviewcontainer.cpp 2010-06-01 20:10:27.000000000 +0200 +++ new/kdebase-4.5.1/apps/dolphin/src/dolphincolumnviewcontainer.cpp 2010-08-27 10:10:17.000000000 +0200 @@ -108,7 +108,7 @@ int columnIndex = 0; foreach (DolphinColumnView* column, m_columns) { - if (column->url() == url) { + if (column->url().equals(url, KUrl::CompareWithoutTrailingSlash)) { // the column represents already the requested URL, hence activate it requestActivation(column); layoutColumns(); @@ -411,6 +411,8 @@ } else { column->deleteLater(); } + + layoutColumns(); } #include "dolphincolumnviewcontainer.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/dolphin/src/dolphinview.cpp new/kdebase-4.5.1/apps/dolphin/src/dolphinview.cpp --- old/kdebase-4.5.0/apps/dolphin/src/dolphinview.cpp 2010-07-06 08:54:19.000000000 +0200 +++ new/kdebase-4.5.1/apps/dolphin/src/dolphinview.cpp 2010-08-27 10:10:17.000000000 +0200 @@ -93,7 +93,6 @@ m_dolphinViewController(0), m_viewModeController(0), m_viewAccessor(proxyModel), - m_selectionModel(0), m_selectionChangedTimer(0), m_rootUrl(), m_activeItemUrl(), @@ -540,30 +539,33 @@ void DolphinView::setUrl(const KUrl& url) { - if (m_viewModeController->url() != url) { - m_newFileNames.clear(); + if (m_viewModeController->url() == url) { + return; + } - m_viewModeController->setUrl(url); // emits urlChanged, which we forward - m_viewAccessor.prepareUrlChange(url); - applyViewProperties(); - loadDirectory(url); + // The selection model might change in the case of the column view. Disconnect + // from the current selection model and reconnect later after the URL switch. + QAbstractItemView* view = m_viewAccessor.itemView(); + disconnect(view->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)), + this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection))); - // When changing the URL there is no need to keep the version - // data of the previous URL. - m_viewAccessor.dirModel()->clearVersionData(); + m_newFileNames.clear(); - emit startedPathLoading(url); - } + m_viewModeController->setUrl(url); // emits urlChanged, which we forward + m_viewAccessor.prepareUrlChange(url); + applyViewProperties(); + loadDirectory(url); - // the selection model might have changed in the case of a column view - QItemSelectionModel* selectionModel = m_viewAccessor.itemView()->selectionModel(); - if (m_selectionModel != selectionModel) { - disconnect(m_selectionModel, SIGNAL(selectionChanged(QItemSelection, QItemSelection)), - this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection))); - m_selectionModel = selectionModel; - connect(m_selectionModel, SIGNAL(selectionChanged(QItemSelection, QItemSelection)), - this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection))); - } + // When changing the URL there is no need to keep the version + // data of the previous URL. + m_viewAccessor.dirModel()->clearVersionData(); + + emit startedPathLoading(url); + + // Reconnect to the (probably) new selection model + view = m_viewAccessor.itemView(); + connect(view->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)), + this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection))); } void DolphinView::selectAll() @@ -1271,28 +1273,28 @@ void DolphinView::createView() { + QAbstractItemView* view = m_viewAccessor.itemView(); + if ((view != 0) && (view->selectionModel() != 0)) { + disconnect(view->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)), + this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection))); + } + deleteView(); Q_ASSERT(m_viewAccessor.itemView() == 0); m_viewAccessor.createView(this, m_dolphinViewController, m_viewModeController, m_mode); - QAbstractItemView* view = m_viewAccessor.itemView(); + view = m_viewAccessor.itemView(); Q_ASSERT(view != 0); view->installEventFilter(this); view->viewport()->installEventFilter(this); m_dolphinViewController->setItemView(view); - // When changing the view mode, the selection is lost due to reinstantiating - // a new item view with a custom selection model. Pass the ownership of the - // selection model to DolphinView, so that it can be shared by all item views. - if (m_selectionModel != 0) { - view->setSelectionModel(m_selectionModel); - } else { - m_selectionModel = view->selectionModel(); - } - m_selectionModel->setParent(this); - connect(m_selectionModel, SIGNAL(selectionChanged(QItemSelection, QItemSelection)), + const int zoomLevel = ZoomLevelInfo::zoomLevelForIconSize(view->iconSize()); + m_viewModeController->setZoomLevel(zoomLevel); + + connect(view->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)), this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection))); setFocusProxy(m_viewAccessor.layoutTarget()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/dolphin/src/dolphinview.h new/kdebase-4.5.1/apps/dolphin/src/dolphinview.h --- old/kdebase-4.5.0/apps/dolphin/src/dolphinview.h 2010-05-16 12:04:03.000000000 +0200 +++ new/kdebase-4.5.1/apps/dolphin/src/dolphinview.h 2010-08-27 10:10:17.000000000 +0200 @@ -796,7 +796,6 @@ ViewModeController* m_viewModeController; ViewAccessor m_viewAccessor; - QItemSelectionModel* m_selectionModel; // allow to switch views without losing the selection QTimer* m_selectionChangedTimer; KUrl m_rootUrl; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/dolphin/src/tooltips/filemetadatatooltip.cpp new/kdebase-4.5.1/apps/dolphin/src/tooltips/filemetadatatooltip.cpp --- old/kdebase-4.5.0/apps/dolphin/src/tooltips/filemetadatatooltip.cpp 2010-07-12 23:08:16.000000000 +0200 +++ new/kdebase-4.5.1/apps/dolphin/src/tooltips/filemetadatatooltip.cpp 2010-08-27 10:10:17.000000000 +0200 @@ -20,10 +20,10 @@ #include "filemetadatatooltip.h" -#include <kcolorscheme.h> +#include <KColorScheme> #include <kfilemetadatawidget.h> -#include <kseparator.h> -#include <kwindowsystem.h> +#include <KSeparator> +#include <KWindowSystem> #include <QLabel> #include <QPainter> @@ -34,7 +34,6 @@ m_preview(0), m_name(0), m_fileMetaDataWidget(0) - { setAttribute(Qt::WA_TranslucentBackground); setWindowFlags(Qt::ToolTip | Qt::FramelessWindowHint); @@ -47,30 +46,25 @@ QFont font = m_name->font(); font.setBold(true); m_name->setFont(font); - m_name->setAlignment(Qt::AlignHCenter); // Create widget for the meta data m_fileMetaDataWidget = new KFileMetaDataWidget(); m_fileMetaDataWidget->setForegroundRole(QPalette::ToolTipText); m_fileMetaDataWidget->setReadOnly(true); + connect(m_fileMetaDataWidget, SIGNAL(metaDataRequestFinished(KFileItemList)), + this, SIGNAL(metaDataRequestFinished(KFileItemList))); - // The stretchwidget allows the metadata widget to be top aligned and fills - // the remaining vertical space - QWidget* stretchWidget = new QWidget(this); - stretchWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding); - - QWidget* textContainer = new QWidget(this); - QVBoxLayout* textLayout = new QVBoxLayout(textContainer); + QVBoxLayout* textLayout = new QVBoxLayout(); + textLayout->setAlignment(Qt::AlignTop); textLayout->addWidget(m_name); textLayout->addWidget(new KSeparator()); textLayout->addWidget(m_fileMetaDataWidget); - textLayout->addWidget(stretchWidget); + textLayout->setAlignment(m_name, Qt::AlignCenter); + textLayout->setAlignment(m_fileMetaDataWidget, Qt::AlignLeft); QHBoxLayout* tipLayout = new QHBoxLayout(this); tipLayout->addWidget(m_preview); - tipLayout->addWidget(textContainer); - - tipLayout->setSizeConstraint(QLayout::SetFixedSize); + tipLayout->addLayout(textLayout); } FileMetaDataToolTip::~FileMetaDataToolTip() @@ -82,9 +76,12 @@ m_preview->setPixmap(pixmap); } -const QPixmap* FileMetaDataToolTip::preview() const +QPixmap FileMetaDataToolTip::preview() const { - return m_preview->pixmap(); + if (m_preview->pixmap() != 0) { + return *m_preview->pixmap(); + } + return QPixmap(); } void FileMetaDataToolTip::setName(const QString& name) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/dolphin/src/tooltips/filemetadatatooltip.h new/kdebase-4.5.1/apps/dolphin/src/tooltips/filemetadatatooltip.h --- old/kdebase-4.5.0/apps/dolphin/src/tooltips/filemetadatatooltip.h 2010-03-30 10:28:06.000000000 +0200 +++ new/kdebase-4.5.1/apps/dolphin/src/tooltips/filemetadatatooltip.h 2010-08-27 10:10:17.000000000 +0200 @@ -18,8 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#ifndef DOLPHINCONTROLLER_H -#define DOLPHINCONTROLLER_H +#ifndef FILEMETADATATOOLTIP_H +#define FILEMETADATATOOLTIP_H #include <QWidget> @@ -40,14 +40,26 @@ virtual ~FileMetaDataToolTip(); void setPreview(const QPixmap& pixmap); - const QPixmap* preview() const; + QPixmap preview() const; void setName(const QString& name); QString name() const; + /** + * Sets the items for which the meta data should be shown. + * The signal metaDataRequestFinished() will be emitted, + * as soon as the meta data for the items has been received. + */ void setItems(const KFileItemList& items); KFileItemList items() const; +signals: + /** + * Is emitted after the meta data has been received for the items + * set by FileMetaDataToolTip::setItems(). + */ + void metaDataRequestFinished(const KFileItemList& items); + protected: virtual void paintEvent(QPaintEvent* event); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/dolphin/src/tooltips/tooltipmanager.cpp new/kdebase-4.5.1/apps/dolphin/src/tooltips/tooltipmanager.cpp --- old/kdebase-4.5.0/apps/dolphin/src/tooltips/tooltipmanager.cpp 2010-07-23 23:12:06.000000000 +0200 +++ new/kdebase-4.5.1/apps/dolphin/src/tooltips/tooltipmanager.cpp 2010-08-27 10:10:17.000000000 +0200 @@ -19,13 +19,9 @@ #include "tooltipmanager.h" -#include "dolphinmodel.h" -#include "dolphinsortfilterproxymodel.h" - #include "filemetadatatooltip.h" -#include <kicon.h> -#include <kio/previewjob.h> -#include <kwindowsystem.h> +#include <KIcon> +#include <KIO/PreviewJob> #include <QApplication> #include <QDesktopWidget> @@ -33,22 +29,22 @@ #include <QScrollBar> #include <QTimer> +#include <dolphinmodel.h> +#include <dolphinsortfilterproxymodel.h> + ToolTipManager::ToolTipManager(QAbstractItemView* parent, DolphinSortFilterProxyModel* model) : QObject(parent), m_view(parent), m_dolphinModel(0), m_proxyModel(model), - m_prepareToolTipTimer(0), - m_startPreviewJobTimer(0), - m_waitOnPreviewTimer(0), - m_showToolTipDelayedTimer(0), + m_showToolTipTimer(0), + m_contentRetrievalTimer(0), m_fileMetaDataToolTip(0), + m_toolTipRequested(false), + m_metaDataRequested(false), m_item(), - m_itemRect(), - m_generatingPreview(false), - m_hasDefaultIcon(false), - m_previewPixmap() + m_itemRect() { static FileMetaDataToolTip* sharedToolTip = 0; if (sharedToolTip == 0) { @@ -58,7 +54,9 @@ // not work. } m_fileMetaDataToolTip = sharedToolTip; - + connect(m_fileMetaDataToolTip, SIGNAL(metaDataRequestFinished(KFileItemList)), + this, SLOT(slotMetaDataRequestFinished())); + m_dolphinModel = static_cast<DolphinModel*>(m_proxyModel->sourceModel()); connect(parent, SIGNAL(entered(const QModelIndex&)), this, SLOT(requestToolTip(const QModelIndex&))); @@ -66,33 +64,25 @@ this, SLOT(hideToolTip())); // Initialize timers - m_prepareToolTipTimer = new QTimer(this); - m_prepareToolTipTimer->setSingleShot(true); - m_prepareToolTipTimer->setInterval(500); - connect(m_prepareToolTipTimer, SIGNAL(timeout()), this, SLOT(prepareToolTip())); - - m_startPreviewJobTimer = new QTimer(this); - m_startPreviewJobTimer->setSingleShot(true); - m_startPreviewJobTimer->setInterval(200); - connect(m_startPreviewJobTimer, SIGNAL(timeout()), this, SLOT(startPreviewJob())); - - m_waitOnPreviewTimer = new QTimer(this); - m_waitOnPreviewTimer->setSingleShot(true); - m_waitOnPreviewTimer->setInterval(250); - connect(m_waitOnPreviewTimer, SIGNAL(timeout()), this, SLOT(prepareToolTip())); - - m_showToolTipDelayedTimer = new QTimer(this); - m_showToolTipDelayedTimer->setSingleShot(true); - m_showToolTipDelayedTimer->setInterval(100); - connect(m_showToolTipDelayedTimer, SIGNAL(timeout()), this, SLOT(showToolTip())); - + m_showToolTipTimer = new QTimer(this); + m_showToolTipTimer->setSingleShot(true); + m_showToolTipTimer->setInterval(500); + connect(m_showToolTipTimer, SIGNAL(timeout()), this, SLOT(showToolTip())); + + m_contentRetrievalTimer = new QTimer(this); + m_contentRetrievalTimer->setSingleShot(true); + m_contentRetrievalTimer->setInterval(200); + connect(m_contentRetrievalTimer, SIGNAL(timeout()), this, SLOT(startContentRetrieval())); + + Q_ASSERT(m_contentRetrievalTimer->interval() < m_showToolTipTimer->interval()); + // When the mousewheel is used, the items don't get a hovered indication // (Qt-issue #200665). To assure that the tooltip still gets hidden, // the scrollbars are observed. connect(parent->horizontalScrollBar(), SIGNAL(valueChanged(int)), - this, SLOT(hideTip())); + this, SLOT(hideToolTip())); connect(parent->verticalScrollBar(), SIGNAL(valueChanged(int)), - this, SLOT(hideTip())); + this, SLOT(hideToolTip())); m_view->viewport()->installEventFilter(this); m_view->installEventFilter(this); @@ -102,9 +92,17 @@ { } -void ToolTipManager::hideTip() +void ToolTipManager::hideToolTip() { - hideToolTip(); + QApplication::restoreOverrideCursor(); + + m_toolTipRequested = false; + m_metaDataRequested = false; + m_showToolTipTimer->stop(); + m_contentRetrievalTimer->stop(); + + m_fileMetaDataToolTip->setItems(KFileItemList()); + m_fileMetaDataToolTip->hide(); } bool ToolTipManager::eventFilter(QObject* watched, QEvent* event) @@ -128,7 +126,7 @@ void ToolTipManager::requestToolTip(const QModelIndex& index) { hideToolTip(); - + // Only request a tooltip for the name column and when no selection or // drag & drop operation is done (indicated by the left mouse button) if ((index.column() == DolphinModel::Name) && !(QApplication::mouseButtons() & Qt::LeftButton)) { @@ -139,44 +137,27 @@ const QModelIndex dirIndex = m_proxyModel->mapToSource(index); m_item = m_dolphinModel->itemForIndex(dirIndex); - // Only start the previewJob when the mouse has been over this item for 200 milliseconds. - // This prevents a lot of useless preview jobs when passing rapidly over a lot of items. - m_startPreviewJobTimer->start(); - m_previewPixmap = QPixmap(); - m_hasDefaultIcon = false; - - m_prepareToolTipTimer->start(); + // Only start the retrieving of the content, when the mouse has been over this + // item for 200 milliseconds. This prevents a lot of useless preview jobs and + // meta data retrieval, when passing rapidly over a lot of items. + m_contentRetrievalTimer->start(); + m_showToolTipTimer->start(); + m_toolTipRequested = true; + Q_ASSERT(!m_metaDataRequested); } } -void ToolTipManager::hideToolTip() -{ - m_prepareToolTipTimer->stop(); - m_startPreviewJobTimer->stop(); - m_waitOnPreviewTimer->stop(); - m_showToolTipDelayedTimer->stop(); - - m_fileMetaDataToolTip->hide(); -} - -void ToolTipManager::prepareToolTip() +void ToolTipManager::startContentRetrieval() { - if (m_generatingPreview) { - m_waitOnPreviewTimer->start(); + if (!m_toolTipRequested) { + return; } - if (!m_previewPixmap.isNull()) { - showToolTipDelayed(m_previewPixmap); - } else if (!m_hasDefaultIcon) { - const QPixmap image(KIcon(m_item.iconName()).pixmap(128, 128)); - showToolTipDelayed(image); - m_hasDefaultIcon = true; - } -} + m_fileMetaDataToolTip->setName(m_item.text()); + + m_metaDataRequested = true; + m_fileMetaDataToolTip->setItems(KFileItemList() << m_item); -void ToolTipManager::startPreviewJob() -{ - m_generatingPreview = true; KIO::PreviewJob* job = KIO::filePreview(KFileItemList() << m_item, 256, 256); connect(job, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)), @@ -189,44 +170,98 @@ void ToolTipManager::setPreviewPix(const KFileItem& item, const QPixmap& pixmap) { - if ((m_item.url() != item.url()) || pixmap.isNull()) { - // An old preview or an invalid preview has been received + if (!m_toolTipRequested || (m_item.url() != item.url())) { + // No tooltip is requested anymore or an old preview has been received + return; + } + + if (pixmap.isNull()) { previewFailed(); } else { - m_previewPixmap = pixmap; - m_generatingPreview = false; + m_fileMetaDataToolTip->setPreview(pixmap); + if (!m_showToolTipTimer->isActive()) { + showToolTip(); + } } } void ToolTipManager::previewFailed() { - m_generatingPreview = false; + if (!m_toolTipRequested) { + return; + } + + const QPixmap pixmap = KIcon(m_item.iconName()).pixmap(128, 128); + m_fileMetaDataToolTip->setPreview(pixmap); + if (!m_showToolTipTimer->isActive()) { + showToolTip(); + } +} + +void ToolTipManager::slotMetaDataRequestFinished() +{ + if (!m_toolTipRequested) { + return; + } + + m_metaDataRequested = false; + if (!m_showToolTipTimer->isActive()) { + showToolTip(); + } } void ToolTipManager::showToolTip() { - const QRect desktop = QApplication::desktop()->screenGeometry(m_itemRect.bottomRight()); - const QSize size = m_fileMetaDataToolTip->sizeHint(); - + Q_ASSERT(m_toolTipRequested); + QApplication::restoreOverrideCursor(); + + if (QApplication::mouseButtons() & Qt::LeftButton) { + return; + } + + if (m_fileMetaDataToolTip->preview().isNull() || m_metaDataRequested) { + QApplication::setOverrideCursor(QCursor(Qt::WaitCursor)); + return; + } + + const QRect screen = QApplication::desktop()->screenGeometry(QCursor::pos()); + + // Restrict tooltip size to current screen size when needed. + // Because layout controlling widget doesn't respect widget's maximumSize property + // (correct me if I'm wrong), we need to let layout do its work, then manually change + // geometry if resulting widget doesn't fit the screen. + + // Step #1 - make sizeHint return calculated tooltip size + m_fileMetaDataToolTip->layout()->setSizeConstraint(QLayout::SetFixedSize); + m_fileMetaDataToolTip->adjustSize(); + QSize size = m_fileMetaDataToolTip->sizeHint(); + + // Step #2 - correct tooltip size when needed + if (size.width() > screen.width()) { + size.setWidth(screen.width()); + } + if (size.height() > screen.height()) { + size.setHeight(screen.height()); + } + // m_itemRect defines the area of the item, where the tooltip should be // shown. Per default the tooltip is shown in the bottom right corner. - // If the tooltip content exceeds the desktop borders, it must be assured that: + // It must be assured that: // - the content is fully visible // - the content is not drawn inside m_itemRect - const bool hasRoomToLeft = (m_itemRect.left() - size.width() >= desktop.left()); - const bool hasRoomToRight = (m_itemRect.right() + size.width() <= desktop.right()); - const bool hasRoomAbove = (m_itemRect.top() - size.height() >= desktop.top()); - const bool hasRoomBelow = (m_itemRect.bottom() + size.height() <= desktop.bottom()); + const bool hasRoomToLeft = (m_itemRect.left() - size.width() >= screen.left()); + const bool hasRoomToRight = (m_itemRect.right() + size.width() <= screen.right()); + const bool hasRoomAbove = (m_itemRect.top() - size.height() >= screen.top()); + const bool hasRoomBelow = (m_itemRect.bottom() + size.height() <= screen.bottom()); if (!hasRoomAbove && !hasRoomBelow && !hasRoomToLeft && !hasRoomToRight) { return; } - - int x = 0; - int y = 0; + + int x, y; if (hasRoomBelow || hasRoomAbove) { x = QCursor::pos().x() + 16; // TODO: use mouse pointer width instead of the magic value of 16 - if (x + size.width() >= desktop.right()) { - x = desktop.right() - size.width(); + if (x + size.width() >= screen.right()) { + x = screen.right() - size.width() + 1; } if (hasRoomBelow) { y = m_itemRect.bottom() + 1; @@ -240,38 +275,18 @@ } else { x = m_itemRect.left() - size.width(); } - // Put the tooltip at the bottom of the screen. The x-coordinate has already // been adjusted, so that no overlapping with m_itemRect occurs. - y = desktop.bottom() - size.height(); + y = screen.bottom() - size.height() + 1; } - - m_fileMetaDataToolTip->move(qMax(x, 0), qMax(y, 0)); - m_fileMetaDataToolTip->show(); -} -void ToolTipManager::showToolTipDelayed(const QPixmap& pixmap) -{ - if (QApplication::mouseButtons() & Qt::LeftButton) { - return; - } - - m_fileMetaDataToolTip->setPreview(pixmap); - m_fileMetaDataToolTip->setName(m_item.text()); - m_fileMetaDataToolTip->setItems(KFileItemList() << m_item); + // Step #3 - Alter tooltip geometry + m_fileMetaDataToolTip->setFixedSize(size); + m_fileMetaDataToolTip->layout()->setSizeConstraint(QLayout::SetNoConstraint); + m_fileMetaDataToolTip->setGeometry(x, y, size.width(), size.height()); + m_fileMetaDataToolTip->show(); - // Because one tooltip instance is reused, the size hint always depends on the previous - // content (QWidgets don't update their layout geometry if they are invisible). To - // assure having a consistent size without relayout flickering, the tooltip is opened - // on an invisible position first. This gives the layout system some time to asynchronously - // update the content. Sadly this only works with compositing enabled. - if (KWindowSystem::compositingActive()) { - const QRect desktop = QApplication::desktop()->screenGeometry(m_itemRect.bottomRight()); - m_fileMetaDataToolTip->move(desktop.bottomRight()); - m_fileMetaDataToolTip->show(); - } - - m_showToolTipDelayedTimer->start(); // Calls ToolTipManager::showToolTip() + m_toolTipRequested = false; } #include "tooltipmanager.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/dolphin/src/tooltips/tooltipmanager.h new/kdebase-4.5.1/apps/dolphin/src/tooltips/tooltipmanager.h --- old/kdebase-4.5.0/apps/dolphin/src/tooltips/tooltipmanager.h 2010-07-12 23:08:16.000000000 +0200 +++ new/kdebase-4.5.1/apps/dolphin/src/tooltips/tooltipmanager.h 2010-08-27 10:10:17.000000000 +0200 @@ -23,7 +23,7 @@ #include <QObject> #include <QRect> -#include <kfileitem.h> +#include <KFileItem> class DolphinModel; class DolphinSortFilterProxyModel; @@ -54,53 +54,38 @@ * only needed when the tooltip should be hidden although * an item is hovered. */ - void hideTip(); + void hideToolTip(); protected: virtual bool eventFilter(QObject* watched, QEvent* event); private slots: void requestToolTip(const QModelIndex& index); - void hideToolTip(); - void prepareToolTip(); - void startPreviewJob(); + void startContentRetrieval(); void setPreviewPix(const KFileItem& item, const QPixmap& pix); void previewFailed(); + void slotMetaDataRequestFinished(); void showToolTip(); - -private: - void showToolTipDelayed(const QPixmap& pixmap); private: QAbstractItemView* m_view; DolphinModel* m_dolphinModel; DolphinSortFilterProxyModel* m_proxyModel; - /// Timeout from requesting a tooltip until the tooltip is shown - QTimer* m_prepareToolTipTimer; - - /// Timeout from requesting a tooltip until starting a job to - /// create a preview pixmap. The preview job is started before - /// m_prepareToolTipTimer has been exceeded, to have the preview - /// pixmap ideally before the tooltip will be shown. - QTimer* m_startPreviewJobTimer; - - /// Don't show the tooltip, before the preview has been received. The - /// time indicates the interval, when the check for a received - /// is done. - QTimer* m_waitOnPreviewTimer; - - /// The tooltip is shown slightly delayed to prevent a flickering - /// because of layouting the content. - QTimer* m_showToolTipDelayedTimer; + /// Timeout from requesting a tooltip until the tooltip + /// should be shown + QTimer* m_showToolTipTimer; + + /// Timeout from requesting a tooltip until the retrieving of + /// the tooltip content like preview and meta data gets started. + QTimer* m_contentRetrievalTimer; FileMetaDataToolTip* m_fileMetaDataToolTip; + bool m_toolTipRequested; + bool m_metaDataRequested; KFileItem m_item; QRect m_itemRect; - bool m_generatingPreview; - bool m_hasDefaultIcon; - QPixmap m_previewPixmap; }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/dolphin/src/viewextensionsfactory.cpp new/kdebase-4.5.1/apps/dolphin/src/viewextensionsfactory.cpp --- old/kdebase-4.5.0/apps/dolphin/src/viewextensionsfactory.cpp 2010-04-07 13:23:19.000000000 +0200 +++ new/kdebase-4.5.1/apps/dolphin/src/viewextensionsfactory.cpp 2010-08-27 10:10:17.000000000 +0200 @@ -61,7 +61,7 @@ m_toolTipManager = new ToolTipManager(view, proxyModel); connect(dolphinViewController, SIGNAL(hideToolTip()), - m_toolTipManager, SLOT(hideTip())); + m_toolTipManager, SLOT(hideToolTip())); } // initialize preview generator diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/keditbookmarks/bookmarklistview.cpp new/kdebase-4.5.1/apps/keditbookmarks/bookmarklistview.cpp --- old/kdebase-4.5.0/apps/keditbookmarks/bookmarklistview.cpp 2010-05-05 11:37:43.000000000 +0200 +++ new/kdebase-4.5.1/apps/keditbookmarks/bookmarklistview.cpp 2010-08-27 10:10:18.000000000 +0200 @@ -200,8 +200,6 @@ return (source_column == 0); } -Q_DECLARE_METATYPE(KBookmark) - bool BookmarkFolderViewFilterModel::filterAcceptsRow ( int source_row, const QModelIndex & source_parent ) const { QModelIndex index = sourceModel()->index(source_row, 0, source_parent); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/keditbookmarks/kbookmarkmodel/model.cpp new/kdebase-4.5.1/apps/keditbookmarks/kbookmarkmodel/model.cpp --- old/kdebase-4.5.0/apps/keditbookmarks/kbookmarkmodel/model.cpp 2010-05-05 11:37:43.000000000 +0200 +++ new/kdebase-4.5.1/apps/keditbookmarks/kbookmarkmodel/model.cpp 2010-08-27 10:10:17.000000000 +0200 @@ -33,8 +33,6 @@ #include <QtCore/QStringList> #include <QtCore/QMimeData> -Q_DECLARE_METATYPE(KBookmark) - class KBookmarkModel::Private { public: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/keditbookmarks/keditbookmarks.desktop new/kdebase-4.5.1/apps/keditbookmarks/keditbookmarks.desktop --- old/kdebase-4.5.0/apps/keditbookmarks/keditbookmarks.desktop 2010-08-04 21:13:57.000000000 +0200 +++ new/kdebase-4.5.1/apps/keditbookmarks/keditbookmarks.desktop 2010-08-27 10:10:18.000000000 +0200 @@ -16,6 +16,7 @@ Name[en_GB]=Bookmark Editor Name[es]=Editor de marcadores Name[et]=Järjehoidjate redaktor +Name[eu]=Laster-marka editorea Name[fi]=Kirjanmerkkimuokkain Name[fr]=Éditeur de signets Name[fy]=Blêdwizerbewurker @@ -24,6 +25,7 @@ Name[he]=עורך הסימניות Name[hi]=पसंदीदा संपादक Name[hr]=Uređivač oznaka +Name[hu]=Könyvjelzőszerkesztő Name[ia]=Editor de marcator de libros Name[id]=Penyunting Penanda Name[is]=Bókamerkjastjóri @@ -38,6 +40,7 @@ Name[nb]=Bokmerkeredigerer Name[nds]=Leesteken-Editor Name[nl]=Bladwijzerbewerker +Name[nn]=Bokmerkeredigering Name[pa]=ਬੁੱਕਮਾਰਕ ਐਡੀਟਰ Name[pl]=Edytor zakładek Name[pt]=Editor de Favoritos @@ -71,6 +74,7 @@ Comment[en_GB]=Bookmark Organiser and Editor Comment[es]=Organizador y editor de marcadores Comment[et]=Järjehoidjate korraldaja ja redaktor +Comment[eu]=Laster-marka antolatzaile eta editorea Comment[fi]=Kirjanmerkkimuokkain ja -järjestelijä Comment[fr]=Éditeur et organisateur de signets Comment[fy]=Blêdwizers organisearje en bewurker @@ -78,6 +82,7 @@ Comment[he]=מארגן ועורך סימניות Comment[hi]=पसंदीदा व्यवस्था और संपादक Comment[hr]=Organizator i uređivač oznaka +Comment[hu]=Könyvjelzőszervező és -szerkesztő Comment[ia]=Editor e organisator de Marcator de libros Comment[id]=Pengorganisir dan Penyunting Penanda Comment[is]=Bókamerkjaskipuleggjari @@ -92,6 +97,7 @@ Comment[nb]=Bokmerkeordner og redigerer Comment[nds]=Leestekenpleger un -editor Comment[nl]=Bladwijzers organiseren en bewerken +Comment[nn]=Bokmerkeordnar og redigering Comment[pa]=ਬੁੱਕਮਾਰਕ ਪਰਬੰਧਕ ਤੇ ਐਡੀਟਰ Comment[pl]=Organizacja i modyfikacja zakładek Comment[pt]=Organizador e Editor de Favoritos diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/konqueror/preloader/konqy_preloader.desktop new/kdebase-4.5.1/apps/konqueror/preloader/konqy_preloader.desktop --- old/kdebase-4.5.0/apps/konqueror/preloader/konqy_preloader.desktop 2010-08-04 21:13:56.000000000 +0200 +++ new/kdebase-4.5.1/apps/konqueror/preloader/konqy_preloader.desktop 2010-08-27 10:10:17.000000000 +0200 @@ -12,6 +12,7 @@ Name[en_GB]=Konqueror Browser Preloader Name[es]=Módulo de precarga del navegador Konqueror Name[et]=Konquerori brauseri eellaadimise moodul +Name[eu]=Konqueror arakatzailearen aurrezamatzailea Name[fi]=Konqueror-selaimen esilataaja Name[fr]=Module de préchargement du navigateur Konqueror Name[fy]=Konqueror Blêder foarlader @@ -20,6 +21,7 @@ Name[he]=טעינה מקדימה של Konqueror Name[hi]=कॉन्क्वेरर ब्राउसर प्रीलोडर Name[hr]=Predučitavanje pretraživača Konqueror +Name[hu]=Előbetöltő a Konqueror böngészőhöz Name[ia]=Precargator del Navigator de Konqueror Name[id]=Prapemuatan Peramban Konqueror Name[is]=Konqueror forræsingareining @@ -35,6 +37,7 @@ Name[nb]=Forhåndslaster for Konqueror nettleser Name[nds]=Konqueror vörladen Name[nl]=Konqueror browser preloader-module +Name[nn]=Førehandslastar for nettlesaren Konqueror Name[pa]=ਕੋਨਕਿਉਰੋਰ ਬਰਾਊਜ਼ਰ ਪਹਿਲਾਂ ਲੋਡ ਮੋਡੀਊਲ Name[pl]=Wstępne wczytywanie dla Konquerora Name[pt]=Pré-Carregamento do Navegador Konqueror diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/konqueror/settings/kio/cache.desktop new/kdebase-4.5.1/apps/konqueror/settings/kio/cache.desktop --- old/kdebase-4.5.0/apps/konqueror/settings/kio/cache.desktop 2010-07-07 19:10:00.000000000 +0200 +++ new/kdebase-4.5.1/apps/konqueror/settings/kio/cache.desktop 2010-08-27 10:10:17.000000000 +0200 @@ -75,7 +75,7 @@ Name[pt]=Cache Name[pt_BR]=Cache Name[ro]=Cache -Name[ru]=Кеш +Name[ru]=Кэш Name[se]=Gaskarájus Name[si]=කැච් Name[sk]=Vyrovnávacia pamäť @@ -165,7 +165,7 @@ Comment[pt]=Configuração das opções da 'cache' da Web Comment[pt_BR]=Configurar as opções de cache da Internet Comment[ro]=Configurează setările cache-ului web -Comment[ru]=Настройка кеша +Comment[ru]=Настройка кэша Comment[se]=Heivet fierpmádatgaskarádjusa Comment[si]=ජාල කැච් සැකසුම් සකසන්න Comment[sk]=Nastavenie vyrovnávacej pamäte pre WWW diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/konqueror/settings/kio/kcookiespolicies.cpp new/kdebase-4.5.1/apps/konqueror/settings/kio/kcookiespolicies.cpp --- old/kdebase-4.5.0/apps/konqueror/settings/kio/kcookiespolicies.cpp 2009-10-06 23:37:09.000000000 +0200 +++ new/kdebase-4.5.1/apps/konqueror/settings/kio/kcookiespolicies.cpp 2010-08-27 10:10:17.000000000 +0200 @@ -191,9 +191,9 @@ if ( !handleDuplicate(domain, advice) ) { const char* strAdvice = KCookieAdvice::adviceToStr(advice); - QTreeWidgetItem* index = new QTreeWidgetItem (dlg->lvDomainPolicy, - QStringList()<< domain << i18n(strAdvice)); - m_pDomainPolicy.insert (index, strAdvice); + QTreeWidgetItem* item = new QTreeWidgetItem (dlg->lvDomainPolicy, + QStringList()<< domain << i18n(strAdvice)); + m_pDomainPolicy.insert (item, strAdvice); configChanged(); } } @@ -395,12 +395,14 @@ group.writeEntry("CookieGlobalAdvice", advice); QStringList domainConfig; - QTreeWidgetItem *at = dlg->lvDomainPolicy->topLevelItem(0); - - while( at ) - { - domainConfig.append(QString::fromLatin1("%1:%2").arg(QString(tolerantToAce(at->text(0)))).arg(m_pDomainPolicy[at])); - at = dlg->lvDomainPolicy->itemBelow(at); + QMapIterator<QTreeWidgetItem*, const char*> it (m_pDomainPolicy); + while (it.hasNext()) { + it.next(); + QTreeWidgetItem *item = it.key(); + QString policy = tolerantToAce(item->text(0)); + policy += QLatin1Char(':'); + policy += QLatin1String(it.value()); + domainConfig << policy; } group.writeEntry("CookieDomainAdvice", domainConfig); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/konqueror/settings/kio/uasproviders/chrome50oncurrent.desktop new/kdebase-4.5.1/apps/konqueror/settings/kio/uasproviders/chrome50oncurrent.desktop --- old/kdebase-4.5.0/apps/konqueror/settings/kio/uasproviders/chrome50oncurrent.desktop 2010-08-04 21:13:56.000000000 +0200 +++ new/kdebase-4.5.1/apps/konqueror/settings/kio/uasproviders/chrome50oncurrent.desktop 2010-08-27 10:10:17.000000000 +0200 @@ -12,6 +12,7 @@ Name[en_GB]=UADescription (Google Chrome 5.0) Name[es]=UADescription (Google Chrome 5.0) Name[et]=UADescription (Google Chrome 5.0) +Name[eu]=UA azalpena (Google Chrome 5.0) Name[fr]=UADescription (Google Chrome 5.0) Name[fy]=UADescription (Google Chrome 5.0) Name[ga]=UADescription (Google Chrome 5.0) @@ -19,6 +20,7 @@ Name[he]=UADescription (Google Chrome 5.0) Name[hi]=यूए-डिस्क्रिप्शन (गूगल क्रोम 5.0्सपी पर) Name[hr]=UADescription (Google Chrome 5.0) +Name[hu]=Böngészőtípus (Google Chrome 5.0) Name[ia]=UADescription (Google Chrome 5.0) Name[id]=UADescription (Google Chrome 5.0) Name[is]=UADescription (Google Chrome 5.0) @@ -34,6 +36,7 @@ Name[nb]=Brukeragent (Google Chrome 5.0) Name[nds]=UA-Beschrieven (Google Chrome 5.0) Name[nl]=GA-beschrijving (Google Chrome 5.0) +Name[nn]=Brukaragent (Google Chrome 5.0) Name[pa]=UADescription (ਗੂਗਲ ਕਰੋਮ ੫.੦) Name[pl]=UADescription (Google Chrome 5.0) Name[pt]=UADescription (Google Chrome 5.0) @@ -41,6 +44,7 @@ Name[ro]=Descriere AU (Google Chrome 5.0) Name[ru]=UADescription (Google Chrome 5.0) Name[sk]=Popis agenta (Google Chrome 5.0) +Name[sl]=UAOpis (Google Chrome 5.0) Name[sr]=УА‑опис (Гуглов Кроум 5.0) Name[sr@ijekavian]=УА‑опис (Гуглов Кроум 5.0) Name[sr@ijekavianlatin]=UA-opis (Googleov Chrome 5.0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/konqueror/settings/kio/uasproviders/firefox30oncurrent.desktop new/kdebase-4.5.1/apps/konqueror/settings/kio/uasproviders/firefox30oncurrent.desktop --- old/kdebase-4.5.0/apps/konqueror/settings/kio/uasproviders/firefox30oncurrent.desktop 2010-07-12 23:08:16.000000000 +0200 +++ new/kdebase-4.5.1/apps/konqueror/settings/kio/uasproviders/firefox30oncurrent.desktop 2010-08-27 10:10:17.000000000 +0200 @@ -14,7 +14,7 @@ Name[eo]=UA-Priskribo (Fajrovulpo 3.0 sub nuna) Name[es]=UADescription (Firefox 3.0 en actual) Name[et]=UADescription (Selles masinas töötav Firefox 3.0) -Name[eu]=UADescription (Firefox 3.0 unekoan) +Name[eu]=UA azalpena (Firefox 3.0 unekoan) Name[fi]=Käyttäjäagenttikuvaus (Firefox 3.0 nykyisellä) Name[fr]=UADescription (Firefox 3.0 sous le système actuel) Name[fy]=UA-beskriuwing (Firefox 3.0 op aktive) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/konqueror/settings/kio/uasproviders/firefox36oncurrent.desktop new/kdebase-4.5.1/apps/konqueror/settings/kio/uasproviders/firefox36oncurrent.desktop --- old/kdebase-4.5.0/apps/konqueror/settings/kio/uasproviders/firefox36oncurrent.desktop 2010-08-04 21:13:56.000000000 +0200 +++ new/kdebase-4.5.1/apps/konqueror/settings/kio/uasproviders/firefox36oncurrent.desktop 2010-08-27 10:10:17.000000000 +0200 @@ -12,6 +12,7 @@ Name[en_GB]=UADescription (Firefox 3.6 on current) Name[es]=UADescription (Firefox 3.6 en actual) Name[et]=UADescription (Selles masinas töötav Firefox 3.6) +Name[eu]=UA azalpena (Firefox 3.6 unekoan) Name[fr]=UADescription (Firefox 3.6 sous le système actuel) Name[fy]=UADescription (Firefox 3.6 op aktive) Name[ga]=UADescription (Firefox 3.6 ar an gcóras reatha) @@ -19,6 +20,7 @@ Name[he]=UADescription (Firefox 3.6 on current) Name[hi]=यूए-डिस्क्रिप्शन (फ़ॉयरफ़ॉक्स 3.6 हालिया पर) Name[hr]=UADescription (Firefox 3.6 on current) +Name[hu]=Böngészőtípus (Firefox 3.6) Name[ia]=UADescription (Firefox 3.6 super le currente) Name[id]=UADescription (Firefox 3.6 pada saat ini) Name[is]=UADescription (Firefox 3.6 á núverandi) @@ -34,6 +36,7 @@ Name[nb]=Brukeragent (Firefox 3.6 herifra) Name[nds]=UA-Beschrieven (Firefox 3.6 op dit Systeem) Name[nl]=UADescription (Firefox 3.6 op huidige) +Name[nn]=Brukaragent (Firefox 3.6 herifrå) Name[pa]=UADescription (ਮੌਜੂਦਾ ਉੱਤੇ ਫਾਇਰਫਾਕਸ ੩.੬) Name[pl]=UADescription (Firefox 3.6, bieżący) Name[pt]=UADescription (Firefox 3.6 no sistema actual) @@ -41,6 +44,7 @@ Name[ro]=Descriere AU (Firefox 3.6 pe sistemul curent) Name[ru]=UADescription (Firefox 3.6 на текущей системе) Name[sk]=Popis agenta (Firefox 3.6 na aktuálnom) +Name[sl]=UAOpis (Firefox 3.6 na trenutnem) Name[sr]=УА‑опис (Фајерфокс 3.6 на текућем) Name[sr@ijekavian]=УА‑опис (Фајерфокс 3.6 на текућем) Name[sr@ijekavianlatin]=UA-opis (Firefox 3.6 na tekućem) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/konqueror/settings/kio/uasproviders/safari40.desktop new/kdebase-4.5.1/apps/konqueror/settings/kio/uasproviders/safari40.desktop --- old/kdebase-4.5.0/apps/konqueror/settings/kio/uasproviders/safari40.desktop 2010-08-04 21:13:56.000000000 +0200 +++ new/kdebase-4.5.1/apps/konqueror/settings/kio/uasproviders/safari40.desktop 2010-08-27 10:10:17.000000000 +0200 @@ -12,6 +12,7 @@ Name[en_GB]=UADescription (Safari 4.0 on MacOS X) Name[es]=UADescription (Safari 4.0 en MacOS X) Name[et]=UADescription (Safari 4.0 MacOS X platvormil) +Name[eu]=UA azalpena (Safari 4.0 MacOS X-en) Name[fr]=UADescription (Safari 4.0 sous MacOS X) Name[fy]=UADescription (Safari 4.0 op MacOS X) Name[ga]=UADescription (Safari 4.0 ar MacOS X) @@ -19,6 +20,7 @@ Name[he]=UADescription (Safari 4.0 on MacOS X) Name[hi]=यूए-डिस्क्रिप्शन (मॅक-ओएस X में सफारी 2.0) Name[hr]=UADescription (Safari 4.0 on MacOS X) +Name[hu]=Böngészőtípus (Safari 4.0, MacOS X) Name[ia]=UADescription (Safari 4.0 super MacOS X) Name[id]=UADescription (Safari 4.0 di MacOS X) Name[is]=UADescription (Safari 4.0 á MacOS X) @@ -34,6 +36,7 @@ Name[nb]=Brukeragent (Safari 4.0 på MacOS X) Name[nds]=UA-Beschrieven (Safari 4.0 op MacOS X) Name[nl]=GA-beschrijving (Safari 4.0 op MacOS X) +Name[nn]=Brukaragent (Safari 4.0 på MacOS X) Name[pa]=UADescription (MacOS X ਉੱਤੇ ਸਫ਼ਾਰੀ ੪.੦) Name[pl]=UADescription (Safari 4.0 w MacOS X) Name[pt]=UADescription (Safari 4.0 no MacOS X) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/konqueror/sidebar/default_entries/places.desktop new/kdebase-4.5.1/apps/konqueror/sidebar/default_entries/places.desktop --- old/kdebase-4.5.0/apps/konqueror/sidebar/default_entries/places.desktop 2010-08-04 21:13:56.000000000 +0200 +++ new/kdebase-4.5.1/apps/konqueror/sidebar/default_entries/places.desktop 2010-08-27 10:10:17.000000000 +0200 @@ -83,6 +83,7 @@ Comment[en_GB]=This is the list of places. Comment[es]=Esta es la lista de lugares. Comment[et]=Asukohtade loend. +Comment[eu]=Hau da lekuen zerrenda. Comment[fi]=Tämä on sijaintien luettelo. Comment[fr]=Ceci est la liste des emplacements. Comment[fy]=Dit is de opsomming fan places. @@ -90,6 +91,7 @@ Comment[he]=זוהי רשימת המקומות. Comment[hi]=यह स्थानों की सूची है Comment[hr]=Ovo je lista mjesta. +Comment[hu]=Ez a helyek listája. Comment[ia]=Isto es le lista de placias Comment[id]=Ini adalah senarai tempat. Comment[is]=Þetta er listi yfir staði á skráarkerfisinu. @@ -105,6 +107,7 @@ Comment[nb]=Dette er lista over steder. Comment[nds]=Dit is de List mit Steden. Comment[nl]=Dit is de lijst met plaatsen. +Comment[nn]=Dette er lista over stader. Comment[pa]=ਇਹ ਥਾਵਾਂ ਦੀ ਲਿਸਟ ਹੈ। Comment[pl]=To jest lista miejsc. Comment[pt]=Esta é a lista de locais. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/konqueror/sidebar/places_module/konqsidebar_places.desktop new/kdebase-4.5.1/apps/konqueror/sidebar/places_module/konqsidebar_places.desktop --- old/kdebase-4.5.0/apps/konqueror/sidebar/places_module/konqsidebar_places.desktop 2010-08-04 21:13:56.000000000 +0200 +++ new/kdebase-4.5.1/apps/konqueror/sidebar/places_module/konqsidebar_places.desktop 2010-08-27 10:10:17.000000000 +0200 @@ -13,12 +13,15 @@ Name[en_GB]=Places SideBar Module Name[es]=Módulo de la barra lateral de lugares Name[et]=Asukohtade külgriba moodul +Name[eu]=Lekuen alboko barraren modulua Name[fi]=Sijainnit sivupalkki-moduuli Name[fr]=Placer le module de barre de navigation Name[fy]=Places sydbalke module Name[ga]=Modúl Barra Taoibh Áiteanna Name[he]=מודול סרגל צד מקומות Name[hi]= बाज़ूपट्टी मॉड्यू लगाता हैल +Name[hr]=Postavlja modul bočne trake +Name[hu]=Helyek oldalsáv-modul Name[ia]=Modulo de Barra Lateral de Placias Name[id]=Tempat Modul Batang Sisi Name[is]=Staðahliðarsláreining @@ -34,6 +37,7 @@ Name[nb]=Modul for steder-sidestolpe Name[nds]=Steden-Sietpaneelmoduul Name[nl]=Plaatst module voor zijbalk +Name[nn]=Modul for stad-sidestolpe Name[pa]=ਥਾਵਾਂ ਬਾਹਰੀ ਮੋਡੀਊਲ Name[pl]=Moduł paska bocznego miejsc Name[pt]=Módulo da Barra Lateral dos Locais diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/konqueror/src/konqcombo.cpp new/kdebase-4.5.1/apps/konqueror/src/konqcombo.cpp --- old/kdebase-4.5.0/apps/konqueror/src/konqcombo.cpp 2010-05-27 19:22:54.000000000 +0200 +++ new/kdebase-4.5.1/apps/konqueror/src/konqcombo.cpp 2010-08-27 10:10:17.000000000 +0200 @@ -869,6 +869,8 @@ const bool blocked = completionbox->blockSignals(true); completionbox->setCurrentItem(matchedItem); completionbox->blockSignals(blocked); + } else { + completionbox->setCurrentRow(-1); } } else { // completion box not visible yet -> show it diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/konqueror/src/konqtabs.cpp new/kdebase-4.5.1/apps/konqueror/src/konqtabs.cpp --- old/kdebase-4.5.0/apps/konqueror/src/konqtabs.cpp 2010-05-16 12:04:02.000000000 +0200 +++ new/kdebase-4.5.1/apps/konqueror/src/konqtabs.cpp 2010-08-27 10:10:17.000000000 +0200 @@ -74,8 +74,6 @@ m_pActiveChild = 0L; m_pViewManager = viewManager; - m_MouseMiddleClickClosesTab = KonqSettings::mouseMiddleClickClosesTab(); - m_permanentCloseButtons = KonqSettings::permanentCloseButton(); if (m_permanentCloseButtons) { setTabsClosable( true ); @@ -379,7 +377,7 @@ void KonqFrameTabs::slotMouseMiddleClick(QWidget *w) { - if (m_MouseMiddleClickClosesTab) { + if (KonqSettings::mouseMiddleClickClosesTab()) { slotCloseRequest(w); } else { KUrl filteredURL(KonqMisc::konqFilteredURL(this, QApplication::clipboard()->text(QClipboard::Selection))); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/konqueror/src/konqtabs.h new/kdebase-4.5.1/apps/konqueror/src/konqtabs.h --- old/kdebase-4.5.0/apps/konqueror/src/konqtabs.h 2010-04-07 13:23:17.000000000 +0200 +++ new/kdebase-4.5.1/apps/konqueror/src/konqtabs.h 2010-08-27 10:10:17.000000000 +0200 @@ -143,7 +143,6 @@ NewTabToolButton* m_leftWidget; bool m_permanentCloseButtons; bool m_alwaysTabBar; - bool m_MouseMiddleClickClosesTab; QMap<QString,QAction*> m_popupActions; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/lib/konq/favicons/favicons.desktop new/kdebase-4.5.1/apps/lib/konq/favicons/favicons.desktop --- old/kdebase-4.5.0/apps/lib/konq/favicons/favicons.desktop 2010-08-04 21:13:56.000000000 +0200 +++ new/kdebase-4.5.1/apps/lib/konq/favicons/favicons.desktop 2010-08-27 10:10:17.000000000 +0200 @@ -82,6 +82,7 @@ Comment[en_GB]=Stores website icons Comment[es]=Almacena iconos de sitios web Comment[et]=Veebilehekülgede ikoonide salvestamine +Comment[eu]=Webguneen ikonoak gordetzen ditu Comment[fi]=Säilyttää nettisivujen kuvakkeita Comment[fr]=Stocker les icônes des site Internet Comment[fy]=Bewarret website byldkaikes @@ -89,6 +90,7 @@ Comment[he]=מאחסן צלמיות אתרים Comment[hi]=वेबसाइट प्रतीक सहेजता है Comment[hr]=Sprema ikone web stranica +Comment[hu]=Weboldalak ikonjainak tárolása Comment[ia]=Il immagazina icones del sito web Comment[id]=Simpan ikon situs web Comment[is]=Geymir táknmyndir vefsvæða @@ -103,6 +105,7 @@ Comment[nb]=Lagrer nettstedsikoner Comment[nds]=Wohrt Nettsiedenlüttbiller Comment[nl]=Slaat website pictogrammen op +Comment[nn]=Lagrar nettstadikon Comment[pa]=ਵੈੱਬਸਾਈਟ ਆਈਕਾਨ ਸਟੋਰ ਕਰਦਾ ਹੈ Comment[pl]=Przechowuje ikony stron WWW Comment[pt]=Guarda os ícones das páginas Web diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/lib/konq/Templates/Floppy.desktop new/kdebase-4.5.1/apps/lib/konq/Templates/Floppy.desktop --- old/kdebase-4.5.0/apps/lib/konq/Templates/Floppy.desktop 2010-08-04 21:13:56.000000000 +0200 +++ new/kdebase-4.5.1/apps/lib/konq/Templates/Floppy.desktop 2010-08-27 10:10:17.000000000 +0200 @@ -13,11 +13,14 @@ Name[en_GB]=Format Name[es]=Formato Name[et]=Vormindamine +Name[eu]=Formatua Name[fi]=Alusta Name[fr]=Format Name[fy]=Opmaak Name[ga]=Formáidigh Name[hi]=फॉर्मेट +Name[hr]=Formatiranje +Name[hu]=Formátum Name[ia]=Format Name[id]=Format Name[is]=Forsníða @@ -33,6 +36,7 @@ Name[nb]=Format Name[nds]=Formateren Name[nl]=Formatteren +Name[nn]=Formater Name[pa]=ਫਾਰਮੈਟ Name[pl]=Format Name[pt]=Formatar @@ -40,6 +44,7 @@ Name[ro]=Formatare Name[ru]=Форматировать Name[sk]=Formát +Name[sl]=Formatiraj Name[sr]=Форматирање Name[sr@ijekavian]=Форматирање Name[sr@ijekavianlatin]=Formatiranje diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/lib/konq/Templates/linkNFS.desktop new/kdebase-4.5.1/apps/lib/konq/Templates/linkNFS.desktop --- old/kdebase-4.5.0/apps/lib/konq/Templates/linkNFS.desktop 2010-04-15 10:58:32.000000000 +0200 +++ new/kdebase-4.5.1/apps/lib/konq/Templates/linkNFS.desktop 2010-08-27 10:10:17.000000000 +0200 @@ -33,7 +33,7 @@ Name[hne]=एनएफएस... Name[hr]=NFS… Name[hsb]=NFS... -Name[hu]=NFS... +Name[hu]=NFS… Name[ia]=NFS... Name[id]=NFS... Name[is]=NFS... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/lib/konq/Templates/linkPath.desktop new/kdebase-4.5.1/apps/lib/konq/Templates/linkPath.desktop --- old/kdebase-4.5.0/apps/lib/konq/Templates/linkPath.desktop 2010-08-04 21:13:56.000000000 +0200 +++ new/kdebase-4.5.1/apps/lib/konq/Templates/linkPath.desktop 2010-08-27 10:10:17.000000000 +0200 @@ -21,6 +21,7 @@ Name[he]=קישור בסיסי לקובץ או ספריה... Name[hi]=फ़ाइल या डॉयरेक्ट्री को मूल कडी... Name[hr]=Osnovni link do datoteke ili direktorija… +Name[hu]=Egyszerű link fájlhoz vagy könyvtárhoz… Name[ia]=Ligamine basic a file o directorio Name[id]=Tautan dasar ke berkas atau direktori... Name[is]=Grunntengill við skrá eða möppu... @@ -81,6 +82,7 @@ Comment[he]=הכנס נתיב קובץ או תיקיה: Comment[hi]=फ़ाइल या डॉयरेक्ट्री का पथ दें: Comment[hr]=Unesite putanju datoteke ili direktorija: +Comment[hu]=Adja meg a fájl vagy könyvtár elérési útját: Comment[ia]=Tu entra le percurso del file o directorio Comment[id]=Masukkan alamat berkas atau direktori: Comment[is]=Settu inn slóð á skrá eða möppu: ++++++ konsolesu.desktop ++++++ --- /var/tmp/diff_new_pack.3tcGny/_old 2010-09-03 14:20:46.000000000 +0200 +++ /var/tmp/diff_new_pack.3tcGny/_new 2010-09-03 14:20:46.000000000 +0200 @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Exec=konsole --profile Root_Shell -Icon=utilities-terminal-su +Icon=utilities-terminal_su X-DocPath=konsole/index.html Terminal=false X-KDE-StartupNotify=true ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit python-sip for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '10

03 Sep '10

Hello community, here is the log from the commit of package python-sip for openSUSE:Factory checked in at Fri Sep 3 14:20:12 CEST 2010. -------- --- python-sip/python-sip.changes 2010-06-08 16:52:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/python-sip/python-sip.changes 2010-09-01 10:46:32.000000000 +0200 @@ -1,0 +2,20 @@ +Wed Sep 1 10:42:55 CEST 2010 - dmueller(a)suse.de + +- update to 4.11: + - Added the %UnitPostIncludeCode directive. + - /KeepReference/ will now accept a key to track when the same object is + passed to more than one method. + - operator() and __call__() can now accept keyword arguments. + - Added support for Python v3.2. + +------------------------------------------------------------------- +Mon Aug 16 22:54:32 CEST 2010 - dmueller(a)suse.de + +- update to 4.10.5: + - A bug fix release for Python v3 and Python v2.7. + - Use capsules when being built for Python v2.7 to work around an apparent + bug in the support for PyCObject. + - Added support for Q_SLOT, Q_SLOTS, Q_SIGNAL and Q_SIGNALS. + - Added the /__len__/ function annotation. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- sip-4.10.2.tar.bz2 New: ---- sip-4.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-sip.spec ++++++ --- /var/tmp/diff_new_pack.aQb1wv/_old 2010-09-03 14:19:55.000000000 +0200 +++ /var/tmp/diff_new_pack.aQb1wv/_new 2010-09-03 14:19:55.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package python-sip (Version 4.10.2) +# spec file for package python-sip (Version 4.11) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,7 +23,7 @@ License: GPLv2+ Group: Development/Libraries/Python Summary: SIP tool to use python sip bindings -Version: 4.10.2 +Version: 4.11 Release: 1 %define rversion %version Url: http://www.riverbankcomputing.com/software/sip/intro ++++++ sip-4.10.2.tar.bz2 -> sip-4.11.tar.bz2 ++++++ ++++ 13201 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

commit libcaca for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '10

03 Sep '10

Hello community, here is the log from the commit of package libcaca for openSUSE:Factory checked in at Fri Sep 3 14:19:49 CEST 2010. -------- --- libcaca/libcaca.changes 2009-11-03 20:19:28.000000000 +0100 +++ libcaca/libcaca.changes 2010-08-30 22:38:34.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Aug 30 20:36:35 UTC 2010 - cristian.rodriguez(a)opensuse.org + +- Do not include build date in binaries + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- caca-no-build-date.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libcaca.spec ++++++ --- /var/tmp/diff_new_pack.nmlj7W/_old 2010-09-03 14:17:55.000000000 +0200 +++ /var/tmp/diff_new_pack.nmlj7W/_new 2010-09-03 14:17:55.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libcaca (Version 0.99.beta16) # -# 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,8 +24,8 @@ BuildRequires: freeglut-devel xorg-x11-libs BuildRequires: gcc-c++ mono-devel ruby-devel Version: 0.99.beta16 -Release: 2 -License: GPL v2 or later +Release: 9 +License: GPLv2+ Summary: Library for Colour ASCII Art, text mode graphics Group: Development/Languages/C and C++ Url: http://sam.zoy.org/projects/libcaca/ @@ -38,6 +38,7 @@ Patch6: remove_badwords.patch Patch7: libcaca-0.99.beta16-missing-GLU.patch Patch8: libcaca-0.99.beta16-libtool.patch +Patch9: caca-no-build-date.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define rb_vendorarch %{_libdir}/ruby/vendor_ruby/%{rb_ver}/%{rb_arch} %define rb_vendorlib %{_libdir}/ruby/vendor_ruby/%{rb_ver} @@ -62,7 +63,7 @@ %endif %package devel -License: GPL v2 or later +License: GPLv2+ Summary: Library for Colour ASCII Art, text mode graphics Group: Development/Languages/C and C++ #yes, nothing else is required to link other applications with "libcaca" @@ -80,7 +81,7 @@ Jean-Yves Lamoureux <jylam(a)lnxscene.org> %package csharp -License: GPL v2 or later +License: GPLv2+ Summary: C# support for libcaca Group: Development/Languages/Mono Requires: %{name} = %{version} mono @@ -96,7 +97,7 @@ Jean-Yves Lamoureux <jylam(a)lnxscene.org> %package ruby -License: GPL v2 or later +License: GPLv2+ Summary: Ruby bindings for libcaca Group: Development/Languages/Ruby Requires: %{name} = %{version} ruby @@ -112,7 +113,7 @@ Jean-Yves Lamoureux <jylam(a)lnxscene.org> %package -n caca-utils -License: GPL v2 or later +License: GPLv2+ Summary: Colour ASCII Art Text mode graphics utilities based on libcaca Group: Amusements/Toys/Graphics @@ -150,6 +151,7 @@ %patch6 -p1 %patch7 %patch8 +%patch9 %build autoreconf -fiv ++++++ caca-no-build-date.patch ++++++ Index: src/img2txt.c =================================================================== --- src/img2txt.c.orig 2010-08-30 16:06:50.000000000 -0400 +++ src/img2txt.c 2010-08-30 16:08:38.214714972 -0400 @@ -81,14 +81,14 @@ static void version(void) { printf( "img2txt Copyright 2006-2007 Sam Hocevar and Jean-Yves Lamoureux\n" - "Internet: <sam(a)zoy.org> <jylam(a)lnxscene.org> Version: %s, date: %s\n" + "Internet: <sam(a)zoy.org> <jylam(a)lnxscene.org> Version: %s\n" "\n" "img2txt, along with its documentation, may be freely copied and distributed.\n" "\n" "The latest version of img2txt is available from the web site,\n" " http://caca.zoy.org/wiki/libcaca in the libcaca package.\n" "\n", - caca_get_version(), __DATE__); + caca_get_version()); } int main(int argc, char **argv) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit kdegraphics4 for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '10

03 Sep '10

Hello community, here is the log from the commit of package kdegraphics4 for openSUSE:Factory checked in at Fri Sep 3 14:19:35 CEST 2010. -------- --- KDE/kdegraphics4/kdegraphics4.changes 2010-07-29 13:54:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdegraphics4/kdegraphics4.changes 2010-08-27 15:45:49.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Aug 27 15:45:45 CEST 2010 - dmueller(a)suse.de + +- update to 4.5.1 + * see http://kde.org/announcements/changelogs/changelog4_5_0to4_5_1.php for details + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdegraphics-4.5.0.tar.bz2 New: ---- kdegraphics-4.5.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdegraphics4.spec ++++++ --- /var/tmp/diff_new_pack.WoX0d7/_old 2010-09-03 14:18:36.000000000 +0200 +++ /var/tmp/diff_new_pack.WoX0d7/_new 2010-09-03 14:18:36.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdegraphics4 (Version 4.5.0) +# spec file for package kdegraphics4 (Version 4.5.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -33,7 +33,7 @@ Group: Productivity/Graphics/Other Summary: kdegraphics base package Url: http://www.kde.org -Version: 4.5.0 +Version: 4.5.1 Release: 1 Source0: kdegraphics-%version.tar.bz2 Patch0: 4_5_BRANCH.diff ++++++ kdegraphics-4.5.0.tar.bz2 -> kdegraphics-4.5.1.tar.bz2 ++++++ Files old/kdegraphics-4.5.0/doc/gwenview/index.cache.bz2 and new/kdegraphics-4.5.1/doc/gwenview/index.cache.bz2 differ Files old/kdegraphics-4.5.0/doc/kcontrol/kamera/index.cache.bz2 and new/kdegraphics-4.5.1/doc/kcontrol/kamera/index.cache.bz2 differ Files old/kdegraphics-4.5.0/doc/kcontrol/kgamma/index.cache.bz2 and new/kdegraphics-4.5.1/doc/kcontrol/kgamma/index.cache.bz2 differ Files old/kdegraphics-4.5.0/doc/kolourpaint/index.cache.bz2 and new/kdegraphics-4.5.1/doc/kolourpaint/index.cache.bz2 differ Files old/kdegraphics-4.5.0/doc/kruler/index.cache.bz2 and new/kdegraphics-4.5.1/doc/kruler/index.cache.bz2 differ Files old/kdegraphics-4.5.0/doc/ksnapshot/index.cache.bz2 and new/kdegraphics-4.5.1/doc/ksnapshot/index.cache.bz2 differ Files old/kdegraphics-4.5.0/doc/okular/index.cache.bz2 and new/kdegraphics-4.5.1/doc/okular/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/libs/libkdcraw/libkdcraw/kdcraw_p.cpp new/kdegraphics-4.5.1/libs/libkdcraw/libkdcraw/kdcraw_p.cpp --- old/kdegraphics-4.5.0/libs/libkdcraw/libkdcraw/kdcraw_p.cpp 2010-05-16 12:06:16.000000000 +0200 +++ new/kdegraphics-4.5.1/libs/libkdcraw/libkdcraw/kdcraw_p.cpp 2010-08-27 10:12:04.000000000 +0200 @@ -116,7 +116,12 @@ identify.pixelAspectRatio = raw->imgdata.sizes.pixel_aspect; identify.rawColors = raw->imgdata.idata.colors; identify.rawImages = raw->imgdata.idata.raw_count; - identify.blackPoint = raw->imgdata.color.black; + identify.blackPoint = raw->imgdata.color.cblack[0]; + //TODO: provide per channel black point with next interface change + for (int i = 1; i < raw->imgdata.idata.colors; i++) + { + identify.blackPoint = qMin(identify.blackPoint, raw->imgdata.color.cblack[i]); + } identify.whitePoint = raw->imgdata.color.maximum; identify.orientation = (DcrawInfoContainer::ImageOrientation)raw->imgdata.sizes.flip; memcpy(&identify.cameraColorMatrix1, &raw->imgdata.color.cmatrix, sizeof(raw->imgdata.color.cmatrix)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/libs/libkexiv2/libkexiv2/kexiv2exif.cpp new/kdegraphics-4.5.1/libs/libkexiv2/libkexiv2/kexiv2exif.cpp --- old/kdegraphics-4.5.0/libs/libkexiv2/libkexiv2/kexiv2exif.cpp 2010-05-27 19:22:45.000000000 +0200 +++ new/kdegraphics-4.5.1/libs/libkexiv2/libkexiv2/kexiv2exif.cpp 2010-08-27 10:12:04.000000000 +0200 @@ -980,10 +980,33 @@ KExiv2::TagsMap KExiv2::getMakernoteTagsList() const { -#if (EXIV2_TEST_VERSION(0,18,1)) try { QList<const Exiv2::TagInfo*> tags; + +#if (EXIV2_TEST_VERSION(0,21,0)) + + const Exiv2::GroupInfo* gi = Exiv2::ExifTags::groupList(); + + while (gi->ifdId_ != Exiv2::lastIfdId) + { + if (QString(gi->name_) == QString("Makernote")) + { + Exiv2::TagListFct tl = gi->tagList_; + const Exiv2::TagInfo* ti = tl(); + + while (ti->tag_ != 0xFFFF) + { + tags << ti; + ++ti; + } + } + ++gi; + } + +#else + +#if (EXIV2_TEST_VERSION(0,18,1)) tags // Canon Makernotes. << Exiv2::CanonMakerNote::tagList() @@ -994,7 +1017,7 @@ << Exiv2::CanonMakerNote::tagListPi() #if (EXIV2_TEST_VERSION(0,19,1)) << Exiv2::CanonMakerNote::tagListFi() -#endif +#endif // (EXIV2_TEST_VERSION(0,19,1)) // Sigma Makernotes. << Exiv2::SigmaMakerNote::tagList() // Sony Makernotes. @@ -1002,7 +1025,7 @@ #if (EXIV2_TEST_VERSION(0,19,1)) << Exiv2::SonyMakerNote::tagListCs() << Exiv2::SonyMakerNote::tagListCs2() -#endif +#endif // (EXIV2_TEST_VERSION(0,19,1)) // Minolta Makernotes. << Exiv2::MinoltaMakerNote::tagList() << Exiv2::MinoltaMakerNote::tagListCsStd() @@ -1031,6 +1054,10 @@ // Fuji Makernotes. << Exiv2::FujiMakerNote::tagList(); +#endif // (EXIV2_TEST_VERSION(0,18,1)) + +#endif // (EXIV2_TEST_VERSION(0,21,0)) + TagsMap tagsMap; for (QList<const Exiv2::TagInfo*>::iterator it = tags.begin(); it != tags.end(); ++it) { @@ -1050,7 +1077,6 @@ { d->printExiv2ExceptionError("Cannot get Makernote Tags list using Exiv2 ", e); } -#endif return TagsMap(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/libs/libkexiv2/libkexiv2/kexiv2_p.cpp new/kdegraphics-4.5.1/libs/libkexiv2/libkexiv2/kexiv2_p.cpp --- old/kdegraphics-4.5.0/libs/libkexiv2/libkexiv2/kexiv2_p.cpp 2010-05-16 12:06:16.000000000 +0200 +++ new/kdegraphics-4.5.1/libs/libkexiv2/libkexiv2/kexiv2_p.cpp 2010-08-27 10:12:04.000000000 +0200 @@ -33,7 +33,9 @@ imageComments.clear(); exifMetadata.clear(); iptcMetadata.clear(); +#ifdef _XMP_SUPPORT_ xmpMetadata.clear(); +#endif } KExiv2Priv::KExiv2Priv() @@ -50,7 +52,7 @@ void KExiv2Priv::printExiv2ExceptionError(const QString& msg, Exiv2::Error& e) { std::string s(e.what()); - kDebug(51003) << msg.toAscii().constData() << " (Error #" + kDebug(51003) << msg.toAscii().constData() << " (Error #" << e.code() << ": " << s.c_str() << endl; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/libs/libkexiv2/libkexiv2/kexiv2_p.h new/kdegraphics-4.5.1/libs/libkexiv2/libkexiv2/kexiv2_p.h --- old/kdegraphics-4.5.0/libs/libkexiv2/libkexiv2/kexiv2_p.h 2010-05-16 12:06:16.000000000 +0200 +++ new/kdegraphics-4.5.1/libs/libkexiv2/libkexiv2/kexiv2_p.h 2010-08-27 10:12:04.000000000 +0200 @@ -26,7 +26,7 @@ #include "kexiv2.h" - // C++ includes. + // C++ includes #include <cstdlib> #include <cstdio> @@ -37,7 +37,7 @@ #include <iomanip> #include <string> -// Qt includes. +// Qt includes #include <QBuffer> #include <QFile> @@ -49,7 +49,7 @@ #include <QDataStream> #include <QSharedData> -// KDE includes. +// KDE includes #include <ktemporaryfile.h> #include <kencodingdetector.h> @@ -57,7 +57,10 @@ #include <kdeversion.h> #include <kdebug.h> -// Exiv2 includes. +// Exiv2 includes ------------------------------------------------------- + +// NOTE: All Exiv2 header must be stay there to not expose external source code to Exiv2 API +// and reduce Exiv2 dependency to client code. // The pragmas are required to be able to catch exceptions thrown by libexiv2: // See http://gcc.gnu.org/wiki/Visibility, the section about c++ exceptions. @@ -65,6 +68,8 @@ #ifdef __GNUC__ #pragma GCC visibility push(default) #endif + +#include <exiv2/exv_conf.h> #include <exiv2/error.hpp> #include <exiv2/image.hpp> #include <exiv2/jpgimage.hpp> @@ -74,25 +79,11 @@ #include <exiv2/properties.hpp> #include <exiv2/types.hpp> #include <exiv2/exif.hpp> -#include <exiv2/canonmn.hpp> -#include <exiv2/sigmamn.hpp> -#include <exiv2/sonymn.hpp> -#include <exiv2/minoltamn.hpp> -#include <exiv2/nikonmn.hpp> -#include <exiv2/olympusmn.hpp> -#include <exiv2/panasonicmn.hpp> -#include <exiv2/pentaxmn.hpp> -#include <exiv2/fujimn.hpp> -//#include <exiv2/preview.hpp> -#ifdef __GNUC__ -#pragma GCC visibility pop -#endif +#include <exiv2/xmpsidecar.hpp> // Check if Exiv2 support XMP -#if (EXIV2_MAJOR_VERSION ==0 && EXIV2_MINOR_VERSION ==15 && EXIV2_PATCH_VERSION >=99) || \ - (EXIV2_MAJOR_VERSION ==0 && EXIV2_MINOR_VERSION >15 ) || \ - (EXIV2_MAJOR_VERSION >0) +#ifdef EXV_HAVE_XMP_TOOLKIT # define _XMP_SUPPORT_ 1 #endif @@ -107,15 +98,28 @@ # define EXIV2_TEST_VERSION(major,minor,patch) (false) #endif -#ifndef _XMP_SUPPORT_ +#if (EXIV2_TEST_VERSION(0,21,0)) -// Dummy redifinition of XmpData class to compile fine -// if XMP metadata support is not available from Exiv2 -namespace Exiv2 -{ - class XmpData{}; -} -#endif // _XMP_SUPPORT_ +// With exiv2 > 0.20.0, all makernote header files have been removed to increase binary compatibility. +// See Exiv2 bugzilla entry http://dev.exiv2.org/issues/719 +// and wiki topic http://dev.exiv2.org/boards/3/topics/583 +#else +#include <exiv2/canonmn.hpp> +#include <exiv2/sigmamn.hpp> +#include <exiv2/sonymn.hpp> +#include <exiv2/minoltamn.hpp> +#include <exiv2/nikonmn.hpp> +#include <exiv2/olympusmn.hpp> +#include <exiv2/panasonicmn.hpp> +#include <exiv2/pentaxmn.hpp> +#include <exiv2/fujimn.hpp> +#endif + +#ifdef __GNUC__ +#pragma GCC visibility pop +#endif + +// End of Exiv2 headers ------------------------------------------------------ namespace KExiv2Iface { @@ -163,14 +167,20 @@ const Exiv2::ExifData& exifMetadata() const { return data.constData()->exifMetadata; } const Exiv2::IptcData& iptcMetadata() const { return data.constData()->iptcMetadata; } - const Exiv2::XmpData& xmpMetadata() const { return data.constData()->xmpMetadata; } const std::string& imageComments() const { return data.constData()->imageComments; } +#ifdef _XMP_SUPPORT_ + const Exiv2::XmpData& xmpMetadata() const { return data.constData()->xmpMetadata; } +#endif + Exiv2::ExifData& exifMetadata() { return data.data()->exifMetadata; } Exiv2::IptcData& iptcMetadata() { return data.data()->iptcMetadata; } - Exiv2::XmpData& xmpMetadata() { return data.data()->xmpMetadata; } std::string& imageComments() { return data.data()->imageComments; } +#ifdef _XMP_SUPPORT_ + Exiv2::XmpData& xmpMetadata() { return data.data()->xmpMetadata; } +#endif + public: bool writeRawFiles; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/libs/libkexiv2/libkexiv2/kexiv2xmp.cpp new/kdegraphics-4.5.1/libs/libkexiv2/libkexiv2/kexiv2xmp.cpp --- old/kdegraphics-4.5.0/libs/libkexiv2/libkexiv2/kexiv2xmp.cpp 2010-05-16 12:06:16.000000000 +0200 +++ new/kdegraphics-4.5.1/libs/libkexiv2/libkexiv2/kexiv2xmp.cpp 2010-08-27 10:12:04.000000000 +0200 @@ -44,7 +44,7 @@ catch( Exiv2::Error& e ) { std::string s(e.what()); - kDebug(51003) << "Cannot check Xmp access mode using Exiv2 (Error #" + kDebug(51003) << "Cannot check Xmp access mode using Exiv2 (Error #" << e.code() << ": " << s.c_str() << ")" << endl; } @@ -52,9 +52,11 @@ #else - return false; + Q_UNUSED(filePath); #endif // _XMP_SUPPORT_ + + return false; } bool KExiv2::hasXmp() const @@ -142,6 +144,10 @@ d->printExiv2ExceptionError("Cannot set Xmp data using Exiv2 ", e); } +#else + + Q_UNUSED(data); + #endif // _XMP_SUPPORT_ return false; @@ -229,6 +235,11 @@ d->printExiv2ExceptionError("Cannot parse Xmp metadata using Exiv2 ", e); } +#else + + Q_UNUSED(xmpKeysFilter); + Q_UNUSED(invertSelection); + #endif // _XMP_SUPPORT_ return MetaDataMap(); @@ -238,17 +249,21 @@ { #ifdef _XMP_SUPPORT_ - try + try { std::string xmpkey(xmpTagName); Exiv2::XmpKey xk(xmpkey); return QString::fromLocal8Bit( Exiv2::XmpProperties::propertyTitle(xk) ); } - catch (Exiv2::Error& e) + catch (Exiv2::Error& e) { d->printExiv2ExceptionError("Cannot get Xmp metadata tag title using Exiv2 ", e); } +#else + + Q_UNUSED(xmpTagName); + #endif // _XMP_SUPPORT_ return QString(); @@ -257,16 +272,22 @@ QString KExiv2::getXmpTagDescription(const char* xmpTagName) { #ifdef _XMP_SUPPORT_ - try + + try { std::string xmpkey(xmpTagName); Exiv2::XmpKey xk(xmpkey); return QString::fromLocal8Bit( Exiv2::XmpProperties::propertyDesc(xk) ); } - catch (Exiv2::Error& e) + catch (Exiv2::Error& e) { d->printExiv2ExceptionError("Cannot get Xmp metadata tag description using Exiv2 ", e); } + +#else + + Q_UNUSED(xmpTagName); + #endif // _XMP_SUPPORT_ return QString(); @@ -299,6 +320,11 @@ .arg(xmpTagName), e); } +#else + + Q_UNUSED(xmpTagName); + Q_UNUSED(escapeCR); + #endif // _XMP_SUPPORT_ return QString(); @@ -325,6 +351,12 @@ d->printExiv2ExceptionError("Cannot set Xmp tag string into image using Exiv2 ", e); } +#else + + Q_UNUSED(xmpTagName); + Q_UNUSED(value); + Q_UNUSED(setProgramName); + #endif // _XMP_SUPPORT_ return false; @@ -345,8 +377,8 @@ AltLangMap map; const Exiv2::LangAltValue &value = static_cast<const Exiv2::LangAltValue &>(it->value()); - for (Exiv2::LangAltValue::ValueType::const_iterator it2 = value.value_.begin(); - it2 != value.value_.end(); ++it2) + for (Exiv2::LangAltValue::ValueType::const_iterator it2 = value.value_.begin(); + it2 != value.value_.end(); ++it2) { QString lang = QString::fromUtf8(it2->first.c_str()); QString text = QString::fromUtf8(it2->second.c_str()); @@ -366,12 +398,17 @@ .arg(xmpTagName), e); } +#else + + Q_UNUSED(xmpTagName); + Q_UNUSED(escapeCR); + #endif // _XMP_SUPPORT_ return AltLangMap(); } -bool KExiv2::setXmpTagStringListLangAlt(const char* xmpTagName, const KExiv2::AltLangMap& values, +bool KExiv2::setXmpTagStringListLangAlt(const char* xmpTagName, const KExiv2::AltLangMap& values, bool setProgramName) const { #ifdef _XMP_SUPPORT_ @@ -407,6 +444,12 @@ d->printExiv2ExceptionError("Cannot set Xmp tag string lang-alt into image using Exiv2 ", e); } +#else + + Q_UNUSED(xmpTagName); + Q_UNUSED(values); + Q_UNUSED(setProgramName); + #endif // _XMP_SUPPORT_ return false; @@ -448,12 +491,18 @@ .arg(xmpTagName), e); } +#else + + Q_UNUSED(xmpTagName); + Q_UNUSED(langAlt); + Q_UNUSED(escapeCR); + #endif // _XMP_SUPPORT_ return QString(); } -bool KExiv2::setXmpTagStringLangAlt(const char* xmpTagName, const QString& value, +bool KExiv2::setXmpTagStringLangAlt(const char* xmpTagName, const QString& value, const QString& langAlt, bool setProgramName) const { #ifdef _XMP_SUPPORT_ @@ -465,7 +514,7 @@ { QString language("x-default"); // default alternative language. - if (!langAlt.isEmpty()) + if (!langAlt.isEmpty()) language = langAlt; QString txtLangAlt = QString("lang=%1 %2").arg(language).arg(value); @@ -499,6 +548,13 @@ d->printExiv2ExceptionError("Cannot set Xmp tag string lang-alt into image using Exiv2 ", e); } +#else + + Q_UNUSED(xmpTagName); + Q_UNUSED(value); + Q_UNUSED(langAlt); + Q_UNUSED(setProgramName); + #endif // _XMP_SUPPORT_ return false; @@ -542,6 +598,11 @@ .arg(xmpTagName), e); } +#else + + Q_UNUSED(xmpTagName); + Q_UNUSED(escapeCR); + #endif // _XMP_SUPPORT_ return QStringList(); @@ -580,6 +641,12 @@ d->printExiv2ExceptionError("Cannot set Xmp tag string Seq into image using Exiv2 ", e); } +#else + + Q_UNUSED(xmpTagName); + Q_UNUSED(seq); + Q_UNUSED(setProgramName); + #endif // _XMP_SUPPORT_ return false; @@ -622,6 +689,11 @@ .arg(xmpTagName), e); } +#else + + Q_UNUSED(xmpTagName); + Q_UNUSED(escapeCR); + #endif // _XMP_SUPPORT_ return QStringList(); @@ -660,6 +732,12 @@ d->printExiv2ExceptionError("Cannot set Xmp tag string Bag into image using Exiv2 ", e); } +#else + + Q_UNUSED(xmpTagName); + Q_UNUSED(bag); + Q_UNUSED(setProgramName); + #endif // _XMP_SUPPORT_ return false; @@ -668,8 +746,6 @@ bool KExiv2::addToXmpTagStringBag(const char* xmpTagName, const QStringList& entriesToAdd, bool setProgramName) const { -//#ifdef _XMP_SUPPORT_ - if (!setProgramId(setProgramName)) return false; @@ -686,16 +762,12 @@ if (setXmpTagStringBag(xmpTagName, newEntries, false)) return true; -//#endif // _XMP_SUPPORT_ - return false; } bool KExiv2::removeFromXmpTagStringBag(const char* xmpTagName, const QStringList& entriesToRemove, bool setProgramName) const { -//#ifdef _XMP_SUPPORT_ - if (!setProgramId(setProgramName)) return false; @@ -712,8 +784,6 @@ if (setXmpTagStringBag(xmpTagName, newEntries, false)) return true; -//#endif // _XMP_SUPPORT_ - return false; } @@ -801,7 +871,7 @@ QMap<QString, QVariant> map; // access the ValueType std::map< std::string, std::string> Exiv2::LangAltValue::ValueType::const_iterator i; - for (i = value.value_.begin(); i != value.value_.end(); ++i) + for (i = value.value_.begin(); i != value.value_.end(); ++i) { map[QString::fromUtf8(i->first.c_str())] = QString::fromUtf8(i->second.c_str()); } @@ -818,6 +888,12 @@ .arg(xmpTagName), e); } +#else + + Q_UNUSED(xmpTagName); + Q_UNUSED(rationalAsListOfInts); + Q_UNUSED(stringEscapeCR); + #endif // _XMP_SUPPORT_ return QVariant(); @@ -839,6 +915,11 @@ KExiv2Priv::printExiv2ExceptionError("Cannot register a new Xmp namespace using Exiv2 ", e); } +#else + + Q_UNUSED(uri); + Q_UNUSED(prefix); + #endif // _XMP_SUPPORT_ return false; @@ -860,6 +941,10 @@ KExiv2Priv::printExiv2ExceptionError("Cannot unregister a new Xmp namespace using Exiv2 ", e); } +#else + + Q_UNUSED(uri); + #endif // _XMP_SUPPORT_ return false; @@ -887,6 +972,11 @@ d->printExiv2ExceptionError("Cannot remove Xmp tag using Exiv2 ", e); } +#else + + Q_UNUSED(xmpTagName); + Q_UNUSED(setProgramName); + #endif // _XMP_SUPPORT_ return false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/okular/core/document.cpp new/kdegraphics-4.5.1/okular/core/document.cpp --- old/kdegraphics-4.5.0/okular/core/document.cpp 2010-04-22 10:04:04.000000000 +0200 +++ new/kdegraphics-4.5.1/okular/core/document.cpp 2010-08-27 10:12:04.000000000 +0200 @@ -3370,6 +3370,11 @@ if ( docFileName == QLatin1String( "-" ) ) return false; + QString docPath = d->m_docFileName; + const QFileInfo fi( docPath ); + if ( fi.isSymLink() ) + docPath = fi.symLinkTarget(); + KZip okularArchive( fileName ); if ( !okularArchive.open( QIODevice::WriteOnly ) ) return false; @@ -3407,7 +3412,7 @@ okularArchive.writeFile( "content.xml", user.loginName(), userGroup.name(), contentDocXml.constData(), contentDocXml.length() ); - okularArchive.addLocalFile( d->m_docFileName, docFileName ); + okularArchive.addLocalFile( docPath, docFileName ); okularArchive.addLocalFile( metadataFile.fileName(), "metadata.xml" ); if ( !okularArchive.close() ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/okular/core/document.h new/kdegraphics-4.5.1/okular/core/document.h --- old/kdegraphics-4.5.0/okular/core/document.h 2010-04-15 10:58:26.000000000 +0200 +++ new/kdegraphics-4.5.1/okular/core/document.h 2010-08-27 10:12:04.000000000 +0200 @@ -791,7 +791,7 @@ /** * If 'rePos.enabled == true' then this structure contains the - * viewport center. + * viewport center or top left depending on the value of pos. */ struct { bool enabled; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/okular/core/version.h new/kdegraphics-4.5.1/okular/core/version.h --- old/kdegraphics-4.5.0/okular/core/version.h 2010-07-28 23:04:13.000000000 +0200 +++ new/kdegraphics-4.5.1/okular/core/version.h 2010-08-27 10:12:04.000000000 +0200 @@ -10,10 +10,10 @@ #ifndef _OKULAR_VERSION_H_ #define _OKULAR_VERSION_H_ -#define OKULAR_VERSION_STRING "0.11" +#define OKULAR_VERSION_STRING "0.11.1" #define OKULAR_VERSION_MAJOR 0 #define OKULAR_VERSION_MINOR 11 -#define OKULAR_VERSION_RELEASE 0 +#define OKULAR_VERSION_RELEASE 1 #define OKULAR_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c)) #define OKULAR_VERSION \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/okular/generators/comicbook/generator_comicbook.cpp new/kdegraphics-4.5.1/okular/generators/comicbook/generator_comicbook.cpp --- old/kdegraphics-4.5.0/okular/generators/comicbook/generator_comicbook.cpp 2010-07-28 23:04:14.000000000 +0200 +++ new/kdegraphics-4.5.1/okular/generators/comicbook/generator_comicbook.cpp 2010-08-27 10:12:04.000000000 +0200 @@ -25,7 +25,7 @@ "okular_comicbook", "okular_comicbook", ki18n( "ComicBook Backend" ), - "0.2", + "0.2.1", ki18n( "A renderer for various comic book formats" ), KAboutData::License_GPL, ki18n( "© 2007-2008 Tobias Koenig" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/okular/generators/comicbook/unrar.cpp new/kdegraphics-4.5.1/okular/generators/comicbook/unrar.cpp --- old/kdegraphics-4.5.0/okular/generators/comicbook/unrar.cpp 2010-04-07 13:25:20.000000000 +0200 +++ new/kdegraphics-4.5.1/okular/generators/comicbook/unrar.cpp 2010-08-27 10:12:04.000000000 +0200 @@ -232,7 +232,7 @@ mProcess->start(); QEventLoop loop; mLoop = &loop; - ret = loop.exec( QEventLoop::WaitForMoreEvents ); + ret = loop.exec( QEventLoop::WaitForMoreEvents | QEventLoop::ExcludeUserInputEvents ); mLoop = 0; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/okular/generators/fax/faxdocument.cpp new/kdegraphics-4.5.1/okular/generators/fax/faxdocument.cpp --- old/kdegraphics-4.5.0/okular/generators/fax/faxdocument.cpp 2008-09-26 16:55:41.000000000 +0200 +++ new/kdegraphics-4.5.1/okular/generators/fax/faxdocument.cpp 2010-08-27 10:12:04.000000000 +0200 @@ -136,6 +136,8 @@ if ( pn->strips == 0 ) pn->rowsperstrip = pn->size.height(); + pn->dataOrig = (t16bits *)data; + return data; } @@ -241,6 +243,7 @@ d->mPageNode.vres = 1; d->mPageNode.inverse = 0; d->mPageNode.data = 0; + d->mPageNode.dataOrig = 0; d->mPageNode.imageData = 0; d->mType = type; @@ -252,7 +255,7 @@ FaxDocument::~FaxDocument() { - delete [] d->mPageNode.data; + delete [] d->mPageNode.dataOrig; delete [] d->mPageNode.imageData; delete d; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/okular/generators/fax/faxexpand.h new/kdegraphics-4.5.1/okular/generators/fax/faxexpand.h --- old/kdegraphics-4.5.0/okular/generators/fax/faxexpand.h 2008-09-26 16:55:41.000000000 +0200 +++ new/kdegraphics-4.5.1/okular/generators/fax/faxexpand.h 2010-08-27 10:12:04.000000000 +0200 @@ -59,6 +59,7 @@ int stripnum; /* current strip while expanding */ struct strip *strips; /* array of strips containing fax data in file */ t16bits *data; /* in-memory copy of strip */ + t16bits *dataOrig; /* copy of `data', in case we shift it */ size_t length; /* length of data */ QSize size; /* width & height of page in pixels */ int inverse; /* black <=> white */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/okular/generators/fax/generator_fax.cpp new/kdegraphics-4.5.1/okular/generators/fax/generator_fax.cpp --- old/kdegraphics-4.5.0/okular/generators/fax/generator_fax.cpp 2008-11-19 11:17:38.000000000 +0100 +++ new/kdegraphics-4.5.1/okular/generators/fax/generator_fax.cpp 2010-08-27 10:12:04.000000000 +0200 @@ -26,7 +26,7 @@ "okular_fax", "okular_fax", ki18n( "Fax Backend" ), - "0.1", + "0.1.1", ki18n( "A G3/G4 fax document backend" ), KAboutData::License_GPL, ki18n( "© 2008 Tobias Koenig" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/okular/generators/plucker/generator_plucker.cpp new/kdegraphics-4.5.1/okular/generators/plucker/generator_plucker.cpp --- old/kdegraphics-4.5.0/okular/generators/plucker/generator_plucker.cpp 2008-04-23 17:51:19.000000000 +0200 +++ new/kdegraphics-4.5.1/okular/generators/plucker/generator_plucker.cpp 2010-08-27 10:12:04.000000000 +0200 @@ -26,7 +26,7 @@ "okular_plucker", "okular_plucker", ki18n( "Plucker Document Backend" ), - "0.1", + "0.1.1", ki18n( "A renderer for Plucker eBooks" ), KAboutData::License_GPL, ki18n( "© 2007-2008 Tobias Koenig" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/okular/generators/plucker/unpluck/image.cpp new/kdegraphics-4.5.1/okular/generators/plucker/unpluck/image.cpp --- old/kdegraphics-4.5.0/okular/generators/plucker/unpluck/image.cpp 2008-02-21 10:27:47.000000000 +0100 +++ new/kdegraphics-4.5.1/okular/generators/plucker/unpluck/image.cpp 2010-08-27 10:12:04.000000000 +0200 @@ -289,8 +289,23 @@ for (j = 0; j < bytes_per_row;) { incount = *palm_ptr++; inval = *palm_ptr++; - memset (rowbuf + j, inval, incount); - j += incount; + if (incount + j <= bytes_per_row * width) + { + memset (rowbuf + j, inval, incount); + j += incount; + } + else + { + free (rowbuf); + free (lastrow); + free (jpeg_row); + + jpeg_destroy_compress (&cinfo); + + fclose( outfile ); + + return false; + } } } else if ((flags & PALM_IS_COMPRESSED_FLAG) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/okular/ui/annotationtools.h new/kdegraphics-4.5.1/okular/ui/annotationtools.h --- old/kdegraphics-4.5.0/okular/ui/annotationtools.h 2008-01-05 00:53:45.000000000 +0100 +++ new/kdegraphics-4.5.1/okular/ui/annotationtools.h 2010-08-27 10:12:04.000000000 +0200 @@ -24,7 +24,7 @@ } /** - * @short Engine: filter events to distill Annotation's. + * @short Engine: filter events to distill Annotations. */ class AnnotatorEngine { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/okular/ui/pageview.cpp new/kdegraphics-4.5.1/okular/ui/pageview.cpp --- old/kdegraphics-4.5.0/okular/ui/pageview.cpp 2010-08-04 21:15:45.000000000 +0200 +++ new/kdegraphics-4.5.1/okular/ui/pageview.cpp 2010-08-27 10:12:04.000000000 +0200 @@ -1427,7 +1427,13 @@ int deltaY = d->mouseMidLastY - mouseY; // wrap mouse from top to bottom - QRect mouseContainer = KGlobalSettings::desktopGeometry( this ); + const QRect mouseContainer = KGlobalSettings::desktopGeometry( this ); + const int absDeltaY = abs(deltaY); + if ( absDeltaY > mouseContainer.height() / 2 ) + { + deltaY = mouseContainer.height() - absDeltaY; + } + if ( mouseY <= mouseContainer.top() + 4 && d->zoomFactor < 3.99 ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/okular/VERSION new/kdegraphics-4.5.1/okular/VERSION --- old/kdegraphics-4.5.0/okular/VERSION 2010-07-28 23:04:18.000000000 +0200 +++ new/kdegraphics-4.5.1/okular/VERSION 2010-08-27 10:12:04.000000000 +0200 @@ -1 +1 @@ -okular v0.11 +okular v0.11.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

commit slang for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '10

03 Sep '10

Hello community, here is the log from the commit of package slang for openSUSE:Factory checked in at Fri Sep 3 14:18:14 CEST 2010. -------- --- slang/slang.changes 2010-04-08 13:51:27.000000000 +0200 +++ /mounts/work_src_done/STABLE/slang/slang.changes 2010-08-17 17:40:11.000000000 +0200 @@ -1,0 +2,32 @@ +Tue Aug 17 15:44:19 UTC 2010 - gber(a)opensuse.org + +- disabled parallel build again, still broken + +------------------------------------------------------------------- +Sat Aug 14 17:43:42 UTC 2010 - gber(a)opensuse.org + +- updated to version 2.2.2 + + new languag features + * ternary expressions + * break and condition statements can now work on several levels + of loops + * multiline strings + * List_Type objects can now also be indexed using an array of + indices + + new modules: zlib, fork, sysconf + + new intrinsic functions: sumsq, expm1, log1p, list_to_array, + string_matches, _close, _fileno, dup2, getsid, killpg, + getpriority, setpriority, ldexp, frexp + + provides pkg-info file + + many bugfixes +- split package to conform to library naming policy +- rebased patches, removed obsolete slang-2.2.1-format.patch +- added patch slang-2.2.2-makefile.patch from Fedora which fixes + shared libs permissions, the slang shared library symlink, and + parallel build dependency issues and removes rpath +- build pcre, png, and zlib modules +- removed incorrect license information +- more accurate summary and description +- further cleanup + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- slang-2.1.1-autoconf.dif slang-2.1.1.dif slang-2.1.1-format.patch slang-2.1.1-fsuid.dif slang-2.1.1.tar.bz2 slangdoc-2.0.4.tar.bz2 New: ---- slang-2.2.2-autoconf.dif slang-2.2.2.dif slang-2.2.2-fsuid.dif slang-2.2.2-libpng12-linker-flag.patch slang-2.2.2-makefile.patch slang-2.2.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ slang.spec ++++++ --- /var/tmp/diff_new_pack.QxBXGF/_old 2010-09-03 14:08:10.000000000 +0200 +++ /var/tmp/diff_new_pack.QxBXGF/_new 2010-09-03 14:08:10.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package slang (Version 2.1.1) +# spec file for package slang (Version 2.2.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,56 +19,101 @@ Name: slang -License: Artistic ; GPLv2+ +License: GPLv2+ Group: System/Libraries -Version: 2.1.1 -Release: 86 -Provides: slang%{version} +Version: 2.2.2 +Release: 1 AutoReqProv: on +Summary: Programming Library and Embeddable Extansion Language +Url: http://www.jedsoft.org/ +Source: ftp://space.mit.edu/pub/davis/slang/v2.2/slang-%{version}.tar.bz2 +Source2: baselibs.conf +Patch: slang-2.2.2.dif +Patch4: slang-2.2.2-autoconf.dif +Patch5: slang-2.2.2-fsuid.dif +Patch8: slang-2.2.2-makefile.patch +Patch9: slang-2.2.2-libpng12-linker-flag.patch +# BuildRequires: oniguruma-devel >= 5.9.0 +BuildRequires: pcre-devel +%if 0%{?suse_version} > 1120 +BuildRequires: libpng12-devel +%else +BuildRequires: libpng-devel +%endif +BuildRequires: zlib-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +S-Lang is a multi-platform programming library designed to allow a developer to +create robust multi-platform software. It provides facilities required by +interactive applications such as display/screen management, keyboard input, +keymaps etc. Another major feature of the library is the interpreter for the +S-Lang extension language which can be embedded into an application to make it +extensible. With slsh a standalone interpreter is available as well. + + +%package slsh +License: GPLv2+ +Summary: Interpreter for S-Lang Scripts +Group: Development/Languages/Other +Provides: slang = %version +Obsoletes: slang <= 2.1.1 # bug437293 %ifarch ppc64 Obsoletes: slang-64bit %endif # -Summary: A Library for Display Control -Url: http://www.jedsoft.org/ -Source: ftp://space.mit.edu/pub/davis/slang/v2.0/slang-%{version}.tar.bz2 -Source1: slangdoc-2.0.4.tar.bz2 -Source2: baselibs.conf -Patch: slang-%{version}.dif -Patch4: slang-%{version}-autoconf.dif -Patch5: slang-%{version}-fsuid.dif -Patch7: slang-%{version}-format.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%package devel -License: Artistic ; GPLv2+ -Provides: slang:/usr/include/slang.h -Summary: Library for Display Control - Development Package +%description slsh +slsh is a standalone interpreter of the S-Lang language. It can be used to +execute scripts or interactively. + + +%package -n libslang2 +License: GPLv2+ +Summary: Programming Library and Embeddable Extension Language Group: System/Libraries + +%description -n libslang2 +S-Lang is a multi-platform programming library designed to allow a developer to +create robust multi-platform software. It provides facilities required by +interactive applications such as display/screen management, keyboard input, +keymaps etc. Another major feature of the library is the interpreter for the +S-Lang extension language which can be embedded into an application to make it +extensible. With slsh a standalone interpreter is available as well. + + +%package devel +License: GPLv2+ +Summary: Programming Library and Embeddable Extension Language - Development Package +Group: Development/Languages/C and C++ Requires: %{name} = %{version} +Provides: slang:/usr/include/slang.h # bug437293 %ifarch ppc64 Obsoletes: slang-devel-64bit %endif # -%description -A library with routines for display access. It is similar to ncurses, -but it has its own programming interface. Slang uses the entries in -/usr/lib/terminfo. - %description devel -A library with routines for display access. It is similar to ncurses, -but it has its own programming interface. Slang uses the entries in -/usr/lib/terminfo. +S-Lang is a multi-platform programming library designed to allow a developer to +create robust multi-platform software. It provides facilities required by +interactive applications such as display/screen management, keyboard input, +keymaps etc. Another major feature of the library is the interpreter for the +S-Lang extension language which can be embedded into an application to make it +extensible. With slsh a standalone interpreter is available as well. + +This package contains all necessary include files and libraries needed to +develop applications that require it. + %prep -%setup -n slang-%{version} -a 1 -%patch -%patch4 -%patch5 -%patch7 +%setup -q +%patch -p1 +%patch4 -p1 +%patch5 -p1 +#%patch8 -p1 +%patch9 -p1 %build mv autoconf/configure.ac . @@ -78,55 +123,53 @@ autoconf -I autoconf export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fstack-protector" export ELF_CFLAGS="$CFLAGS" - ./configure --prefix=/usr --enable-wide-chars \ - --libdir=%{_libdir} \ - --sysconfdir=/etc \ - --mandir=%{_mandir} \ - --enable-warnings -# Not parallizable in 2.1.1. -Marcus Meissner -make static +%configure \ + --docdir=%{_datadir}/doc/packages/slang-devel \ + --with-pcre \ + --with-pnginc=/usr/include/libpng12 \ + --with-pnglib=/usr/lib \ + --with-z +# --with-onig +# parallel make still broken in 2.2.2 make +make static -%install +%clean rm -rf "$RPM_BUILD_ROOT" -mkdir "$RPM_BUILD_ROOT" -make DESTDIR="$RPM_BUILD_ROOT" install install-static install-links -#make runtests -cd doc -ln -s slangdoc.html index.html -cd ../modules -make clean -cd ../slsh -make clean -cd .. -mv slsh examples/ -rm -rf $RPM_BUILD_ROOT/usr/share/doc/slang -rm -f /doc/tm/tools/{solarisobjs,i686objs} -%post -%run_ldconfig +%install +%makeinstall install-static + +rm -rf %{buildroot}%{_datadir}/doc/ + +%check +make check -%postun -%run_ldconfig +%post -n libslang2 -p /sbin/ldconfig -%files +%postun -n libslang2 -p /sbin/ldconfig + +%files slsh %defattr(-,root,root) -%doc README COPY* *.txt -%{_libdir}/lib*.so.* -/usr/bin/slsh -/etc/slsh.rc -%{_libdir}/slang -%{_mandir}/man1/slsh* -/usr/share/slsh +%doc COPYING slsh/README +%doc slsh/doc/html/ +%config(noreplace) %{_sysconfdir}/slsh.rc +%{_bindir}/slsh +%{_libdir}/slang/ +%{_datadir}/slsh/ +%{_mandir}/man1/slsh.1* -%files devel +%files -n libslang2 %defattr(-,root,root) -/usr/include/* -%{_libdir}/lib*.a -%{_libdir}/lib*.so -%doc doc/* demo examples modules +%{_libdir}/libslang.so.* -%clean -rm -rf "$RPM_BUILD_ROOT" +%files devel +%defattr(-,root,root) +%doc changes.txt COPYING NEWS README UPGRADE.txt demo/ examples/ +%doc doc/grammar.txt doc/text/ +%{_includedir}/* +%{_libdir}/pkgconfig/slang.pc +%{_libdir}/libslang.a +%{_libdir}/libslang.so %changelog ++++++ slang-2.1.1-autoconf.dif -> slang-2.2.2-autoconf.dif ++++++ --- slang/slang-2.1.1-autoconf.dif 2008-07-09 01:28:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/slang/slang-2.2.2-autoconf.dif 2010-08-17 16:19:27.000000000 +0200 @@ -1,6 +1,7 @@ ---- autoconf/aclocal.m4 -+++ autoconf/aclocal.m4 -@@ -306,18 +306,18 @@ dnl#}}} +diff -urN slang-2.2.2.orig/autoconf/aclocal.m4 slang-2.2.2/autoconf/aclocal.m4 +--- slang-2.2.2.orig/autoconf/aclocal.m4 2009-12-05 20:03:51.000000000 +0100 ++++ slang-2.2.2/autoconf/aclocal.m4 2010-08-15 13:48:23.000000000 +0200 +@@ -317,18 +317,18 @@ AC_DEFUN(JD_GCC_WARNINGS, dnl#{{{ [ AC_ARG_ENABLE(warnings, @@ -29,7 +30,7 @@ fi ]) -@@ -480,7 +480,7 @@ do +@@ -495,7 +495,7 @@ done if test "$TERMCAP"; then AC_MSG_RESULT(no) @@ -38,10 +39,10 @@ fi AC_SUBST(TERMCAP)dnl AC_SUBST(MISC_TERMINFO_DIRS)dnl -@@ -491,9 +491,9 @@ dnl#}}} - +@@ -507,9 +507,9 @@ AC_DEFUN(JD_ANSI_CC, dnl#{{{ [ + AC_AIX -AC_PROG_CC -AC_PROG_CPP -AC_PROG_GCC_TRADITIONAL @@ -49,9 +50,9 @@ +AC_REQUIRE([AC_PROG_CPP]) +AC_REQUIRE([AC_PROG_GCC_TRADITIONAL]) AC_ISC_POSIX - AC_AIX -@@ -506,7 +506,7 @@ AC_EGREP_CPP(yes, + dnl #This stuff came from Yorick config script +@@ -521,7 +521,7 @@ yes #endif ], [ @@ -60,7 +61,7 @@ if test "$CC" = cc; then CC="cc -Ae"; fi ])dnl dnl -@@ -530,8 +530,11 @@ dnl #----------------------------------- +@@ -545,8 +545,11 @@ dnl # Check for dynamic linker dnl #------------------------------------------------------------------------- DYNAMIC_LINK_LIB="" @@ -73,7 +74,7 @@ AC_CHECK_LIB(dl,dlopen,[ DYNAMIC_LINK_LIB="-ldl" AC_DEFINE(HAVE_DLOPEN) -@@ -562,7 +565,7 @@ case "$host_os" in +@@ -585,7 +588,7 @@ *linux*|*gnu*|k*bsd*-gnu ) DYNAMIC_LINK_FLAGS="-Wl,-export-dynamic" ELF_CC="\$(CC)" @@ -82,9 +83,10 @@ ELF_LINK="\$(CC) \$(LDFLAGS) -shared -Wl,-O1 -Wl,--version-script,\$(VERSION_SCRIPT) -Wl,-soname,\$(ELFLIB_MAJOR)" ELF_DEP_LIBS="\$(DL_LIB) -lm -lc" CC_SHARED="\$(CC) \$(CFLAGS) -shared -fPIC" ---- autoconf/configure.ac -+++ autoconf/configure.ac -@@ -17,6 +17,62 @@ dnl fi +diff -urN slang-2.2.2.orig/autoconf/configure.ac slang-2.2.2/autoconf/configure.ac +--- slang-2.2.2.orig/autoconf/configure.ac 2009-12-05 20:03:51.000000000 +0100 ++++ slang-2.2.2/autoconf/configure.ac 2010-08-15 13:49:02.000000000 +0200 +@@ -17,6 +17,62 @@ AC_CONFIG_AUX_DIR(autoconf) AC_CANONICAL_HOST @@ -147,7 +149,7 @@ JD_INIT JD_ANSI_CC -@@ -112,16 +168,16 @@ AC_CACHE_CHECK([for nl_langinfo and CODE +@@ -125,20 +181,20 @@ ]) if test $jd_cv_nl_langinfo_codeset = yes then @@ -160,6 +162,10 @@ -AC_CHECK_LIB(m, atanh, [AC_DEFINE(HAVE_ATANH)]) -AC_CHECK_LIB(m, hypot, [AC_DEFINE(HAVE_HYPOT)]) -AC_CHECK_LIB(m, atan2, [AC_DEFINE(HAVE_ATAN2)]) +-AC_CHECK_LIB(m, frexp, [AC_DEFINE(HAVE_FREXP)]) +-AC_CHECK_LIB(m, frexpf, [AC_DEFINE(HAVE_FREXPF)]) +-AC_CHECK_LIB(m, ldexp, [AC_DEFINE(HAVE_LDEXP)]) +-AC_CHECK_LIB(m, ldexpf, [AC_DEFINE(HAVE_LDEXPF)]) -AC_CHECK_LIB(m, feclearexcept, [AC_DEFINE(HAVE_FECLEAREXCEPT)]) -AC_CHECK_LIB(m, fpsetsticky, [AC_DEFINE(HAVE_FPSETSTICKY)]) +AC_CHECK_LIB(m, acosh, [AC_DEFINE(HAVE_ACOSH,1,[Define to 1 if you have the `acosh' function])]) @@ -167,39 +173,54 @@ +AC_CHECK_LIB(m, atanh, [AC_DEFINE(HAVE_ATANH,1,[Define to 1 if you have the `atanh' function])]) +AC_CHECK_LIB(m, hypot, [AC_DEFINE(HAVE_HYPOT,1,[Define to 1 if you have the `hypot' function])]) +AC_CHECK_LIB(m, atan2, [AC_DEFINE(HAVE_ATAN2,1,[Define to 1 if you have the `atan2' function])]) ++AC_CHECK_LIB(m, frexp, [AC_DEFINE(HAVE_FREXP,1,[Define to 1 if you have the `frexp' function])]) ++AC_CHECK_LIB(m, frexpf, [AC_DEFINE(HAVE_FREXPF,1,[Define to 1 if you have the `frexpf' function])]) ++AC_CHECK_LIB(m, ldexp, [AC_DEFINE(HAVE_LDEXP,1,[Define to 1 if you have the `ldexp' function])]) ++AC_CHECK_LIB(m, ldexpf, [AC_DEFINE(HAVE_LDEXPF,1,[Define to 1 if you have the `ldexpf' function])]) +AC_CHECK_LIB(m, feclearexcept, [AC_DEFINE(HAVE_FECLEAREXCEPT,1,[Define to 1 if you have the `feclearexcept' function])]) +AC_CHECK_LIB(m, fpsetsticky, [AC_DEFINE(HAVE_FPSETSTICKY,1,[Define to 1 if you have the `fpsetsticky' function])]) JD_ELF_COMPILER JD_IEEE_CFLAGS -@@ -149,7 +205,7 @@ JD_CHECK_FOR_LIBRARY(pcre) +@@ -168,7 +224,7 @@ if test $jd_with_pcre_library = yes then PCRE_MODULE="pcre-module.so" - AC_DEFINE(HAVE_PCRE_H) + AC_DEFINE(HAVE_PCRE_H,1,[Define to 1 if you have the pcre.h header]) + extramodules="$extramodules pcre" else PCRE_MODULE="" - fi -@@ -159,7 +215,7 @@ JD_CHECK_FOR_LIBRARY(onig,oniguruma.h) +@@ -180,7 +236,7 @@ if test $jd_with_onig_library = yes then ONIG_MODULE="onig-module.so" - AC_DEFINE(HAVE_ONIGURUMA_H) + AC_DEFINE(HAVE_ONIGURUMA_H,1,[Define to 1 if you have the oniguruma.h header]) + extramodules="$extramodules oniguruma" else ONIG_MODULE="" - fi -@@ -169,20 +225,20 @@ JD_CHECK_FOR_LIBRARY(png) +@@ -192,7 +248,7 @@ if test $jd_with_png_library = yes then PNG_MODULE="png-module.so" - AC_DEFINE(HAVE_PNG_H) + AC_DEFINE(HAVE_PNG_H,1,[Define to 1 if you have the png.h header]) + extramodules="$extramodules png" else PNG_MODULE="" +@@ -204,7 +260,7 @@ + if test $jd_with_z_library = yes + then + ZLIB_MODULE="zlib-module.so" +- AC_DEFINE(HAVE_ZLIB_H) ++ AC_DEFINE(HAVE_ZLIB_H, 1, [Define to 1 if you have the zlib library]) + extramodules="$extramodules z" + else + ZLIB_MODULE="" +@@ -212,14 +268,14 @@ fi - AC_SUBST(PNG_MODULE) + AC_SUBST(ZLIB_MODULE) -m4_include([./iconv.m4]) +dnl m4_include([./iconv.m4]) @@ -212,5 +233,5 @@ - AC_DEFINE(HAVE_ICONV_H) + AC_DEFINE(HAVE_ICONV_H, 1, [Define to 1 if you have the iconv library]) ICONV_LIB="$ICONV_LIB -liconv" + extramodules="$extramodules iconv" else - SLANG_AM_ICONV ++++++ slang-2.1.1-autoconf.dif -> slang-2.2.2.dif ++++++ --- slang/slang-2.1.1-autoconf.dif 2008-07-09 01:28:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/slang/slang-2.2.2.dif 2010-08-17 16:31:58.000000000 +0200 @@ -1,216 +1,84 @@ ---- autoconf/aclocal.m4 -+++ autoconf/aclocal.m4 -@@ -306,18 +306,18 @@ dnl#}}} - AC_DEFUN(JD_GCC_WARNINGS, dnl#{{{ - [ - AC_ARG_ENABLE(warnings, -- [ --enable-warnings turn on GCC compiler warnings], -+ AC_HELP_STRING([--enable-warnings],[turn on GCC compiler warnings]), - [gcc_warnings=$enableval]) --if test -n "$GCC" -+if test -n "$GCC" && test -n "$gcc_warnings" - then -- #CFLAGS="$CFLAGS -fno-strength-reduce" -- if test -n "$gcc_warnings" -- then -- CFLAGS="$CFLAGS -Wall -W -pedantic -Winline -Wmissing-prototypes \ -- -Wnested-externs -Wpointer-arith -Wcast-align -Wshadow -Wstrict-prototypes" -- # Now trim excess whitespace -- CFLAGS=`echo $CFLAGS` -- fi -+ CFLAGS="$CFLAGS -Wall -W -pedantic -Winline -Wmissing-prototypes \ -+ -Wnested-externs -Wpointer-arith -Wcast-align -Wshadow -Wstrict-prototypes \ -+ -Wformat -Wformat-security" -+ ELF_CFLAGS="$ELF_CFLAGS -Wall -W -pedantic -Winline -Wmissing-prototypes \ -+ -Wnested-externs -Wpointer-arith -Wcast-align -Wshadow -Wstrict-prototypes \ -+ -Wformat -Wformat-security" -+ # Now trim excess whitespace -+ CFLAGS=`echo $CFLAGS` - fi - ]) - -@@ -480,7 +480,7 @@ do - done - if test "$TERMCAP"; then - AC_MSG_RESULT(no) -- AC_DEFINE(USE_TERMCAP) -+ AC_DEFINE(USE_TERMCAP,1,[Define to use termcap]) - fi - AC_SUBST(TERMCAP)dnl - AC_SUBST(MISC_TERMINFO_DIRS)dnl -@@ -491,9 +491,9 @@ dnl#}}} - - AC_DEFUN(JD_ANSI_CC, dnl#{{{ - [ --AC_PROG_CC --AC_PROG_CPP --AC_PROG_GCC_TRADITIONAL -+AC_REQUIRE([AC_PROG_CC]) -+AC_REQUIRE([AC_PROG_CPP]) -+AC_REQUIRE([AC_PROG_GCC_TRADITIONAL]) - AC_ISC_POSIX - AC_AIX +diff -urN slang-2.2.2.orig/src/sldisply.c slang-2.2.2/src/sldisply.c +--- slang-2.2.2.orig/src/sldisply.c 2009-12-05 20:03:51.000000000 +0100 ++++ slang-2.2.2/src/sldisply.c 2010-08-15 13:30:36.000000000 +0200 +@@ -2441,6 +2441,13 @@ + Term_Init_Str = tt_tgetstr ("ti"); + Term_Reset_Str = tt_tgetstr ("te"); -@@ -506,7 +506,7 @@ AC_EGREP_CPP(yes, - yes - #endif - ], [ --AC_DEFINE(_HPUX_SOURCE) -+AC_DEFINE(_HPUX_SOURCE,1,[Special define needed for HPUX]) - if test "$CC" = cc; then CC="cc -Ae"; fi - ])dnl - dnl -@@ -530,8 +530,11 @@ dnl #----------------------------------- - dnl # Check for dynamic linker - dnl #------------------------------------------------------------------------- - DYNAMIC_LINK_LIB="" -+ -+AH_TEMPLATE([HAVE_DLOPEN],[Define if you have dlopen]) -+ - AC_CHECK_HEADER(dlfcn.h,[ -- AC_DEFINE(HAVE_DLFCN_H) -+ AC_DEFINE(HAVE_DLFCN_H,1,[Define if you have the dlfcn.h header]) - AC_CHECK_LIB(dl,dlopen,[ - DYNAMIC_LINK_LIB="-ldl" - AC_DEFINE(HAVE_DLOPEN) -@@ -562,7 +565,7 @@ case "$host_os" in - *linux*|*gnu*|k*bsd*-gnu ) - DYNAMIC_LINK_FLAGS="-Wl,-export-dynamic" - ELF_CC="\$(CC)" -- ELF_CFLAGS="\$(CFLAGS) -fPIC" -+ ELF_CFLAGS="$ELF_CFLAGS -fPIC" - ELF_LINK="\$(CC) \$(LDFLAGS) -shared -Wl,-O1 -Wl,--version-script,\$(VERSION_SCRIPT) -Wl,-soname,\$(ELFLIB_MAJOR)" - ELF_DEP_LIBS="\$(DL_LIB) -lm -lc" - CC_SHARED="\$(CC) \$(CFLAGS) -shared -fPIC" ---- autoconf/configure.ac -+++ autoconf/configure.ac -@@ -17,6 +17,62 @@ dnl fi - AC_CONFIG_AUX_DIR(autoconf) - AC_CANONICAL_HOST - -+AH_TOP([ -+/* -*- c -*- */ -+/* Note: this is for unix only. */ -+ -+#ifndef SL_CONFIG_H -+#define SL_CONFIG_H -+]) -+ -+AH_BOTTOM([ -+#if defined(HAVE_SIGADDSET) && defined(HAVE_SIGEMPTYSET) -+# if defined(HAVE_SIGACTION) && defined(HAVE_SIGPROCMASK) -+# define SLANG_POSIX_SIGNALS -+# endif -+#endif -+ -+/* Define if you need to in order for stat and other things to work. */ -+#undef _POSIX_SOURCE -+ -+#ifdef _AIX -+# ifndef _POSIX_SOURCE -+# define _POSIX_SOURCE 1 -+# endif -+# ifndef _ALL_SOURCE -+# define _ALL_SOURCE -+# endif -+/* This may generate warnings but the fact is that without it, xlc will -+ * INCORRECTLY inline many str* functions. */ -+# undef __STR__ -+#endif -+ -+/* define USE_TERMCAP if you want to use it instead of terminfo. */ -+#if defined(sequent) || defined(NeXT) +# ifndef USE_TERMCAP -+# define USE_TERMCAP -+# endif -+#endif -+ -+#if defined(ultrix) && !defined(__GNUC__) -+# ifndef NO_PROTOTYPES -+# define NO_PROTOTYPES -+# endif -+#endif -+ -+#ifndef unix -+# define unix 1 -+#endif -+ -+#ifndef __unix__ -+# define __unix__ 1 ++ /* Use the given terminal specification of the terminfo entries ++ * even if we have almost vtxxx. ++ */ ++ Keypad_Init_Str = SLtt_tgetstr ("ks"); ++ Keypad_Reset_Str = SLtt_tgetstr ("ke"); ++# else + /* If I do this for vtxxx terminals, arrow keys start sending ESC O A, + * which I do not want. This is mainly for HP terminals. + */ +@@ -2449,6 +2456,7 @@ + Keypad_Init_Str = tt_tgetstr ("ks"); + Keypad_Reset_Str = tt_tgetstr ("ke"); + } ++#endif + + /* Make up for defective termcap/terminfo databases */ + if ((Vt100_Like && (term[2] != '1')) +@@ -2651,10 +2659,12 @@ + /* specific to vtxxx only */ + void SLtt_enable_cursor_keys (void) + { ++#if 0 + #ifdef __unix__ + if (Vt100_Like) + #endif + tt_write_string("\033=\033[?1l"); +#endif + } + + #ifdef VMS +diff -urN slang-2.2.2.orig/src/sltermin.c slang-2.2.2/src/sltermin.c +--- slang-2.2.2.orig/src/sltermin.c 2009-12-05 20:03:51.000000000 +0100 ++++ slang-2.2.2/src/sltermin.c 2010-08-15 13:35:11.000000000 +0200 +@@ -23,6 +23,9 @@ + USA. + */ + ++#include <unistd.h> ++#include <sys/types.h> ++ + #include "slinclud.h" + + #include "slang.h" +@@ -119,7 +122,32 @@ + * I will also look into the use of setreuid, seteuid and setregid, setegid. + * FIXME: Priority=medium + */ ++ /* If your system lacks setfsuid/getfsuid either write ++ equivalent support or dont use slang to build setuid/setgid ++ apps like Mutt */ ++ ++ if(setfsuid(getuid())==-1) ++ { ++ perror("setfsuid"); ++ return NULL; ++ } ++ if(setfsgid(getgid())==-1) ++ { ++ perror("setfsgid"); ++ return NULL; ++ } + fp = fopen (file, "rb"); ++ if(setfsuid(geteuid())==-1) ++ { ++ perror("setfsuid"); ++ return NULL; ++ } ++ if(setfsgid(getegid())==-1) ++ { ++ perror("setfsgid"); ++ return NULL; ++ } + -+#define _SLANG_SOURCE_ 1 -+#endif /* SL_CONFIG_H */ -+]) -+ -+ - JD_INIT - JD_ANSI_CC + if (fp == NULL) return NULL; -@@ -112,16 +168,16 @@ AC_CACHE_CHECK([for nl_langinfo and CODE - ]) - if test $jd_cv_nl_langinfo_codeset = yes - then -- AC_DEFINE(HAVE_NL_LANGINFO_CODESET, 1) -+ AC_DEFINE(HAVE_NL_LANGINFO_CODESET, 1, [Define to 1 if you have the nl_langinfo(CODESET) function]) - fi - --AC_CHECK_LIB(m, acosh, [AC_DEFINE(HAVE_ACOSH)]) --AC_CHECK_LIB(m, asinh, [AC_DEFINE(HAVE_ASINH)]) --AC_CHECK_LIB(m, atanh, [AC_DEFINE(HAVE_ATANH)]) --AC_CHECK_LIB(m, hypot, [AC_DEFINE(HAVE_HYPOT)]) --AC_CHECK_LIB(m, atan2, [AC_DEFINE(HAVE_ATAN2)]) --AC_CHECK_LIB(m, feclearexcept, [AC_DEFINE(HAVE_FECLEAREXCEPT)]) --AC_CHECK_LIB(m, fpsetsticky, [AC_DEFINE(HAVE_FPSETSTICKY)]) -+AC_CHECK_LIB(m, acosh, [AC_DEFINE(HAVE_ACOSH,1,[Define to 1 if you have the `acosh' function])]) -+AC_CHECK_LIB(m, asinh, [AC_DEFINE(HAVE_ASINH,1,[Define to 1 if you have the `asinh' function])]) -+AC_CHECK_LIB(m, atanh, [AC_DEFINE(HAVE_ATANH,1,[Define to 1 if you have the `atanh' function])]) -+AC_CHECK_LIB(m, hypot, [AC_DEFINE(HAVE_HYPOT,1,[Define to 1 if you have the `hypot' function])]) -+AC_CHECK_LIB(m, atan2, [AC_DEFINE(HAVE_ATAN2,1,[Define to 1 if you have the `atan2' function])]) -+AC_CHECK_LIB(m, feclearexcept, [AC_DEFINE(HAVE_FECLEAREXCEPT,1,[Define to 1 if you have the `feclearexcept' function])]) -+AC_CHECK_LIB(m, fpsetsticky, [AC_DEFINE(HAVE_FPSETSTICKY,1,[Define to 1 if you have the `fpsetsticky' function])]) - - JD_ELF_COMPILER - JD_IEEE_CFLAGS -@@ -149,7 +205,7 @@ JD_CHECK_FOR_LIBRARY(pcre) - if test $jd_with_pcre_library = yes - then - PCRE_MODULE="pcre-module.so" -- AC_DEFINE(HAVE_PCRE_H) -+ AC_DEFINE(HAVE_PCRE_H,1,[Define to 1 if you have the pcre.h header]) - else - PCRE_MODULE="" - fi -@@ -159,7 +215,7 @@ JD_CHECK_FOR_LIBRARY(onig,oniguruma.h) - if test $jd_with_onig_library = yes - then - ONIG_MODULE="onig-module.so" -- AC_DEFINE(HAVE_ONIGURUMA_H) -+ AC_DEFINE(HAVE_ONIGURUMA_H,1,[Define to 1 if you have the oniguruma.h header]) - else - ONIG_MODULE="" - fi -@@ -169,20 +225,20 @@ JD_CHECK_FOR_LIBRARY(png) - if test $jd_with_png_library = yes - then - PNG_MODULE="png-module.so" -- AC_DEFINE(HAVE_PNG_H) -+ AC_DEFINE(HAVE_PNG_H,1,[Define to 1 if you have the png.h header]) - else - PNG_MODULE="" - fi - AC_SUBST(PNG_MODULE) - --m4_include([./iconv.m4]) -+dnl m4_include([./iconv.m4]) - - ICONV_MODULE="" - JD_CHECK_FOR_LIBRARY(iconv) - if test $jd_with_iconv_library = yes - then - ICONV_MODULE="iconv-module.so" -- AC_DEFINE(HAVE_ICONV_H) -+ AC_DEFINE(HAVE_ICONV_H, 1, [Define to 1 if you have the iconv library]) - ICONV_LIB="$ICONV_LIB -liconv" - else - SLANG_AM_ICONV + if ((12 == fread ((char *) buf, 1, 12, fp) && (MAGIC == make_integer (buf)))) ++++++ slang-2.1.1-fsuid.dif -> slang-2.2.2-fsuid.dif ++++++ --- slang/slang-2.1.1-fsuid.dif 2010-01-13 13:50:01.000000000 +0100 +++ /mounts/work_src_done/STABLE/slang/slang-2.2.2-fsuid.dif 2010-08-17 16:19:27.000000000 +0200 @@ -1,12 +1,12 @@ -Index: autoconf/configure.ac -=================================================================== ---- autoconf/configure.ac.orig -+++ autoconf/configure.ac -@@ -109,8 +109,17 @@ sys/socket.h \ +diff -urN slang-2.2.2.orig/autoconf/configure.ac slang-2.2.2/autoconf/configure.ac +--- slang-2.2.2.orig/autoconf/configure.ac 2010-08-15 13:13:18.000000000 +0200 ++++ slang-2.2.2/autoconf/configure.ac 2010-08-15 13:23:24.000000000 +0200 +@@ -116,9 +116,18 @@ netinet/in.h \ arpa/inet.h \ sys/un.h \ +sys/fsuid.h \ + sys/resource.h \ ) +AC_CHECK_FUNCS(setfsuid setfsgid) @@ -20,10 +20,21 @@ AC_TYPE_MODE_T AC_TYPE_PID_T AC_TYPE_UID_T -Index: src/slinclud.h -=================================================================== ---- src/slinclud.h.orig -+++ src/slinclud.h +diff -urN slang-2.2.2.orig/src/config.hin slang-2.2.2/src/config.hin +--- slang-2.2.2.orig/src/config.hin 2009-12-05 20:03:51.000000000 +0100 ++++ slang-2.2.2/src/config.hin 2010-08-15 13:25:31.000000000 +0200 +@@ -179,6 +179,8 @@ + #undef HAVE_SYS_UN_H + #undef socklen_t + ++#undef HAVE_SYS_FSUID_H ++#undef HAVE_SETFSUID + #undef HAVE_CONFSTR + #undef HAVE_SYSCONF + #undef HAVE_PATHCONF +diff -urN slang-2.2.2.orig/src/slinclud.h slang-2.2.2/src/slinclud.h +--- slang-2.2.2.orig/src/slinclud.h 2009-12-05 20:03:51.000000000 +0100 ++++ slang-2.2.2/src/slinclud.h 2010-08-15 13:24:28.000000000 +0200 @@ -30,4 +30,8 @@ # include <memory.h> #endif @@ -33,19 +44,3 @@ +#endif + #endif /* _SLANG_INCLUDE_H_ */ -Index: src/config.hin -=================================================================== ---- src/config.hin.orig -+++ src/config.hin -@@ -166,6 +166,11 @@ - #undef HAVE_SYS_UN_H - #undef socklen_t - -+ -+#undef HAVE_SYS_FSUID_H -+#undef HAVE_SETFSUID -+ -+ - /* These two are needed on DOS-like systems. Unix does not require them. - * They are included here for consistency. - * ++++++ slang-2.2.2-libpng12-linker-flag.patch ++++++ diff -urN slang-2.2.2.orig/modules/Makefile.in slang-2.2.2/modules/Makefile.in --- slang-2.2.2.orig/modules/Makefile.in 2009-12-05 20:03:51.000000000 +0100 +++ slang-2.2.2/modules/Makefile.in 2010-08-14 20:40:22.000000000 +0200 @@ -33,7 +33,7 @@ # If building the PNG module, you may need to set these #--------------------------------------------------------------------------- PNG_INC = @PNG_INC@ -PNG_LIB = @PNG_LIB@ -lpng +PNG_LIB = @PNG_LIB@ -lpng12 #--------------------------------------------------------------------------- # If building the ICONV module, you may need to set these #--------------------------------------------------------------------------- ++++++ slang-2.2.2-makefile.patch ++++++ diff -up slang-2.2.2/autoconf/Makefile.in.makefile slang-2.2.2/autoconf/Makefile.in --- slang-2.2.2/autoconf/Makefile.in.makefile 2009-12-05 20:03:51.000000000 +0100 +++ slang-2.2.2/autoconf/Makefile.in 2009-12-07 10:02:56.000000000 +0100 @@ -47,8 +47,7 @@ help: @echo "make check : Build the library and run the regression tests" static: makefiles cd src; $(MAKE) static - cd slsh; $(MAKE) all -elf: makefiles +elf: makefiles static cd src; $(MAKE) elf cd slsh; $(MAKE) all cd modules; $(MAKE) all diff -up slang-2.2.2/modules/Makefile.in.makefile slang-2.2.2/modules/Makefile.in --- slang-2.2.2/modules/Makefile.in.makefile 2009-12-05 20:03:51.000000000 +0100 +++ slang-2.2.2/modules/Makefile.in 2009-12-07 10:02:56.000000000 +0100 @@ -59,7 +59,7 @@ SOCKET_LIBS = @X_EXTRA_LIBS@ MODULE_INSTALL_DIR = @libdir@/slang/v@slang_major_version@/modules INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ -INSTALL_MODULE = @INSTALL_MODULE@ +INSTALL_MODULE = @INSTALL@ MKINSDIR = ../autoconf/mkinsdir.sh SLSH_DIR = $(prefix)/share/slsh CMAPS_DIR = $(SLSH_DIR)/cmaps @@ -73,7 +73,7 @@ DEST_SLSH_DIR = $(DESTDIR)$(SLSH_DIR) DEST_CMAPSDIR = $(DESTDIR)$(CMAPS_DIR) DEST_HELPDIR = $(DESTDIR)$(HELP_DIR) #--------------------------------------------------------------------------- -RPATH = @RPATH@ +RPATH = LIBS = $(LDFLAGS) $(RPATH) $(SLANG_LIB) $(DL_LIB) @M_LIB@ #LIBS = $(RPATH) $(DL_LIB) @M_LIB@ diff -up slang-2.2.2/slsh/Makefile.in.makefile slang-2.2.2/slsh/Makefile.in --- slang-2.2.2/slsh/Makefile.in.makefile 2009-12-05 20:03:51.000000000 +0100 +++ slang-2.2.2/slsh/Makefile.in 2009-12-07 10:02:56.000000000 +0100 @@ -15,7 +15,7 @@ SLANG_SRCINC = -I@SRCDIR@ SLANG_SRCLIB = -L@ELFDIR@ #--------------------------------------------------------------------------- OTHER_LIBS = @TERMCAP@ @DYNAMIC_LINK_LIB@ @LIBS@ @M_LIB@ -RPATH = @RPATH@ +RPATH = #---------------------------------------------------------------------------- INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ diff -up slang-2.2.2/src/Makefile.in.makefile slang-2.2.2/src/Makefile.in --- slang-2.2.2/src/Makefile.in.makefile 2009-12-05 20:03:51.000000000 +0100 +++ slang-2.2.2/src/Makefile.in 2009-12-07 10:02:56.000000000 +0100 @@ -139,17 +139,21 @@ UPDATE_VERSION_SCRIPT = $(HOME)/bin/upda # Rules #--------------------------------------------------------------------------- all: static elf -static: $(OBJDIR) $(CONFIG_H) $(OBJDIR_NORMAL_LIB) $(OTHERSTUFF) -elf: $(ELFDIR) $(CONFIG_H) $(ELFDIR_ELF_LIB) +static: $(OBJDIR)/stamp $(CONFIG_H) $(OBJDIR_NORMAL_LIB) $(OTHERSTUFF) +elf: $(ELFDIR)/stamp $(CONFIG_H) $(ELFDIR_ELF_LIB) -$(OBJDIR_NORMAL_LIB): $(OBJDIR) $(CONFIG_H) $(OBJS) +$(OBJS): $(OBJDIR)/stamp + +$(ELFOBJS): $(ELFDIR)/stamp + +$(OBJDIR_NORMAL_LIB): $(CONFIG_H) $(OBJS) -$(RM) $(OBJDIR_NORMAL_LIB) cd $(OBJDIR); $(AR_CR) $(NORMAL_LIB) $(OFILES) $(RANLIB) $(OBJDIR_NORMAL_LIB) @echo "" @echo $(NORMAL_LIB) created in $(OBJDIR) -$(ELFDIR_ELF_LIB): $(ELFDIR) $(CONFIG_H) $(ELFOBJS) $(VERSION_SCRIPT) +$(ELFDIR_ELF_LIB): $(CONFIG_H) $(ELFOBJS) $(VERSION_SCRIPT) -$(RM) $(ELFDIR_ELF_LIB) cd $(ELFDIR); $(ELF_LINK_CMD) -o $(ELFLIB_BUILD_NAME) $(OFILES) $(LDFLAGS) $(ELF_DEP_LIBS) if [ $(ELFLIB_MAJOR) != $(ELFLIB_BUILD_NAME) ]; then \ @@ -160,10 +164,12 @@ $(ELFDIR_ELF_LIB): $(ELFDIR) $(CONFIG_H) @echo $(ELFLIB_BUILD_NAME) created in $(ELFDIR). @echo The link $(ELFLIB) to $(ELFLIB_BUILD_NAME) was also created. @echo "" -$(OBJDIR) : +$(OBJDIR)/stamp : -$(MKDIR) $(OBJDIR) -$(ELFDIR) : + touch $(OBJDIR)/stamp +$(ELFDIR)/stamp : -$(MKDIR) $(ELFDIR) + touch $(ELFDIR)/stamp $(CONFIG_H) : sysconf.h -$(CP) sysconf.h $(CONFIG_H) @@ -194,9 +200,9 @@ install-elf-and-links: -$(RM) $(DEST_LIBDIR)/$(ELFLIB) -$(RM) $(DEST_LIBDIR)/$(ELFLIB_MAJOR) @echo installing $(ELFLIB_BUILD_NAME) in $(DEST_LIBDIR) - $(INSTALL_DATA) $(ELFDIR_ELF_LIB) $(DEST_LIBDIR)/ + $(INSTALL) $(ELFDIR_ELF_LIB) $(DEST_LIBDIR)/ -cd $(DEST_LIBDIR); $(LN) $(ELFLIB_BUILD_NAME) $(ELFLIB_MAJOR) - -cd $(DEST_LIBDIR); $(LN) $(ELFLIB_BUILD_NAME) $(ELFLIB) + -cd $(DEST_LIBDIR); $(LN) $(ELFLIB_MAJOR) $(ELFLIB) @echo "" @echo $(ELFLIB_BUILD_NAME) created in $(DEST_LIBDIR). @echo The links $(ELFLIB) and $(ELFLIB_MAJOR) to $(ELFLIB_BUILD_NAME) were also created. ++++++ slang-2.1.1.tar.bz2 -> slang-2.2.2.tar.bz2 ++++++ ++++ 148713 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

commit kdebase4-workspace for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '10

03 Sep '10

Hello community, here is the log from the commit of package kdebase4-workspace for openSUSE:Factory checked in at Fri Sep 3 14:17:40 CEST 2010. -------- --- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2010-08-10 12:13:41.000000000 +0200 +++ kdebase4-workspace/kdebase4-wallpapers.changes 2010-09-03 14:11:01.408454000 +0200 @@ -1,0 +2,12 @@ +Fri Aug 27 13:43:25 CEST 2010 - dmueller(a)suse.de + +- update to 4.5.1 + * see http://kde.org/announcements/changelogs/changelog4_5_0to4_5_1.php for details + +------------------------------------------------------------------- +Fri Aug 13 15:24:29 CEST 2010 - dmueller(a)suse.de + +- update 4_5_BRANCH.diff: + * disable MALLOC_CHECK_ export + +------------------------------------------------------------------- kdebase4-workspace.changes: same change python-kdebase4.changes: same change calling whatdependson for head-i586 Old: ---- kdebase-workspace-4.5.0.tar.bz2 r1159603-plasma-safe-applet-drag.diff r1159643-panel-applet-drag-behaviour.diff New: ---- kdebase-workspace-4.5.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-wallpapers.spec ++++++ --- /var/tmp/diff_new_pack.MrsFur/_old 2010-09-03 14:11:11.000000000 +0200 +++ /var/tmp/diff_new_pack.MrsFur/_new 2010-09-03 14:11:11.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4-wallpapers (Version 4.5.0) +# spec file for package kdebase4-wallpapers (Version 4.5.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -30,7 +30,7 @@ Group: System/GUI/KDE Summary: KDE 4 Wallpapers Url: http://www.kde.org/ -Version: 4.5.0 +Version: 4.5.1 Release: 1 Source0: kdebase-workspace-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.MrsFur/_old 2010-09-03 14:11:11.000000000 +0200 +++ /var/tmp/diff_new_pack.MrsFur/_new 2010-09-03 14:11:11.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4-workspace (Version 4.5.0) +# spec file for package kdebase4-workspace (Version 4.5.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -39,7 +39,7 @@ Group: System/GUI/KDE Summary: The KDE Workspace Components Url: http://www.kde.org/ -Version: 4.5.0 +Version: 4.5.1 Release: 1 Source0: kdebase-workspace-%version.tar.bz2 Source1: rcksysguardd @@ -88,8 +88,6 @@ Patch201: plasma-notifications-kill-timer.diff Patch203: kdebase-workspace-4.3.95-ck-shutdown.patch Patch208: kdm-themer-wallpaper-sizes.diff -Patch209: r1159603-plasma-safe-applet-drag.diff -Patch210: r1159643-panel-applet-drag-behaviour.diff Patch211: disable-python-support.diff Patch212: build-final.diff Requires: kde4-kgreeter-plugins = %version @@ -190,8 +188,6 @@ %patch203 -p1 ###KDE45: rediff! #%patch208 -%patch209 -%patch210 %patch211 %patch212 cp %{SOURCE3} kwin/effects/cube/data/cubecap.png ++++++ python-kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.MrsFur/_old 2010-09-03 14:11:11.000000000 +0200 +++ /var/tmp/diff_new_pack.MrsFur/_new 2010-09-03 14:11:11.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package python-kdebase4 (Version 4.5.0) +# spec file for package python-kdebase4 (Version 4.5.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -28,7 +28,7 @@ Group: System/GUI/KDE Summary: Python bindings for KDE 4 desktop shell Url: http://www.kde.org/ -Version: 4.5.0 +Version: 4.5.1 Release: 1 Source0: kdebase-workspace-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ 4_5_BRANCH.diff ++++++ --- /var/tmp/diff_new_pack.MrsFur/_old 2010-09-03 14:11:11.000000000 +0200 +++ /var/tmp/diff_new_pack.MrsFur/_new 2010-09-03 14:11:11.000000000 +0200 @@ -3,80 +3,5 @@ --- BRANCH_STATUS +++ BRANCH_STATUS @@ -0,0 +1,2 @@ -+current HEAD: 1159322 ++current HEAD: 1163120 +svn di between //tags/KDE/4.5.0/kdebase/workspace and //branches/KDE/4.5/kdebase/workspace ---- kcontrol/keyboard/kcm_view_models.cpp -+++ kcontrol/keyboard/kcm_view_models.cpp -@@ -307,8 +307,8 @@ - else { - int groupRow = index.row(); - const OptionGroupInfo* xkbGroup = rules->optionGroupInfos[groupRow]; -- foreach(const QString& option, keyboardConfig->xkbOptions) { -- if( option.startsWith(xkbGroup->name + Rules::XKB_OPTION_GROUP_SEPARATOR) ) -+ foreach(const OptionInfo* optionInfo, xkbGroup->optionInfos) { -+ if( keyboardConfig->xkbOptions.indexOf(optionInfo->name) != -1 ) - return Qt::PartiallyChecked; - } - return Qt::Unchecked; ---- kcontrol/keyboard/CMakeLists.txt -+++ kcontrol/keyboard/CMakeLists.txt -@@ -3,14 +3,11 @@ - - if( X11_Xinput_FOUND AND XiGetDevicePresenceNotifyEvent_EXISTS ) - set(XiGetDevicePresence_FOUND 1) -+ ADD_DEFINITIONS(-DHAVE_XINPUT_AND_DEVICE_NOTIFY=1) - else( X11_Xinput_FOUND AND XiGetDevicePresenceNotifyEvent_EXISTS ) - MESSAGE(STATUS "_XiGetDevicePresenceNotifyEvent is not found, libXi version 1.2.0 or later is required to keep layouts with keyboard hotplugging") - endif( X11_Xinput_FOUND AND XiGetDevicePresenceNotifyEvent_EXISTS ) - --macro_bool_to_01(XiGetDevicePresence_FOUND HAVE_XINPUT) --ADD_DEFINITIONS(-DHAVE_XINPUT=${HAVE_XINPUT}) -- -- - - ### kded daemon ### - ---- kcontrol/keyboard/layout_widget.cpp -+++ kcontrol/keyboard/layout_widget.cpp -@@ -190,7 +190,7 @@ - - m_notifierItem->setToolTipSubTitle(longText); - -- const QIcon icon(flags->getIcon(layoutUnit.layout)); -+ const QIcon icon(getFlag(layoutUnit.layout)); - m_notifierItem->setToolTipIconByPixmap(icon); - - QIcon textOrIcon = flags->getIconWithText(layoutUnit, *keyboardConfig); ---- kcontrol/keyboard/xinput_helper.cpp -+++ kcontrol/keyboard/xinput_helper.cpp -@@ -27,7 +27,7 @@ - #include <X11/Xlib.h> - #include <X11/Xatom.h> - --#if HAVE_XINPUT==1 -+#ifdef HAVE_XINPUT_AND_DEVICE_NOTIFY - #include <X11/extensions/XInput.h> - #endif - -@@ -75,7 +75,7 @@ - } - - --#if HAVE_XINPUT==1 -+#ifdef HAVE_XINPUT_AND_DEVICE_NOTIFY - - extern "C" { - extern int _XiGetDevicePresenceNotifyEvent(Display *); ---- krunner/interfaces/default/interface.cpp -+++ krunner/interfaces/default/interface.cpp -@@ -172,9 +172,9 @@ - - KrunnerTabFilter *krunnerTabFilter = new KrunnerTabFilter(m_resultsScene, lineEdit, this); - m_searchTerm->installEventFilter(krunnerTabFilter); -- m_singleRunnerSearchTerm->installEventFilter(krunnerTabFilter); - connect(krunnerTabFilter, SIGNAL(historyRotated(QString)), this, SLOT(queryTextEdited(QString))); - lineEdit->installEventFilter(this); -+ m_singleRunnerSearchTerm->installEventFilter(this); - - themeUpdated(); - connect(Plasma::Theme::defaultTheme(), SIGNAL(themeChanged()), this, SLOT(themeUpdated())); ++++++ kdebase-workspace-4.5.0.tar.bz2 -> kdebase-workspace-4.5.1.tar.bz2 ++++++ KDE/kdebase4-workspace/kdebase-workspace-4.5.0.tar.bz2 kdebase4-workspace/kdebase-workspace-4.5.1.tar.bz2 differ: char 11, 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

commit libgphoto2 for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '10

03 Sep '10

Hello community, here is the log from the commit of package libgphoto2 for openSUSE:Factory checked in at Fri Sep 3 14:09:16 CEST 2010. -------- --- GNOME/libgphoto2/libgphoto2.changes 2010-08-15 20:05:34.000000000 +0200 +++ libgphoto2/libgphoto2.changes 2010-08-31 11:50:26.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Aug 31 09:50:22 UTC 2010 - aj(a)suse.de + +- Recommend instead of require lang package since it's not mandatory. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgphoto2.spec ++++++ --- /var/tmp/diff_new_pack.kFOwLx/_old 2010-09-03 14:09:06.000000000 +0200 +++ /var/tmp/diff_new_pack.kFOwLx/_new 2010-09-03 14:09:06.000000000 +0200 @@ -31,12 +31,12 @@ Group: Hardware/Camera Summary: A Digital Camera Library Version: 2.4.10 -Release: 1 +Release: 2 Source0: libgphoto2-%{version}.tar.bz2 Source1: baselibs.conf Patch1: libgphoto2-4096files.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: %{name}-lang = %{version} +Recommends: %{name}-lang = %{version} %package devel Summary: Development headers for libgphoto2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit kdebase4-runtime for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '10

03 Sep '10

Hello community, here is the log from the commit of package kdebase4-runtime for openSUSE:Factory checked in at Fri Sep 3 14:08:54 CEST 2010. -------- --- KDE/kdebase4-runtime/kdebase4-runtime.changes 2010-08-10 10:40:14.000000000 +0200 +++ kdebase4-runtime/kdebase4-runtime.changes 2010-08-27 13:43:11.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Aug 27 13:43:07 CEST 2010 - dmueller(a)suse.de + +- update to 4.5.1 + * see http://kde.org/announcements/changelogs/changelog4_5_0to4_5_1.php for details + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdebase-runtime-4.5.0.tar.bz2 New: ---- kdebase-runtime-4.5.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-runtime.spec ++++++ --- /var/tmp/diff_new_pack.ZcZ4N1/_old 2010-09-03 14:07:18.000000000 +0200 +++ /var/tmp/diff_new_pack.ZcZ4N1/_new 2010-09-03 14:07:18.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4-runtime (Version 4.5.0) +# spec file for package kdebase4-runtime (Version 4.5.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -42,7 +42,7 @@ Group: System/GUI/KDE Summary: The KDE Runtime Components Url: http://www.kde.org/ -Version: 4.5.0 +Version: 4.5.1 Release: 1 Source0: kdebase-runtime-%version.tar.bz2 Source1: kde4-essential.menu @@ -246,6 +246,7 @@ %doc %lang(en) %_kde4_htmldir/en/kioslave %doc %lang(en) %_kde4_htmldir/en/knetattach %doc %lang(en) %_kde4_htmldir/en/network +%doc %lang(en) %_kde4_htmldir/en/onlinehelp %_kde4_libdir/attica_kde.so %_kde4_sysconfdir/xdg/menus/applications-merged/kde4-essential.menu %_kde4_sysconfdir/xdg/menus/kde4-information.menu ++++++ 4_5_BRANCH.diff ++++++ ++++ 1156 lines (skipped) ++++ between KDE/kdebase4-runtime/4_5_BRANCH.diff ++++ and kdebase4-runtime/4_5_BRANCH.diff ++++++ kdebase-runtime-4.5.0.tar.bz2 -> kdebase-runtime-4.5.1.tar.bz2 ++++++ ++++ 4444 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

commit kdepimlibs4 for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '10

03 Sep '10

Hello community, here is the log from the commit of package kdepimlibs4 for openSUSE:Factory checked in at Fri Sep 3 14:07:06 CEST 2010. -------- --- KDE/kdepimlibs4/kdepimlibs4.changes 2010-07-29 16:55:28.000000000 +0200 +++ kdepimlibs4/kdepimlibs4.changes 2010-08-27 13:37:09.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Aug 27 13:36:57 CEST 2010 - dmueller(a)suse.de + +- update to 4.5.1 + * see http://kde.org/announcements/changelogs/changelog4_5_0to4_5_1.php for details + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdepimlibs-4.5.0.tar.bz2 New: ---- kdepimlibs-4.5.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepimlibs4.spec ++++++ --- /var/tmp/diff_new_pack.wkfrn3/_old 2010-09-03 14:05:59.000000000 +0200 +++ /var/tmp/diff_new_pack.wkfrn3/_new 2010-09-03 14:05:59.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdepimlibs4 (Version 4.5.0) +# spec file for package kdepimlibs4 (Version 4.5.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,7 +23,7 @@ Group: System/GUI/KDE Summary: KDE PIM Libraries Url: http://www.kde.org -Version: 4.5.0 +Version: 4.5.1 Release: 1 Source0: kdepimlibs-%version.tar.bz2 Patch0: 4_5_BRANCH.diff ++++++ kdepimlibs-4.5.0.tar.bz2 -> kdepimlibs-4.5.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.0/CMakeLists.txt new/kdepimlibs-4.5.1/CMakeLists.txt --- old/kdepimlibs-4.5.0/CMakeLists.txt 2010-07-28 23:04:12.000000000 +0200 +++ new/kdepimlibs-4.5.1/CMakeLists.txt 2010-08-27 10:09:27.000000000 +0200 @@ -11,7 +11,7 @@ ############### The kdepimlibs version (used e.g. in KdepimLibsConfig.cmake) ############### set(KDEPIMLIBS_VERSION_MAJOR 4) set(KDEPIMLIBS_VERSION_MINOR 5) -set(KDEPIMLIBS_VERSION_PATCH 00) +set(KDEPIMLIBS_VERSION_PATCH 1) set(KDEPIMLIBS_VERSION ${KDEPIMLIBS_VERSION_MAJOR}.${KDEPIMLIBS_VERSION_MINOR}.${KDEPIMLIBS_VERSION_PATCH}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.0/akonadi/contact/editor/im/protocols/groupwiseprotocol.desktop new/kdepimlibs-4.5.1/akonadi/contact/editor/im/protocols/groupwiseprotocol.desktop --- old/kdepimlibs-4.5.0/akonadi/contact/editor/im/protocols/groupwiseprotocol.desktop 2010-07-28 23:04:08.000000000 +0200 +++ new/kdepimlibs-4.5.1/akonadi/contact/editor/im/protocols/groupwiseprotocol.desktop 2010-08-27 10:09:27.000000000 +0200 @@ -11,6 +11,7 @@ Comment[de]=Novell-GroupWise-Nachrichtendienst Comment[en_GB]=Novell GroupWise Messenger Comment[eo]=Novell GroupWise mesaĝilo +Comment[es]=Mensajería de Novell GroupWise Comment[et]=Novell GroupWise Messenger Comment[fr]=Messagerie GroupWise Novell Comment[ga]=Teachtaire Novell GroupWise @@ -41,6 +42,7 @@ Name[de]=GroupWise Name[en_GB]=GroupWise Name[eo]=GroupWise +Name[es]=GroupWise Name[et]=GroupWise Name[fr]=GroupWise Name[ga]=GroupWise diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.0/akonadi/contact/editor/im/protocols/ircprotocol.desktop new/kdepimlibs-4.5.1/akonadi/contact/editor/im/protocols/ircprotocol.desktop --- old/kdepimlibs-4.5.0/akonadi/contact/editor/im/protocols/ircprotocol.desktop 2010-07-28 23:04:08.000000000 +0200 +++ new/kdepimlibs-4.5.1/akonadi/contact/editor/im/protocols/ircprotocol.desktop 2010-08-27 10:09:27.000000000 +0200 @@ -11,6 +11,7 @@ Comment[de]=Internet Relay Chat Comment[en_GB]=Internet Relay Chat Comment[eo]=Interreta plusenda babilado +Comment[es]=Internet Relay Chat Comment[et]=Rühmadiskussioon internetis Comment[fr]=Relai Internet de discussion Comment[ga]=Internet Relay Chat diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.0/akonadi/entitymimetypefiltermodel.cpp new/kdepimlibs-4.5.1/akonadi/entitymimetypefiltermodel.cpp --- old/kdepimlibs-4.5.0/akonadi/entitymimetypefiltermodel.cpp 2010-05-20 13:41:04.000000000 +0200 +++ new/kdepimlibs-4.5.1/akonadi/entitymimetypefiltermodel.cpp 2010-08-27 10:09:27.000000000 +0200 @@ -214,6 +214,13 @@ if (!sourceModel()) return false; + // QSortFilterProxyModel implementation is buggy in that it emits rowsAboutToBeInserted etc + // only after the source model has emitted rowsInserted, instead of emitting it when the + // source model emits rowsAboutToBeInserted. That means that the source and the proxy are out + // of sync around the time of insertions, so we can't use the optimization below. + return rowCount(parent) > 0; +#if 0 + if ( !parent.isValid() ) return sourceModel()->hasChildren(parent); @@ -233,6 +240,7 @@ } } return false; +#endif } bool EntityMimeTypeFilterModel::canFetchMore( const QModelIndex &parent ) const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.0/akonadi/itemsync.cpp new/kdepimlibs-4.5.1/akonadi/itemsync.cpp --- old/kdepimlibs-4.5.0/akonadi/itemsync.cpp 2010-07-06 08:54:00.000000000 +0200 +++ new/kdepimlibs-4.5.1/akonadi/itemsync.cpp 2010-08-27 10:09:27.000000000 +0200 @@ -53,7 +53,8 @@ mStreaming( false ), mIncremental( false ), mLocalListDone( false ), - mDeliveryDone( false ) + mDeliveryDone( false ), + mFinished( false ) { // we want to fetch all data by default mFetchScope.fetchFullPayload(); @@ -106,6 +107,7 @@ bool mIncremental; bool mLocalListDone; bool mDeliveryDone; + bool mFinished; }; void ItemSync::Private::createLocalItem( const Item & item ) @@ -124,7 +126,10 @@ if ( mPendingJobs > 0 || !mDeliveryDone || mTransactionJobs > 0 ) return; - q->emitResult(); + if ( !mFinished ) { // prevent double result emission, can happen since checkDone() is called from all over the place + mFinished = true; + q->emitResult(); + } } ItemSync::ItemSync( const Collection &collection, QObject *parent ) : diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.0/akonadi/kdescendantsproxymodel.cpp new/kdepimlibs-4.5.1/akonadi/kdescendantsproxymodel.cpp --- old/kdepimlibs-4.5.0/akonadi/kdescendantsproxymodel.cpp 2010-07-23 23:11:01.000000000 +0200 +++ new/kdepimlibs-4.5.1/akonadi/kdescendantsproxymodel.cpp 2010-08-27 10:09:27.000000000 +0200 @@ -171,7 +171,10 @@ Q_ASSERT(child.isValid()); if (q->sourceModel()->hasChildren(child)) + { + Q_ASSERT(q->sourceModel()->rowCount(child) > 0); newPendingParents.append(child); + } } } m_pendingParents += newPendingParents; @@ -335,6 +338,7 @@ if (d->m_mapping.isEmpty() && sourceModel()->hasChildren()) { + Q_ASSERT(sourceModel()->rowCount() > 0); const_cast<KDescendantsProxyModelPrivate*>(d)->synchronousMappingRefresh(); } return d->m_rowCount; @@ -538,6 +542,7 @@ if (!q->sourceModel()->hasChildren(parent)) { + Q_ASSERT(q->sourceModel()->rowCount(parent) == 0); // parent was not a parent before. return; } @@ -559,6 +564,7 @@ QModelIndex idx = q->sourceModel()->index(rowCount - 1, column, parent); while (q->sourceModel()->hasChildren(idx)) { + Q_ASSERT(q->sourceModel()->rowCount(idx) > 0); idx = q->sourceModel()->index(q->sourceModel()->rowCount(idx) - 1, column, idx); } // The last item in the list is getting a sibling below it. @@ -648,13 +654,16 @@ const QModelIndex idx = q->sourceModel()->index(row, column, parent); Q_ASSERT(idx.isValid()); if (q->sourceModel()->hasChildren(idx)) + { + Q_ASSERT(q->sourceModel()->rowCount(idx) > 0); m_pendingParents.append(idx); + } } m_rowCount += difference; - scheduleProcessPendingParents(); q->endInsertRows(); + scheduleProcessPendingParents(); } void KDescendantsProxyModelPrivate::sourceRowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) @@ -667,6 +676,7 @@ QModelIndex idx = q->sourceModel()->index(end, column, parent); while (q->sourceModel()->hasChildren(idx)) { + Q_ASSERT(q->sourceModel()->rowCount(idx) > 0); idx = q->sourceModel()->index(q->sourceModel()->rowCount(idx) - 1, column, idx); } const int proxyEnd = q->mapFromSource(idx).row(); @@ -751,6 +761,7 @@ resetInternalData(); if (q->sourceModel()->hasChildren()) { + Q_ASSERT(q->sourceModel()->rowCount() > 0); m_pendingParents.append(QModelIndex()); scheduleProcessPendingParents(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.0/akonadi/session.cpp new/kdepimlibs-4.5.1/akonadi/session.cpp --- old/kdepimlibs-4.5.0/akonadi/session.cpp 2010-07-12 23:08:14.000000000 +0200 +++ new/kdepimlibs-4.5.1/akonadi/session.cpp 2010-08-27 10:09:27.000000000 +0200 @@ -164,7 +164,6 @@ if ( currentJob ) currentJob->d_ptr->lostConnection(); connected = false; - QTimer::singleShot( 30000, mParent, SLOT( reconnect() ) ); } void SessionPrivate::dataReceived() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.0/akonadi/tests/itemsynctest.cpp new/kdepimlibs-4.5.1/akonadi/tests/itemsynctest.cpp --- old/kdepimlibs-4.5.0/akonadi/tests/itemsynctest.cpp 2010-05-05 16:51:13.000000000 +0200 +++ new/kdepimlibs-4.5.1/akonadi/tests/itemsynctest.cpp 2010-08-27 10:09:26.000000000 +0200 @@ -97,9 +97,10 @@ Item::List l; l << origItems[i]; syncer->setFullSyncItems( l ); - if ( i < origItems.count() - 1 ) + if ( i < origItems.count() - 1 ) { QTest::qWait( 10 ); // enter the event loop so itemsync actually can do something - QCOMPARE( spy.count(), 0 ); + QCOMPARE( spy.count(), 0 ); + } } QTest::qWait( 1000 ); // let it finish its job QCOMPARE( spy.count(), 1 ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.0/akonadi/transactionsequence.cpp new/kdepimlibs-4.5.1/akonadi/transactionsequence.cpp --- old/kdepimlibs-4.5.0/akonadi/transactionsequence.cpp 2010-06-16 14:02:27.000000000 +0200 +++ new/kdepimlibs-4.5.1/akonadi/transactionsequence.cpp 2010-08-27 10:09:27.000000000 +0200 @@ -104,7 +104,7 @@ else Job::removeSubjob( job ); - if ( subjobs().isEmpty() && d->mState == TransactionSequencePrivate::WaitingForSubjobs ) { + if ( !hasSubjobs() && d->mState == TransactionSequencePrivate::WaitingForSubjobs ) { d->mState = TransactionSequencePrivate::Committing; TransactionCommitJob *job = new TransactionCommitJob( this ); connect( job, SIGNAL( result( KJob* ) ), SLOT( commitResult( KJob* ) ) ); @@ -113,7 +113,14 @@ setError( job->error() ); setErrorText( job->errorText() ); removeSubjob( job ); + + // cancel all subjobs in case someone else is listening (such as ItemSync), but without notifying ourselves again + foreach ( KJob* job, subjobs() ) { + disconnect( job, SIGNAL(result(KJob*)), this, SLOT(slotResult(KJob*)) ); + job->kill( EmitResult ); + } clearSubjobs(); + if ( d->mState == TransactionSequencePrivate::Running || d->mState == TransactionSequencePrivate::WaitingForSubjobs ) { d->mState = TransactionSequencePrivate::RollingBack; TransactionRollbackJob *job = new TransactionRollbackJob( this ); Files old/kdepimlibs-4.5.0/doc/kcontrol/kresources/index.cache.bz2 and new/kdepimlibs-4.5.1/doc/kcontrol/kresources/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.0/kcal/incidenceformatter.cpp new/kdepimlibs-4.5.1/kcal/incidenceformatter.cpp --- old/kdepimlibs-4.5.0/kcal/incidenceformatter.cpp 2010-07-07 19:08:52.000000000 +0200 +++ new/kdepimlibs-4.5.1/kcal/incidenceformatter.cpp 2010-08-27 10:09:26.000000000 +0200 @@ -351,7 +351,11 @@ if ( (*it)->uri().startsWith( QLatin1String( "kmail:" ) ) ) { name = i18n( "Show mail" ); } else { - name = (*it)->label(); + if ( (*it)->label().isEmpty() ) { + name = (*it)->uri(); + } else { + name = (*it)->label(); + } } tmpStr += htmlAddLink( (*it)->uri(), name ); } else { @@ -395,7 +399,6 @@ //TODO: add a birthday cake icon QString tmpStr = displayViewLinkPerson( email_1, name_1, uid_1, iconPath ); - return tmpStr; } @@ -578,7 +581,7 @@ const bool isBirthday = event->customProperty( "KABC", "BIRTHDAY" ) == "YES"; const bool isAnniversary = event->customProperty( "KABC", "ANNIVERSARY" ) == "YES"; - if ( isBirthday || isAnniversary ) { + if ( isBirthday || isAnniversary ) { tmpStr += "<tr>"; if ( isAnniversary ) { tmpStr += "<td><b>" + i18n( "Anniversary:" ) + "</b></td>"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.0/kimap/sessionthread.cpp new/kdepimlibs-4.5.1/kimap/sessionthread.cpp --- old/kdepimlibs-4.5.0/kimap/sessionthread.cpp 2010-06-24 18:26:24.000000000 +0200 +++ new/kdepimlibs-4.5.1/kimap/sessionthread.cpp 2010-08-27 10:09:26.000000000 +0200 @@ -118,16 +118,12 @@ void SessionThread::closeSocket() { - QMutexLocker locker(&m_mutex); - - m_encryptedMode = false; QTimer::singleShot( 0, this, SLOT( doCloseSocket() ) ); } void SessionThread::doCloseSocket() { - QMutexLocker locker(&m_mutex); - + m_encryptedMode = false; m_socket->close(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.0/kmime/kmime_content.cpp new/kdepimlibs-4.5.1/kmime/kmime_content.cpp --- old/kdepimlibs-4.5.0/kmime/kmime_content.cpp 2010-07-07 19:08:52.000000000 +0200 +++ new/kdepimlibs-4.5.1/kmime/kmime_content.cpp 2010-08-27 10:09:26.000000000 +0200 @@ -513,6 +513,7 @@ // Add to new content. main->setHeader( *it ); // Remove from this content. + delete (*it); it = h_eaders.erase( it ); } else { ++it; @@ -575,6 +576,7 @@ foreach( Headers::Base *h, main->h_eaders ) { setHeader( h ); // Will remove the old one if present. } + qDeleteAll( main->h_eaders ); main->h_eaders.clear(); // Move the body. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit libproxy for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '10

03 Sep '10

Hello community, here is the log from the commit of package libproxy for openSUSE:Factory checked in at Fri Sep 3 13:57:20 CEST 2010. -------- --- GNOME/libproxy/libproxy-plugins.changes 2010-06-11 10:26:27.000000000 +0200 +++ libproxy/libproxy-plugins.changes 2010-09-03 13:50:11.348618000 +0200 @@ -1,0 +2,64 @@ +Fri Aug 20 15:16:46 UTC 2010 - dimstar(a)opensuse.org + +- Mono bindings are not available for all supported platforms, + thus wrapping it in a if have_mono [...] endif. + +------------------------------------------------------------------- +Thu Aug 19 22:16:22 UTC 2010 - dimstar(a)opensuse.org + +- Check for build_snapshot: the svn snapshot project contains + unversioned tarballs. + +------------------------------------------------------------------- +Thu Aug 19 15:49:02 UTC 2010 - dimstar(a)opensuse.org + +- Update to version 0.4.5: + + C# bindings are installable (-DWITH_DOTNET=ON) + + C# bindings installation path can be changed using -DGAC_DIR= + + Internal libmodman build fixed + + Installation dirs are now all relative to CMAKE_INSTALL_PREFIX + + Fixed test while using --as-needed linker flag + + Fixed generation of libproxy-1.0.pc + + Basic support for Mingw added (not yet 100% functional) + + Ruby binding implemented (not yet in the build system) + + Fixed modules not being found caused by relative + LIBEXEC_INSTALL_DIR + + Fixed bug with builtin plugins (Issue 133) + + Vala bindings installation path can be changed using + -DVAPI_DIR= + + Python bindings installation path can be changed using + -DPYTHON_SITEPKG_DIR= + + Perl bindings can be installed in vendor directory + (-DPERL_VENDORARCH=ON) + + Perl bindings installation path can be change using + -DPX_PERL_ARCH= + + Unit test now builds on OSX +- Changes from version 0.4.4: + + Add support for optionally building using a system libmodman + + Rework build system to be cleaner + + Fix two major build system bugs: 127, 128 + +------------------------------------------------------------------- +Mon Jul 5 21:42:37 UTC 2010 - dimstar(a)opensuse.org + +- Add mono-devel BuildRequires to install the csharp bindings. + +------------------------------------------------------------------- +Tue Jun 22 17:48:31 UTC 2010 - dimstar(a)opensuse.org + +- Initial work to support win32 cross building. + +------------------------------------------------------------------- +Mon Jun 14 17:48:01 UTC 2010 - dimstar(a)opensuse.org + +- Use external libmodman: add libmodman-devel BuildRequires. +- Drop libmodman0 subpackage + +------------------------------------------------------------------- +Wed Jun 9 22:52:05 UTC 2010 - dimstar(a)opensuse.org + +- Enable build on other distributions than openSUSE, wrapping + openSUSE rpm tags like Recommends and Supplements in %if + statements. + +------------------------------------------------------------------- libproxy.changes: same change calling whatdependson for head-i586 Old: ---- libproxy-0.4.3.tar.bz2 New: ---- libproxy-0.4.5.tar.bz2 update-from-svn.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libproxy-plugins.spec ++++++ --- /var/tmp/diff_new_pack.2L93T6/_old 2010-09-03 13:50:22.000000000 +0200 +++ /var/tmp/diff_new_pack.2L93T6/_new 2010-09-03 13:50:22.000000000 +0200 @@ -1,8 +1,7 @@ # -# spec file for package libproxy-plugins (Version 0.4.3) +# spec file for package libproxy-plugins (Version 0.4.5) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. -# Copyright (c) 2010 Dominique Leuenberger, Amsterdam, Netherlands. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,20 +15,21 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %define build_core_not_modules 0 -%if 0%{suse_version} > 1120 +%if 0%{?suse_version} +%define have_mono 1 +%else +%define have_mono 0 +%endif + +%if 0%{?suse_version} > 1120 %define xulrunner_ver 192 %else -%if 0%{suse_version} > 1110 +%if 0%{?suse_version} > 1110 %define xulrunner_ver 191 %else -%if 0%{suse_version} >= 1100 %define xulrunner_ver 190 -%else -%define xulrunner_ver 181 -%endif %endif %endif Url: http://code.google.com/p/libproxy/ @@ -38,34 +38,52 @@ Name: libproxy-plugins Group: System/Libraries Summary: Libproxy provides consistent proxy configuration to applications -Version: 0.4.3 +Version: 0.4.5 Release: 1 -Source: http://libproxy.googlecode.com/files/%{_name}-%{version}.tar.bz2 +%if 0%{?build_snapshot} +%define _sourcename %{_name} +%else +%define _sourcename %{_name}-%{version} +%endif +Source: http://libproxy.googlecode.com/files/%{_sourcename}.tar.bz2 +# Script used for automatic snapshot updates +Source98: update-from-svn.sh Source99: baselibs.conf -License: LGPLv2.1+ +License: GPLv2+ ; LGPLv2.1+ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake BuildRequires: gcc-c++ -BuildRequires: pkg-config +BuildRequires: libmodman-devel +BuildRequires: pkgconfig BuildRequires: zlib-devel -%if !%build_core_not_modules +%if !%{build_core_not_modules} +%if ! 0%{?windows} BuildRequires: dbus-1-devel BuildRequires: gconf2-devel # For directory ownership, but also because we want to rebuild the modules if # the library changed BuildRequires: libproxy1 BuildRequires: libwebkit-devel +%if 0%{?suse_version} BuildRequires: mozilla-xulrunner%{xulrunner_ver}-devel +%else +BuildRequires: xulrunner-devel +%endif BuildRequires: NetworkManager-devel BuildRequires: libkde4-devel BuildRequires: libqt4-devel +%endif %else +%if 0%{?have_mono} +BuildRequires: mono-devel +%endif +BuildRequires: perl BuildRequires: python-devel %endif -%if %suse_version <= 1110 -%define python_sitelib %{py_sitedir} -%endif +%{!?python_sitelib: %global python_sitelib %(%__python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%{!?python_sitearch: %global python_sitearch %(%__python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} +%{!?_assemblies_dir: %global _assemblies_dir %(pkg-config cecil --variable=assemblies_dir)} %description libproxy offers the following features: * extremely small core @@ -73,11 +91,8 @@ * no external dependencies within libproxy core (libproxy modules may have dependencies) - * only 3 functions in the stable external API - * dynamic adjustment to changing network topology - * a standard way of dealing with proxy settings across all scenarios @@ -107,11 +122,8 @@ * no external dependencies within libproxy core (libproxy modules may have dependencies) - * only 3 functions in the stable external API - * dynamic adjustment to changing network topology - * a standard way of dealing with proxy settings across all scenarios @@ -126,33 +138,19 @@ * no external dependencies within libproxy core (libproxy modules may have dependencies) - * only 3 functions in the stable external API - * dynamic adjustment to changing network topology - * a standard way of dealing with proxy settings across all scenarios -%package -n libmodman0 -License: GPLv2+ ; LGPLv2.1+ -Summary: Libproxy's Module Management Library -Group: System/Libraries -Obsoletes: libmodman0_0_0 < %{version} -Provides: libmodman0_0_0 = %{version} - -%description -n libmodman0 -A module management library taking care of loading / unload modules -including heuristics in detecting which bindings might already -be used by an application and favouring this one. - - %package -n python-libproxy License: GPLv2+ ; LGPLv2.1+ Summary: Python bindings for libproxy Group: System/Libraries +%if 0%{?suse_version} > 1110 BuildArch: noarch -Requires: libproxy1 = %{version} %py_requires +%endif +Requires: libproxy1 = %{version} %description -n python-libproxy libproxy offers the following features: * extremely small core @@ -160,11 +158,8 @@ * no external dependencies within libproxy core (libproxy modules may have dependencies) - * only 3 functions in the stable external API - * dynamic adjustment to changing network topology - * a standard way of dealing with proxy settings across all scenarios @@ -173,7 +168,8 @@ Summary: Perl bindings for libproxy Group: Development/Libraries/Perl Requires: libproxy1 = %{version} -Requires: perl = %{perl_version} +# For Fedora at least perl = perl_version does not work. +Requires: perl >= %{perl_version} %description -n perl-Net-Libproxy libproxy offers the following features: * extremely small core @@ -181,13 +177,11 @@ * no external dependencies within libproxy core (libproxy modules may have dependencies) - * only 3 functions in the stable external API - * dynamic adjustment to changing network topology - * a standard way of dealing with proxy settings across all scenarios +%if 0%{?have_mono} %package -n libproxy-sharp License: GPLv2+ ; LGPLv2.1+ @@ -201,13 +195,10 @@ * no external dependencies within libproxy core (libproxy modules may have dependencies) - * only 3 functions in the stable external API - * dynamic adjustment to changing network topology - * a standard way of dealing with proxy settings across all scenarios - +%endif %else @@ -216,9 +207,12 @@ Summary: Libproxy module for GNOME configuration Group: System/Libraries Requires: libproxy1 = %{version} +%if 0%{?suse_version} Recommends: libproxy1-pacrunner = %{version} -Recommends: libproxy1-wpad-dns = %{version} Supplements: packageand(libproxy1:gconf2) +%else +Requires: libproxy1-pacrunner = %{version} +%endif Provides: libproxy-gnome = %{version} Obsoletes: libproxy-gnome < %{version} @@ -232,9 +226,12 @@ Summary: Libproxy module for KDE configuration Group: System/Libraries Requires: libproxy1 = %{version} +%if 0%{?suse_version} Recommends: libproxy1-pacrunner = %{version} -Recommends: libproxy1-wpad-dns = %{version} Supplements: packageand(libproxy1:libkde4) +%else +Requires: libproxy1-pacrunner = %{version} +%endif Provides: libproxy-kde = %{version} Obsoletes: libproxy-kde < %{version} @@ -248,7 +245,9 @@ Summary: Libproxy module to support wpad/pac parsing via Mozilla JavaScript Engine Group: System/Libraries Requires: libproxy1 = %{version} +%if 0%{?suse_version} Supplements: packageand(libproxy1:mozilla-xulrunner%{xulrunner_ver}) +%endif # A virtual symbol to identify that this is a pacrunner. Provides: libproxy1-pacrunner = %{version} @@ -262,7 +261,9 @@ Summary: Libproxy module to support WPAD/PAC parsing via WebKit JavaScript Engine Group: System/Libraries Requires: libproxy1 = %{version} -Supplements: packageand(libproxy1:libwebkit-1) +%if 0%{?suse_version} +Supplements: packageand(libproxy1:libwebkitgtk-0) +%endif # A virtual symbol to identify that this is a pacrunner. Provides: libproxy1-pacrunner = %{version} @@ -270,13 +271,14 @@ A module to extend libproxy with capabilities to pass addresses to a WPAD/PAC script and have it find the correct proxy. - %package -n libproxy1-networkmanager License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy module for NetworkManager configuration Group: System/Libraries Requires: libproxy1 = %{version} +%if 0%{?suse_version} Supplements: packageand(libproxy1:NetworkManager) +%endif %description -n libproxy1-networkmanager A module to extend libproxy with capabilities to query NetworkManager @@ -285,88 +287,134 @@ %endif %prep -%setup -q -n %{_name}-%{version} +%setup -q -n %{_sourcename} mkdir build %build cd build +export CXXFLAGS="%{optflags}" +export CFLAGS="%{optflags}" +%if 0%{?suse_version} < 1120 && 0%{?suse_version} +export CXXFLAGS="%{optflags} -DXP_UNIX" +%endif +%if 0%{?windows} +export CXXFLAGS="%{optflags} -fno-stack-protector -static-libgcc" +%endif cmake \ - -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -Dlibdir=%{_libdir} \ - -Dlibexecdir=%{_libexecdir}/libproxy \ - -Ddatadir=%{_datadir} \ - -Dmoduledir=%{_libdir}/libproxy/%{version}/modules \ +%if 0%{?windows} + -DCMAKE_TOOLCHAIN_FILE=../cmake/mingw32.cmake \ + -DBUILD_TESTING=False \ + -DWITH_DOTNET=OFF \ +%else -DWITH_VALA=yes \ + -DWITH_DOTNET=%{have_mono} \ + -DFORCE_SYSTEM_LIBMODMAN=ON \ +%endif + -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DBIN_INSTALL_DIR=%{_bindir} \ + -DLIB_INSTALL_DIR=%{_libdir} \ + -DMODULE_INSTALL_DIR=%{_libdir}/libproxy-%{version}/modules \ + -DLIBEXEC_INSTALL_DIR=%{_libexecdir}/libproxy-%{version} \ + -DSHARE_INSTALL_PREFIX=%{_datadir} \ + -DINCLUDE_INSTALL_DIR=%{_includedir} \ -DPERL_VENDORINSTALL=yes \ +%if ! %build_core_not_modules + -DWITH_DOTNET=OFF \ +%endif +%if 0%{?suse_version} && 0%{?suse_version} < 1120 + -DCMAKE_BUILD_TYPE=DebugFull \ + -DCMAKE_INSTALL_CONFIG_NAME=DebugFull \ +%else + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_INSTALL_CONFIG_NAME=RelWithDebInfo \ +%endif .. -%{__make} %{?jobs:-j%jobs} +%{__make} VERBOSE=1 %install cd build -%makeinstall +make DESTDIR=%{buildroot} install + +# On Windows we also do not want to provide the static libraries. +%if 0%{?windows} +find %{buildroot}%{_libdir} -name '*.dll.a' -delete -print +rm %{buildroot}%{_libdir}/libmodman.dll +%endif + %if %build_core_not_modules # Build the basic directory structure for the modules so we can # own the directories in the main library package -install -d %{buildroot}%{_libexecdir}/libproxy -install -d %{buildroot}%{_libdir}/%{name}/%{version}/modules +install -d %{buildroot}%{_libexecdir}/libproxy-%{version} +install -d %{buildroot}%{_libdir}/%{name}-%{version}/modules %else # remove files that are part of the core -rm %{buildroot}%{_includedir}/*.h +rm -f %{buildroot}%{_includedir}/*.h # Delete all files that exist in the base libproxy package -rm %{buildroot}%{_bindir}/proxy -rm %{buildroot}%{_libdir}/libproxy.so* -rm %{buildroot}%{_libdir}/libmodman.so* -rm %{buildroot}%{python_sitelib}/*.py -rm %{buildroot}%{_libdir}/pkgconfig/libproxy-1.0.pc -rm %{buildroot}%{_datadir}/cmake/Modules/Findlibproxy.cmake -rm %{buildroot}%{_datadir}/vala/vapi/libproxy-1.0.vapi -rm %{buildroot}%{perl_vendorarch}/Net/Libproxy.pm -rm %{buildroot}%{perl_vendorarch}/auto/Net/Libproxy/Libproxy.so +rm -f %{buildroot}%{_bindir}/proxy%{?windows:.exe} +rm -f %{buildroot}%{_libdir}/libproxy.* +rm -f %{buildroot}%{python_sitelib}/*.py +rm -f %{buildroot}%{_libdir}/pkgconfig/libproxy-1.0.pc +rm -f %{buildroot}%{_datadir}/cmake/Modules/Findlibproxy.cmake +rm -f %{buildroot}%{_datadir}/vala/vapi/libproxy-1.0.vapi +rm -f %{buildroot}%{perl_vendorarch}/Net/Libproxy.pm +rm -f %{buildroot}%{perl_vendorarch}/auto/Net/Libproxy/Libproxy.so %endif + +%check +cd build +make test + %if %build_core_not_modules %post -n libproxy1 -p /sbin/ldconfig -%post -n libmodman0 -p /sbin/ldconfig - %postun -n libproxy1 -p /sbin/ldconfig -%postun -n libmodman0 -p /sbin/ldconfig - %files tools %defattr(-, root, root) -%{_bindir}/proxy +%{_bindir}/proxy%{?windows:.exe} %files -n libproxy1 %defattr(-, root, root) +%doc COPYING README AUTHORS +%if ! 0%{?windows} %{_libdir}/libproxy.so.* -%dir %{_libexecdir}/libproxy -%dir %{_libdir}/libproxy -%dir %{_libdir}/libproxy/%{version} -%dir %{_libdir}/libproxy/%{version}/modules -#%{_libdir}/libproxy/%{version}/modules/config_envvar.so -#%{_libdir}/libproxy/%{version}/modules/config_file.so -#%{_libdir}/libproxy/%{version}/modules/config_direct.so -#%{_libdir}/libproxy/%{version}/modules/ignore_*.so - -%files -n libmodman0 -%defattr(-, root, root) -%{_libdir}/libmodman.so.* +%else +%{_libdir}/libproxy.dll +%endif +%dir %{_libexecdir}/libproxy-%{version} +%dir %{_libdir}/libproxy-%{version} +%dir %{_libdir}/libproxy-%{version}/modules %files devel %defattr(-, root, root) %{_includedir}/*.h +%if ! 0%{?windows} %{_libdir}/*.so %{_libdir}/pkgconfig/libproxy-1.0.pc +%if 0%{have_mono} +%{_libdir}/pkgconfig/libproxy-sharp-1.0.pc +%endif %{_datadir}/cmake/Modules/Findlibproxy.cmake %dir %{_datadir}/vala %dir %{_datadir}/vala/vapi %{_datadir}/vala/vapi/libproxy-1.0.vapi +%endif %files -n python-libproxy %defattr(-, root, root) %{python_sitelib}/*.py +%if 0%{?have_mono} + +%files -n libproxy-sharp +%defattr(-, root, root) +%{_assemblies_dir}/gac/libproxy-sharp +%{_assemblies_dir}/libproxy-sharp +%endif + +%if ! 0%{?windows} + %files -n perl-Net-Libproxy %defattr(-,root,root) %dir %{perl_vendorarch}/Net @@ -374,28 +422,32 @@ %dir %{perl_vendorarch}/auto/Net/Libproxy %{perl_vendorarch}/Net/Libproxy.pm %{perl_vendorarch}/auto/Net/Libproxy/Libproxy.so +%endif %else +%if ! 0%{?windows} + %files -n libproxy1-config-kde4 %defattr(-, root, root) -%{_libdir}/libproxy/%{version}/modules/config_kde4.so +%{_libdir}/libproxy-%{version}/modules/config_kde4.so %files -n libproxy1-config-gnome %defattr(-, root, root) -%{_libdir}/libproxy/%{version}/modules/config_gnome.so -%{_libexecdir}/libproxy/pxgconf +%{_libdir}/libproxy-%{version}/modules/config_gnome.so +%{_libexecdir}/libproxy-%{version}/pxgconf %files -n libproxy1-networkmanager %defattr(-, root, root) -%{_libdir}/libproxy/%{version}/modules/network_networkmanager.so +%{_libdir}/libproxy-%{version}/modules/network_networkmanager.so %files -n libproxy1-pacrunner-webkit %defattr(-, root, root) -%{_libdir}/libproxy/%{version}/modules/pacrunner_webkit.so +%{_libdir}/libproxy-%{version}/modules/pacrunner_webkit.so %files -n libproxy1-pacrunner-mozjs %defattr(-, root, root) -%{_libdir}/libproxy/%{version}/modules/pacrunner_mozjs.so +%{_libdir}/libproxy-%{version}/modules/pacrunner_mozjs.so +%endif %endif %changelog ++++++ libproxy.spec ++++++ --- /var/tmp/diff_new_pack.2L93T6/_old 2010-09-03 13:50:22.000000000 +0200 +++ /var/tmp/diff_new_pack.2L93T6/_new 2010-09-03 13:50:22.000000000 +0200 @@ -1,8 +1,7 @@ # -# spec file for package libproxy (Version 0.4.3) +# spec file for package libproxy (Version 0.4.5) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. -# Copyright (c) 2010 Dominique Leuenberger, Amsterdam, Netherlands. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,20 +15,21 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %define build_core_not_modules 1 -%if 0%{suse_version} > 1120 +%if 0%{?suse_version} +%define have_mono 1 +%else +%define have_mono 0 +%endif + +%if 0%{?suse_version} > 1120 %define xulrunner_ver 192 %else -%if 0%{suse_version} > 1110 +%if 0%{?suse_version} > 1110 %define xulrunner_ver 191 %else -%if 0%{suse_version} >= 1100 %define xulrunner_ver 190 -%else -%define xulrunner_ver 181 -%endif %endif %endif Url: http://code.google.com/p/libproxy/ @@ -38,34 +38,52 @@ Name: libproxy Group: System/Libraries Summary: Libproxy provides consistent proxy configuration to applications -Version: 0.4.3 +Version: 0.4.5 Release: 1 -Source: http://libproxy.googlecode.com/files/%{_name}-%{version}.tar.bz2 +%if 0%{?build_snapshot} +%define _sourcename %{_name} +%else +%define _sourcename %{_name}-%{version} +%endif +Source: http://libproxy.googlecode.com/files/%{_sourcename}.tar.bz2 +# Script used for automatic snapshot updates +Source98: update-from-svn.sh Source99: baselibs.conf -License: LGPLv2.1+ +License: GPLv2+ ; LGPLv2.1+ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake BuildRequires: gcc-c++ -BuildRequires: pkg-config +BuildRequires: libmodman-devel +BuildRequires: pkgconfig BuildRequires: zlib-devel -%if !%build_core_not_modules +%if !%{build_core_not_modules} +%if ! 0%{?windows} BuildRequires: dbus-1-devel BuildRequires: gconf2-devel # For directory ownership, but also because we want to rebuild the modules if # the library changed BuildRequires: libproxy1 BuildRequires: libwebkit-devel +%if 0%{?suse_version} BuildRequires: mozilla-xulrunner%{xulrunner_ver}-devel +%else +BuildRequires: xulrunner-devel +%endif BuildRequires: NetworkManager-devel BuildRequires: libkde4-devel BuildRequires: libqt4-devel +%endif %else +%if 0%{?have_mono} +BuildRequires: mono-devel +%endif +BuildRequires: perl BuildRequires: python-devel %endif -%if %suse_version <= 1110 -%define python_sitelib %{py_sitedir} -%endif +%{!?python_sitelib: %global python_sitelib %(%__python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%{!?python_sitearch: %global python_sitearch %(%__python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} +%{!?_assemblies_dir: %global _assemblies_dir %(pkg-config cecil --variable=assemblies_dir)} %description libproxy offers the following features: * extremely small core @@ -73,11 +91,8 @@ * no external dependencies within libproxy core (libproxy modules may have dependencies) - * only 3 functions in the stable external API - * dynamic adjustment to changing network topology - * a standard way of dealing with proxy settings across all scenarios @@ -107,11 +122,8 @@ * no external dependencies within libproxy core (libproxy modules may have dependencies) - * only 3 functions in the stable external API - * dynamic adjustment to changing network topology - * a standard way of dealing with proxy settings across all scenarios @@ -126,33 +138,19 @@ * no external dependencies within libproxy core (libproxy modules may have dependencies) - * only 3 functions in the stable external API - * dynamic adjustment to changing network topology - * a standard way of dealing with proxy settings across all scenarios -%package -n libmodman0 -License: GPLv2+ ; LGPLv2.1+ -Summary: Libproxy's Module Management Library -Group: System/Libraries -Obsoletes: libmodman0_0_0 < %{version} -Provides: libmodman0_0_0 = %{version} - -%description -n libmodman0 -A module management library taking care of loading / unload modules -including heuristics in detecting which bindings might already -be used by an application and favouring this one. - - %package -n python-libproxy License: GPLv2+ ; LGPLv2.1+ Summary: Python bindings for libproxy Group: System/Libraries +%if 0%{?suse_version} > 1110 BuildArch: noarch -Requires: libproxy1 = %{version} %py_requires +%endif +Requires: libproxy1 = %{version} %description -n python-libproxy libproxy offers the following features: * extremely small core @@ -160,11 +158,8 @@ * no external dependencies within libproxy core (libproxy modules may have dependencies) - * only 3 functions in the stable external API - * dynamic adjustment to changing network topology - * a standard way of dealing with proxy settings across all scenarios @@ -173,7 +168,8 @@ Summary: Perl bindings for libproxy Group: Development/Libraries/Perl Requires: libproxy1 = %{version} -Requires: perl = %{perl_version} +# For Fedora at least perl = perl_version does not work. +Requires: perl >= %{perl_version} %description -n perl-Net-Libproxy libproxy offers the following features: * extremely small core @@ -181,13 +177,11 @@ * no external dependencies within libproxy core (libproxy modules may have dependencies) - * only 3 functions in the stable external API - * dynamic adjustment to changing network topology - * a standard way of dealing with proxy settings across all scenarios +%if 0%{?have_mono} %package -n libproxy-sharp License: GPLv2+ ; LGPLv2.1+ @@ -201,13 +195,10 @@ * no external dependencies within libproxy core (libproxy modules may have dependencies) - * only 3 functions in the stable external API - * dynamic adjustment to changing network topology - * a standard way of dealing with proxy settings across all scenarios - +%endif %else @@ -216,9 +207,12 @@ Summary: Libproxy module for GNOME configuration Group: System/Libraries Requires: libproxy1 = %{version} +%if 0%{?suse_version} Recommends: libproxy1-pacrunner = %{version} -Recommends: libproxy1-wpad-dns = %{version} Supplements: packageand(libproxy1:gconf2) +%else +Requires: libproxy1-pacrunner = %{version} +%endif Provides: libproxy-gnome = %{version} Obsoletes: libproxy-gnome < %{version} @@ -232,9 +226,12 @@ Summary: Libproxy module for KDE configuration Group: System/Libraries Requires: libproxy1 = %{version} +%if 0%{?suse_version} Recommends: libproxy1-pacrunner = %{version} -Recommends: libproxy1-wpad-dns = %{version} Supplements: packageand(libproxy1:libkde4) +%else +Requires: libproxy1-pacrunner = %{version} +%endif Provides: libproxy-kde = %{version} Obsoletes: libproxy-kde < %{version} @@ -248,7 +245,9 @@ Summary: Libproxy module to support wpad/pac parsing via Mozilla JavaScript Engine Group: System/Libraries Requires: libproxy1 = %{version} +%if 0%{?suse_version} Supplements: packageand(libproxy1:mozilla-xulrunner%{xulrunner_ver}) +%endif # A virtual symbol to identify that this is a pacrunner. Provides: libproxy1-pacrunner = %{version} @@ -262,7 +261,9 @@ Summary: Libproxy module to support WPAD/PAC parsing via WebKit JavaScript Engine Group: System/Libraries Requires: libproxy1 = %{version} -Supplements: packageand(libproxy1:libwebkit-1) +%if 0%{?suse_version} +Supplements: packageand(libproxy1:libwebkitgtk-0) +%endif # A virtual symbol to identify that this is a pacrunner. Provides: libproxy1-pacrunner = %{version} @@ -270,13 +271,14 @@ A module to extend libproxy with capabilities to pass addresses to a WPAD/PAC script and have it find the correct proxy. - %package -n libproxy1-networkmanager License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy module for NetworkManager configuration Group: System/Libraries Requires: libproxy1 = %{version} +%if 0%{?suse_version} Supplements: packageand(libproxy1:NetworkManager) +%endif %description -n libproxy1-networkmanager A module to extend libproxy with capabilities to query NetworkManager @@ -285,88 +287,134 @@ %endif %prep -%setup -q -n %{_name}-%{version} +%setup -q -n %{_sourcename} mkdir build %build cd build +export CXXFLAGS="%{optflags}" +export CFLAGS="%{optflags}" +%if 0%{?suse_version} < 1120 && 0%{?suse_version} +export CXXFLAGS="%{optflags} -DXP_UNIX" +%endif +%if 0%{?windows} +export CXXFLAGS="%{optflags} -fno-stack-protector -static-libgcc" +%endif cmake \ - -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -Dlibdir=%{_libdir} \ - -Dlibexecdir=%{_libexecdir}/libproxy \ - -Ddatadir=%{_datadir} \ - -Dmoduledir=%{_libdir}/libproxy/%{version}/modules \ +%if 0%{?windows} + -DCMAKE_TOOLCHAIN_FILE=../cmake/mingw32.cmake \ + -DBUILD_TESTING=False \ + -DWITH_DOTNET=OFF \ +%else -DWITH_VALA=yes \ + -DWITH_DOTNET=%{have_mono} \ + -DFORCE_SYSTEM_LIBMODMAN=ON \ +%endif + -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DBIN_INSTALL_DIR=%{_bindir} \ + -DLIB_INSTALL_DIR=%{_libdir} \ + -DMODULE_INSTALL_DIR=%{_libdir}/libproxy-%{version}/modules \ + -DLIBEXEC_INSTALL_DIR=%{_libexecdir}/libproxy-%{version} \ + -DSHARE_INSTALL_PREFIX=%{_datadir} \ + -DINCLUDE_INSTALL_DIR=%{_includedir} \ -DPERL_VENDORINSTALL=yes \ +%if ! %build_core_not_modules + -DWITH_DOTNET=OFF \ +%endif +%if 0%{?suse_version} && 0%{?suse_version} < 1120 + -DCMAKE_BUILD_TYPE=DebugFull \ + -DCMAKE_INSTALL_CONFIG_NAME=DebugFull \ +%else + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_INSTALL_CONFIG_NAME=RelWithDebInfo \ +%endif .. -%{__make} %{?jobs:-j%jobs} +%{__make} VERBOSE=1 %install cd build -%makeinstall +make DESTDIR=%{buildroot} install + +# On Windows we also do not want to provide the static libraries. +%if 0%{?windows} +find %{buildroot}%{_libdir} -name '*.dll.a' -delete -print +rm %{buildroot}%{_libdir}/libmodman.dll +%endif + %if %build_core_not_modules # Build the basic directory structure for the modules so we can # own the directories in the main library package -install -d %{buildroot}%{_libexecdir}/libproxy -install -d %{buildroot}%{_libdir}/%{name}/%{version}/modules +install -d %{buildroot}%{_libexecdir}/libproxy-%{version} +install -d %{buildroot}%{_libdir}/%{name}-%{version}/modules %else # remove files that are part of the core -rm %{buildroot}%{_includedir}/*.h +rm -f %{buildroot}%{_includedir}/*.h # Delete all files that exist in the base libproxy package -rm %{buildroot}%{_bindir}/proxy -rm %{buildroot}%{_libdir}/libproxy.so* -rm %{buildroot}%{_libdir}/libmodman.so* -rm %{buildroot}%{python_sitelib}/*.py -rm %{buildroot}%{_libdir}/pkgconfig/libproxy-1.0.pc -rm %{buildroot}%{_datadir}/cmake/Modules/Findlibproxy.cmake -rm %{buildroot}%{_datadir}/vala/vapi/libproxy-1.0.vapi -rm %{buildroot}%{perl_vendorarch}/Net/Libproxy.pm -rm %{buildroot}%{perl_vendorarch}/auto/Net/Libproxy/Libproxy.so +rm -f %{buildroot}%{_bindir}/proxy%{?windows:.exe} +rm -f %{buildroot}%{_libdir}/libproxy.* +rm -f %{buildroot}%{python_sitelib}/*.py +rm -f %{buildroot}%{_libdir}/pkgconfig/libproxy-1.0.pc +rm -f %{buildroot}%{_datadir}/cmake/Modules/Findlibproxy.cmake +rm -f %{buildroot}%{_datadir}/vala/vapi/libproxy-1.0.vapi +rm -f %{buildroot}%{perl_vendorarch}/Net/Libproxy.pm +rm -f %{buildroot}%{perl_vendorarch}/auto/Net/Libproxy/Libproxy.so %endif + +%check +cd build +make test + %if %build_core_not_modules %post -n libproxy1 -p /sbin/ldconfig -%post -n libmodman0 -p /sbin/ldconfig - %postun -n libproxy1 -p /sbin/ldconfig -%postun -n libmodman0 -p /sbin/ldconfig - %files tools %defattr(-, root, root) -%{_bindir}/proxy +%{_bindir}/proxy%{?windows:.exe} %files -n libproxy1 %defattr(-, root, root) +%doc COPYING README AUTHORS +%if ! 0%{?windows} %{_libdir}/libproxy.so.* -%dir %{_libexecdir}/libproxy -%dir %{_libdir}/libproxy -%dir %{_libdir}/libproxy/%{version} -%dir %{_libdir}/libproxy/%{version}/modules -#%{_libdir}/libproxy/%{version}/modules/config_envvar.so -#%{_libdir}/libproxy/%{version}/modules/config_file.so -#%{_libdir}/libproxy/%{version}/modules/config_direct.so -#%{_libdir}/libproxy/%{version}/modules/ignore_*.so - -%files -n libmodman0 -%defattr(-, root, root) -%{_libdir}/libmodman.so.* +%else +%{_libdir}/libproxy.dll +%endif +%dir %{_libexecdir}/libproxy-%{version} +%dir %{_libdir}/libproxy-%{version} +%dir %{_libdir}/libproxy-%{version}/modules %files devel %defattr(-, root, root) %{_includedir}/*.h +%if ! 0%{?windows} %{_libdir}/*.so %{_libdir}/pkgconfig/libproxy-1.0.pc +%if 0%{have_mono} +%{_libdir}/pkgconfig/libproxy-sharp-1.0.pc +%endif %{_datadir}/cmake/Modules/Findlibproxy.cmake %dir %{_datadir}/vala %dir %{_datadir}/vala/vapi %{_datadir}/vala/vapi/libproxy-1.0.vapi +%endif %files -n python-libproxy %defattr(-, root, root) %{python_sitelib}/*.py +%if 0%{?have_mono} + +%files -n libproxy-sharp +%defattr(-, root, root) +%{_assemblies_dir}/gac/libproxy-sharp +%{_assemblies_dir}/libproxy-sharp +%endif + +%if ! 0%{?windows} + %files -n perl-Net-Libproxy %defattr(-,root,root) %dir %{perl_vendorarch}/Net @@ -374,28 +422,32 @@ %dir %{perl_vendorarch}/auto/Net/Libproxy %{perl_vendorarch}/Net/Libproxy.pm %{perl_vendorarch}/auto/Net/Libproxy/Libproxy.so +%endif %else +%if ! 0%{?windows} + %files -n libproxy1-config-kde4 %defattr(-, root, root) -%{_libdir}/libproxy/%{version}/modules/config_kde4.so +%{_libdir}/libproxy-%{version}/modules/config_kde4.so %files -n libproxy1-config-gnome %defattr(-, root, root) -%{_libdir}/libproxy/%{version}/modules/config_gnome.so -%{_libexecdir}/libproxy/pxgconf +%{_libdir}/libproxy-%{version}/modules/config_gnome.so +%{_libexecdir}/libproxy-%{version}/pxgconf %files -n libproxy1-networkmanager %defattr(-, root, root) -%{_libdir}/libproxy/%{version}/modules/network_networkmanager.so +%{_libdir}/libproxy-%{version}/modules/network_networkmanager.so %files -n libproxy1-pacrunner-webkit %defattr(-, root, root) -%{_libdir}/libproxy/%{version}/modules/pacrunner_webkit.so +%{_libdir}/libproxy-%{version}/modules/pacrunner_webkit.so %files -n libproxy1-pacrunner-mozjs %defattr(-, root, root) -%{_libdir}/libproxy/%{version}/modules/pacrunner_mozjs.so +%{_libdir}/libproxy-%{version}/modules/pacrunner_mozjs.so +%endif %endif %changelog ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.2L93T6/_old 2010-09-03 13:50:22.000000000 +0200 +++ /var/tmp/diff_new_pack.2L93T6/_new 2010-09-03 13:50:22.000000000 +0200 @@ -1,4 +1,3 @@ -libmodman0 libproxy1 libproxy1-config-gnome supplements "packageand(libproxy1-<targettype>:libproxy1-gnome)" ++++++ libproxy-0.4.3.tar.bz2 -> libproxy-0.4.5.tar.bz2 ++++++ ++++ 2485 lines of diff (skipped) ++++++ update-from-svn.sh ++++++ #!/bin/sh MODULE=$(basename $(pwd)) if [ ! -x /usr/bin/svn ]; then echo "subversion is missing - aborting" return 1 fi if [ ! -d $MODULE ]; then echo "Base directory of $MODULE checkout is missing - aborting" exit 2 fi pushd $MODULE svn update VERSION=$(grep "version" $MODULE/CMakeLists.txt | awk -F'(' '{print $2}' | awk '{print $1+0"."$2+0"."$3+0}') SVNREV=$(svn info | awk '/Revision:/ { print $2 }') popd # Adjust the version information and svn rev in the spec file to what we get from the svn checkout. sed -i "s/Version:.*/Version: ${VERSION}.svn.$SVNREV/" $MODULE.spec tar cjf $MODULE.tar.bz2 $MODULE [ -f pre_checkin.sh ] && sh pre_checkin.sh osc ci -m "Update to ${VERSION/git/svn.$SVNREV}" --skip-validation ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit kdelibs4 for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '10

03 Sep '10

Hello community, here is the log from the commit of package kdelibs4 for openSUSE:Factory checked in at Fri Sep 3 13:53:14 CEST 2010. -------- --- KDE/kdelibs4/kdelibs4.changes 2010-07-29 13:57:06.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdelibs4/kdelibs4.changes 2010-08-27 13:36:41.000000000 +0200 @@ -1,0 +2,11 @@ +Fri Aug 27 13:36:20 CEST 2010 - dmueller(a)suse.de + +- update to 4.5.1 + * see http://kde.org/announcements/changelogs/changelog4_5_0to4_5_1.php for details + +------------------------------------------------------------------- +Fri Aug 13 22:01:00 UTC 2010 - javier(a)opensuse.org + +- new package: kdelibs4-apidocs (bnc#596021) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdelibs-4.5.0.tar.bz2 New: ---- kdelibs-4.5.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs4.spec ++++++ --- /var/tmp/diff_new_pack.I3bcdu/_old 2010-09-03 13:51:42.000000000 +0200 +++ /var/tmp/diff_new_pack.I3bcdu/_new 2010-09-03 13:51:42.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdelibs4 (Version 4.5.0) +# spec file for package kdelibs4 (Version 4.5.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,6 +25,7 @@ BuildRequires: OpenEXR-devel automoc4 enchant-devel fam-devel libacl-devel utempter BuildRequires: libattica-devel shared-desktop-ontologies-devel soprano-backend-redland BuildRequires: docbook-xsl-stylesheets docbook_4 libdbusmenu-qt-devel +BuildRequires: doxygen graphviz libqt4-devel-doc %if %suse_version > 1110 BuildRequires: xz-devel %else @@ -49,7 +50,7 @@ Group: System/GUI/KDE Summary: KDE Base Libraries Url: http://www.kde.org -Version: 4.5.0 +Version: 4.5.1 Release: 1 Requires: soprano >= %( echo `rpm -q --queryformat '%{VERSION}' libsoprano-devel`) Recommends: strigi >= %( echo `rpm -q --queryformat '%{VERSION}' strigi-devel`) @@ -180,6 +181,10 @@ -DKDE_DEFAULT_HOME=.kde4 -DSYSCONF_INSTALL_DIR=/etc" %cmake_kde4 -d build -- -DKDE_DISTRIBUTION_TEXT="%distribution" $EXTRA_FLAGS %make_jobs +# build kdelibs4-apidocs +export QTDOCDIR=`pkg-config --variable=docdir Qt` +cd .. +doc/api/doxygen.sh . %install cd build @@ -208,6 +213,13 @@ mkdir -p $RPM_BUILD_ROOT/%_libdir/kconf_update_bin %kde_post_install +# install apidocs and the generator script +install -p -D doc/api/doxygen.sh %{buildroot}%{_kde4_bindir}/kde4-doxygen.sh +mkdir -p %{buildroot}%{_kde4_docdir}/HTML/en +cp -prf kdelibs-%version-apidocs %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs +%fdupes %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs +find %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs -iname "installdox" | xargs chmod -x + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -241,6 +253,32 @@ %_kde4_appsdir/ksgmltools2 %doc %lang(en) %_kde4_htmldir/en/kioslave +%package apidocs +License: LGPLv2.1+ +Group: System/GUI/KDE +Summary: KDE 4 API documentation +Requires: kde4-filesystem +%if %suse_version > 1110 +BuildArch: noarch +%endif +%if %sles_version > 11 +BuildArch: noarch +%endif + +%description apidocs +This package includes the KDE 4 API documentation in HTML +format for easy browsing. + + + +Authors: +-------- + The KDE Team <kde(a)kde.org> + +%files apidocs +%defattr(-,root,root,-) +%{_kde4_docdir}/HTML/en/kdelibs4-apidocs/ + %package -n libkdecore4 License: LGPLv2.1+ Group: System/GUI/KDE ++++++ kdelibs-4.5.0.tar.bz2 -> kdelibs-4.5.1.tar.bz2 ++++++ KDE/kdelibs4/kdelibs-4.5.0.tar.bz2 /mounts/work_src_done/STABLE/kdelibs4/kdelibs-4.5.1.tar.bz2 differ: byte 11, 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

commit Botan for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '10

03 Sep '10

Hello community, here is the log from the commit of package Botan for openSUSE:Factory checked in at Fri Sep 3 13:51:21 CEST 2010. -------- --- Botan/Botan.changes 2010-03-10 01:02:20.000000000 +0100 +++ /mounts/work_src_done/STABLE/Botan/Botan.changes 2010-09-02 12:07:49.000000000 +0200 @@ -1,0 +2,39 @@ +Wed Sep 1 16:38:40 CEST 2010 - pth(a)suse.de + +- Prefix last patch with Botan-. +- Enable building of the qt_mutex module. This means that from now + on libbotan requires libQtCore. +- Fix test for thread/mutex support to also work for Qt4. + +- Update to 1.8.10: + + * This release changes a number of aspects of how private keys are + encrypted. The default encryption algorithm has changed from 3DES + to AES-256 + + * The default iteration count for PBES1 and PBES2 encryption schemes + (which are used primarily to encrypt asymmetric keys like RSA or + DSA) has increased from 2048 to 10000, which should make brute + force key cracking substantially harder. + + * The first round of AES now uses a smaller set of lookup tables; + this only reduces performance slightly but some timing and cache + analysis attacks against AES are substantially harder when AES is + implemented this way. + + * The class known as S2K was renamed PBKDF in 1.9, with a typedef + for backwards compatibility. For providing an equivalent forward + compatibility path, 1.8.10 includes a typedef for PBKDF and a new + accessor function get_pbkdf. It also includes a new interface for + deriving keys with a passphrase which takes both the passphrase + and desired output length as well as the salt and iteration + count; in many cases this call is actually significantly more + convenient than the older API. + +------------------------------------------------------------------- +Tue Aug 31 09:22:59 UTC 2010 - aj(a)suse.de + +- Do not include build time and host in package to not trigger rebuilds. +- Add pkg-config build requires as suggested by rpmlint. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- botan-1.8.8-binutils_lea_offset.patch Botan-1.8.8.tar.bz2 New: ---- Botan-1.8.10.tar.bz2 Botan-no-buildtime.patch Botan-qt_thread_support.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Botan.spec ++++++ --- /var/tmp/diff_new_pack.FEV4CW/_old 2010-09-03 13:48:25.000000000 +0200 +++ /var/tmp/diff_new_pack.FEV4CW/_new 2010-09-03 13:48:25.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package Botan (Version 1.8.8) +# spec file for package Botan (Version 1.8.10) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,8 +20,8 @@ %define version_suffix 1_8_2 Name: Botan -Version: 1.8.8 -Release: 5 +Version: 1.8.10 +Release: 1 Url: http://botan.randombit.net Summary: A C++ Crypto Library License: BSD3c @@ -32,11 +32,13 @@ Patch0: Botan-inttypes.patch Patch1: Botan-ull_constants.patch.bz2 Patch2: Botan-fix_install_paths.patch -Patch3: botan-1.8.8-binutils_lea_offset.patch +Patch4: Botan-no-buildtime.patch +Patch5: Botan-qt_thread_support.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: zlib, bzip2 >= 1.0.2, gmp >= 4.1 BuildRequires: bzip2 >= 1.0.2 gmp-devel >= 4.1 zlib-devel BuildRequires: gcc-c++ gmp-devel libbz2-devel openssl-devel python +BuildRequires: libqt4-devel pkg-config %description Botan is a C++ library that provides support for many common @@ -50,7 +52,8 @@ -------- Jack Lloyd <lloyd(a)randombit.net> -%package -n libbotan-1_8_2 +%package -n libbotan-%{version_suffix} + License: BSD3c Summary: A C++ Crypto Library Group: Development/Libraries/C and C++ @@ -93,7 +96,8 @@ %patch0 %patch1 %patch2 -%patch3 +%patch4 +%patch5 %build export RPM_OPT_FLAGS @@ -105,9 +109,10 @@ --with-zlib \ --with-gnump \ --with-openssl \ + --enable-modules=qt_mutex \ --with-tr1-implementation=system \ --cpu=%_target_cpu -make %{?_smp_mflags} WARN_FLAGS="$RPM_OPT_FLAGS" +make %{?_smp_mflags} WARN_FLAGS="$RPM_OPT_FLAGS -I/usr/include/Qt" %install %makeinstall ++++++ Botan-1.8.8.tar.bz2 -> Botan-1.8.10.tar.bz2 ++++++ ++++ 9642 lines of diff (skipped) ++++++ Botan-no-buildtime.patch ++++++ Index: src/build-data/buildh.in =================================================================== --- src/build-data/buildh.in.orig +++ src/build-data/buildh.in @@ -2,7 +2,7 @@ #ifndef BOTAN_BUILD_CONFIG_H__ #define BOTAN_BUILD_CONFIG_H__ -/* This file was automatically generated %{timestamp} UTC */ +/* This file was automatically generated */ #define BOTAN_VERSION_MAJOR %{version_major} #define BOTAN_VERSION_MINOR %{version_minor} @@ -50,7 +50,7 @@ %{local_config} /* -%{user}@%{hostname} ran '%{command_line}' +%{user} ran '%{command_line}' Target ------- ++++++ Botan-qt_thread_support.patch ++++++ Index: src/mutex/qt_mutex/mux_qt.cpp =================================================================== --- src/mutex/qt_mutex/mux_qt.cpp.orig 2010-08-31 18:39:00.000000000 +0200 +++ src/mutex/qt_mutex/mux_qt.cpp 2010-09-01 18:50:46.546845986 +0200 @@ -9,7 +9,7 @@ #include <botan/mux_qt.h> #include <qmutex.h> -#if !defined(QT_THREAD_SUPPORT) +#if !(defined(QT_THREAD_SUPPORT) || !defined(QT_NO_THREAD)) #error Your version of Qt does not support threads or mutexes #endif Index: src/mutex/qt_mutex/info.txt =================================================================== --- src/mutex/qt_mutex/info.txt.orig 2010-08-31 18:39:00.000000000 +0200 +++ src/mutex/qt_mutex/info.txt 2010-09-01 20:07:41.039257575 +0200 @@ -14,5 +14,5 @@ mux_qt.h # I think we want to always use qt-mt, not qt -- not much point in supporting # mutexes in a single threaded application, after all. <libs> -all -> qt-mt +all -> QtCore </libs> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit kde4-filesystem for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '10

03 Sep '10

Hello community, here is the log from the commit of package kde4-filesystem for openSUSE:Factory checked in at Fri Sep 3 13:48:11 CEST 2010. -------- --- KDE/kde4-filesystem/kde4-filesystem.changes 2010-07-29 13:47:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/kde4-filesystem/kde4-filesystem.changes 2010-08-27 10:22:36.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Aug 27 10:22:07 CEST 2010 - dmueller(a)suse.de + +- bump version requirements to 4.5.1 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kde4-filesystem.spec ++++++ --- /var/tmp/diff_new_pack.74chOm/_old 2010-09-03 13:42:53.000000000 +0200 +++ /var/tmp/diff_new_pack.74chOm/_new 2010-09-03 13:42:53.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kde4-filesystem (Version 4.5.0) +# spec file for package kde4-filesystem (Version 4.5.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ Name: kde4-filesystem Url: http://www.kde.org -Version: 4.5.0 +Version: 4.5.1 Release: 1 License: LGPLv2.1+ BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ macros.kde4 ++++++ --- /var/tmp/diff_new_pack.74chOm/_old 2010-09-03 13:42:53.000000000 +0200 +++ /var/tmp/diff_new_pack.74chOm/_new 2010-09-03 13:42:53.000000000 +0200 @@ -27,8 +27,8 @@ %_kde4_modules %{_kde4_modulesdir} %_kde4_servicetypes %{_kde4_servicetypesdir} -%_kde_platform_version 4.5.0 -%_kde_pimlibs_version 4.5.0 +%_kde_platform_version 4.5.1 +%_kde_pimlibs_version 4.5.1 %_kde_akonadi_version 1.4.0 %kde4_runtime_requires Requires: kdebase4-runtime >= %_kde_platform_version libqt4-x11 >= 4.6.3 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit orc for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '10

03 Sep '10

Hello community, here is the log from the commit of package orc for openSUSE:Factory checked in at Fri Sep 3 13:42:41 CEST 2010. -------- --- orc/orc.changes 2010-08-26 12:06:53.000000000 +0200 +++ /mounts/work_src_done/STABLE/orc/orc.changes 2010-08-30 17:47:48.000000000 +0200 @@ -1,0 +2,17 @@ +Mon Aug 30 17:36:41 CEST 2010 - vuntz(a)opensuse.org + +- Update to version 0.4.8: + + Fix Windows and OS/X builds + + Improve behavior in failure cases + + Major improvements for Altivec backend + + Significant documentation additions + + Memory for executable code storage is now handled in a much + more controlled manner, and it's now possible to reclaim this + memory after it's no longer needed. + + A few more 64-bit opcodes have been added, mostly related to + arithmetic on floating point values. + + The orcc tool now handles 64-bit and floating point parameters + and constants. +- Add baselibs.conf. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- orc-0.4.7.tar.bz2 New: ---- baselibs.conf orc-0.4.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ orc.spec ++++++ --- /var/tmp/diff_new_pack.Dz3SJU/_old 2010-09-03 13:42:16.000000000 +0200 +++ /var/tmp/diff_new_pack.Dz3SJU/_new 2010-09-03 13:42:16.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package orc (Version 0.4.7) +# spec file for package orc (Version 0.4.8) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 Dominique Leuenberger, Amsterdam, Netherlands. @@ -19,13 +19,14 @@ Name: orc -Version: 0.4.7 +Version: 0.4.8 Release: 1 License: BSD and Motorola License (please mark changes) Summary: The Oil Runtime Compiler Url: http://code.entropywave.com/projects/orc/ Group: Productivity/Multimedia/Other Source: %{name}-%{version}.tar.bz2 +Source99: baselibs.conf # PATCH-FIX-UPSTREAM orc-asneeded.patch dimstar(a)opensuse.org -- Fix build by properly linking the library with libm. BuildRequires: gtk-doc BuildRequires: pkg-config ++++++ baselibs.conf ++++++ liborc-0_4-0 ++++++ orc-0.4.7.tar.bz2 -> orc-0.4.8.tar.bz2 ++++++ ++++ 56220 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

commit libqt4 for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '10

03 Sep '10

Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at Fri Sep 3 13:41:45 CEST 2010. -------- --- libqt4/libqt4.changes 2010-08-03 16:25:19.000000000 +0200 +++ /mounts/work_src_done/STABLE/libqt4/libqt4.changes 2010-09-01 15:33:02.000000000 +0200 @@ -1,0 +2,13 @@ +Wed Sep 1 15:31:54 CEST 2010 - dmueller(a)suse.de + +- update to 4.7.0 RC1: + - Qt 4.7 introduces many new features and improvements as well as bugfixes + over the 4.6.x series. For more details, refer to the online documentation + included in this distribution. The documentation is also available online: + + http://qt.nokia.com/doc/4.7 + + A detailed list of code fixes since previous 4.7.0 Beta + can be found in the included changes-4.7.0 file. + +------------------------------------------------------------------- libqt4-devel-doc.changes: same change libqt4-devel-doc-data.changes: same change libqt4-sql-plugins.changes: same change calling whatdependson for head-i586 Old: ---- bnc610578.diff qgtkstyle-no-gtk-crash.diff qt-everywhere-opensource-src-4.6.3.tar.bz2 qtwebkit-initialize-gtk.diff SSL-error-endless-loop.diff New: ---- qt-everywhere-opensource-src-4.7.0-rc1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt4-devel-doc-data.spec ++++++ --- /var/tmp/diff_new_pack.ryQzBw/_old 2010-09-03 13:38:58.000000000 +0200 +++ /var/tmp/diff_new_pack.ryQzBw/_new 2010-09-03 13:38:58.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libqt4-devel-doc-data (Version 4.6.3) +# spec file for package libqt4-devel-doc-data (Version 4.6.95+4.7.0rc1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -27,11 +27,11 @@ %endif # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN -Version: 4.6.3 -Release: 5 +Version: 4.6.95+4.7.0rc1 +Release: 1 %define base_name libqt4 %define x11_free -everywhere-opensource-src- -%define rversion 4.6.3 +%define rversion 4.7.0-rc1 # COMMON-VERSION-END # COMMON-VERSION-END Url: http://www.trolltech.com @@ -75,16 +75,12 @@ Patch108: minimal-toc-for-webkit.diff Patch109: libqt4-libtool-nodate.diff Patch113: ppc64-webkit-link-fix.diff -Patch115: qgtkstyle-no-gtk-crash.diff -Patch117: bnc610578.diff Patch118: rcc-stable-dirlisting.diff Patch119: hppa_ldcw_fix.diff Patch120: hppa_unaligned_access_fix_458133.diff Patch121: webkit-sparc64.diff -Patch122: SSL-error-endless-loop.diff -Patch123: qtwebkit-initialize-gtk.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build - %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -xsync -xinput -gtkstyle + %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -importdir %plugindir/imports -xsync -xinput -gtkstyle %define check_config \ grep '# define' src/corelib/global/qconfig.h | egrep -v 'QT_(ARCH|USE)'; \ if test -f /usr/share/qt4/mkspecs/qconfig.pri ; then \ @@ -119,29 +115,32 @@ %patch40 %patch41 %patch43 -%patch55 -%patch60 +# ### 47 rediff +#%patch55 +# ### 47 rediff +# %patch60 # bnc#374073 comment #8 # %patch61 %patch70 %patch75 %patch87 %patch101 -%patch102 -%patch107 -%patch108 +# ### 47 rediff +# %patch102 +# ### 47 rediff +# %patch107 +# ### 47 rediff +#%patch108 %patch109 -%patch113 -%patch115 -%patch117 -p1 +# ### 47 rediff +#%patch113 %patch118 -p1 %ifarch hppa %patch119 %patch120 %endif -%patch121 -p1 -%patch122 -p1 -%patch123 +# ### 47 rediff +#%patch121 -p1 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff,fonts} # COMMON-END libqt4-devel-doc.spec: same change ++++++ libqt4.spec ++++++ --- /var/tmp/diff_new_pack.ryQzBw/_old 2010-09-03 13:38:59.000000000 +0200 +++ /var/tmp/diff_new_pack.ryQzBw/_new 2010-09-03 13:38:59.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libqt4 (Version 4.6.3) +# spec file for package libqt4 (Version 4.6.95+4.7.0rc1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ Name: libqt4 BuildRequires: Mesa-devel cups-devel freetype2-devel gcc-c++ libjpeg-devel libmng-devel -BuildRequires: libpng-devel libtiff-devel pkgconfig sqlite-devel +BuildRequires: libpng-devel libtiff-devel pkgconfig sqlite3-devel BuildRequires: fdupes glib2-devel update-desktop-files BuildRequires: dbus-1-devel openssl-devel xorg-x11-devel BuildRequires: alsa-devel gtk2-devel @@ -53,11 +53,11 @@ Provides: libqt4-dbus-1 = 4.4.0 Obsoletes: libqt4-dbus-1 < 4.4.0 # COMMON-VERSION-BEGIN -Version: 4.6.3 -Release: 5 +Version: 4.6.95+4.7.0rc1 +Release: 1 %define base_name libqt4 %define x11_free -everywhere-opensource-src- -%define rversion 4.6.3 +%define rversion 4.7.0-rc1 # COMMON-VERSION-END # COMMON-BEGIN Source: qt%x11_free%rversion.tar.bz2 @@ -92,16 +92,12 @@ Patch108: minimal-toc-for-webkit.diff Patch109: libqt4-libtool-nodate.diff Patch113: ppc64-webkit-link-fix.diff -Patch115: qgtkstyle-no-gtk-crash.diff -Patch117: bnc610578.diff Patch118: rcc-stable-dirlisting.diff Patch119: hppa_ldcw_fix.diff Patch120: hppa_unaligned_access_fix_458133.diff Patch121: webkit-sparc64.diff -Patch122: SSL-error-endless-loop.diff -Patch123: qtwebkit-initialize-gtk.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build - %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -xsync -xinput -gtkstyle + %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -importdir %plugindir/imports -xsync -xinput -gtkstyle %define check_config \ grep '# define' src/corelib/global/qconfig.h | egrep -v 'QT_(ARCH|USE)'; \ if test -f /usr/share/qt4/mkspecs/qconfig.pri ; then \ @@ -136,29 +132,32 @@ %patch40 %patch41 %patch43 -%patch55 -%patch60 +# ### 47 rediff +#%patch55 +# ### 47 rediff +# %patch60 # bnc#374073 comment #8 # %patch61 %patch70 %patch75 %patch87 %patch101 -%patch102 -%patch107 -%patch108 +# ### 47 rediff +# %patch102 +# ### 47 rediff +# %patch107 +# ### 47 rediff +#%patch108 %patch109 -%patch113 -%patch115 -%patch117 -p1 +# ### 47 rediff +#%patch113 %patch118 -p1 %ifarch hppa %patch119 %patch120 %endif -%patch121 -p1 -%patch122 -p1 -%patch123 +# ### 47 rediff +#%patch121 -p1 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff,fonts} # COMMON-END @@ -170,7 +169,7 @@ Requires: zlib-devel c++_compiler pkgconfig Requires: freetype2-devel libmng-devel libpng-devel libtiff-devel Requires: xorg-x11-devel Mesa-devel dbus-1-devel openssl-devel -Requires: glib2-devel sqlite-devel +Requires: glib2-devel sqlite3-devel Requires: %name = %version Requires: libqt4-sql-sqlite >= %version # bug437293 @@ -299,6 +298,8 @@ Group: Development/Libraries/C and C++ Summary: Open source Web Browser engine based on Qt4 Requires: libqt4-x11 = %version +Provides: libQtDeclarative4 = 4.6.0 +Obsoletes: libQtDeclarative4 <= 4.6.0 %description -n libQtWebKit4 WebKit is an open source web browser engine. WebKit's HTML and JavaScript @@ -320,6 +321,8 @@ Summary: Open source Web Browser engine based on Qt4 Requires: libQtWebKit4 = %version Requires: libqt4-devel = %version +Provides: libQtDeclarative-devel = 4.6.0 +Obsoletes: libQtDeclarative-devel <= 4.6.0 %description -n libQtWebKit-devel WebKit is an open source web browser engine. WebKit's HTML and JavaScript @@ -482,7 +485,7 @@ #install qdoc3 install -m 755 bin/qdoc3 $RPM_BUILD_ROOT/usr/bin/ # packaged in devel-doc -rm $RPM_BUILD_ROOT/usr/bin/{qcollectiongenerator,assistant,assistant_adp} +rm $RPM_BUILD_ROOT/usr/bin/{qcollectiongenerator,assistant} # some packages expect these symlinks ln -s /usr/include $RPM_BUILD_ROOT/%_libdir/qt4/include ln -s %_libdir $RPM_BUILD_ROOT/%_libdir/qt4/lib @@ -561,6 +564,7 @@ /usr/bin/qtconfig %endif /usr/bin/qdbusviewer +/usr/bin/qmlviewer /usr/share/applications/qt4config.desktop # designer.png is referenced by qt4config.desktop /usr/share/pixmaps/designer.png @@ -570,7 +574,6 @@ %_libdir/libQtScript.so.* %_libdir/libQtScriptTools.so.* %_libdir/libQtDesigner*.so.* -%_libdir/libQtAssistantClient.so.* %_libdir/libQtHelp.so.* %_libdir/libQtMultimedia.so.* %dir %plugindir/iconengines @@ -578,11 +581,15 @@ %dir %plugindir/inputmethods %dir %plugindir/accessible %dir %plugindir/graphicssystems +%dir %plugindir/bearer +%dir %plugindir/imports %plugindir/iconengines/* %plugindir/imageformats/* %plugindir/inputmethods/* %plugindir/accessible/* %plugindir/graphicssystems/* +%plugindir/bearer/* +%plugindir/imports/* /usr/share/qt4/phrasebooks /usr/share/qt4/translations/qtconfig_*.qm %plugindir/script/libqtscriptdbus.so @@ -600,31 +607,41 @@ /usr/bin/xmlpatternsvalidator %_libdir/libQtWebKit.so.* %_libdir/libQtXmlPatterns.so.* +%_libdir/libQtDeclarative.so.* %files -n libQtWebKit-devel %defattr(-,root,root,755) /usr/include/QtWebKit /usr/include/QtXmlPatterns +/usr/include/QtDeclarative %_libdir/libQtXmlPatterns.so %_libdir/libQtXmlPatterns.prl %_libdir/libQtXmlPatterns.la %_libdir/libQtWebKit.so %_libdir/libQtWebKit.prl %_libdir/libQtWebKit.la +%_libdir/libQtDeclarative.so +%_libdir/libQtDeclarative.prl +%_libdir/libQtDeclarative.la %_libdir/pkgconfig/QtWebKit.pc %_libdir/pkgconfig/QtXmlPatterns.pc +%_libdir/pkgconfig/QtDeclarative.pc %files devel %defattr(-,root,root,755) %exclude %_libdir/libQtWebKit.la %exclude %_libdir/libQtWebKit.prl %exclude %_libdir/libQtWebKit.so +%exclude %_libdir/libQtDeclarative.so +%exclude %_libdir/libQtDeclarative.prl +%exclude %_libdir/libQtDeclarative.la %exclude %_libdir/libQtXmlPatterns.la %exclude %_libdir/libQtXmlPatterns.prl %exclude %_libdir/libQtXmlPatterns.prl %exclude %_libdir/libQtXmlPatterns.so %exclude %_libdir/pkgconfig/QtWebKit.pc %exclude %_libdir/pkgconfig/QtXmlPatterns.pc +%exclude %_libdir/pkgconfig/QtDeclarative.pc /usr/bin/rcc /usr/bin/uic %if %with_qt3support @@ -655,7 +672,6 @@ %plugindir/designer /usr/include/Qt3Support %endif -/usr/include/QtAssistant /usr/include/QtCore /usr/include/QtDBus /usr/include/QtDesigner ++++++ libqt4-sql-plugins.spec ++++++ --- /var/tmp/diff_new_pack.ryQzBw/_old 2010-09-03 13:38:59.000000000 +0200 +++ /var/tmp/diff_new_pack.ryQzBw/_new 2010-09-03 13:38:59.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libqt4-sql-plugins (Version 4.6.3) +# spec file for package libqt4-sql-plugins (Version 4.6.95+4.7.0rc1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -28,11 +28,11 @@ %endif # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN -Version: 4.6.3 -Release: 5 +Version: 4.6.95+4.7.0rc1 +Release: 1 %define base_name libqt4 %define x11_free -everywhere-opensource-src- -%define rversion 4.6.3 +%define rversion 4.7.0-rc1 # COMMON-VERSION-END # COMMON-VERSION-END Url: http://www.trolltech.com @@ -74,16 +74,12 @@ Patch108: minimal-toc-for-webkit.diff Patch109: libqt4-libtool-nodate.diff Patch113: ppc64-webkit-link-fix.diff -Patch115: qgtkstyle-no-gtk-crash.diff -Patch117: bnc610578.diff Patch118: rcc-stable-dirlisting.diff Patch119: hppa_ldcw_fix.diff Patch120: hppa_unaligned_access_fix_458133.diff Patch121: webkit-sparc64.diff -Patch122: SSL-error-endless-loop.diff -Patch123: qtwebkit-initialize-gtk.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build - %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -xsync -xinput -gtkstyle + %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -importdir %plugindir/imports -xsync -xinput -gtkstyle %define check_config \ grep '# define' src/corelib/global/qconfig.h | egrep -v 'QT_(ARCH|USE)'; \ if test -f /usr/share/qt4/mkspecs/qconfig.pri ; then \ @@ -118,29 +114,32 @@ %patch40 %patch41 %patch43 -%patch55 -%patch60 +# ### 47 rediff +#%patch55 +# ### 47 rediff +# %patch60 # bnc#374073 comment #8 # %patch61 %patch70 %patch75 %patch87 %patch101 -%patch102 -%patch107 -%patch108 +# ### 47 rediff +# %patch102 +# ### 47 rediff +# %patch107 +# ### 47 rediff +#%patch108 %patch109 -%patch113 -%patch115 -%patch117 -p1 +# ### 47 rediff +#%patch113 %patch118 -p1 %ifarch hppa %patch119 %patch120 %endif -%patch121 -p1 -%patch122 -p1 -%patch123 +# ### 47 rediff +#%patch121 -p1 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff,fonts} # COMMON-END ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit ant for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '10

03 Sep '10

Hello community, here is the log from the commit of package ant for openSUSE:Factory checked in at Fri Sep 3 13:37:34 CEST 2010. -------- --- ant/ant.changes 2010-04-09 12:43:05.000000000 +0200 +++ /mounts/work_src_done/STABLE/ant/ant.changes 2010-09-02 14:14:13.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Aug 31 12:08:16 UTC 2010 - mvyskocil(a)suse.cz + +- Build with antlr-bootstrap, ignore antlr(-java) to reduce build cycles + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ant-antlr.spec ++++++ --- /var/tmp/diff_new_pack.YnmGqI/_old 2010-09-03 13:36:43.000000000 +0200 +++ /var/tmp/diff_new_pack.YnmGqI/_new 2010-09-03 13:36:43.000000000 +0200 @@ -29,7 +29,7 @@ # This line is not a comment, please do not remove it! #%(sh %{_sourcedir}/ant-antlr-prepare.sh %{_sourcedir} %{name}) Version: 1.7.1 -Release: 8 +Release: 15 %if %bootstrap Summary: Antlr Task for ant %else ++++++ ant.spec ++++++ --- /var/tmp/diff_new_pack.YnmGqI/_old 2010-09-03 13:36:43.000000000 +0200 +++ /var/tmp/diff_new_pack.YnmGqI/_new 2010-09-03 13:36:43.000000000 +0200 @@ -28,7 +28,7 @@ # This line is not a comment, please do not remove it! #%(sh %{_sourcedir}/ant-antlr-prepare.sh %{_sourcedir} %{name}) Version: 1.7.1 -Release: 8 +Release: 15 %if %bootstrap Summary: Antlr Task for ant %else @@ -75,6 +75,7 @@ BuildRequires: jpackage-utils >= 1.7.5 BuildRequires: java-1_5_0-gcj-compat-devel BuildRequires: antlr-bootstrap +#!BuildIgnore: antlr antlr-java BuildRequires: unzip BuildRequires: xerces-j2-bootstrap BuildRequires: xml-commons-apis-bootstrap @@ -85,7 +86,6 @@ BuildRequires: junit BuildRequires: xml-commons-apis BuildRequires: xerces-j2 -#!BuildIgnore: antlr %endif %if %bootstrap Requires: xerces-j2 >= 2.7.1-2 @@ -494,7 +494,7 @@ %build export OPT_JAR_LIST=: %if ! %bootstrap -export CLASSPATH=$(build-classpath xerces-j2 xml-commons-apis antlr bcel jaf javamail/mailapi jdepend junit log4j oro regexp bsf commons-logging commons-net jsch xml-commons-resolver) +export CLASSPATH=$(build-classpath xerces-j2 xml-commons-apis antlr-bootstrap bcel jaf javamail/mailapi jdepend junit log4j oro regexp bsf commons-logging commons-net jsch xml-commons-resolver) %{ant} jars %{ant} javadocs %else ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit antlr for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '10

03 Sep '10

Hello community, here is the log from the commit of package antlr for openSUSE:Factory checked in at Fri Sep 3 13:36:06 CEST 2010. -------- --- antlr/antlr-bootstrap.changes 2010-08-23 10:19:13.000000000 +0200 +++ /mounts/work_src_done/STABLE/antlr/antlr-bootstrap.changes 2010-08-31 11:11:07.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Aug 31 09:09:28 UTC 2010 - mvyskocil(a)suse.cz + +- Do not install antlr.jar to avoid conflicts with a regular + antlr-java packages. Packages using antlr-bootstrap needs to have + antlr-bootstrap in their CLASSPATH + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ antlr-bootstrap.spec ++++++ --- /var/tmp/diff_new_pack.tk8JxF/_old 2010-09-03 13:34:24.000000000 +0200 +++ /var/tmp/diff_new_pack.tk8JxF/_new 2010-09-03 13:34:24.000000000 +0200 @@ -25,7 +25,7 @@ %define real_name antlr Summary: Antlr for bootstrapping purposes Version: 2.7.7 -Release: 78 +Release: 79 Url: http://www.antlr.org Group: Development/Libraries/Java License: BSD3c ; Public Domain, Freeware @@ -131,20 +131,19 @@ #>>> %install %install -mkdir -p $RPM_BUILD_ROOT%{_javadir} -cp %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{non_bootstrap_name}.jar -ln -sf %{_javadir}/%{non_bootstrap_name}.jar $RPM_BUILD_ROOT/%{_javadir}/%{name}.jar +%{__install} -d -m 0755 %{buildroot}%{_javadir} +%{__install} -m 0644 %{name}.jar %{buildroot}%{_javadir}/ +%{__ln_s} -f %{_javadir}/%{name}.jar %{buildroot}/%{_javadir}/%{name}-%{version}.jar #<<< %clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf %{buildroot} #>>> files %files %defattr(-,root,root) #%dir %{_javadir} -%{_javadir}/%{name}.jar -%{_javadir}/%{non_bootstrap_name}.jar +%{_javadir}/%{name}*.jar #<<< # vim:fdm=marker:foldmarker=#>>>,#<<<:foldcolumn=6: ++++++ antlr.spec ++++++ --- /var/tmp/diff_new_pack.tk8JxF/_old 2010-09-03 13:34:24.000000000 +0200 +++ /var/tmp/diff_new_pack.tk8JxF/_new 2010-09-03 13:34:24.000000000 +0200 @@ -22,7 +22,7 @@ Name: antlr Summary: Another Tool for Language Recognition Version: 2.7.7 -Release: 78 +Release: 79 License: GPLv2+ ; Public Domain, Freeware ; MIT Url: http://www.antlr.org/ Group: Development/Tools/Other @@ -101,6 +101,7 @@ %package -n python-%{name} + License: GPLv2+ ; Public Domain, Freeware ; MIT Group: Development/Tools/Other Summary: ANother Tool for Language Recognition (python runtime) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit bea-stax for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '10

03 Sep '10

Hello community, here is the log from the commit of package bea-stax for openSUSE:Factory checked in at Fri Sep 3 13:34:08 CEST 2010. -------- --- bea-stax/bea-stax.changes 2009-05-21 15:59:22.000000000 +0200 +++ /mounts/work_src_done/STABLE/bea-stax/bea-stax.changes 2010-09-02 14:31:59.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Sep 2 12:30:43 UTC 2010 - mvyskocil(a)suse.cz + +- ignore antlr(-java) to reduce build cycles + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bea-stax.spec ++++++ --- /var/tmp/diff_new_pack.jq16Ya/_old 2010-09-03 13:33:59.000000000 +0200 +++ /var/tmp/diff_new_pack.jq16Ya/_new 2010-09-03 13:33:59.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package bea-stax (Version MACRO) +# spec file for package bea-stax (Version 1.2.0) # -# 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 @@ -29,8 +29,8 @@ Name: bea-stax Version: %{version} -Release: 6 -License: The Apache Software License +Release: 13 +License: ASLv.. Group: Development/Libraries/Java BuildArch: noarch BuildRequires: jpackage-utils >= 1.6 @@ -42,6 +42,7 @@ BuildRequires: xml-commons-apis-bootstrap BuildRequires: xml-commons-resolver-bootstrap BuildRequires: xml-commons-which-bootstrap +#!BuildIgnore: antlr antlr-java #!BuildIgnore: xerces-j2 xml-commons xml-commons-apis xml-commons-resolver xml-commons-which %endif Requires: jpackage-utils >= 1.6 @@ -55,7 +56,7 @@ %package api -License: The Apache Software License +License: ASLv.. Summary: The StAX API Group: Development/Libraries/Java @@ -67,7 +68,7 @@ %{summary} %package javadoc -License: The Apache Software License +License: ASLv.. Summary: Javadoc for bea-stax Group: Development/Libraries/Java ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit freeglut for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '10

03 Sep '10

Hello community, here is the log from the commit of package freeglut for openSUSE:Factory checked in at Fri Sep 3 13:33:47 CEST 2010. -------- --- freeglut/freeglut.changes 2010-04-04 18:57:11.000000000 +0200 +++ /mounts/work_src_done/STABLE/freeglut/freeglut.changes 2010-08-31 15:43:25.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Aug 31 15:38:09 CEST 2010 - sndirsch(a)suse.de + +- switched to current freeglut sources in SVN (2010-05-29); + hopefully also fixes bnc #635821 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- freeglut-090301.tar.bz2 New: ---- freeglut-100529.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ freeglut.spec ++++++ --- /var/tmp/diff_new_pack.RScvG4/_old 2010-09-03 13:33:15.000000000 +0200 +++ /var/tmp/diff_new_pack.RScvG4/_new 2010-09-03 13:33:15.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package freeglut (Version 090301) +# spec file for package freeglut (Version 100529) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,8 +21,8 @@ Name: freeglut BuildRequires: Mesa-devel gcc-c++ libdrm-devel pkgconfig xorg-x11-devel Summary: Freely licensed alternative to the GLUT library -Version: 090301 -Release: 4 +Version: 100529 +Release: 1 Url: http://freeglut.sourceforge.net/ %define USE_EXTERNAL_MESA 1 Source0: freeglut-%{version}.tar.bz2 ++++++ freeglut-090301.tar.bz2 -> freeglut-100529.tar.bz2 ++++++ ++++ 91997 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

commit jline for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '10

03 Sep '10

Hello community, here is the log from the commit of package jline for openSUSE:Factory checked in at Fri Sep 3 13:32:59 CEST 2010. -------- --- jline/jline.changes 2009-11-18 13:29:40.000000000 +0100 +++ /mounts/work_src_done/STABLE/jline/jline.changes 2010-09-02 14:32:53.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Sep 2 12:32:48 UTC 2010 - mvyskocil(a)suse.cz + +- ignore antlr(-java) to reduce build cycles + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jline.spec ++++++ --- /var/tmp/diff_new_pack.CeAgHt/_old 2010-09-03 13:32:15.000000000 +0200 +++ /var/tmp/diff_new_pack.CeAgHt/_new 2010-09-03 13:32:15.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package jline (Version 0.9.94) # -# 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 @@ -27,9 +27,9 @@ Name: jline Version: 0.9.94 -Release: 3 +Release: 10 Summary: Java library for reading and editing user input in console applications -License: BSD 3-clause (or similar) +License: BSD3c(or similar) Url: http://jline.sourceforge.net/ Group: Development/Libraries/Java Source0: http://download.sourceforge.net/sourceforge/jline/jline-0.9.94.zip @@ -57,6 +57,7 @@ BuildRequires: unzip BuildRequires: ant BuildRequires: java-1_5_0-gcj-compat-devel +#!BuildIgnore: antlr antlr-java BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -69,7 +70,7 @@ %package demo -License: BSD 3-clause (or similar) +License: BSD3c(or similar) Summary: Java library for reading and editing user input in console applications Group: Development/Libraries/Java @@ -82,7 +83,7 @@ %package javadoc -License: BSD 3-clause (or similar) +License: BSD3c(or similar) Summary: Java library for reading and editing user input in console applications Group: Development/Libraries/Java ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit rhino for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '10

03 Sep '10

Hello community, here is the log from the commit of package rhino for openSUSE:Factory checked in at Fri Sep 3 13:32:06 CEST 2010. -------- --- rhino/rhino.changes 2009-11-18 13:11:16.000000000 +0100 +++ /mounts/work_src_done/STABLE/rhino/rhino.changes 2010-09-02 14:35:27.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Sep 2 12:35:23 UTC 2010 - mvyskocil(a)suse.cz + +- ignore antlr(-java) to reduce build cycles + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rhino.spec ++++++ --- /var/tmp/diff_new_pack.MBpuur/_old 2010-09-03 13:31:35.000000000 +0200 +++ /var/tmp/diff_new_pack.MBpuur/_new 2010-09-03 13:31:35.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package rhino (Version 1.7) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2000-2009, JPackage Project # All rights reserved. # @@ -24,7 +24,7 @@ Name: rhino Version: 1.7 -Release: 7 +Release: 14 Summary: JavaScript for Java License: MPL .. # wget ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino%{archive_version}.zip @@ -64,6 +64,7 @@ BuildRequires: unzip BuildRequires: xerces-j2-bootstrap #!BuildIgnore: xerces-j2 xml-commons xml-commons-apis xml-commons-resolver +#!BuildIgnore: antlr antlr-java BuildArch: noarch #BuildRequires: java-devel BuildRequires: java-1_5_0-gcj-compat-devel ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit xml-commons for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '10

03 Sep '10

Hello community, here is the log from the commit of package xml-commons for openSUSE:Factory checked in at Fri Sep 3 13:27:55 CEST 2010. -------- --- xml-commons/xml-commons-apis-bootstrap.changes 2008-01-22 15:50:02.000000000 +0100 +++ /mounts/work_src_done/STABLE/xml-commons/xml-commons-apis-bootstrap.changes 2010-09-02 14:47:00.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Sep 2 12:46:03 UTC 2010 - mvyskocil(a)suse.cz + +- ignore antlr(-java) to reduce build cycles + +------------------------------------------------------------------- --- xml-commons/xml-commons.changes 2008-09-11 16:31:32.000000000 +0200 +++ /mounts/work_src_done/STABLE/xml-commons/xml-commons.changes 2010-09-02 14:47:01.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Sep 2 12:38:36 UTC 2010 - mvyskocil(a)suse.cz + +- ignore antlr(-java) to reduce build cycles + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xml-commons-apis-bootstrap.spec ++++++ --- /var/tmp/diff_new_pack.Utvtb7/_old 2010-09-03 13:27:18.000000000 +0200 +++ /var/tmp/diff_new_pack.Utvtb7/_new 2010-09-03 13:27:18.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xml-commons-apis-bootstrap (Version 1.3) # -# Copyright (c) 2008 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 @@ -19,7 +19,7 @@ Name: xml-commons-apis-bootstrap -#!BuildIgnore: antlr +#!BuildIgnore: antlr antlr-java BuildRequires: antlr-bootstrap fastjar gcc-gij gcc-java java-1_4_2-gcj-compat java-1_4_2-gcj-compat-devel unzip zip %if %{?!suse_version:1}0 %if %{?!mandriva_release:1}0 @@ -40,10 +40,10 @@ %define which_jar %{real_name}-which-bootstrap Summary: Common code for XML projects - bootstrapping package Version: 1.3 -Release: 227 +Release: 268 # ... externals have to be checked out with svn ... see README.PACKAGER.xml-commons-external Url: http://xml.apache.org/commons/ -License: The Apache Software License +License: ASLv.. Group: Development/Libraries/Java AutoReqProv: on Source0: %{real_name}-%{xml_commons_version}.tar.bz2 @@ -65,12 +65,12 @@ %package -n xml-commons-which-bootstrap -License: The Apache Software License +License: ASLv.. Summary: Which subproject of xml-commons Group: Development/Libraries/Java Url: http://xml.apache.org/commons/ Version: 1.0.b2 -Release: 227 +Release: 268 %description -n xml-commons-which-bootstrap This is xml-which from the java-bootrapping-tools package. DO NOT ++++++ xml-commons.spec ++++++ --- /var/tmp/diff_new_pack.Utvtb7/_old 2010-09-03 13:27:18.000000000 +0200 +++ /var/tmp/diff_new_pack.Utvtb7/_new 2010-09-03 13:27:18.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xml-commons (Version 1.3.02) # -# Copyright (c) 2008 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 @@ -22,12 +22,13 @@ BuildRequires: ant BuildRequires: java-1_5_0-gcj-compat-devel #!BuildIgnore: xml-commons-resolver +#!BuildIgnore: antlr antlr-java %define section free %define whichver 1.0 Summary: Common code for XML projects Version: 1.3.02 -Release: 265 -License: The Apache Software License +Release: 268 +License: ASLv.. Url: http://xml.apache.org/commons/ #Source0: http://xml.apache.org/dist/commons/xml-commons-1.0.b2.tar.gz Source0: xml-commons-1.0.b2.tar.bz2 @@ -56,7 +57,7 @@ %package apis -License: The Apache Software License +License: ASLv.. Summary: APIs subproject of xml-commons Group: Development/Libraries/Java Requires: %{name} = %{version}-%{release} @@ -77,7 +78,7 @@ %package which -License: The Apache Software License +License: ASLv.. Summary: which subproject of xml-commons Group: Development/Libraries/Java Requires: %{name} = %{version}-%{release} @@ -99,7 +100,7 @@ %package apis-manual -License: The Apache Software License +License: ASLv.. Summary: Manual for xml-commons-apis Group: Development/Libraries/Java @@ -119,7 +120,7 @@ %package apis-javadoc -License: The Apache Software License +License: ASLv.. PreReq: coreutils Summary: Javadoc for xml-commons-apis Group: Development/Libraries/Java @@ -140,7 +141,7 @@ %package which-javadoc -License: The Apache Software License +License: ASLv.. PreReq: coreutils Summary: Javadoc for xml-commons-which Group: Development/Libraries/Java ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit xml-commons-resolver for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '10

03 Sep '10

Hello community, here is the log from the commit of package xml-commons-resolver for openSUSE:Factory checked in at Fri Sep 3 13:27:04 CEST 2010. -------- --- xml-commons-resolver/xml-commons-resolver-bootstrap.changes 2008-01-22 16:44:21.000000000 +0100 +++ /mounts/work_src_done/STABLE/xml-commons-resolver/xml-commons-resolver-bootstrap.changes 2010-09-02 14:45:27.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Sep 2 12:45:20 UTC 2010 - mvyskocil(a)suse.cz + +- ignore antlr(-java) to reduce build cycles + +------------------------------------------------------------------- --- xml-commons-resolver/xml-commons-resolver.changes 2008-09-11 16:47:32.000000000 +0200 +++ /mounts/work_src_done/STABLE/xml-commons-resolver/xml-commons-resolver.changes 2010-09-02 14:45:28.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Sep 2 12:45:17 UTC 2010 - mvyskocil(a)suse.cz + +- ignore antlr(-java) to reduce build cycles + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xml-commons-resolver-bootstrap.spec ++++++ --- /var/tmp/diff_new_pack.l9hoif/_old 2010-09-03 13:24:54.000000000 +0200 +++ /var/tmp/diff_new_pack.l9hoif/_new 2010-09-03 13:24:54.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xml-commons-resolver-bootstrap (Version 1.1) # -# Copyright (c) 2008 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 @@ -31,14 +31,14 @@ %define _jvmjardir %{_libdir}/jvm-exports %endif %define real_name xml-commons-resolver -#!BuildIgnore: antlr +#!BuildIgnore: antlr antlr-java BuildRequires: ecj-bootstrap fastjar gcc-gij gcc-java java-1_4_2-gcj-compat-devel unzip zip Summary: Resolver subproject of xml-commons Group: Development/Libraries/Java Url: http://xml.apache.org/commons/ Version: 1.1 -Release: 237 -License: The Apache Software License +Release: 270 +License: ASLv.. AutoReqProv: on Source0: xml-commons-resolver-%{version}.tar.bz2 Patch1: xml-commons-resolver-build-jdk5.patch ++++++ xml-commons-resolver.spec ++++++ --- /var/tmp/diff_new_pack.l9hoif/_old 2010-09-03 13:24:54.000000000 +0200 +++ /var/tmp/diff_new_pack.l9hoif/_new 2010-09-03 13:24:54.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xml-commons-resolver (Version 1.1) # -# Copyright (c) 2008 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 @@ -21,6 +21,7 @@ Name: xml-commons-resolver BuildRequires: ant BuildRequires: java-1_5_0-gcj-compat-devel +#!BuildIgnore antlr antlr-java BuildRequires: xml-commons-apis # ant requires xml-commons-apis (sub-package of xml-commons) and xml-commons-resolver. # While xml-commons-apis is actually needed for build, xml-commons-resolver is not: @@ -28,9 +29,9 @@ %define section free %define resolverdir %{_sysconfdir}/java/resolver Version: 1.1 -Release: 267 +Release: 270 Summary: Resolver subproject of xml-commons -License: The Apache Software License +License: ASLv.. Url: http://xml.apache.org/commons/ #Source0: http://archive.apache.org/dist/xml/commons/xml-commons-resolver-1.1.tar.bz2 Source0: %{name}-%{version}.tar.bz2 @@ -61,7 +62,7 @@ %package javadoc -License: The Apache Software License +License: ASLv.. PreReq: coreutils Summary: Javadoc for xml-commons-resolver Group: Development/Libraries/Java ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit mozilla-xulrunner192 for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '10

03 Sep '10

Hello community, here is the log from the commit of package mozilla-xulrunner192 for openSUSE:Factory checked in at Fri Sep 3 13:24:43 CEST 2010. -------- --- mozilla-xulrunner192/mozilla-xulrunner192.changes 2010-07-30 07:07:24.000000000 +0200 +++ /mounts/work_src_done/STABLE/mozilla-xulrunner192/mozilla-xulrunner192.changes 2010-08-30 17:33:06.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Aug 30 17:32:20 CEST 2010 - wr(a)rosenauer.org + +- fixed build with latest Gnome in Factory + (mozilla-gdk-pixbuf.patch + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- mozilla-gdk-pixbuf.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozilla-xulrunner192.spec ++++++ --- /var/tmp/diff_new_pack.CjYp4n/_old 2010-09-03 13:22:35.000000000 +0200 +++ /var/tmp/diff_new_pack.CjYp4n/_new 2010-09-03 13:22:35.000000000 +0200 @@ -40,7 +40,7 @@ %endif License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ Version: 1.9.2.8 -Release: 1 +Release: 2 %define releasedate 2010072300 %define version_internal 1.9.2.8 %define apiversion 1.9.2 @@ -84,6 +84,7 @@ Patch14: mozilla-cairo-lcd.patch # --- Patch15: mozilla-ua-locale-pref.patch +Patch16: mozilla-gdk-pixbuf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: mozilla-js192 = %{version} Requires(post): update-alternatives coreutils @@ -233,6 +234,7 @@ %patch14 -p1 # bmo#542999 %patch15 -p1 +%patch16 -p1 %build %if %suse_version >= 1110 ++++++ mozilla-gdk-pixbuf.patch ++++++ # HG changeset patch # Parent bad58443f421fd09ef6366d359b8405ed50c3731 diff --git a/toolkit/system/gnome/Makefile.in b/toolkit/system/gnome/Makefile.in --- a/toolkit/system/gnome/Makefile.in +++ b/toolkit/system/gnome/Makefile.in @@ -77,20 +77,22 @@ endif EXTRA_DSO_LDOPTS += \ $(XPCOM_GLUE_LDOPTS) \ $(XPCOM_FROZEN_LDOPTS) \ $(NSPR_LIBS) \ $(MOZ_GCONF_LIBS) \ $(MOZ_GNOMEVFS_LIBS) \ $(GLIB_LIBS) \ $(MOZ_LIBNOTIFY_LIBS) \ + $(MOZ_GTK2_LIBS) \ $(NULL) LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/components/build/ include $(topsrcdir)/config/rules.mk CXXFLAGS += \ $(MOZ_GCONF_CFLAGS) \ $(MOZ_GNOMEVFS_CFLAGS) \ $(GLIB_CFLAGS) \ $(MOZ_LIBNOTIFY_CFLAGS) \ + $(MOZ_GTK2_CFLAGS) \ $(NULL) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit openmpi for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '10

03 Sep '10

Hello community, here is the log from the commit of package openmpi for openSUSE:Factory checked in at Fri Sep 3 13:19:07 CEST 2010. -------- --- openmpi/openmpi.changes 2010-06-17 11:08:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/openmpi/openmpi.changes 2010-08-31 00:35:42.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Aug 30 22:33:21 UTC 2010 - cristian.rodriguez(a)opensuse.org + +- Do not include build date and build host info on binaries + this should save a significant number of rebuilds/publish + all over aprox 120 packages and its dependencies. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- openmpi-no-build-date.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openmpi.spec ++++++ --- /var/tmp/diff_new_pack.OvPJEu/_old 2010-09-03 13:15:24.000000000 +0200 +++ /var/tmp/diff_new_pack.OvPJEu/_new 2010-09-03 13:15:24.000000000 +0200 @@ -22,7 +22,7 @@ Name: openmpi Summary: A powerful implementaion of MPI Version: 1.2.8 -Release: 9 +Release: 16 License: BSD3c(or similar) Group: Development/Libraries/Parallel Source0: %{name}-%{version}.tar.bz2 @@ -43,6 +43,7 @@ Requires: mpi-selector PreReq: mpi-selector %define _prefix /usr/%_lib/mpi/gcc/%name +Patch: openmpi-no-build-date.patch %description Open MPI is a project combining technologies and resources from several @@ -73,7 +74,7 @@ %prep %setup -q -# %patch0 +%patch %build %configure \ ++++++ openmpi-no-build-date.patch ++++++ Index: ompi/debuggers/ompi_dll.c =================================================================== --- ompi/debuggers/ompi_dll.c.orig 2008-08-25 21:17:13.000000000 +0200 +++ ompi/debuggers/ompi_dll.c 2010-08-31 00:08:33.940665000 +0200 @@ -177,8 +177,7 @@ int mqs_version_compatibility (void) /* This one can say what you like */ char *mqs_version_string (void) { - return "Open MPI message queue support for parallel" - " debuggers compiled on " __DATE__; + return "Open MPI message queue support for parallel"; } /* mqs_version_string */ /* So the debugger can tell what interface width the library was compiled with */ Index: ompi/tools/ompi_info/param.cc =================================================================== --- ompi/tools/ompi_info/param.cc.orig 2008-08-25 21:17:12.000000000 +0200 +++ ompi/tools/ompi_info/param.cc 2010-08-31 00:14:36.564171000 +0200 @@ -364,7 +364,7 @@ void ompi_info::do_config(bool want_all) } else { threads = "no"; } - +/* out("Configured by", "config:user", OMPI_CONFIGURE_USER); out("Configured on", "config:timestamp", OMPI_CONFIGURE_DATE); out("Configure host", "config:host", OMPI_CONFIGURE_HOST); @@ -372,7 +372,7 @@ void ompi_info::do_config(bool want_all) out("Built by", "build:user", OMPI_BUILD_USER); out("Built on", "build:timestamp", OMPI_BUILD_DATE); out("Built host", "build:host", OMPI_BUILD_HOST); - + */ out("C bindings", "bindings:c", "yes"); out("C++ bindings", "bindings:cxx", cxx); out("Fortran77 bindings", "bindings:f77", f77); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit netpbm for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '10

03 Sep '10

Hello community, here is the log from the commit of package netpbm for openSUSE:Factory checked in at Fri Sep 3 13:15:13 CEST 2010. -------- --- netpbm/netpbm.changes 2010-04-06 11:25:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/netpbm/netpbm.changes 2010-09-01 11:16:42.000000000 +0200 @@ -1,0 +2,17 @@ +Wed Sep 1 11:13:33 CEST 2010 - pgajdos(a)suse.cz + +- updated to 10.35.76: + * Pnmtopng: -libversion doesn't report level of linked libz. + * don't fail due to SIGRTMIN, SIGRTMAX being undefined. + * palmtopnm: fix for pixel size 16. Thanks Paul Bolle + <pebolle(a)tiscali.nl>. + * fix -reduce. Introduced in 10.27. +- build against libpng14 + * libpng14.patch + +------------------------------------------------------------------- +Tue Aug 31 03:55:28 UTC 2010 - cristian.rodriguez(a)opensuse.org + +- Do not include build date in binaries + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- netpbm-10.35.74-documentation.tar.bz2 netpbm-10.35.74-fixes.patch netpbm-10.35.74-make.patch netpbm-10.35.74-manpages.patch netpbm-10.35.74-missing-file-close.patch netpbm-10.35.74-pamscale.patch netpbm-10.35.74-pnmtopng-CAN-2978.patch netpbm-10.35.74-security2.patch netpbm-10.35.74-security.patch netpbm-10.35.74.tar.bz2 netpbm-10.35.74-tmpfile.patch New: ---- netpbm-10.35.76-documentation.tar.bz2 netpbm-10.35.76-fixes.patch netpbm-10.35.76-libpng14.patch netpbm-10.35.76-make.patch netpbm-10.35.76-manpages.patch netpbm-10.35.76-missing-file-close.patch netpbm-10.35.76-pamscale.patch netpbm-10.35.76-pnmtopng-CAN-2978.patch netpbm-10.35.76-security2.patch netpbm-10.35.76-security.patch netpbm-10.35.76.tar.bz2 netpbm-10.35.76-tmpfile.patch netpbm-no-build-date.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ netpbm.spec ++++++ --- /var/tmp/diff_new_pack.4R3Kgn/_old 2010-09-03 13:13:53.000000000 +0200 +++ /var/tmp/diff_new_pack.4R3Kgn/_new 2010-09-03 13:13:53.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package netpbm (Version 10.35.74) +# spec file for package netpbm (Version 10.35.76) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ Name: netpbm # regarding to libpng: netpbm is compatible with libpng14 from version 10.48 -BuildRequires: flex libjasper-devel libpng12-compat-devel libtiff-devel python +BuildRequires: flex libjasper-devel libpng-devel libtiff-devel python License: LGPLv2.1+ Group: Productivity/Graphics/Convertors Provides: pbmplus @@ -30,8 +30,8 @@ Obsoletes: netpbm-64bit %endif # -Version: 10.35.74 -Release: 2 +Version: 10.35.76 +Release: 1 Summary: A Powerful Graphics Conversion Package Source: netpbm-%{version}.tar.bz2 Source1: netpbm-%{version}-documentation.tar.bz2 @@ -55,6 +55,10 @@ Patch7: %{name}-%{version}-pamscale.patch # upstreamed in development version Patch8: %{name}-%{version}-missing-file-close.patch +# no build date +Patch9: netpbm-no-build-date.patch +# new versions build against libpng14 +Patch10: %{name}-%{version}-libpng14.patch Url: http://netpbm.sourceforge.net BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -118,6 +122,8 @@ %patch6 %patch7 %patch8 +%patch9 +%patch10 -p1 rm -rf converter/other/jpeg2000/libjasper/include #make sure the internal libjasper is not used mkdir -p pnmtopalm cd pnmtopalm ++++++ netpbm-10.35.74-documentation.tar.bz2 -> netpbm-10.35.76-documentation.tar.bz2 ++++++ ++++ no output (probably identical) ++++++ netpbm-10.35.74-fixes.patch -> netpbm-10.35.76-fixes.patch ++++++ ++++++ netpbm-10.35.76-libpng14.patch ++++++ Index: netpbm-10.35.76/converter/other/pnmtopng.c =================================================================== --- netpbm-10.35.76.orig/converter/other/pnmtopng.c +++ netpbm-10.35.76/converter/other/pnmtopng.c @@ -69,12 +69,6 @@ #include "nstring.h" #include "version.h" -#if PNG_LIBPNG_VER >= 10400 -#error Your PNG library (<png.h>) is incompatible with this Netpbm source code. -#error You need either an older PNG library (older than 1.4) -#error newer Netpbm source code (at least 10.48) -#endif - struct zlibCompression { /* These are parameters that describe a form of zlib compression. @@ -2612,7 +2606,7 @@ convertpnm(struct cmdlineInfo const cmdl info_ptr->num_palette = palette_size; if (trans_size > 0) { info_ptr->valid |= PNG_INFO_tRNS; - info_ptr->trans = trans; + info_ptr->trans_alpha = trans; info_ptr->num_trans = trans_size; /* omit opaque values */ } /* creating hIST chunk */ @@ -2649,7 +2643,7 @@ convertpnm(struct cmdlineInfo const cmdl info_ptr->color_type == PNG_COLOR_TYPE_RGB) { if (transparent > 0) { info_ptr->valid |= PNG_INFO_tRNS; - info_ptr->trans_values = + info_ptr->trans_color = xelToPngColor_16(transcolor, maxval, png_maxval); } } else { @@ -2661,10 +2655,10 @@ convertpnm(struct cmdlineInfo const cmdl if (info_ptr->valid && PNG_INFO_tRNS) pm_message("Transparent color {gray, red, green, blue} = " "{%d, %d, %d, %d}", - info_ptr->trans_values.gray, - info_ptr->trans_values.red, - info_ptr->trans_values.green, - info_ptr->trans_values.blue); + info_ptr->trans_color.gray, + info_ptr->trans_color.red, + info_ptr->trans_color.green, + info_ptr->trans_color.blue); else pm_message("No transparent color"); } Index: netpbm-10.35.76/converter/other/pngtopnm.c =================================================================== --- netpbm-10.35.76.orig/converter/other/pngtopnm.c +++ netpbm-10.35.76/converter/other/pngtopnm.c @@ -44,12 +44,6 @@ #include "nstring.h" #include "shhopt.h" -#if PNG_LIBPNG_VER >= 10400 -#error Your PNG library (<png.h>) is incompatible with this Netpbm source code. -#error You need either an older PNG library (older than 1.4) -#error newer Netpbm source code (at least 10.48) -#endif - typedef struct _jmpbuf_wrapper { jmp_buf jmpbuf; } jmpbuf_wrapper; @@ -482,7 +476,7 @@ isTransparentColor(pngcolor const colo bool retval; if (info_ptr->valid & PNG_INFO_tRNS) { - const png_color_16 * const transColorP = &info_ptr->trans_values; + const png_color_16 * const transColorP = &info_ptr->trans_color; /* There seems to be a problem here: you can't compare real @@ -575,8 +569,8 @@ paletteHasPartialTransparency(png_info * for (i = 0, foundGray = FALSE; i < info_ptr->num_trans && !foundGray; ++i) { - if (info_ptr->trans[i] != 0 && - info_ptr->trans[i] != maxval) { + if (info_ptr->trans_alpha[i] != 0 && + info_ptr->trans_alpha[i] != maxval) { foundGray = TRUE; } } @@ -647,7 +641,7 @@ setupSignificantBits(png_struct * unsigned int i; trans_mix = TRUE; for (i = 0; i < info_ptr->num_trans; ++i) - if (info_ptr->trans[i] != 0 && info_ptr->trans[i] != 255) { + if (info_ptr->trans_alpha[i] != 0 && info_ptr->trans_alpha[i] != 255) { trans_mix = FALSE; break; } @@ -885,7 +879,7 @@ writePnm(FILE * const ofP, setXel(&xelrow[col], fgColor, bgColor, alpha_handling, ((info_ptr->valid & PNG_INFO_tRNS) && (fgColor.r == - gamma_correct(info_ptr->trans_values.gray, + gamma_correct(info_ptr->trans_color.gray, totalgamma))) ? 0 : maxval); } @@ -914,7 +908,7 @@ writePnm(FILE * const ofP, setXel(&xelrow[col], fgColor, bgColor, alpha_handling, (info_ptr->valid & PNG_INFO_tRNS) && index < info_ptr->num_trans ? - info_ptr->trans[index] : maxval); + info_ptr->trans_alpha[index] : maxval); } break; ++++++ netpbm-10.35.74-make.patch -> netpbm-10.35.76-make.patch ++++++ ++++++ netpbm-10.35.74-manpages.patch -> netpbm-10.35.76-manpages.patch ++++++ ++++++ netpbm-10.35.74-missing-file-close.patch -> netpbm-10.35.76-missing-file-close.patch ++++++ ++++++ netpbm-10.35.74-pamscale.patch -> netpbm-10.35.76-pamscale.patch ++++++ ++++++ netpbm-10.35.74-pnmtopng-CAN-2978.patch -> netpbm-10.35.76-pnmtopng-CAN-2978.patch ++++++ ++++++ netpbm-10.35.74-security2.patch -> netpbm-10.35.76-security2.patch ++++++ ++++++ netpbm-10.35.74-security2.patch -> netpbm-10.35.76-security.patch ++++++ ++++ 2247 lines (skipped) ++++ between netpbm/netpbm-10.35.74-security2.patch ++++ and /mounts/work_src_done/STABLE/netpbm/netpbm-10.35.76-security.patch ++++++ netpbm-10.35.74-documentation.tar.bz2 -> netpbm-10.35.76.tar.bz2 ++++++ ++++ 373363 lines of diff (skipped) ++++++ netpbm-10.35.74-tmpfile.patch -> netpbm-10.35.76-tmpfile.patch ++++++ ++++++ netpbm-no-build-date.patch ++++++ Index: buildtools/stamp-date =================================================================== --- buildtools/stamp-date.orig 2006-08-18 23:12:28.000000000 -0400 +++ buildtools/stamp-date 2010-08-30 23:51:36.999688787 -0400 @@ -19,5 +19,3 @@ fi echo "/* This file tells the package when it was compiled */" echo "/* DO NOT EDIT - THIS FILE IS MAINTAINED AUTOMATICALLY */" echo "/* Created by the program 'stamp-date' */" -echo "#define COMPILE_TIME \"$DATE\"" -echo "#define COMPILED_BY \"$USER\"" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit libpng12 for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '10

03 Sep '10

Hello community, here is the log from the commit of package libpng12 for openSUSE:Factory checked in at Fri Sep 3 13:08:33 CEST 2010. -------- --- libpng12/libpng12.changes 2010-07-29 15:13:42.000000000 +0200 +++ /mounts/work_src_done/STABLE/libpng12/libpng12.changes 2010-08-30 16:26:18.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Aug 30 14:26:10 UTC 2010 - coolo(a)novell.com + +- fix baselibs.conf after previous change + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libpng12.spec ++++++ --- /var/tmp/diff_new_pack.foN6zh/_old 2010-09-03 13:08:25.000000000 +0200 +++ /var/tmp/diff_new_pack.foN6zh/_new 2010-09-03 13:08:25.000000000 +0200 @@ -28,7 +28,7 @@ Group: System/Libraries Url: http://www.libpng.org/pub/png/libpng.html Version: %{major}.%{minor}.%{micro} -Release: 5 +Release: 6 Summary: Library for the Portable Network Graphics Format (PNG) Source: libpng-%{version}.tar.bz2 Source2: baselibs.conf ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.foN6zh/_old 2010-09-03 13:08:25.000000000 +0200 +++ /var/tmp/diff_new_pack.foN6zh/_new 2010-09-03 13:08:25.000000000 +0200 @@ -2,4 +2,7 @@ obsoletes "libpng-<targettype> < <version>" provides "libpng-<targettype> = <version>" libpng12-devel + requires -libpng12-<targettype> + requires "libpng12-0-<targettype> = <version>" libpng12-compat-devel + requires -libpng12-compat-<targettype> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit giflib for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '10

03 Sep '10

Hello community, here is the log from the commit of package giflib for openSUSE:Factory checked in at Fri Sep 3 13:07:53 CEST 2010. -------- --- giflib/giflib.changes 2009-12-17 20:50:22.000000000 +0100 +++ /mounts/work_src_done/STABLE/giflib/giflib.changes 2010-08-30 01:16:47.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Aug 29 23:15:24 UTC 2010 - cristian.rodriguez(a)opensuse.org + +- Do not use __Date__ and __TIME__ , make build-compare + happier + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ giflib.spec ++++++ --- /var/tmp/diff_new_pack.QBU2VC/_old 2010-09-03 13:06:07.000000000 +0200 +++ /var/tmp/diff_new_pack.QBU2VC/_new 2010-09-03 13:06:07.000000000 +0200 @@ -31,7 +31,7 @@ %endif # Version: 4.1.6 -Release: 13 +Release: 19 Summary: A Library for Working with GIF Images Provides: libungif %ifarch ia64 x86_64 s390x ppc64 @@ -99,6 +99,16 @@ %setup -q %build +# USE __TIMESTAMP__ instead of __DATE__ , __TIME__ +# this change is pointless unless we preserve the original +# file modification time +for file in `find util -name "*.c"`; do + touch -r $file $file.stamp; + sed -i -e s@'__DATE__ ", " __TIME__'@__TIMESTAMP__@g $file; + touch -r $file.stamp $file; + rm -v $file.stamp +done + autoreconf -fiv %configure --disable-static --with-pic --x-libraries=%{_libdir} %{__make} %{?jobs:-j%jobs} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit gstreamer-0_10 for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '10

03 Sep '10

Hello community, here is the log from the commit of package gstreamer-0_10 for openSUSE:Factory checked in at Fri Sep 3 13:05:55 CEST 2010. -------- --- GNOME/gstreamer-0_10/gstreamer-0_10.changes 2010-07-29 14:26:21.000000000 +0200 +++ /mounts/work_src_done/STABLE/gstreamer-0_10/gstreamer-0_10.changes 2010-08-31 14:57:18.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Aug 31 12:57:07 UTC 2010 - aj(a)suse.de + +- Recommend instead of require lang package since it's not mandatory. + +------------------------------------------------------------------- +Tue Aug 31 09:42:17 UTC 2010 - aj(a)suse.de + +- Recommend instead of require lang package since it's not mandatory. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gstreamer-0_10-doc.spec ++++++ --- /var/tmp/diff_new_pack.jon4qi/_old 2010-09-03 13:04:29.000000000 +0200 +++ /var/tmp/diff_new_pack.jon4qi/_new 2010-09-03 13:04:29.000000000 +0200 @@ -22,7 +22,7 @@ %define build_doc 1 %define _name gstreamer Version: 0.10.30 -Release: 1 +Release: 2 %define gst_branch 0.10 BuildRequires: bison check-devel fdupes flex glib2-devel libxml2-devel pyxml translation-update-upstream %ifarch %ix86 ppc x86_64 @@ -48,7 +48,7 @@ # Ensure that the documentation corresponds with the installed version: Requires: libgstreamer-0_10-0 = %{version} %else -Requires: %{name}-lang = %{version} +Recommends: %{name}-lang = %{version} # Name up to 10.3: Provides: gstreamer010 = %{version} Obsoletes: gstreamer010 < %{version} gstreamer010-lang < %{version} ++++++ gstreamer-0_10.spec ++++++ --- /var/tmp/diff_new_pack.jon4qi/_old 2010-09-03 13:04:29.000000000 +0200 +++ /var/tmp/diff_new_pack.jon4qi/_new 2010-09-03 13:04:29.000000000 +0200 @@ -22,7 +22,7 @@ %define build_doc 0 %define _name gstreamer Version: 0.10.30 -Release: 1 +Release: 2 %define gst_branch 0.10 BuildRequires: bison check-devel fdupes flex glib2-devel libxml2-devel pyxml translation-update-upstream %ifarch %ix86 ppc x86_64 @@ -48,7 +48,7 @@ # Ensure that the documentation corresponds with the installed version: Requires: libgstreamer-0_10-0 = %{version} %else -Requires: %{name}-lang = %{version} +Recommends: %{name}-lang = %{version} # Name up to 10.3: Provides: gstreamer010 = %{version} Obsoletes: gstreamer010 < %{version} gstreamer010-lang < %{version} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit xorg-x11 for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '10

03 Sep '10

Hello community, here is the log from the commit of package xorg-x11 for openSUSE:Factory checked in at Fri Sep 3 13:03:45 CEST 2010. -------- --- xorg-x11/xorg-x11.changes 2010-08-12 15:59:55.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2010-09-02 02:12:58.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Sep 2 02:10:00 CEST 2010 - sndirsch(a)suse.de + +- /etc/X11/xdm/Xsetup + * removed obsolete xrandr hacks including variables in + displaymanager sysconfig (bnc #623250) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.Co0wmj/_old 2010-09-03 13:03:11.000000000 +0200 +++ /var/tmp/diff_new_pack.Co0wmj/_new 2010-09-03 13:03:11.000000000 +0200 @@ -22,7 +22,7 @@ BuildRequires: ConsoleKit-devel fontconfig-devel freetype2-devel libXi6-devel libpng-devel ncurses-devel pam-devel pkgconfig rsh update-desktop-files xorg-x11-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel Url: http://xorg.freedesktop.org/ Version: 7.5 -Release: 16 +Release: 17 License: MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Utilities ++++++ xdm.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etc/X11/xdm/Xsetup new/etc/X11/xdm/Xsetup --- old/etc/X11/xdm/Xsetup 2010-03-17 11:59:56.000000000 +0100 +++ new/etc/X11/xdm/Xsetup 2010-09-02 02:06:18.000000000 +0200 @@ -70,39 +70,6 @@ xvkbdargs="-compact -geometry -0-0 -xdm -always-on-top -keyfile /usr/share/X11/app-defaults/xvkbd.default" # -# Check if the machine is a laptop and configure -# external output if XRANDR 1.2 is available -# -if xrandr | grep -q "^default connected" ; then - echo "Driver not XRANDR 1.2 capable, ignoring DISPLAYMANAGER_RANDR_MODE_* settings" -else - if $halporp --key system.formfactor --string laptop ; then - mode_auto="$DISPLAYMANAGER_RANDR_MODE_auto" - else - mode_auto="" - fi - for ext in VGA DVI-I DVI-D DVI-A Composite S-Video Component LFP Proprietary ; do - var="DISPLAYMANAGER_RANDR_MODE_${ext//-/_}" - line="${!var}" - test "x$line" = xauto && line="$mode_auto" - mode="${line%% *}" - case "x$line" in - x) ;; - x*\ *) - echo "xrandr for $ext: new mode $line" - xrandr --newmode $line - xrandr --addmode $ext $mode - xrandr --output $ext --mode $mode - ;; - x*) - echo "xrandr for $ext: known mode $line" - xrandr --output $ext --mode $mode - ;; - esac - done -fi - -# # Check if xdm is running # xdmpid=/var/run/xdm.pid diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/var/adm/fillup-templates/sysconfig.displaymanager new/var/adm/fillup-templates/sysconfig.displaymanager --- old/var/adm/fillup-templates/sysconfig.displaymanager 2010-01-18 17:11:56.000000000 +0100 +++ new/var/adm/fillup-templates/sysconfig.displaymanager 2010-09-02 02:07:47.000000000 +0200 @@ -84,46 +84,3 @@ # the polkit-default-privs mechanism. # DISPLAYMANAGER_SHUTDOWN="auto" - -## Type: string -## Default: "" -# -# Mode to configure on output devices by default -# (RANDR 1.2 compatible drivers only). -# -# If set to "auto", DISPLAYMANAGER_RANDR_MODE_auto is used on laptops, and -# the empty string on workstations. -# -# The output is not explicitly enabled (read: disabled) if set to an empty -# string. -# If the variable contains a fully configured modeline (see default of -# DISPLAYMANAGER_RANDR_MODE_auto), the mode is defined and set. -# If the variable contains a mode name only, the mode has to be defined -# already. -# -# If a monitor is attached during Xstartup, or when invoking "xrandr --auto" -# during runtime, the output is correctly configured and a mode is -# automatically selected if none has been used so far. -# -# Variables are checked according to their extension for -# VGA DVI_I DVI_D DVI_A Composite S_Video Component LFP Proprietary -# -DISPLAYMANAGER_RANDR_MODE_VGA="" -#DISPLAYMANAGER_RANDR_MODE_DVI_I="" -#DISPLAYMANAGER_RANDR_MODE_DVI_D="" -#DISPLAYMANAGER_RANDR_MODE_DVI_A="" -#DISPLAYMANAGER_RANDR_MODE_Compsite="" -#DISPLAYMANAGER_RANDR_MODE_S_Video="" -#DISPLAYMANAGER_RANDR_MODE_Component="" -#DISPLAYMANAGER_RANDR_MODE_LFP="" -#DISPLAYMANAGER_RANDR_MODE_Proprietary="" - -## Type: string -## Default: "1024x768_60 64.11 1024 1080 1184 1344 768 769 772 795 -HSync +Vsync" -# -# Mode to use for laptops for DISPLAYMANAGER_RANDR_MODE_* on laptops only, -# when the according variable is set to "auto". -# (RANDR 1.2 compatible drivers only). -# -DISPLAYMANAGER_RANDR_MODE_auto="1024x768_60 64.11 1024 1080 1184 1344 768 769 772 795 -HSync +Vsync" - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit cpio for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '10

03 Sep '10

Hello community, here is the log from the commit of package cpio for openSUSE:Factory checked in at Fri Sep 3 13:02:55 CEST 2010. -------- --- cpio/cpio.changes 2010-08-10 17:01:04.000000000 +0200 +++ /mounts/work_src_done/STABLE/cpio/cpio.changes 2010-08-31 11:37:09.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Aug 31 09:37:05 UTC 2010 - aj(a)suse.de + +- Recommend instead of require lang package since it's not mandatory. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cpio.spec ++++++ --- /var/tmp/diff_new_pack.0sGwAK/_old 2010-09-03 13:02:30.000000000 +0200 +++ /var/tmp/diff_new_pack.0sGwAK/_new 2010-09-03 13:02:30.000000000 +0200 @@ -24,7 +24,7 @@ Group: Productivity/Archiving/Compression AutoReqProv: on Version: 2.11 -Release: 6 +Release: 7 Summary: A Backup and Archiving Utility Source: cpio-%{version}.tar.bz2 Patch2: cpio-use_new_ascii_format.patch @@ -44,7 +44,7 @@ Patch21: cpio-pattern-file-sigsegv.patch PreReq: %install_info_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: %{name}-lang = %{version} +Recommends: %{name}-lang = %{version} %description GNU cpio is a program to manage archives of files. This package also ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit libdrm for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '10

03 Sep '10

Hello community, here is the log from the commit of package libdrm for openSUSE:Factory checked in at Fri Sep 3 13:02:21 CEST 2010. -------- --- libdrm/libdrm.changes 2010-07-07 01:24:49.000000000 +0200 +++ /mounts/work_src_done/STABLE/libdrm/libdrm.changes 2010-08-28 16:11:31.000000000 +0200 @@ -1,0 +2,8 @@ +Sat Aug 28 14:02:09 UTC 2010 - sndirsch(a)novell.com + +- updated to git master commit #23287f0 (still 2.4.21) +- "--enable-nouveau-experimental-api" configure option appears to + be obsolete meanwhile +- enabled build of VMWare's experimental API + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libdrm-2.4.21-726210f.tar.bz2 New: ---- libdrm-2.4.21-23287f0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdrm.spec ++++++ --- /var/tmp/diff_new_pack.NEn6cf/_old 2010-09-03 13:01:06.000000000 +0200 +++ /var/tmp/diff_new_pack.NEn6cf/_new 2010-09-03 13:01:06.000000000 +0200 @@ -25,7 +25,7 @@ Group: System/Libraries AutoReqProv: on Version: 2.4.21 -Release: 2 +Release: 5 Provides: libdrm23 = %{version} Obsoletes: libdrm23 < %{version} # bug437293 @@ -35,7 +35,7 @@ %endif # Summary: Userspace Interface for Kernel DRM Services -Source: %{name}-%{version}-726210f.tar.bz2 +Source: %{name}-%{version}-23287f0.tar.bz2 Source2: baselibs.conf Patch: enable_test_tools.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -68,7 +68,7 @@ %build autoreconf -fi export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -%configure --with-pic --enable-nouveau-experimental-api --enable-radeon-experimental-api --enable-udev +%configure --with-pic --enable-nouveau-experimental-api --enable-vmwgfx-experimental-api --enable-udev %{__make} %{?jobs:-j%jobs} %{__make} %{?jobs:-j%jobs} -C tests/modeprint %{__make} %{?jobs:-j%jobs} -C tests/modetest ++++++ libdrm-2.4.21-726210f.tar.bz2 -> libdrm-2.4.21-23287f0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.21/include/drm/drm.h new/libdrm-2.4.21/include/drm/drm.h --- old/libdrm-2.4.21/include/drm/drm.h 2010-05-31 12:10:26.000000000 +0200 +++ new/libdrm-2.4.21/include/drm/drm.h 2010-08-27 11:19:15.000000000 +0200 @@ -373,7 +373,11 @@ */ struct drm_buf_map { int count; /**< Length of the buffer list */ +#ifdef __cplusplus + void *virt; +#else void *virtual; /**< Mmap'd area in user-virtual */ +#endif struct drm_buf_pub *list; /**< Buffer information */ }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.21/include/drm/drm_mode.h new/libdrm-2.4.21/include/drm/drm_mode.h --- old/libdrm-2.4.21/include/drm/drm_mode.h 2010-05-31 12:10:26.000000000 +0200 +++ new/libdrm-2.4.21/include/drm/drm_mode.h 2010-08-27 11:19:15.000000000 +0200 @@ -74,6 +74,7 @@ /* Dithering mode options */ #define DRM_MODE_DITHERING_OFF 0 #define DRM_MODE_DITHERING_ON 1 +#define DRM_MODE_DITHERING_AUTO 2 /* Dirty info options */ #define DRM_MODE_DIRTY_OFF 0 @@ -85,7 +86,7 @@ __u16 hdisplay, hsync_start, hsync_end, htotal, hskew; __u16 vdisplay, vsync_start, vsync_end, vtotal, vscan; - __u32 vrefresh; /* vertical refresh * 1000 */ + __u32 vrefresh; __u32 flags; __u32 type; @@ -160,6 +161,7 @@ #define DRM_MODE_CONNECTOR_HDMIA 11 #define DRM_MODE_CONNECTOR_HDMIB 12 #define DRM_MODE_CONNECTOR_TV 13 +#define DRM_MODE_CONNECTOR_eDP 14 struct drm_mode_get_connector { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.21/include/drm/i915_drm.h new/libdrm-2.4.21/include/drm/i915_drm.h --- old/libdrm-2.4.21/include/drm/i915_drm.h 2010-06-08 12:19:09.000000000 +0200 +++ new/libdrm-2.4.21/include/drm/i915_drm.h 2010-08-27 11:19:15.000000000 +0200 @@ -617,8 +617,8 @@ __u32 num_cliprects; /** This is a struct drm_clip_rect *cliprects */ __u64 cliprects_ptr; -#define I915_EXEC_RENDER (1 << 0) -#define I915_EXEC_BSD (1 << 1) +#define I915_EXEC_RENDER (1<<0) +#define I915_EXEC_BSD (1<<1) __u64 flags; __u64 rsvd1; __u64 rsvd2; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.21/include/drm/Makefile new/libdrm-2.4.21/include/drm/Makefile --- old/libdrm-2.4.21/include/drm/Makefile 2010-06-24 16:48:26.000000000 +0200 +++ new/libdrm-2.4.21/include/drm/Makefile 2010-08-28 15:57:23.000000000 +0200 @@ -58,7 +58,7 @@ POST_UNINSTALL = : build_triplet = x86_64-suse-linux-gnu host_triplet = x86_64-suse-linux-gnu -#am__append_1 = vmwgfx_drm.h +am__append_1 = vmwgfx_drm.h subdir = include/drm DIST_COMMON = $(am__klibdrminclude_HEADERS_DIST) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.21/include/drm/nouveau_drm.h new/libdrm-2.4.21/include/drm/nouveau_drm.h --- old/libdrm-2.4.21/include/drm/nouveau_drm.h 2010-02-17 12:00:08.000000000 +0100 +++ new/libdrm-2.4.21/include/drm/nouveau_drm.h 2010-08-27 11:19:15.000000000 +0200 @@ -79,6 +79,7 @@ #define NOUVEAU_GETPARAM_CHIPSET_ID 11 #define NOUVEAU_GETPARAM_VM_VRAM_BASE 12 #define NOUVEAU_GETPARAM_GRAPH_UNITS 13 +#define NOUVEAU_GETPARAM_PTIMER_TIME 14 struct drm_nouveau_getparam { uint64_t param; uint64_t value; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.21/include/drm/radeon_drm.h new/libdrm-2.4.21/include/drm/radeon_drm.h --- old/libdrm-2.4.21/include/drm/radeon_drm.h 2010-02-26 11:19:25.000000000 +0100 +++ new/libdrm-2.4.21/include/drm/radeon_drm.h 2010-08-27 11:19:16.000000000 +0200 @@ -902,6 +902,10 @@ #define RADEON_INFO_NUM_GB_PIPES 0x01 #define RADEON_INFO_NUM_Z_PIPES 0x02 #define RADEON_INFO_ACCEL_WORKING 0x03 +#define RADEON_INFO_CRTC_FROM_ID 0x04 +#define RADEON_INFO_ACCEL_WORKING2 0x05 +#define RADEON_INFO_TILING_CONFIG 0x06 +#define RADEON_INFO_WANT_HYPERZ 0x07 struct drm_radeon_info { uint32_t request; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.21/include/drm/vmwgfx_drm.h new/libdrm-2.4.21/include/drm/vmwgfx_drm.h --- old/libdrm-2.4.21/include/drm/vmwgfx_drm.h 2010-02-26 11:19:26.000000000 +0100 +++ new/libdrm-2.4.21/include/drm/vmwgfx_drm.h 2010-08-27 11:19:16.000000000 +0200 @@ -50,6 +50,8 @@ #define DRM_VMW_EXECBUF 12 #define DRM_VMW_FIFO_DEBUG 13 #define DRM_VMW_FENCE_WAIT 14 +/* guarded by minor version >= 2 */ +#define DRM_VMW_UPDATE_LAYOUT 15 /*************************************************************************/ @@ -88,6 +90,49 @@ /*************************************************************************/ /** + * DRM_VMW_EXTENSION - Query device extensions. + */ + +/** + * struct drm_vmw_extension_rep + * + * @exists: The queried extension exists. + * @driver_ioctl_offset: Ioctl number of the first ioctl in the extension. + * @driver_sarea_offset: Offset to any space in the DRI SAREA + * used by the extension. + * @major: Major version number of the extension. + * @minor: Minor version number of the extension. + * @pl: Patch level version number of the extension. + * + * Output argument to the DRM_VMW_EXTENSION Ioctl. + */ + +struct drm_vmw_extension_rep { + int32_t exists; + uint32_t driver_ioctl_offset; + uint32_t driver_sarea_offset; + uint32_t major; + uint32_t minor; + uint32_t pl; + uint32_t pad64; +}; + +/** + * union drm_vmw_extension_arg + * + * @extension - Ascii name of the extension to be queried. //In + * @rep - Reply as defined above. //Out + * + * Argument to the DRM_VMW_EXTENSION Ioctl. + */ + +union drm_vmw_extension_arg { + char extension[DRM_VMW_EXT_NAME_LEN]; + struct drm_vmw_extension_rep rep; +}; + +/*************************************************************************/ +/** * DRM_VMW_CREATE_CONTEXT - Create a host context. * * Allocates a device unique context id, and queues a create context command @@ -542,4 +587,28 @@ * sure that the stream has been stopped. */ +/*************************************************************************/ +/** + * DRM_VMW_UPDATE_LAYOUT - Update layout + * + * Updates the prefered modes and connection status for connectors. The + * command conisits of one drm_vmw_update_layout_arg pointing out a array + * of num_outputs drm_vmw_rect's. + */ + +/** + * struct drm_vmw_update_layout_arg + * + * @num_outputs: number of active + * @rects: pointer to array of drm_vmw_rect + * + * Input argument to the DRM_VMW_UPDATE_LAYOUT Ioctl. + */ + +struct drm_vmw_update_layout_arg { + uint32_t num_outputs; + uint32_t pad64; + uint64_t rects; +}; + #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.21/intel/intel_bufmgr_gem.c new/libdrm-2.4.21/intel/intel_bufmgr_gem.c --- old/libdrm-2.4.21/intel/intel_bufmgr_gem.c 2010-06-24 16:39:30.000000000 +0200 +++ new/libdrm-2.4.21/intel/intel_bufmgr_gem.c 2010-08-27 11:19:16.000000000 +0200 @@ -1006,12 +1006,9 @@ &set_domain); } while (ret == -1 && errno == EINTR); if (ret != 0) { - ret = -errno; fprintf(stderr, "%s:%d: Error setting to CPU domain %d: %s\n", __FILE__, __LINE__, bo_gem->gem_handle, strerror(errno)); - pthread_mutex_unlock(&bufmgr_gem->lock); - return ret; } pthread_mutex_unlock(&bufmgr_gem->lock); @@ -1086,9 +1083,7 @@ DRM_IOCTL_I915_GEM_SET_DOMAIN, &set_domain); } while (ret == -1 && errno == EINTR); - if (ret != 0) { - ret = -errno; fprintf(stderr, "%s:%d: Error setting domain %d: %s\n", __FILE__, __LINE__, bo_gem->gem_handle, strerror(errno)); @@ -1096,7 +1091,7 @@ pthread_mutex_unlock(&bufmgr_gem->lock); - return ret; + return 0; } int drm_intel_gem_bo_unmap_gtt(drm_intel_bo *bo) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.21/intel/intel_bufmgr.h new/libdrm-2.4.21/intel/intel_bufmgr.h --- old/libdrm-2.4.21/intel/intel_bufmgr.h 2010-06-08 12:19:09.000000000 +0200 +++ new/libdrm-2.4.21/intel/intel_bufmgr.h 2010-08-27 11:19:16.000000000 +0200 @@ -66,7 +66,11 @@ * Virtual address for accessing the buffer data. Only valid while * mapped. */ +#ifdef __cplusplus + void *virt; +#else void *virtual; +#endif /** Buffer manager context associated with this buffer object */ drm_intel_bufmgr *bufmgr; @@ -168,7 +172,7 @@ drm_intel_bo *drm_intel_bo_fake_alloc_static(drm_intel_bufmgr *bufmgr, const char *name, unsigned long offset, - unsigned long size, void *virtual); + unsigned long size, void *virt); void drm_intel_bo_fake_disable_backing_store(drm_intel_bo *bo, void (*invalidate_cb) (drm_intel_bo * bo, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.21/nouveau/nouveau_device.c new/libdrm-2.4.21/nouveau/nouveau_device.c --- old/libdrm-2.4.21/nouveau/nouveau_device.c 2010-02-17 12:00:09.000000000 +0100 +++ new/libdrm-2.4.21/nouveau/nouveau_device.c 2010-08-27 11:19:16.000000000 +0200 @@ -26,10 +26,6 @@ #include "nouveau_private.h" -#if NOUVEAU_DRM_HEADER_PATCHLEVEL != 16 -#error nouveau_drm.h does not match expected patchlevel, update libdrm. -#endif - int nouveau_device_open_existing(struct nouveau_device **dev, int close, int fd, drm_context_t ctx) @@ -42,11 +38,6 @@ if (!dev || *dev) return -EINVAL; - ver = drmGetVersion(fd); - if (!ver || ver->version_patchlevel != NOUVEAU_DRM_HEADER_PATCHLEVEL) - return -EINVAL; - drmFreeVersion(ver); - nvdev = calloc(1, sizeof(*nvdev)); if (!nvdev) return -ENOMEM; @@ -54,6 +45,18 @@ nvdev->ctx = ctx; nvdev->needs_close = close; + ver = drmGetVersion(fd); + if (!ver) + return -EINVAL; + + if ((ver->version_major == 0 && ver->version_patchlevel != 16) && + ver->version_major != 1) { + nouveau_device_close((void *)&nvdev); + return -EINVAL; + } + + drmFreeVersion(ver); + ret = nouveau_device_get_param(&nvdev->base, NOUVEAU_GETPARAM_VM_VRAM_BASE, &value); if (ret) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.21/xf86drm.c new/libdrm-2.4.21/xf86drm.c --- old/libdrm-2.4.21/xf86drm.c 2010-01-06 03:43:01.000000000 +0100 +++ new/libdrm-2.4.21/xf86drm.c 2010-08-27 11:19:16.000000000 +0200 @@ -229,7 +229,7 @@ * PCI:b:d:f format and the newer pci:oooo:bb:dd.f format. In the format, o is * domain, b is bus, d is device, f is function. */ -static int drmMatchBusID(const char *id1, const char *id2) +static int drmMatchBusID(const char *id1, const char *id2, int pci_domain_ok) { /* First, check if the IDs are exactly the same */ if (strcasecmp(id1, id2) == 0) @@ -257,6 +257,13 @@ return 0; } + /* If domains aren't properly supported by the kernel interface, + * just ignore them, which sucks less than picking a totally random + * card with "open by name" + */ + if (!pci_domain_ok) + o1 = o2 = 0; + if ((o1 != o2) || (b1 != b2) || (d1 != d2) || (f1 != f2)) return 0; else @@ -482,7 +489,7 @@ */ static int drmOpenByBusid(const char *busid) { - int i; + int i, pci_domain_ok = 1; int fd; const char *buf; drmSetVersion sv; @@ -492,14 +499,27 @@ fd = drmOpenMinor(i, 1, DRM_NODE_RENDER); drmMsg("drmOpenByBusid: drmOpenMinor returns %d\n", fd); if (fd >= 0) { + /* We need to try for 1.4 first for proper PCI domain support + * and if that fails, we know the kernel is busted + */ sv.drm_di_major = 1; - sv.drm_di_minor = 1; + sv.drm_di_minor = 4; sv.drm_dd_major = -1; /* Don't care */ sv.drm_dd_minor = -1; /* Don't care */ - drmSetInterfaceVersion(fd, &sv); + if (drmSetInterfaceVersion(fd, &sv)) { +#ifndef __alpha__ + pci_domain_ok = 0; +#endif + sv.drm_di_major = 1; + sv.drm_di_minor = 1; + sv.drm_dd_major = -1; /* Don't care */ + sv.drm_dd_minor = -1; /* Don't care */ + drmMsg("drmOpenByBusid: Interface 1.4 failed, trying 1.1\n",fd); + drmSetInterfaceVersion(fd, &sv); + } buf = drmGetBusid(fd); drmMsg("drmOpenByBusid: drmGetBusid reports %s\n", buf); - if (buf && drmMatchBusID(buf, busid)) { + if (buf && drmMatchBusID(buf, busid, pci_domain_ok)) { drmFreeBusid(buf); return fd; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.21/xf86drmMode.c new/libdrm-2.4.21/xf86drmMode.c --- old/libdrm-2.4.21/xf86drmMode.c 2010-01-17 09:20:13.000000000 +0100 +++ new/libdrm-2.4.21/xf86drmMode.c 2010-08-27 11:19:16.000000000 +0200 @@ -52,6 +52,12 @@ #define U642VOID(x) ((void *)(unsigned long)(x)) #define VOID2U64(x) ((uint64_t)(unsigned long)(x)) +static inline DRM_IOCTL(int fd, int cmd, void *arg) +{ + int ret = drmIoctl(fd, cmd, arg); + return ret < 0 ? -errno : ret; +} + /* * Util functions */ @@ -242,7 +248,7 @@ f.depth = depth; f.handle = bo_handle; - if ((ret = drmIoctl(fd, DRM_IOCTL_MODE_ADDFB, &f))) + if ((ret = DRM_IOCTL(fd, DRM_IOCTL_MODE_ADDFB, &f))) return ret; *buf_id = f.fb_id; @@ -251,7 +257,7 @@ int drmModeRmFB(int fd, uint32_t bufferId) { - return drmIoctl(fd, DRM_IOCTL_MODE_RMFB, &bufferId); + return DRM_IOCTL(fd, DRM_IOCTL_MODE_RMFB, &bufferId); } @@ -289,7 +295,7 @@ dirty.clips_ptr = VOID2U64(clips); dirty.num_clips = num_clips; - return drmIoctl(fd, DRM_IOCTL_MODE_DIRTYFB, &dirty); + return DRM_IOCTL(fd, DRM_IOCTL_MODE_DIRTYFB, &dirty); } @@ -344,7 +350,7 @@ } else crtc.mode_valid = 0; - return drmIoctl(fd, DRM_IOCTL_MODE_SETCRTC, &crtc); + return DRM_IOCTL(fd, DRM_IOCTL_MODE_SETCRTC, &crtc); } /* @@ -361,7 +367,7 @@ arg.height = height; arg.handle = bo_handle; - return drmIoctl(fd, DRM_IOCTL_MODE_CURSOR, &arg); + return DRM_IOCTL(fd, DRM_IOCTL_MODE_CURSOR, &arg); } int drmModeMoveCursor(int fd, uint32_t crtcId, int x, int y) @@ -373,7 +379,7 @@ arg.x = x; arg.y = y; - return drmIoctl(fd, DRM_IOCTL_MODE_CURSOR, &arg); + return DRM_IOCTL(fd, DRM_IOCTL_MODE_CURSOR, &arg); } /* @@ -510,7 +516,7 @@ memcpy(&res.mode, mode_info, sizeof(struct drm_mode_modeinfo)); res.connector_id = connector_id; - return drmIoctl(fd, DRM_IOCTL_MODE_ATTACHMODE, &res); + return DRM_IOCTL(fd, DRM_IOCTL_MODE_ATTACHMODE, &res); } int drmModeDetachMode(int fd, uint32_t connector_id, drmModeModeInfoPtr mode_info) @@ -520,7 +526,7 @@ memcpy(&res.mode, mode_info, sizeof(struct drm_mode_modeinfo)); res.connector_id = connector_id; - return drmIoctl(fd, DRM_IOCTL_MODE_DETACHMODE, &res); + return DRM_IOCTL(fd, DRM_IOCTL_MODE_DETACHMODE, &res); } @@ -613,7 +619,7 @@ } if (!(r = drmMalloc(sizeof(*r)))) - return NULL; + goto err_allocs; r->id = blob.blob_id; r->length = blob.length; @@ -637,16 +643,12 @@ uint64_t value) { struct drm_mode_connector_set_property osp; - int ret; osp.connector_id = connector_id; osp.prop_id = property_id; osp.value = value; - if ((ret = drmIoctl(fd, DRM_IOCTL_MODE_SETPROPERTY, &osp))) - return ret; - - return 0; + return DRM_IOCTL(fd, DRM_IOCTL_MODE_SETPROPERTY, &osp); } /* @@ -715,7 +717,6 @@ int drmModeCrtcGetGamma(int fd, uint32_t crtc_id, uint32_t size, uint16_t *red, uint16_t *green, uint16_t *blue) { - int ret; struct drm_mode_crtc_lut l; l.crtc_id = crtc_id; @@ -724,16 +725,12 @@ l.green = VOID2U64(green); l.blue = VOID2U64(blue); - if ((ret = drmIoctl(fd, DRM_IOCTL_MODE_GETGAMMA, &l))) - return ret; - - return 0; + return DRM_IOCTL(fd, DRM_IOCTL_MODE_GETGAMMA, &l); } int drmModeCrtcSetGamma(int fd, uint32_t crtc_id, uint32_t size, uint16_t *red, uint16_t *green, uint16_t *blue) { - int ret; struct drm_mode_crtc_lut l; l.crtc_id = crtc_id; @@ -742,10 +739,7 @@ l.green = VOID2U64(green); l.blue = VOID2U64(blue); - if ((ret = drmIoctl(fd, DRM_IOCTL_MODE_SETGAMMA, &l))) - return ret; - - return 0; + return DRM_IOCTL(fd, DRM_IOCTL_MODE_SETGAMMA, &l); } int drmHandleEvent(int fd, drmEventContextPtr evctx) @@ -810,5 +804,5 @@ flip.flags = flags; flip.reserved = 0; - return drmIoctl(fd, DRM_IOCTL_MODE_PAGE_FLIP, &flip); + return DRM_IOCTL(fd, DRM_IOCTL_MODE_PAGE_FLIP, &flip); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit pam-config for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '10

03 Sep '10

Hello community, here is the log from the commit of package pam-config for openSUSE:Factory checked in at Fri Sep 3 13:00:55 CEST 2010. -------- --- pam-config/pam-config.changes 2010-08-25 15:10:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/pam-config/pam-config.changes 2010-08-31 17:12:57.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Aug 31 17:07:37 CEST 2010 - kukuk(a)suse.de + +- Version 0.77 + * Fix check for lib64 [bnc#635098] + * Add pam_sss support + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- pam-config-0.76.tar.bz2 New: ---- pam-config-0.77.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pam-config.spec ++++++ --- /var/tmp/diff_new_pack.hC7M68/_old 2010-09-03 13:00:38.000000000 +0200 +++ /var/tmp/diff_new_pack.hC7M68/_new 2010-09-03 13:00:38.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package pam-config (Version 0.76) +# spec file for package pam-config (Version 0.77) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ Name: pam-config Summary: Modify common PAM configuration files -Version: 0.76 +Version: 0.77 Release: 1 License: GPLv2 AutoReqProv: on ++++++ pam-config-0.76.tar.bz2 -> pam-config-0.77.tar.bz2 ++++++ ++++ 9019 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

commit unzip for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '10

03 Sep '10

Hello community, here is the log from the commit of package unzip for openSUSE:Factory checked in at Fri Sep 3 13:00:27 CEST 2010. -------- --- unzip/unzip.changes 2010-06-25 18:34:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/unzip/unzip.changes 2010-08-30 21:46:55.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Aug 30 19:44:17 UTC 2010 - cristian.rodriguez(a)opensuse.org + +- Do not include build host specific info like build dates In + binaries. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- unzip-no-build-date.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ unzip.spec ++++++ --- /var/tmp/diff_new_pack.gaAGtk/_old 2010-09-03 12:59:59.000000000 +0200 +++ /var/tmp/diff_new_pack.gaAGtk/_new 2010-09-03 12:59:59.000000000 +0200 @@ -24,7 +24,7 @@ Obsoletes: crunzip AutoReqProv: on Version: 6.00 -Release: 1 +Release: 2 %define fileversion 60 Summary: A program to unpack compressed files Source: %{name}%{fileversion}.tar.bz2 @@ -36,6 +36,7 @@ Patch5: unzip-no_file_name_translation.patch Patch8: unzip-open_missing_mode.patch Patch10: unzip-5.52-use_librcc.patch +Patch11: unzip-no-build-date.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: librcc-devel @@ -61,6 +62,7 @@ %patch5 %patch8 %patch10 +%patch11 %build export RPM_OPT_FLAGS="%optflags -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -fstack-protector -I." ++++++ unzip-no-build-date.patch ++++++ Index: cmsmvs/vmmvs.c =================================================================== --- cmsmvs/vmmvs.c.orig 2005-01-26 23:03:28.000000000 -0300 +++ cmsmvs/vmmvs.c 2010-08-30 14:15:34.271732500 -0400 @@ -664,14 +664,6 @@ void version(__G) /* Add compile environment */ platform, - - /* Add timestamp */ -#ifdef __DATE__ - " on " __DATE__ -#ifdef __TIME__ - " at " __TIME__ -#endif -#endif ".\n", "", liblvlmsg ); Index: macos/source/sxunzip.c =================================================================== --- macos/source/sxunzip.c.orig 2001-02-09 21:55:34.000000000 -0300 +++ macos/source/sxunzip.c 2010-08-30 14:18:39.555731949 -0400 @@ -123,7 +123,7 @@ static char UnZipVersionLocal[50]; memset(UnZipVersionLocal,0,sizeof(UnZipVersionLocal)); -sprintf(UnZipVersionLocal, "[%s %s]", __DATE__, __TIME__); +sprintf(UnZipVersionLocal, "[Unknown]"); return UnZipVersionLocal; } Index: macos/source/macos.c =================================================================== --- macos/source/macos.c.orig 2007-12-23 14:15:36.000000000 -0300 +++ macos/source/macos.c 2010-08-30 14:29:28.405735321 -0400 @@ -937,14 +937,11 @@ void version(__G) ZCONST char Far CompiledWith[] = "Compiled with %s%s for %s%s%s%s.\n\n"; */ -char DateTime[50]; - #ifdef __MWERKS__ char CompVer[10]; sprintf(CompVer, "%x", __MWERKS__); #endif - sprintf(DateTime,"%s %s",__DATE__, __TIME__); sprintf((char *)slide, LoadFarString(CompiledWith), @@ -960,13 +957,7 @@ sprintf(CompVer, "%x", __MWERKS__); #else " PowerPC Processor", #endif - -#ifdef __DATE__ - - "\n compile time: ", DateTime, "" -#else "", "", "" -#endif ); (*G.message)((zvoid *)&G, slide, (ulg)strlen((char *)slide), 0); Index: amiga/amiga.c =================================================================== --- amiga/amiga.c.orig 2007-12-23 12:52:22.000000000 -0300 +++ amiga/amiga.c 2010-08-30 14:30:10.528753108 -0400 @@ -1002,12 +1002,7 @@ void version(__G) sprintf(buf2,"unknown version"); # endif #endif - -#ifdef __DATE__ - sprintf(buf4," on %s",__DATE__); -#else strcpy(buf4," unknown date"); -#endif /****** #ifdef __TIME__ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit libpng14 for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '10

03 Sep '10

Hello community, here is the log from the commit of package libpng14 for openSUSE:Factory checked in at Fri Sep 3 12:52:28 CEST 2010. -------- --- libpng14/libpng14.changes 2010-07-30 09:46:30.000000000 +0200 +++ /mounts/work_src_done/STABLE/libpng14/libpng14.changes 2010-08-30 16:22:33.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Aug 30 14:22:24 UTC 2010 - coolo(a)novell.com + +- fix baselibs.conf after previous change + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libpng14.spec ++++++ --- /var/tmp/diff_new_pack.yzgQYQ/_old 2010-09-03 12:52:14.000000000 +0200 +++ /var/tmp/diff_new_pack.yzgQYQ/_new 2010-09-03 12:52:14.000000000 +0200 @@ -28,7 +28,7 @@ Group: System/Libraries Url: http://www.libpng.org/pub/png/libpng.html Version: %{major}.%{minor}.%{micro} -Release: 5 +Release: 6 Summary: Library for the Portable Network Graphics Format (PNG) Source: libpng-%{version}.tar.bz2 Source2: baselibs.conf ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.yzgQYQ/_old 2010-09-03 12:52:14.000000000 +0200 +++ /var/tmp/diff_new_pack.yzgQYQ/_new 2010-09-03 12:52:14.000000000 +0200 @@ -2,4 +2,7 @@ obsoletes "libpng-<targettype> < <version>" provides "libpng-<targettype> = <version>" libpng14-devel + requires -libpng14-<targettype> + requires "libpng14-14-<targettype> = <version>" libpng14-compat-devel + requires -libpng14-compat-<targettype> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit pam for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '10

03 Sep '10

Hello community, here is the log from the commit of package pam for openSUSE:Factory checked in at Fri Sep 3 12:51:22 CEST 2010. -------- --- pam/pam.changes 2010-05-10 14:23:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/pam/pam.changes 2010-08-31 13:38:58.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Aug 31 13:38:23 CEST 2010 - kukuk(a)suse.de + +- Update to Linux-PAM 1.1.2 + +------------------------------------------------------------------- +Mon Jun 28 06:38:35 UTC 2010 - jengelh(a)medozas.de + +- use %_smp_mflags + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- Linux-PAM-1.1.1.90-docs.tar.bz2 Linux-PAM-1.1.1.90.tar.bz2 New: ---- Linux-PAM-1.1.2-docs.tar.bz2 Linux-PAM-1.1.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pam.spec ++++++ --- /var/tmp/diff_new_pack.vWsgC0/_old 2010-09-03 12:50:59.000000000 +0200 +++ /var/tmp/diff_new_pack.vWsgC0/_new 2010-09-03 12:50:59.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package pam (Version 1.1.1.90) +# spec file for package pam (Version 1.1.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -26,7 +26,7 @@ %if %{enable_selinux} BuildRequires: libselinux-devel %endif -%define libpam_so_version 0.82.2 +%define libpam_so_version 0.82.3 %define libpam_misc_so_version 0.82.0 %define libpamc_so_version 0.82.1 License: Beerware, Cardware, Shareware (not restricted) ; BSD3c ; GPLv2+ @@ -37,7 +37,7 @@ Obsoletes: pam-64bit %endif # -Version: 1.1.1.90 +Version: 1.1.2 Release: 1 Summary: A Security Tool that Provides Authentication for Applications Source: Linux-PAM-%{version}.tar.bz2 @@ -64,7 +64,7 @@ License: Beerware, Cardware, Shareware (not restricted) ; BSD3c ; GPLv2+ Summary: Documentation for Pluggable Authentication Modules Group: Documentation/HTML -BuildArch: noarch +###BuildArch: noarch %description doc PAM (Pluggable Authentication Modules) is a system security tool that @@ -112,10 +112,10 @@ --libdir=/%{_lib} \ --enable-isadir=../../%{_lib}/security \ --enable-securedir=/%{_lib}/security -make %{?jobs:-j%jobs}; +make %{?_smp_mflags}; %check -make %{?jobs:-j%jobs} check +make %{?_smp_mflags} check %install mkdir -p $RPM_BUILD_ROOT/etc/pam.d ++++++ Linux-PAM-1.1.1.90-docs.tar.bz2 -> Linux-PAM-1.1.2-docs.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Linux-PAM-1.1.1.90/doc/adg/html/Linux-PAM_ADG.html new/Linux-PAM-1.1.2/doc/adg/html/Linux-PAM_ADG.html --- old/Linux-PAM-1.1.1.90/doc/adg/html/Linux-PAM_ADG.html 2010-04-01 17:20:33.000000000 +0200 +++ new/Linux-PAM-1.1.2/doc/adg/html/Linux-PAM_ADG.html 2010-08-31 13:16:39.000000000 +0200 @@ -1,4 +1,4 @@ -<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>The Linux-PAM Application Developers' Guide</title><meta name="generator" content="DocBook XSL Stylesheets V1.74.0"><meta name="description" content="This manual documents what an application developer needs to know about the Linux-PAM library. It describes how an application might use the Linux-PAM library to authenticate users. In addition it contains a description of the functions to be found in libpam_misc library, that can be used in general applications. Finally, it contains some comments on PAM related security issues for the application developer."><link rel="home" href="Linux-PAM_ADG.html" title="The Linux-PAM Application Developers' Guide"><link rel="next" href="adg-introduction.html" title="Chapter�1.�Introduction"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">The Linux-PAM Application Developers' Guide</th></tr><tr><td width="20%" align="left">�</td><th width="60%" align="center">�</th><td width="20%" align="right">�<a accesskey="n" href="adg-introduction.html">Next</a></td></tr></table><hr></div><div class="book" lang="en"><div class="titlepage"><div><div><h1 class="title"><a name="adg"></a>The Linux-PAM Application Developers' Guide</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Andrew G.</span> <span class="surname">Morgan</span></h3><code class="email"><<a class="email" href="mailto:morgan@kernel.org">morgan(a)kernel.org</a>></code></div><div class="author"><h3 class="author"><span class="firstname">Thorsten</span> <span class="surname">Kukuk</span></h3><code class="email"><<a class="email" href="mailto:kukuk@thkukuk.de">kukuk(a)thkukuk.de</a>></code></div></div></div><div><p class="releaseinfo">Version 1.1.1, 16. December 2009</p></div><div><div class="abstract"><p class="title"><b>Abstract</b></p><p> +<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>The Linux-PAM Application Developers' Guide</title><meta name="generator" content="DocBook XSL Stylesheets V1.74.0"><meta name="description" content="This manual documents what an application developer needs to know about the Linux-PAM library. It describes how an application might use the Linux-PAM library to authenticate users. In addition it contains a description of the functions to be found in libpam_misc library, that can be used in general applications. Finally, it contains some comments on PAM related security issues for the application developer."><link rel="home" href="Linux-PAM_ADG.html" title="The Linux-PAM Application Developers' Guide"><link rel="next" href="adg-introduction.html" title="Chapter�1.�Introduction"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">The Linux-PAM Application Developers' Guide</th></tr><tr><td width="20%" align="left">�</td><th width="60%" align="center">�</th><td width="20%" align="right">�<a accesskey="n" href="adg-introduction.html">Next</a></td></tr></table><hr></div><div class="book" lang="en"><div class="titlepage"><div><div><h1 class="title"><a name="adg"></a>The Linux-PAM Application Developers' Guide</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Andrew G.</span> <span class="surname">Morgan</span></h3><code class="email"><<a class="email" href="mailto:morgan@kernel.org">morgan(a)kernel.org</a>></code></div><div class="author"><h3 class="author"><span class="firstname">Thorsten</span> <span class="surname">Kukuk</span></h3><code class="email"><<a class="email" href="mailto:kukuk@thkukuk.de">kukuk(a)thkukuk.de</a>></code></div></div></div><div><p class="releaseinfo">Version 1.1.2, 31. August 2010</p></div><div><div class="abstract"><p class="title"><b>Abstract</b></p><p> This manual documents what an application developer needs to know about the <span class="emphasis"><em>Linux-PAM</em></span> library. It describes how an application might use the Files old/Linux-PAM-1.1.1.90/doc/adg/Linux-PAM_ADG.pdf and new/Linux-PAM-1.1.2/doc/adg/Linux-PAM_ADG.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Linux-PAM-1.1.1.90/doc/adg/Linux-PAM_ADG.txt new/Linux-PAM-1.1.2/doc/adg/Linux-PAM_ADG.txt --- old/Linux-PAM-1.1.1.90/doc/adg/Linux-PAM_ADG.txt 2010-04-01 17:20:19.000000000 +0200 +++ new/Linux-PAM-1.1.2/doc/adg/Linux-PAM_ADG.txt 2010-08-31 13:16:30.000000000 +0200 @@ -8,7 +8,7 @@ <kukuk(a)thkukuk.de> -Version 1.1.1, 16. December 2009 +Version 1.1.2, 31. August 2010 Abstract diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Linux-PAM-1.1.1.90/doc/mwg/html/Linux-PAM_MWG.html new/Linux-PAM-1.1.2/doc/mwg/html/Linux-PAM_MWG.html --- old/Linux-PAM-1.1.1.90/doc/mwg/html/Linux-PAM_MWG.html 2010-04-01 17:21:23.000000000 +0200 +++ new/Linux-PAM-1.1.2/doc/mwg/html/Linux-PAM_MWG.html 2010-08-31 13:17:14.000000000 +0200 @@ -1,4 +1,4 @@ -<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>The Linux-PAM Module Writers' Guide</title><meta name="generator" content="DocBook XSL Stylesheets V1.74.0"><meta name="description" content="This manual documents what a programmer needs to know in order to write a module that conforms to the Linux-PAM standard.It also discusses some security issues from the point of view of the module programmer."><link rel="home" href="Linux-PAM_MWG.html" title="The Linux-PAM Module Writers' Guide"><link rel="next" href="mwg-introduction.html" title="Chapter�1.�Introduction"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">The Linux-PAM Module Writers' Guide</th></tr><tr><td width="20%" align="left">�</td><th width="60%" align="center">�</th><td width="20%" align="right">�<a accesskey="n" href="mwg-introduction.html">Next</a></td></tr></table><hr></div><div class="book" lang="en"><div class="titlepage"><div><div><h1 class="title"><a name="mwg"></a>The Linux-PAM Module Writers' Guide</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Andrew G.</span> <span class="surname">Morgan</span></h3><code class="email"><<a class="email" href="mailto:morgan@kernel.org">morgan(a)kernel.org</a>></code></div><div class="author"><h3 class="author"><span class="firstname">Thorsten</span> <span class="surname">Kukuk</span></h3><code class="email"><<a class="email" href="mailto:kukuk@thkukuk.de">kukuk(a)thkukuk.de</a>></code></div></div></div><div><p class="releaseinfo">Version 1.1.1, 16. December 2009</p></div><div><div class="abstract"><p class="title"><b>Abstract</b></p><p> +<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>The Linux-PAM Module Writers' Guide</title><meta name="generator" content="DocBook XSL Stylesheets V1.74.0"><meta name="description" content="This manual documents what a programmer needs to know in order to write a module that conforms to the Linux-PAM standard.It also discusses some security issues from the point of view of the module programmer."><link rel="home" href="Linux-PAM_MWG.html" title="The Linux-PAM Module Writers' Guide"><link rel="next" href="mwg-introduction.html" title="Chapter�1.�Introduction"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">The Linux-PAM Module Writers' Guide</th></tr><tr><td width="20%" align="left">�</td><th width="60%" align="center">�</th><td width="20%" align="right">�<a accesskey="n" href="mwg-introduction.html">Next</a></td></tr></table><hr></div><div class="book" lang="en"><div class="titlepage"><div><div><h1 class="title"><a name="mwg"></a>The Linux-PAM Module Writers' Guide</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Andrew G.</span> <span class="surname">Morgan</span></h3><code class="email"><<a class="email" href="mailto:morgan@kernel.org">morgan(a)kernel.org</a>></code></div><div class="author"><h3 class="author"><span class="firstname">Thorsten</span> <span class="surname">Kukuk</span></h3><code class="email"><<a class="email" href="mailto:kukuk@thkukuk.de">kukuk(a)thkukuk.de</a>></code></div></div></div><div><p class="releaseinfo">Version 1.1.2, 31. August 2010</p></div><div><div class="abstract"><p class="title"><b>Abstract</b></p><p> This manual documents what a programmer needs to know in order to write a module that conforms to the <span class="emphasis"><em>Linux-PAM</em></span> standard.It also Files old/Linux-PAM-1.1.1.90/doc/mwg/Linux-PAM_MWG.pdf and new/Linux-PAM-1.1.2/doc/mwg/Linux-PAM_MWG.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Linux-PAM-1.1.1.90/doc/mwg/Linux-PAM_MWG.txt new/Linux-PAM-1.1.2/doc/mwg/Linux-PAM_MWG.txt --- old/Linux-PAM-1.1.1.90/doc/mwg/Linux-PAM_MWG.txt 2010-04-01 17:21:11.000000000 +0200 +++ new/Linux-PAM-1.1.2/doc/mwg/Linux-PAM_MWG.txt 2010-08-31 13:17:06.000000000 +0200 @@ -8,7 +8,7 @@ <kukuk(a)thkukuk.de> -Version 1.1.1, 16. December 2009 +Version 1.1.2, 31. August 2010 Abstract diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Linux-PAM-1.1.1.90/doc/sag/html/Linux-PAM_SAG.html new/Linux-PAM-1.1.2/doc/sag/html/Linux-PAM_SAG.html --- old/Linux-PAM-1.1.1.90/doc/sag/html/Linux-PAM_SAG.html 2010-05-05 10:10:36.000000000 +0200 +++ new/Linux-PAM-1.1.2/doc/sag/html/Linux-PAM_SAG.html 2010-08-31 13:15:46.000000000 +0200 @@ -1,4 +1,4 @@ -<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>The Linux-PAM System Administrators' Guide</title><meta name="generator" content="DocBook XSL Stylesheets V1.74.0"><meta name="description" content="This manual documents what a system-administrator needs to know about the Linux-PAM library. It covers the correct syntax of the PAM configuration file and discusses strategies for maintaining a secure system."><link rel="home" href="Linux-PAM_SAG.html" title="The Linux-PAM System Administrators' Guide"><link rel="next" href="sag-introduction.html" title="Chapter�1.�Introduction"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">The Linux-PAM System Administrators' Guide</th></tr><tr><td width="20%" align="left">�</td><th width="60%" align="center">�</th><td width="20%" align="right">�<a accesskey="n" href="sag-introduction.html">Next</a></td></tr></table><hr></div><div class="book" lang="en"><div class="titlepage"><div><div><h1 class="title"><a name="sag"></a>The Linux-PAM System Administrators' Guide</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Andrew G.</span> <span class="surname">Morgan</span></h3><code class="email"><<a class="email" href="mailto:morgan@kernel.org">morgan(a)kernel.org</a>></code></div><div class="author"><h3 class="author"><span class="firstname">Thorsten</span> <span class="surname">Kukuk</span></h3><code class="email"><<a class="email" href="mailto:kukuk@thkukuk.de">kukuk(a)thkukuk.de</a>></code></div></div></div><div><p class="releaseinfo">Version 1.1.1, 16. December 2009</p></div><div><div class="abstract"><p class="title"><b>Abstract</b></p><p> +<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>The Linux-PAM System Administrators' Guide</title><meta name="generator" content="DocBook XSL Stylesheets V1.74.0"><meta name="description" content="This manual documents what a system-administrator needs to know about the Linux-PAM library. It covers the correct syntax of the PAM configuration file and discusses strategies for maintaining a secure system."><link rel="home" href="Linux-PAM_SAG.html" title="The Linux-PAM System Administrators' Guide"><link rel="next" href="sag-introduction.html" title="Chapter�1.�Introduction"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">The Linux-PAM System Administrators' Guide</th></tr><tr><td width="20%" align="left">�</td><th width="60%" align="center">�</th><td width="20%" align="right">�<a accesskey="n" href="sag-introduction.html">Next</a></td></tr></table><hr></div><div class="book" lang="en"><div class="titlepage"><div><div><h1 class="title"><a name="sag"></a>The Linux-PAM System Administrators' Guide</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Andrew G.</span> <span class="surname">Morgan</span></h3><code class="email"><<a class="email" href="mailto:morgan@kernel.org">morgan(a)kernel.org</a>></code></div><div class="author"><h3 class="author"><span class="firstname">Thorsten</span> <span class="surname">Kukuk</span></h3><code class="email"><<a class="email" href="mailto:kukuk@thkukuk.de">kukuk(a)thkukuk.de</a>></code></div></div></div><div><p class="releaseinfo">Version 1.1.2, 31. August 2010</p></div><div><div class="abstract"><p class="title"><b>Abstract</b></p><p> This manual documents what a system-administrator needs to know about the <span class="emphasis"><em>Linux-PAM</em></span> library. It covers the correct syntax of the PAM configuration file and discusses strategies diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Linux-PAM-1.1.1.90/doc/sag/html/sag-pam_group.html new/Linux-PAM-1.1.2/doc/sag/html/sag-pam_group.html --- old/Linux-PAM-1.1.1.90/doc/sag/html/sag-pam_group.html 2010-05-05 10:10:32.000000000 +0200 +++ new/Linux-PAM-1.1.2/doc/sag/html/sag-pam_group.html 2010-08-31 13:15:42.000000000 +0200 @@ -46,11 +46,13 @@ field, is a logic list of terminal names that this rule applies to. </p><p> The third field, the <em class="replaceable"><code>users</code></em> - field, is a logic list of users or a netgroup of users to whom this - rule applies. + field, is a logic list of users, or a UNIX group, or a netgroup of + users to whom this rule applies. Group names are preceded by a '%' + symbol, while netgroup names are preceded by a '@' symbol. </p><p> For these items the simple wildcard '*' may be used only once. - With netgroups no wildcards or logic operators are allowed. + With UNIX groups or netgroups no wildcards or logic operators + are allowed. </p><p> The <em class="replaceable"><code>times</code></em> field is used to indicate "when" these groups are to be given to the user. The format here is a logic @@ -98,6 +100,11 @@ </p><pre class="programlisting"> xsh; tty* ;sword;!Wk0900-1800;games, sound xsh; tty* ;*;Al0900-1800;floppy - </pre></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="sag-pam_group-authors"></a>6.11.8.�AUTHORS</h3></div></div></div><p> + </pre><p> + Any member of the group 'admin' running 'xsh' on tty*, + is granted access (at any time) to the group 'plugdev' + </p><pre class="programlisting"> +xsh; tty* ;%admin;Al0000-2400;plugdev + </pre></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="sag-pam_group-authors"></a>6.11.8.�AUTHORS</h3></div></div></div><p> pam_group was written by Andrew G. Morgan <morgan(a)kernel.org>. </p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="sag-pam_ftp.html">Prev</a>�</td><td width="20%" align="center"><a accesskey="u" href="sag-module-reference.html">Up</a></td><td width="40%" align="right">�<a accesskey="n" href="sag-pam_issue.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">6.10.�pam_ftp - module for anonymous access�</td><td width="20%" align="center"><a accesskey="h" href="Linux-PAM_SAG.html">Home</a></td><td width="40%" align="right" valign="top">�6.12.�pam_issue - add issue file to user prompt</td></tr></table></div></body></html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Linux-PAM-1.1.1.90/doc/sag/html/sag-pam_nologin.html new/Linux-PAM-1.1.2/doc/sag/html/sag-pam_nologin.html --- old/Linux-PAM-1.1.1.90/doc/sag/html/sag-pam_nologin.html 2010-05-05 10:10:33.000000000 +0200 +++ new/Linux-PAM-1.1.2/doc/sag/html/sag-pam_nologin.html 2010-08-31 13:15:44.000000000 +0200 @@ -4,14 +4,15 @@ successok ]</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="sag-pam_nologin-description"></a>6.23.1.�DESCRIPTION</h3></div></div></div><p> pam_nologin is a PAM module that prevents users from logging into - the system when <code class="filename">/etc/nologin</code> exists. The contents - of the <code class="filename">/etc/nologin</code> file are displayed to the - user. The pam_nologin module has no effect on the root user's ability - to log in. + the system when <code class="filename">/var/run/nologin</code> or + <code class="filename">/etc/nologin</code>exists. The contents + of the file are displayed to the user. The pam_nologin module + has no effect on the root user's ability to log in. </p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="sag-pam_nologin-options"></a>6.23.2.�OPTIONS</h3></div></div></div><div class="variablelist"><dl><dt><span class="term"> <code class="option">file=<em class="replaceable"><code>/path/nologin</code></em></code> </span></dt><dd><p> Use this file instead the default + <code class="filename">/var/run/nologin</code> or <code class="filename">/etc/nologin</code>. </p></dd><dt><span class="term"> <code class="option">successok</code> @@ -27,7 +28,7 @@ This is the default return value. </p></dd><dt><span class="term">PAM_SUCCESS</span></dt><dd><p> Success: either the user is root or the - <code class="filename">/etc/nologin</code> file does not exist. + nologin file does not exist. </p></dd><dt><span class="term">PAM_USER_UNKNOWN</span></dt><dd><p> User not known to the underlying authentication module. </p></dd></dl></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="sag-pam_nologin-examples"></a>6.23.5.�EXAMPLES</h3></div></div></div><p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Linux-PAM-1.1.1.90/doc/sag/html/sag-pam_succeed_if.html new/Linux-PAM-1.1.2/doc/sag/html/sag-pam_succeed_if.html --- old/Linux-PAM-1.1.1.90/doc/sag/html/sag-pam_succeed_if.html 2010-05-05 10:10:34.000000000 +0200 +++ new/Linux-PAM-1.1.2/doc/sag/html/sag-pam_succeed_if.html 2010-08-31 13:15:45.000000000 +0200 @@ -16,6 +16,8 @@ Don't log failure to the system log. </p></dd><dt><span class="term"><code class="option">quiet_success</code></span></dt><dd><p> Don't log success to the system log. + </p></dd><dt><span class="term"><code class="option">audit</code></span></dt><dd><p> + Log unknown users to the system log. </p></dd></dl></div><p> <span class="emphasis"><em>Condition</em></span>s are three words: a field, a test, and a value to test for. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Linux-PAM-1.1.1.90/doc/sag/html/sag-pam_tally.html new/Linux-PAM-1.1.2/doc/sag/html/sag-pam_tally.html --- old/Linux-PAM-1.1.1.90/doc/sag/html/sag-pam_tally.html 2010-05-05 10:10:34.000000000 +0200 +++ new/Linux-PAM-1.1.2/doc/sag/html/sag-pam_tally.html 2010-08-31 13:15:45.000000000 +0200 @@ -34,7 +34,12 @@ --quiet ]</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="sag-pam_tally-description"></a>6.32.1.�DESCRIPTION</h3></div></div></div><p> This module maintains a count of attempted accesses, can - reset count on success, can deny access if too many attempts fail. + reset count on success, can deny access if too many attempts + fail. + </p><p> + pam_tally has several limitations, which are solved with + pam_tally2. For this reason pam_tally is deprecated and + will be removed in a future release. </p><p> pam_tally comes in two parts: <span class="emphasis"><em>pam_tally.so</em></span> and diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Linux-PAM-1.1.1.90/doc/sag/html/sag-pam_umask.html new/Linux-PAM-1.1.2/doc/sag/html/sag-pam_umask.html --- old/Linux-PAM-1.1.1.90/doc/sag/html/sag-pam_umask.html 2010-05-05 10:10:35.000000000 +0200 +++ new/Linux-PAM-1.1.2/doc/sag/html/sag-pam_umask.html 2010-08-31 13:15:46.000000000 +0200 @@ -38,10 +38,9 @@ </p></dd><dt><span class="term"> <code class="option">usergroups</code> </span></dt><dd><p> - If the user is not root, and the user ID is equal to the - group ID, and the username is the same as primary group name, - the umask group bits are set to be the same as - owner bits (examples: 022 -> 002, 077 -> 007). + If the user is not root and the username is the same as + primary group name, the umask group bits are set to be the + same as owner bits (examples: 022 -> 002, 077 -> 007). </p></dd><dt><span class="term"> <code class="option">umask=<em class="replaceable"><code>mask</code></em></code> </span></dt><dd><p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Linux-PAM-1.1.1.90/doc/sag/html/sag-pam_unix.html new/Linux-PAM-1.1.2/doc/sag/html/sag-pam_unix.html --- old/Linux-PAM-1.1.1.90/doc/sag/html/sag-pam_unix.html 2010-05-05 10:10:35.000000000 +0200 +++ new/Linux-PAM-1.1.2/doc/sag/html/sag-pam_unix.html 2010-08-31 13:15:46.000000000 +0200 @@ -153,6 +153,12 @@ </span></dt><dd><p> Ignore errors reading shadow information for users in the account management module. + </p></dd><dt><span class="term"> + <code class="option">minlen=<em class="replaceable"><code>n</code></em></code> + </span></dt><dd><p> + Set a minimum password length of <em class="replaceable"><code>n</code></em> + characters. The max. for DES crypt based passwords are 8 + characters. </p></dd></dl></div><p> Invalid arguments are logged with <span class="citerefentry"><span class="refentrytitle">syslog</span>(3)</span>. </p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="sag-pam_unix-types"></a>6.37.3.�MODULE TYPES PROVIDED</h3></div></div></div><p> Files old/Linux-PAM-1.1.1.90/doc/sag/Linux-PAM_SAG.pdf and new/Linux-PAM-1.1.2/doc/sag/Linux-PAM_SAG.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Linux-PAM-1.1.1.90/doc/sag/Linux-PAM_SAG.txt new/Linux-PAM-1.1.2/doc/sag/Linux-PAM_SAG.txt --- old/Linux-PAM-1.1.1.90/doc/sag/Linux-PAM_SAG.txt 2010-05-05 10:10:11.000000000 +0200 +++ new/Linux-PAM-1.1.2/doc/sag/Linux-PAM_SAG.txt 2010-08-31 13:15:21.000000000 +0200 @@ -8,7 +8,7 @@ <kukuk(a)thkukuk.de> -Version 1.1.1, 16. December 2009 +Version 1.1.2, 31. August 2010 Abstract @@ -1759,11 +1759,12 @@ The second field, the tty field, is a logic list of terminal names that this rule applies to. -The third field, the users field, is a logic list of users or a netgroup of -users to whom this rule applies. +The third field, the users field, is a logic list of users, or a UNIX group, or +a netgroup of users to whom this rule applies. Group names are preceded by a +'%' symbol, while netgroup names are preceded by a '@' symbol. -For these items the simple wildcard '*' may be used only once. With netgroups -no wildcards or logic operators are allowed. +For these items the simple wildcard '*' may be used only once. With UNIX groups +or netgroups no wildcards or logic operators are allowed. The times field is used to indicate "when" these groups are to be given to the user. The format here is a logic list of day/time-range entries. The days are @@ -1842,6 +1843,12 @@ xsh; tty* ;*;Al0900-1800;floppy +Any member of the group 'admin' running 'xsh' on tty*, is granted access (at +any time) to the group 'plugdev' + +xsh; tty* ;%admin;Al0000-2400;plugdev + + 6.11.8. AUTHORS pam_group was written by Andrew G. Morgan <morgan(a)kernel.org>. @@ -3080,15 +3087,15 @@ 6.23.1. DESCRIPTION pam_nologin is a PAM module that prevents users from logging into the system -when /etc/nologin exists. The contents of the /etc/nologin file are displayed -to the user. The pam_nologin module has no effect on the root user's ability to -log in. +when /var/run/nologin or /etc/nologinexists. The contents of the file are +displayed to the user. The pam_nologin module has no effect on the root user's +ability to log in. 6.23.2. OPTIONS file=/path/nologin - Use this file instead the default /etc/nologin. + Use this file instead the default /var/run/nologin or /etc/nologin. successok @@ -3115,7 +3122,7 @@ PAM_SUCCESS - Success: either the user is root or the /etc/nologin file does not exist. + Success: either the user is root or the nologin file does not exist. PAM_USER_UNKNOWN @@ -3627,6 +3634,10 @@ Don't log success to the system log. +audit + + Log unknown users to the system log. + Conditions are three words: a field, a test, and a value to test for. Available fields are user, uid, gid, shell, home and service: @@ -3745,6 +3756,9 @@ This module maintains a count of attempted accesses, can reset count on success, can deny access if too many attempts fail. +pam_tally has several limitations, which are solved with pam_tally2. For this +reason pam_tally is deprecated and will be removed in a future release. + pam_tally comes in two parts: pam_tally.so and pam_tally. The former is the PAM module and the latter, a stand-alone program. pam_tally is an (optional) application which can be used to interrogate and manipulate the counter file. @@ -4326,9 +4340,9 @@ usergroups - If the user is not root, and the user ID is equal to the group ID, and the - username is the same as primary group name, the umask group bits are set to - be the same as owner bits (examples: 022 -> 002, 077 -> 007). + If the user is not root and the username is the same as primary group name, + the umask group bits are set to be the same as owner bits (examples: 022 -> + 002, 077 -> 007). umask=mask @@ -4509,6 +4523,11 @@ Ignore errors reading shadow information for users in the account management module. +minlen=n + + Set a minimum password length of n characters. The max. for DES crypt based + passwords are 8 characters. + Invalid arguments are logged with syslog(3). 6.37.3. MODULE TYPES PROVIDED ++++++ Linux-PAM-1.1.1.90-docs.tar.bz2 -> Linux-PAM-1.1.2.tar.bz2 ++++++ ++++ 257680 lines of diff (skipped) ++++++ pam_tally-deprecated.diff ++++++ --- /var/tmp/diff_new_pack.vWsgC0/_old 2010-09-03 12:51:00.000000000 +0200 +++ /var/tmp/diff_new_pack.vWsgC0/_new 2010-09-03 12:51:00.000000000 +0200 @@ -1,20 +1,3 @@ ---- modules/pam_tally/pam_tally.8.xml -+++ modules/pam_tally/pam_tally.8.xml 2009/03/27 10:49:17 -@@ -81,7 +81,13 @@ - - <para> - This module maintains a count of attempted accesses, can -- reset count on success, can deny access if too many attempts fail. -+ reset count on success, can deny access if too many attempts -+ fail. -+ </para> -+ <para> -+ pam_tally has several limitations, which are solved with -+ pam_tally2. For this reason pam_tally is deprecated and -+ will be removed in a future release. - </para> - <para> - pam_tally comes in two parts: --- modules/pam_tally/pam_tally.c +++ modules/pam_tally/pam_tally.c 2009/03/27 10:52:56 @@ -630,6 +630,8 @@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

commit gdbm for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '10

03 Sep '10

Hello community, here is the log from the commit of package gdbm for openSUSE:Factory checked in at Fri Sep 3 12:50:35 CEST 2010. -------- --- gdbm/gdbm.changes 2010-06-28 08:48:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/gdbm/gdbm.changes 2010-08-30 01:44:14.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Aug 29 23:43:39 UTC 2010 - cristian.rodriguez(a)opensuse.org + +- DO not include a compile date in the resulting binaries + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- gdbm-1.8.3-no-build-date.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdbm.spec ++++++ --- /var/tmp/diff_new_pack.D4zOzl/_old 2010-09-03 12:50:13.000000000 +0200 +++ /var/tmp/diff_new_pack.D4zOzl/_new 2010-09-03 12:50:13.000000000 +0200 @@ -31,7 +31,7 @@ %endif # Version: 1.8.3 -Release: 374 +Release: 382 Summary: GNU Database Routines Source: ftp://prep.ai.mit.edu/gnu/gdbm/gdbm-%{version}.tar.bz2 Source2: baselibs.conf @@ -39,6 +39,7 @@ Patch1: gdbm-protoize_dbm_headers.patch Patch2: gdbm-prototype_static_functions.patch Patch3: gdbm-fix_testprogs.patch +Patch4: gdbm-1.8.3-no-build-date.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -77,6 +78,7 @@ %patch1 %patch2 %patch3 +%patch4 %build aclocal ++++++ gdbm-1.8.3-no-build-date.patch ++++++ Index: version.c =================================================================== --- version.c.orig 2002-10-16 00:00:42.000000000 +0200 +++ version.c 2010-08-30 01:41:23.653696000 +0200 @@ -29,8 +29,4 @@ #include "autoconf.h" /* Keep a string with the version number in it! */ -const char * gdbm_version = "GDBM version 1.8.3. 10/15/2002" -#if defined(__STDC__) && defined(__DATE__) && defined(__TIME__) - " (built " __DATE__ " " __TIME__ ")" -#endif - ; +const char * gdbm_version = "GDBM version 1.8.3. 10/15/2002"; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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