From 01017fb3790a39a695feaa73472ddcc89cb6faced6132706ceeb40636725ee72 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 19 Jun 2007 23:31:11 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/scribus?expand=0&rev=6 --- scribus-1.3.3.7.tar.bz2 | 3 --- scribus-1.3.3.7_format-not-literal.patch | 21 ------------------ ...us-1.3.3.7_string-literal-comparsion.patch | 22 ------------------- scribus-1.3.3.9.tar.bz2 | 3 +++ ...-1.3.3.9_string-literal-comparsion-b.patch | 0 scribus.changes | 15 +++++++++++++ scribus.spec | 22 +++++++++++++------ 7 files changed, 33 insertions(+), 53 deletions(-) delete mode 100644 scribus-1.3.3.7.tar.bz2 delete mode 100644 scribus-1.3.3.7_format-not-literal.patch delete mode 100644 scribus-1.3.3.7_string-literal-comparsion.patch create mode 100644 scribus-1.3.3.9.tar.bz2 rename scribus-1.3.3.7_string-literal-comparsion-b.patch => scribus-1.3.3.9_string-literal-comparsion-b.patch (100%) diff --git a/scribus-1.3.3.7.tar.bz2 b/scribus-1.3.3.7.tar.bz2 deleted file mode 100644 index 9c41f78..0000000 --- a/scribus-1.3.3.7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9437050c956467cf68ab4d9bb5d9fe46dd6661eb5433c7da4a1bb4b84e93ecd2 -size 12501959 diff --git a/scribus-1.3.3.7_format-not-literal.patch b/scribus-1.3.3.7_format-not-literal.patch deleted file mode 100644 index 8492f90..0000000 --- a/scribus-1.3.3.7_format-not-literal.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- scribus/plugins/psimport/importps.cpp -+++ scribus/plugins/psimport/importps.cpp -@@ -626,7 +626,7 @@ - filename = filename.mid(0, filename.length()-3) + "psd"; - } - -- qDebug(QString("import %6 image %1: %2x%3 @ (%4,%5) °%5").arg(filename).arg(w).arg(h).arg(x).arg(y).arg(angle).arg(device)); -+ qDebug("%s", QString("import %6 image %1: %2x%3 @ (%4,%5) °%5").arg(filename).arg(w).arg(h).arg(x).arg(y).arg(angle).arg(device)); - QString rawfile = filename.mid(0, filename.length()-3) + "dat"; - QStringList args; - args.append( getShortPathName(PrefsManager::instance()->ghostscriptExecutable()) ); ---- scribus/scimage.cpp -+++ scribus/scimage.cpp -@@ -4416,6 +4416,6 @@ - QMessageBox::warning(ScMW, CommonStrings::trWarning, message, 1, 0, 0); - } - else if (!message.isEmpty()) -- qWarning( message.local8Bit().data() ); -+ qWarning("%s", message.local8Bit().data() ); - return true; - } diff --git a/scribus-1.3.3.7_string-literal-comparsion.patch b/scribus-1.3.3.7_string-literal-comparsion.patch deleted file mode 100644 index ecaeee3..0000000 --- a/scribus-1.3.3.7_string-literal-comparsion.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- scribus/colorm.cpp -+++ scribus/colorm.cpp -@@ -210,7 +210,7 @@ - ColorListBox::ColorListBox(QWidget * parent, const char * name, WFlags f) - : QListBox(parent, name, f) - { -- if (name == "") -+ if (name[0] == 0) - setName("ColorListBox"); - } - ---- scribus/plugins/scriptplugin/cmdcolor.cpp -+++ scribus/plugins/scriptplugin/cmdcolor.cpp -@@ -147,7 +147,7 @@ - char *Repl = const_cast(CommonStrings::None.latin1()); - if (!PyArg_ParseTuple(args, "es|es", "utf-8", &Name, "utf-8", &Repl)) - return NULL; -- if (Name == "") -+ if (Name[0] == 0) - { - PyErr_SetString(PyExc_ValueError, QObject::tr("Cannot delete a color with an empty name.","python error")); - return NULL; diff --git a/scribus-1.3.3.9.tar.bz2 b/scribus-1.3.3.9.tar.bz2 new file mode 100644 index 0000000..c78ec04 --- /dev/null +++ b/scribus-1.3.3.9.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eff35a313a19378df0788bd57e44531d4a03a330937547f88901e0923e19c051 +size 13591901 diff --git a/scribus-1.3.3.7_string-literal-comparsion-b.patch b/scribus-1.3.3.9_string-literal-comparsion-b.patch similarity index 100% rename from scribus-1.3.3.7_string-literal-comparsion-b.patch rename to scribus-1.3.3.9_string-literal-comparsion-b.patch diff --git a/scribus.changes b/scribus.changes index e33b8e4..3e2b699 100644 --- a/scribus.changes +++ b/scribus.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Wed Jun 13 15:26:52 CEST 2007 - ltinkl@suse.cz + +- update to 1.3.3.9 bugfix release + - many bugfixes + - more translation updates + - improvements to the SVG importer + - improvements to PDF forms +- update to 1.3.3.8 + - many bugfixes + - more translation updates + - improvements to the SVG importer + - improvements to the Open Document Draw importer + - improvements to PDF forms + ------------------------------------------------------------------- Mon Apr 23 10:37:37 CEST 2007 - pgajdos@suse.cz diff --git a/scribus.spec b/scribus.spec index 04880eb..5e79698 100644 --- a/scribus.spec +++ b/scribus.spec @@ -1,5 +1,5 @@ # -# spec file for package scribus (Version 1.3.3.7) +# spec file for package scribus (Version 1.3.3.9) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -27,11 +27,9 @@ Suggests: AdobeICCProfiles %endif Provides: scribus-short-words Obsoletes: scribus-i18n-de scribus-i18n-en scribus-i18n-fr scribus-short-words -Version: 1.3.3.7 -Release: 15 +Version: 1.3.3.9 +Release: 1 Source: %{name}-%{version}.tar.bz2 -Patch: %{name}-%{version}_string-literal-comparsion.patch -Patch1: %{name}-%{version}_format-not-literal.patch Patch2: %{name}-%{version}_string-literal-comparsion-b.patch URL: http://www.scribus.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -103,8 +101,6 @@ Authors: %define prefix /usr %prep %setup -q -%patch -%patch1 %patch2 %build @@ -175,6 +171,18 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/include/scribus %changelog +* Wed Jun 13 2007 - ltinkl@suse.cz +- update to 1.3.3.9 bugfix release + - many bugfixes + - more translation updates + - improvements to the SVG importer + - improvements to PDF forms +- update to 1.3.3.8 + - many bugfixes + - more translation updates + - improvements to the SVG importer + - improvements to the Open Document Draw importer + - improvements to PDF forms * Mon Apr 23 2007 - pgajdos@suse.cz - fixed doc paths in spec file * Mon Mar 12 2007 - pgajdos@suse.cz