upgrading package: scribus 1.1.6 -> 1.1.7

scribus/scribus.patch

@@ -1,21 +0,0 @@
-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
-@@ -5660,7 +5660,7 @@
- void ScribusApp::slotPrefsOrg()
- {
- 	void *mo;
--	char *error;
-+	const char *error;
- 	bool zChange = false;
- 	typedef Preferences* (*sdem)(QWidget *d, preV *Vor);
- 	sdem demo;
-@@ -6142,7 +6142,7 @@
- bool ScribusApp::getPDFDriver(QString fn, QString nam, int Components, int frPa, int toPa, QMap<int,QPixmap> thumbs)
- {
- 	bool ret = false;
--	char *error;
-+	const char *error;
- 	void *PDFDriver;
- 	typedef bool (*sdem)(ScribusApp *plug, QString fn, QString nam, int Components, int frPa, int toPa, QMap<int,QPixmap> thumbs);
- 	sdem demo;

scribus/scribus.spec

@@ -33,15 +33,14 @@ Distribution: OpenPKG
 Class:        EVAL
 Group:        Editor
 License:      GPL
-Version:      1.1.6
-Release:      20040330
+Version:      1.1.7
+Release:      20040606
 
 #   package options
 %option       with_python  no
 
 #   list of sources
 Source0:      http://web2.altmuehlnet.de/fschmid/scribus-%{version}.tar.gz
-Patch0:       scribus.patch
 
 #   build information
 Prefix:       %{l_prefix}
@@ -76,29 +75,23 @@ AutoReqProv:  no
 
 %prep
     %setup -q
-    %patch -p0
     %{l_shtool} subst \
         -e 's;$(prefix);$(DESTDIR)$(prefix);' \
         scribus/Makefile.in \
         scribus/dicts/Makefile.in \
         scribus/icons/Makefile.in \
         scribus/profiles/Makefile.in \
-        scribus/qm/Makefile.in
-
+        scribus/qm/Makefile.in \
+        scribus/plugins/psimport/Makefile.in \
+        scribus/plugins/fontpreview/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' \
+        -e 's;^\(jpeg_incdirs="\)[^"]*\("\);\1%{l_prefix}/include\2;' \
         configure
-%if "%{with_python}" == "yes"
-%else
-    %{l_shtool} subst \
-        -e 's;^\(SUBDIRS =.*\) scriptplugin\(.*\)$;\1\2;' \
-        scribus/plugins/Makefile.in
-%endif
 
 %build
     CC="%{l_cc}" \