From 17c140d8a26717bd7c0aadb9ecc27d2a6fc04bf2115105162e2ec4cae44a3aad Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 10 Jan 2008 02:06:57 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/scribus?expand=0&rev=8 --- lib64.diff | 22 ----- scribus-1.3.3.10-doc-path.diff | 25 +++++ scribus-1.3.3.10.tar.bz2 | 3 + scribus-1.3.3.9-no-rpath.diff | 20 ---- scribus-1.3.3.9.tar.bz2 | 3 - scribus.changes | 5 + scribus.spec | 44 +++++---- string-compare.diff | 170 --------------------------------- 8 files changed, 56 insertions(+), 236 deletions(-) delete mode 100644 lib64.diff create mode 100644 scribus-1.3.3.10-doc-path.diff create mode 100644 scribus-1.3.3.10.tar.bz2 delete mode 100644 scribus-1.3.3.9-no-rpath.diff delete mode 100644 scribus-1.3.3.9.tar.bz2 delete mode 100644 string-compare.diff diff --git a/lib64.diff b/lib64.diff deleted file mode 100644 index 32599fe..0000000 --- a/lib64.diff +++ /dev/null @@ -1,22 +0,0 @@ ---- CMakeLists.txt -+++ CMakeLists.txt -@@ -79,9 +79,9 @@ SET(SCRIPTSDIR "share/${MAIN_DIR_NAME}${TAG_VERSION}/scripts/") - ADD_DEFINITIONS("-DSCRIPTSDIR=\\\"${CMAKE_INSTALL_PREFIX}/${SCRIPTSDIR}\\\"") - SET(TEMPLATEDIR "share/${MAIN_DIR_NAME}${TAG_VERSION}/templates/") - ADD_DEFINITIONS("-DTEMPLATEDIR=\\\"${CMAKE_INSTALL_PREFIX}/${TEMPLATEDIR}\\\"") --SET(LIBDIR "lib/${MAIN_DIR_NAME}${TAG_VERSION}/") -+SET(LIBDIR "lib${LIB_SUFFIX}/${MAIN_DIR_NAME}${TAG_VERSION}/") - ADD_DEFINITIONS("-DLIBDIR=\\\"${CMAKE_INSTALL_PREFIX}/${LIBDIR}\\\"") --SET(PLUGINDIR "lib/${MAIN_DIR_NAME}${TAG_VERSION}/plugins/") -+SET(PLUGINDIR "lib${LIB_SUFFIX}/${MAIN_DIR_NAME}${TAG_VERSION}/plugins/") - ADD_DEFINITIONS("-DPLUGINDIR=\\\"${CMAKE_INSTALL_PREFIX}/${PLUGINDIR}\\\"") - set(CMAKE_INSTALL_RPATH ${PLUGINDIR}) - ---- scribus/CMakeLists.txt -+++ scribus/CMakeLists.txt -@@ -438,4 +438,4 @@ ENDIF(RENDER_LIB STREQUAL "LIBART") - - INSTALL(TARGETS ${EXE_NAME} - RUNTIME DESTINATION bin -- LIBRARY DESTINATION lib) -+ LIBRARY DESTINATION lib${LIB_SUFFIX}) diff --git a/scribus-1.3.3.10-doc-path.diff b/scribus-1.3.3.10-doc-path.diff new file mode 100644 index 0000000..12714d0 --- /dev/null +++ b/scribus-1.3.3.10-doc-path.diff @@ -0,0 +1,25 @@ +--- CMakeLists.txt 2008/01/08 20:17:05 1.3 ++++ CMakeLists.txt 2008/01/08 20:19:11 +@@ -96,9 +96,9 @@ + ADD_DEFINITIONS("-DSHAREDIR=\\\"${CMAKE_INSTALL_PREFIX}/${SHAREDIR}\\\"") + #SHARE + IF(TAG_VERSION) +- SET(DOCDIR "share/doc/${MAIN_DIR_NAME}${TAG_VERSION}/") ++ SET(DOCDIR "share/doc/packages/${MAIN_DIR_NAME}${TAG_VERSION}/") + ELSE(TAG_VERSION) +- SET(DOCDIR "share/doc/${MAIN_DIR_NAME}-${VERSION}/") ++ SET(DOCDIR "share/doc/packages/${MAIN_DIR_NAME}-${VERSION}/") + ENDIF (TAG_VERSION) + ADD_DEFINITIONS("-DSHAREDIR=\\\"${CMAKE_INSTALL_PREFIX}/${SHAREDIR}\\\"") + SET(DOCDIR "share/doc/${MAIN_DIR_NAME}${TAG_VERSION}/") +--- CMakeLists.txt 2008/01/09 10:27:50 1.3 ++++ CMakeLists.txt 2008/01/09 10:28:02 +@@ -101,7 +101,7 @@ + SET(DOCDIR "share/doc/packages/${MAIN_DIR_NAME}-${VERSION}/") + ENDIF (TAG_VERSION) + ADD_DEFINITIONS("-DSHAREDIR=\\\"${CMAKE_INSTALL_PREFIX}/${SHAREDIR}\\\"") +-SET(DOCDIR "share/doc/${MAIN_DIR_NAME}${TAG_VERSION}/") ++SET(DOCDIR "share/doc/packages/${MAIN_DIR_NAME}${TAG_VERSION}/") + ADD_DEFINITIONS("-DDOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DOCDIR}\\\"") + SET(ICONDIR "share/${MAIN_DIR_NAME}${TAG_VERSION}/icons/") + ADD_DEFINITIONS("-DICONDIR=\\\"${CMAKE_INSTALL_PREFIX}/${ICONDIR}\\\"") diff --git a/scribus-1.3.3.10.tar.bz2 b/scribus-1.3.3.10.tar.bz2 new file mode 100644 index 0000000..74aeb86 --- /dev/null +++ b/scribus-1.3.3.10.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2c2c55816e565981606a2455a389956a322ee9b0d097b353383fbe9d0769e089 +size 13301950 diff --git a/scribus-1.3.3.9-no-rpath.diff b/scribus-1.3.3.9-no-rpath.diff deleted file mode 100644 index b0f8c58..0000000 --- a/scribus-1.3.3.9-no-rpath.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- CMakeLists.txt -+++ CMakeLists.txt -@@ -7,7 +7,7 @@ - SET(CMAKE_COLOR_MAKEFILE ON) - SET(CMAKE_VERBOSE_MAKEFILE ON) - SET(CMAKE_INCLUDE_CURRENT_DIR TRUE) --SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) -+SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) - #SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) - #SET(CMAKE_SKIP_RPATH:BOOL NO) - SET(CMAKE_SKIP_RULE_DEPENDENCY TRUE) -@@ -69,7 +69,7 @@ - SET(DOCDIR "share/doc/${MAIN_DIR_NAME}-${VERSION}/") - ENDIF (TAG_VERSION) - ADD_DEFINITIONS("-DSHAREDIR=\\\"${CMAKE_INSTALL_PREFIX}/${SHAREDIR}\\\"") --SET(DOCDIR "share/doc/${MAIN_DIR_NAME}${TAG_VERSION}/") -+SET(DOCDIR "share/doc/packages/${MAIN_DIR_NAME}${TAG_VERSION}/") - ADD_DEFINITIONS("-DDOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DOCDIR}\\\"") - SET(ICONDIR "share/${MAIN_DIR_NAME}${TAG_VERSION}/icons/") - ADD_DEFINITIONS("-DICONDIR=\\\"${CMAKE_INSTALL_PREFIX}/${ICONDIR}\\\"") diff --git a/scribus-1.3.3.9.tar.bz2 b/scribus-1.3.3.9.tar.bz2 deleted file mode 100644 index c78ec04..0000000 --- a/scribus-1.3.3.9.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eff35a313a19378df0788bd57e44531d4a03a330937547f88901e0923e19c051 -size 13591901 diff --git a/scribus.changes b/scribus.changes index a46fd2a..ff72ae4 100644 --- a/scribus.changes +++ b/scribus.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jan 8 21:15:04 CET 2008 - stbinner@suse.de + +- update to 1.3.3.10, many bugfixes - for details see ChangeLog + ------------------------------------------------------------------- Wed Jun 27 19:25:56 CEST 2007 - dmueller@suse.de diff --git a/scribus.spec b/scribus.spec index 922f3be..a8256ea 100644 --- a/scribus.spec +++ b/scribus.spec @@ -1,7 +1,7 @@ # -# spec file for package scribus (Version 1.3.3.9) +# spec file for package scribus (Version 1.3.3.10) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -19,35 +19,37 @@ BuildRequires: libjpeg-devel %if %suse_version < 1010 BuildRequires: -ghostscript-library libtiff-devel openssl-devel %endif -License: GNU General Public License (GPL) +License: GPL v2 or later Group: Productivity/Publishing/Other -Autoreqprov: on +AutoReqProv: on Requires: tk python-imaging %if %suse_version > 1000 -Suggests: AdobeICCProfiles +Suggests: AdobeICCProfiles %endif Provides: scribus-short-words Obsoletes: scribus-i18n-de scribus-i18n-en scribus-i18n-fr scribus-short-words -Version: 1.3.3.9 -Release: 2 +Version: 1.3.3.10 +Release: 1 Source: %{name}-%{version}.tar.bz2 -Patch3: %{name}-1.3.3.9-no-rpath.diff -Patch4: string-compare.diff -Patch5: lib64.diff -URL: http://www.scribus.net/ +Patch3: %{name}-%{version}-doc-path.diff +Url: http://www.scribus.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Open Source Page Layout and Desktop Publishing (DTP) %description Scribus is a desktop open source page layout program with the aim of -producing commerical grade output in PDF and Postscript, primarily, -though not exclusively, for Linux. +producing commercial grade output in PDF and Postscript. It is +primarily, though not exclusively,designed for Linux. -While the goals of the program are ease of use and simple -easy-to-understand tools, Scribus offers support for professional -publishing features, such as CMYK colors, easy PDF creation, -Encapsulated Postscript import and export, and creation of color -separations. +While the goals of the program are ease of use and user-friendly + tools, Scribus offers support for the following professional + publishing features: * CMYK colors + +* Easy PDF creation + +* Encapsulated Postscript import and export + +* Creation of color separations. @@ -70,8 +72,6 @@ Authors: %prep %setup -q %patch3 -%patch4 -%patch5 %build mkdir build @@ -89,8 +89,8 @@ cd build cd .. mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name} install -m 644 -D $RPM_BUILD_ROOT/usr/share/scribus/icons/scribusicon.png $RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/apps/scribusicon.png -%suse_update_desktop_file %name Office WordProcessor install -m 644 -D scribus.desktop $RPM_BUILD_ROOT%{_datadir}/applications/scribus.desktop +%suse_update_desktop_file %name Office WordProcessor install -m 644 -D scribus.xml $RPM_BUILD_ROOT%{_datadir}/mime/packages/scribus.xml %post @@ -121,6 +121,8 @@ rm -rf $RPM_BUILD_ROOT %dir /usr/share/man/pl/man1 %changelog +* Tue Jan 08 2008 - stbinner@suse.de +- update to 1.3.3.10, many bugfixes - for details see ChangeLog * Wed Jun 27 2007 - dmueller@suse.de - build against cmake to fix various issues * Wed Jun 13 2007 - ltinkl@suse.cz diff --git a/string-compare.diff b/string-compare.diff deleted file mode 100644 index d79d4ba..0000000 --- a/string-compare.diff +++ /dev/null @@ -1,170 +0,0 @@ ---- scribus/plugins/scriptplugin/cmdcolor.cpp -+++ scribus/plugins/scriptplugin/cmdcolor.cpp -@@ -147,7 +147,7 @@ PyObject *scribus_delcolor(PyObject* /* self */, PyObject* args) - 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) - { - PyErr_SetString(PyExc_ValueError, QObject::tr("Cannot delete a color with an empty name.","python error")); - return NULL; ---- scribus/plugins/scriptplugin/cmdmisc.cpp -+++ scribus/plugins/scriptplugin/cmdmisc.cpp -@@ -190,7 +190,7 @@ PyObject *scribus_senttolayer(PyObject* /* self */, PyObject* args) - return NULL; - if(!checkHaveDocument()) - return NULL; -- if (Layer == "") -+ if (!*Layer) - { - PyErr_SetString(PyExc_ValueError, QObject::tr("Cannot have an empty layer name.","python error")); - return NULL; -@@ -229,7 +229,7 @@ PyObject *scribus_layervisible(PyObject* /* self */, PyObject* args) - return NULL; - if(!checkHaveDocument()) - return NULL; -- if (Name == "") -+ if (!*Name) - { - PyErr_SetString(PyExc_ValueError, QString("Cannot have an empty layer name")); - return NULL; -@@ -261,7 +261,7 @@ PyObject *scribus_layerprint(PyObject* /* self */, PyObject* args) - return NULL; - if(!checkHaveDocument()) - return NULL; -- if (Name == "") -+ if (!*Name) - { - PyErr_SetString(PyExc_ValueError, QObject::tr("Cannot have an empty layer name.","python error")); - return NULL; -@@ -292,7 +292,7 @@ PyObject *scribus_glayervisib(PyObject* /* self */, PyObject* args) - return NULL; - if(!checkHaveDocument()) - return NULL; -- if (Name == "") -+ if (!*Name) - { - PyErr_SetString(PyExc_ValueError, QObject::tr("Cannot have an empty layer name.","python error")); - return NULL; -@@ -323,7 +323,7 @@ PyObject *scribus_glayerprint(PyObject* /* self */, PyObject* args) - return NULL; - if(!checkHaveDocument()) - return NULL; -- if (Name == "") -+ if (!*Name) - { - PyErr_SetString(PyExc_ValueError, QObject::tr("Cannot have an empty layer name.","python error")); - return NULL; -@@ -355,7 +355,7 @@ PyObject *scribus_removelayer(PyObject* /* self */, PyObject* args) - return NULL; - if(!checkHaveDocument()) - return NULL; -- if (Name == "") -+ if (!*Name) - { - PyErr_SetString(PyExc_ValueError, QObject::tr("Cannot have an empty layer name.","python error")); - return NULL; -@@ -410,7 +410,7 @@ PyObject *scribus_createlayer(PyObject* /* self */, PyObject* args) - return NULL; - if(!checkHaveDocument()) - return NULL; -- if (Name == "") -+ if (!*Name) - { - PyErr_SetString(PyExc_ValueError, QObject::tr("Cannot create layer without a name.","python error")); - return NULL; ---- scribus/plugins/scriptplugin/cmdobj.cpp -+++ scribus/plugins/scriptplugin/cmdobj.cpp -@@ -30,7 +30,7 @@ PyObject *scribus_newrect(PyObject* /* self */, PyObject* args) - ScMW->doc->toolSettings.dWidth, - ScMW->doc->toolSettings.dBrush, ScMW->doc->toolSettings.dPen, true); - ScMW->doc->setRedrawBounding(ScMW->doc->Items->at(i)); -- if (Name != "") -+ if (*Name) - ScMW->doc->Items->at(i)->setItemName(QString::fromUtf8(Name)); - return PyString_FromString(ScMW->doc->Items->at(i)->itemName().utf8()); - } -@@ -59,7 +59,7 @@ PyObject *scribus_newellipse(PyObject* /* self */, PyObject* args) - return NULL; - } - ScMW->doc->setRedrawBounding(ScMW->doc->Items->at(i)); -- if (Name != "") -+ if (*Name) - ScMW->doc->Items->at(i)->setItemName(QString::fromUtf8(Name)); - return PyString_FromString(ScMW->doc->Items->at(i)->itemName().utf8()); - } -@@ -86,7 +86,7 @@ PyObject *scribus_newimage(PyObject* /* self */, PyObject* args) - return NULL; - } - ScMW->doc->setRedrawBounding(ScMW->doc->Items->at(i)); -- if (Name != "") -+ if (*Name) - ScMW->doc->Items->at(i)->setItemName(QString::fromUtf8(Name)); - return PyString_FromString(ScMW->doc->Items->at(i)->itemName().utf8()); - } -@@ -113,7 +113,7 @@ PyObject *scribus_newtext(PyObject* /* self */, PyObject* args) - return NULL; - } - ScMW->doc->setRedrawBounding(ScMW->doc->Items->at(i)); -- if (Name != "") -+ if (*Name) - ScMW->doc->Items->at(i)->setItemName(QString::fromUtf8(Name)); - return PyString_FromString(ScMW->doc->Items->at(i)->itemName().utf8()); - } -@@ -151,7 +151,7 @@ PyObject *scribus_newline(PyObject* /* self */, PyObject* args) - it->updateClip(); - ScMW->doc->setRedrawBounding(it); - it->OwnPage = ScMW->doc->OnPage(it); -- if (Name != "") -+ if (*Name) - it->setItemName(QString::fromUtf8(Name)); - return PyString_FromString(it->itemName().utf8()); - } -@@ -224,7 +224,7 @@ PyObject *scribus_polyline(PyObject* /* self */, PyObject* args) - } - ScMW->view->SizeItem(it->PoLine.WidthHeight().x(), it->PoLine.WidthHeight().y(), ic, false, false, false); - ScMW->view->AdjustItemSize(it); -- if (Name != "") -+ if (*Name) - { - it->setItemName(QString::fromUtf8(Name)); - } -@@ -304,7 +304,7 @@ PyObject *scribus_polygon(PyObject* /* self */, PyObject* args) - } - ScMW->view->SizeItem(it->PoLine.WidthHeight().x(), it->PoLine.WidthHeight().y(), ic, false, false, false); - ScMW->view->AdjustItemSize(it); -- if (Name != "") -+ if (*Name) - it->setItemName(QString::fromUtf8(Name)); - return PyString_FromString(it->itemName().utf8()); - } -@@ -429,7 +429,7 @@ PyObject *scribus_pathtext(PyObject* /* self */, PyObject* args) - PageItem *it = ScMW->doc->Items->at(i); - ScMW->view->ToPathText(); - ScMW->view->MoveItem(pageUnitXToDocX(x) - it->xPos(), pageUnitYToDocY(y) - it->yPos(), it); -- if (Name != "") -+ if (*Name) - it->setItemName(QString::fromUtf8(Name)); - return PyString_FromString(it->itemName().utf8()); - } -@@ -532,7 +532,7 @@ PyObject *scribus_setstyle(PyObject* /* self */, PyObject* args) - return NULL; - } - // for current item only -- if (ScMW->doc->m_Selection->count() == 0 || name != "") -+ if (ScMW->doc->m_Selection->count() == 0 || *name) - { - // quick hack to always apply on the right frame - pv - ScMW->view->Deselect(true); ---- scribus/plugins/scriptplugin/cmdobj.cpp -+++ scribus/plugins/scriptplugin/cmdobj.cpp -@@ -391,7 +391,7 @@ PyObject *scribus_bezierline(PyObject* /* self */, PyObject* args) - } - ScMW->view->SizeItem(it->PoLine.WidthHeight().x(), it->PoLine.WidthHeight().y(), ic, false, false, false); - ScMW->view->AdjustItemSize(it); -- if (Name != "") -+ if (*Name) - it->setItemName(QString::fromUtf8(Name)); - return PyString_FromString(it->itemName().utf8()); - }