Hello community,
here is the log from the commit of package attica for openSUSE:Factory
checked in at Mon Dec 21 14:07:24 CET 2009.
--------
--- KDE/attica/attica.changes 2009-12-05 22:07:17.000000000 +0100
+++ /mounts/work_src_done/STABLE/attica/attica.changes 2009-12-18 23:07:11.000000000 +0100
@@ -1,0 +2,15 @@
+Fri Dec 18 23:06:58 CET 2009 - dmueller@suse.de
+
+- packaging cleanups
+
+-------------------------------------------------------------------
+Tue Dec 15 10:34:38 UTC 2009 - wstephenson@novell.com
+
+- Update to released stable version 0.1.1
+
+-------------------------------------------------------------------
+Mon Dec 14 12:01:19 UTC 2009 - tittiatcoke@gmail.com
+
+- update to svn1060455
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
attica-r1058931.tar.bz2
New:
----
attica-0.1.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ attica.spec ++++++
--- /var/tmp/diff_new_pack.rq62X9/_old 2009-12-21 14:06:20.000000000 +0100
+++ /var/tmp/diff_new_pack.rq62X9/_new 2009-12-21 14:06:20.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package attica (Version 0.1)
+# spec file for package attica (Version 0.1.1)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -20,14 +20,14 @@
Name: attica
BuildRequires: cmake kde4-filesystem libqt4-devel
Url: http://websvn.kde.org/trunk/kdesupport/attica
-Version: 0.1
+Version: 0.1.1
Release: 1
License: LGPLv2.1+
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/GUI/KDE
Summary: Open Collaboration Service client library
Requires: libqt4 > 4.4
-%define tar_version r1058931
+%define tar_version 0.1.1
Source: attica-%{tar_version}.tar.bz2
Requires: libattica0 = %{version}
@@ -44,7 +44,6 @@
License: LGPLv2.1+
Group: System/GUI/KDE
Summary: Open Collaboration Service client library - development files
-Provides: libattica = %{version}
%description -n libattica0
Attica is a library to access Open Collaboration Service servers.
@@ -60,7 +59,7 @@
License: LGPLv2.1+
Group: Development/Libraries/C and C++
Summary: Open Collaboration Service client library - development files
-Requires: libattica = %{version}
+Requires: libattica0 >= %{version}
%description -n libattica-devel
Development files for attica, Attica a library to access Open Collaboration Service servers.
@@ -73,7 +72,7 @@
Frederik Gladhorn
%prep
-%setup -q -n attica
+%setup -q -n attica-%{version}
%build
%cmake_kde4 -d build
@@ -90,18 +89,15 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%files
-%defattr(-,root,root)
-%doc README AUTHORS COPYING
-
%files -n libattica0
%defattr(-,root,root)
+%doc README AUTHORS COPYING
%{_libdir}/libattica*.so.*
%files -n libattica-devel
%defattr(-,root,root)
%{_libdir}/libattica*.so
%{_libdir}/pkgconfig/libattica*.pc
-%{_prefix}/include/attica
+%{_includedir}/attica
%changelog
++++++ attica-r1058931.tar.bz2 -> attica-0.1.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica/CMakeLists.txt new/attica-0.1.1/CMakeLists.txt
--- old/attica/CMakeLists.txt 2009-12-05 22:06:00.000000000 +0100
+++ new/attica-0.1.1/CMakeLists.txt 2009-12-08 13:49:32.000000000 +0100
@@ -1,9 +1,9 @@
project(attica)
-set(ATTICA_VERSION_MAJOR 0 CACHE INT "Major Attica version number" FORCE)
-set(ATTICA_VERSION_MINOR 1 CACHE INT "Minor Attica version number" FORCE)
-set(ATTICA_VERSION_PATCH 0 CACHE INT "Release Attica version number" FORCE)
-set(ATTICA_VERSION_STRING "${ATTICA_VERSION_MAJOR}.${ATTICA_VERSION_MINOR}.${ATTICA_VERSION_PATCH}" CACHE STRING "Attica version string" FORCE)
+set(CMAKE_LIBATTICA_VERSION_MAJOR 0 CACHE INT "Major Attica version number" FORCE)
+set(CMAKE_LIBATTICA_VERSION_MINOR 1 CACHE INT "Minor Attica version number" FORCE)
+set(CMAKE_LIBATTICA_VERSION_PATCH 1 CACHE INT "Release Attica version number" FORCE)
+set(CMAKE_LIBATTICA_VERSION_STRING "${CMAKE_LIBATTICA_VERSION_MAJOR}.${CMAKE_LIBATTICA_VERSION_MINOR}.${CMAKE_LIBATTICA_VERSION_PATCH}" CACHE STRING "Attica version string" FORCE)
cmake_minimum_required(VERSION 2.6)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica/lib/CMakeLists.txt new/attica-0.1.1/lib/CMakeLists.txt
--- old/attica/lib/CMakeLists.txt 2009-12-05 22:06:00.000000000 +0100
+++ new/attica-0.1.1/lib/CMakeLists.txt 2009-12-08 13:49:32.000000000 +0100
@@ -10,6 +10,8 @@
find_package(Qt4 REQUIRED)
include_directories( ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} )
+configure_file(version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/version.h)
+
set(ocsclient_SRCS
qtplatformdependent.cpp
parser.cpp
@@ -50,8 +52,8 @@
add_library(attica SHARED ${ocsclient_SRCS})
set_target_properties(attica PROPERTIES
- VERSION ${ATTICA_VERSION_STRING}
- SOVERSION ${ATTICA_VERSION_MAJOR}
+ VERSION ${CMAKE_LIBATTICA_VERSION_STRING}
+ SOVERSION ${CMAKE_LIBATTICA_VERSION_MAJOR}
LINK_INTERFACE_LIBRARIES ""
DEFINE_SYMBOL MAKE_ATTICA_LIB
)
@@ -86,6 +88,7 @@
postjob.h
providermanager.h
provider.h
+ ${CMAKE_CURRENT_BINARY_DIR}/version.h
DESTINATION include/attica COMPONENT Devel
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica/lib/atticabasejob.cpp new/attica-0.1.1/lib/atticabasejob.cpp
--- old/attica/lib/atticabasejob.cpp 2009-12-05 22:06:00.000000000 +0100
+++ new/attica-0.1.1/lib/atticabasejob.cpp 2009-12-08 13:49:32.000000000 +0100
@@ -84,13 +84,18 @@
QTimer::singleShot(0, this, SLOT(doWork()));
}
-
void BaseJob::doWork()
{
d->m_reply = executeRequest();
connect(d->m_reply, SIGNAL(finished()), SLOT(dataFinished()));
}
+void BaseJob::abort()
+{
+ if (d->m_reply) {
+ d->m_reply->abort();
+ }
+}
PlatformDependent* BaseJob::internals()
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica/lib/atticabasejob.h new/attica-0.1.1/lib/atticabasejob.h
--- old/attica/lib/atticabasejob.h 2009-12-05 22:06:00.000000000 +0100
+++ new/attica-0.1.1/lib/atticabasejob.h 2009-12-08 13:49:32.000000000 +0100
@@ -46,6 +46,7 @@
public Q_SLOTS:
void start();
+ void abort();
Q_SIGNALS:
void finished(Attica::BaseJob* job);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica/lib/platformdependent.h new/attica-0.1.1/lib/platformdependent.h
--- old/attica/lib/platformdependent.h 2009-12-05 22:06:00.000000000 +0100
+++ new/attica-0.1.1/lib/platformdependent.h 2009-12-08 13:49:32.000000000 +0100
@@ -43,6 +43,7 @@
public:
virtual ~PlatformDependent() {}
virtual QList<QUrl> getDefaultProviderFiles() const = 0;
+ virtual bool hasCredentials(const QUrl& baseUrl) const = 0;
virtual bool loadCredentials(const QUrl& baseUrl, QString& user, QString& password) = 0;
virtual bool askForCredentials(const QUrl& baseUrl, QString& user, QString& password) = 0;
virtual bool saveCredentials(const QUrl& baseUrl, const QString& user, const QString& password) = 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica/lib/provider.cpp new/attica-0.1.1/lib/provider.cpp
--- old/attica/lib/provider.cpp 2009-12-05 22:06:00.000000000 +0100
+++ new/attica-0.1.1/lib/provider.cpp 2009-12-08 13:49:32.000000000 +0100
@@ -83,7 +83,7 @@
}
QString user;
QString pass;
- if (m_internals->loadCredentials(m_baseUrl, user, pass)) {
+ if (m_internals->hasCredentials(m_baseUrl) && m_internals->loadCredentials(m_baseUrl, user, pass)) {
m_credentialsUserName = user;
m_credentialsPassword = pass;
}
@@ -101,7 +101,7 @@
}
Provider::Provider(const Provider& other)
- : QObject(), d(other.d)
+ : d(other.d)
{
}
@@ -137,6 +137,20 @@
return d->m_name;
}
+bool Provider::hasCredentials()
+{
+ return d->m_internals->hasCredentials(d->m_baseUrl);
+}
+
+bool Provider::loadCredentials(QString& user, QString& password)
+{
+ return d->m_internals->loadCredentials(d->m_baseUrl, user, password);
+}
+
+bool Provider::saveCredentials(const QString& user, const QString& password)
+{
+ return d->m_internals->saveCredentials(d->m_baseUrl, user, password);
+}
PostJob* Provider::checkLogin(const QString& user, const QString& password)
{
@@ -623,6 +637,3 @@
{
return new ListJob<Message>(d->m_internals, createRequest(url));
}
-
-
-#include "provider.moc"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica/lib/provider.h new/attica-0.1.1/lib/provider.h
--- old/attica/lib/provider.h 2009-12-05 22:06:00.000000000 +0100
+++ new/attica-0.1.1/lib/provider.h 2009-12-08 13:49:32.000000000 +0100
@@ -64,10 +64,8 @@
* Accessing funtions of the Provider returns a Job class that
* takes care of accessing the server and parsing the result.
*/
-class ATTICA_EXPORT Provider :public QObject
+class ATTICA_EXPORT Provider
{
- Q_OBJECT
-
public:
Provider();
Provider(const Provider& other);
@@ -85,6 +83,10 @@
Downloads
};
+ bool hasCredentials();
+ bool loadCredentials(QString& user, QString& password);
+ bool saveCredentials(const QString& user, const QString& password);
+
PostJob* checkLogin(const QString& user, const QString& password);
// Person part of OCS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica/lib/providermanager.cpp new/attica-0.1.1/lib/providermanager.cpp
--- old/attica/lib/providermanager.cpp 2009-12-05 22:06:00.000000000 +0100
+++ new/attica-0.1.1/lib/providermanager.cpp 2009-12-08 13:49:32.000000000 +0100
@@ -173,7 +173,6 @@
parseProviderFile(providerXml, QString());
}
-
void ProviderManager::parseProviderFile(const QString& xmlString, const QString& url)
{
QXmlStreamReader xml(xmlString);
@@ -245,11 +244,13 @@
QString user;
QString password;
if (auth->user().isEmpty() && auth->password().isEmpty()) {
- if (d->m_internals->loadCredentials(baseUrl, user, password)) {
- qDebug() << "ProviderManager::authenticate: loading authentication";
- auth->setUser(user);
- auth->setPassword(password);
- return;
+ if (d->m_internals->hasCredentials(baseUrl)) {
+ if (d->m_internals->loadCredentials(baseUrl, user, password)) {
+ qDebug() << "ProviderManager::authenticate: loading authentication";
+ auth->setUser(user);
+ auth->setPassword(password);
+ return;
+ }
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica/lib/qtplatformdependent.cpp new/attica-0.1.1/lib/qtplatformdependent.cpp
--- old/attica/lib/qtplatformdependent.cpp 2009-12-05 22:06:00.000000000 +0100
+++ new/attica-0.1.1/lib/qtplatformdependent.cpp 2009-12-08 13:49:32.000000000 +0100
@@ -46,6 +46,12 @@
}
+bool QtPlatformDependent::hasCredentials(const QUrl& baseUrl) const
+{
+ return false;
+}
+
+
bool QtPlatformDependent::saveCredentials(const QUrl& baseUrl, const QString& user, const QString& password)
{
Q_UNUSED(baseUrl)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica/lib/qtplatformdependent.h new/attica-0.1.1/lib/qtplatformdependent.h
--- old/attica/lib/qtplatformdependent.h 2009-12-05 22:06:00.000000000 +0100
+++ new/attica-0.1.1/lib/qtplatformdependent.h 2009-12-08 13:49:32.000000000 +0100
@@ -38,6 +38,7 @@
virtual QNetworkReply* post(const QNetworkRequest& request, const QByteArray& data);
virtual QNetworkReply* post(const QNetworkRequest& request, QIODevice* data);
virtual QNetworkReply* get(const QNetworkRequest& request);
+ virtual bool hasCredentials(const QUrl& baseUrl) const;
virtual bool saveCredentials(const QUrl& baseUrl, const QString& user, const QString& password);
virtual bool loadCredentials(const QUrl& baseUrl, QString& user, QString& password);
virtual bool askForCredentials(const QUrl& baseUrl, QString& user, QString& password);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica/lib/version.h.cmake new/attica-0.1.1/lib/version.h.cmake
--- old/attica/lib/version.h.cmake 1970-01-01 01:00:00.000000000 +0100
+++ new/attica-0.1.1/lib/version.h.cmake 2009-12-08 13:49:32.000000000 +0100
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2007 Sebastian Trueg
+ * Copyright (C) 2009 Frederik Gladhorn
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef _ATTICA_VERSION_H_
+#define _ATTICA_VERSION_H_
+
+#include "atticaclient_export.h"
+
+/// @brief Attica version as string at compile time.
+#define LIBATTICA_VERSION_STRING "${CMAKE_LIBATTICA_VERSION_STRING}"
+
+/// @brief The major Attica version number at compile time
+#define LIBATTICA_VERSION_MAJOR ${CMAKE_LIBATTICA_VERSION_MAJOR}
+
+/// @brief The minor Attica version number at compile time
+#define LIBATTICA_VERSION_MINOR ${CMAKE_LIBATTICA_VERSION_MINOR}
+
+/// @brief The Attica release version number at compile time
+#define LIBATTICA_VERSION_RELEASE ${CMAKE_LIBATTICA_VERSION_RELEASE}
+
+/**
+ * \brief Create a unique number from the major, minor and release number of a %Attica version
+ *
+ * This function can be used for preprocessing. For version information at runtime
+ * use the version methods in the Attica namespace.
+ */
+#define LIBATTICA_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c))
+
+/**
+ * \brief %Attica Version as a unique number at compile time
+ *
+ * This macro calculates the %Attica version into a number. It is mainly used
+ * through LIBATTICA_IS_VERSION in preprocessing. For version information at runtime
+ * use the version methods in the Attica namespace.
+ */
+#define LIBATTICA_VERSION \
+ LIBATTICA_MAKE_VERSION(LIBATTICA_VERSION_MAJOR,LIBATTICA_VERSION_MINOR,LIBATTICA_VERSION_RELEASE)
+
+/**
+ * \brief Check if the %Attica version matches a certain version or is higher
+ *
+ * This macro is typically used to compile conditionally a part of code:
+ * \code
+ * #if LIBATTICA_IS_VERSION(2,1)
+ * // Code for Attica 2.1
+ * #else
+ * // Code for Attica 2.0
+ * #endif
+ * \endcode
+ *
+ * For version information at runtime
+ * use the version methods in the Attica namespace.
+ */
+#define LIBATTICA_IS_VERSION(a,b,c) ( LIBATTICA_VERSION >= LIBATTICA_MAKE_VERSION(a,b,c) )
+
+
+namespace Attica {
+ /**
+ * @brief Returns the major number of Attica's version, e.g.
+ * 1 for %Attica 1.0.2.
+ * @return the major version number at runtime.
+ */
+ ATTICA_EXPORT unsigned int versionMajor();
+
+ /**
+ * @brief Returns the minor number of Attica's version, e.g.
+ * 0 for %Attica 1.0.2.
+ * @return the minor version number at runtime.
+ */
+ ATTICA_EXPORT unsigned int versionMinor();
+
+ /**
+ * @brief Returns the release of Attica's version, e.g.
+ * 2 for %Attica 1.0.2.
+ * @return the release number at runtime.
+ */
+ ATTICA_EXPORT unsigned int versionRelease();
+
+ /**
+ * @brief Returns the %Attica version as string, e.g. "1.0.2".
+ *
+ * On contrary to the macro LIBATTICA_VERSION_STRING this function returns
+ * the version number of Attica at runtime.
+ * @return the %Attica version. You can keep the string forever
+ */
+ ATTICA_EXPORT const char* versionString();
+}
+
+#endif
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org