OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 30-Mar-2004 12:43:20
Branch: HEAD Handle: 2004033011432000
Modified files:
openpkg-src/scribus scribus.patch scribus.spec
Log:
upgrading package: scribus 1.1.5 -> 1.1.6
Summary:
Revision Changes Path
1.13 +2 -2 openpkg-src/scribus/scribus.patch
1.32 +8 -8 openpkg-src/scribus/scribus.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/scribus/scribus.patch
============================================================================
$ cvs diff -u -r1.12 -r1.13 scribus.patch
--- openpkg-src/scribus/scribus.patch 27 Feb 2004 09:57:02 -0000 1.12
+++ openpkg-src/scribus/scribus.patch 30 Mar 2004 10:43:20 -0000 1.13
@@ -1,7 +1,7 @@
Index: scribus/scribus.cpp
--- scribus/scribus.cpp.orig 2003-12-19 21:42:16.000000000 +0100
+++ scribus/scribus.cpp 2003-12-28 10:09:44.000000000 +0100
-@@ -5017,7 +5017,7 @@
+@@ -5660,7 +5660,7 @@
void ScribusApp::slotPrefsOrg()
{
void *mo;
@@ -10,7 +10,7 @@
bool zChange = false;
typedef Preferences* (*sdem)(QWidget *d, preV *Vor);
sdem demo;
-@@ -5472,7 +5472,7 @@
+@@ -6142,7 +6142,7 @@
bool ScribusApp::getPDFDriver(QString fn, QString nam, int Components, int frPa,
int toPa, QMap<int,QPixmap> thumbs)
{
bool ret = false;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/scribus/scribus.spec
============================================================================
$ cvs diff -u -r1.31 -r1.32 scribus.spec
--- openpkg-src/scribus/scribus.spec 27 Feb 2004 09:57:02 -0000 1.31
+++ openpkg-src/scribus/scribus.spec 30 Mar 2004 10:43:20 -0000 1.32
@@ -33,8 +33,8 @@
Class: EVAL
Group: Editor
License: GPL
-Version: 1.1.5
-Release: 20040227
+Version: 1.1.6
+Release: 20040330
# package options
%option with_python no
@@ -82,17 +82,17 @@
scribus/Makefile.in \
scribus/dicts/Makefile.in \
scribus/icons/Makefile.in \
- scribus/libpdf/Makefile.in \
- scribus/libpostscript/Makefile.in \
scribus/profiles/Makefile.in \
scribus/qm/Makefile.in
+
+ %{l_shtool} subst \
+ -e 's;\([^=] *\)$(prefix);\1$(DESTDIR)$(prefix);' \
+ scribus/libpostscript/Makefile.in \
+ scribus/libpdf/Makefile.in
+
%{l_shtool} subst \
-e 's; ! -f $libstdcpp;;g' \
configure
- %{l_shtool} subst \
- -e 's;u_int\([0-9]*\)_t;uint\1_t;g' \
- scribus/*.cpp \
- scribus/*.h
%if "%{with_python}" == "yes"
%else
%{l_shtool} subst \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
