upgrading package: scribus 1.0rc1 -> 1.0

scribus/scribus.patch

@@ -1,6 +1,6 @@
---- scribus-0.9.10.orig/scribus/scribus.cpp	2003-06-16 07:26:32.000000000 +0200
-+++ scribus-0.9.10/scribus/scribus.cpp	2003-06-16 07:27:19.000000000 +0200
-@@ -3040,7 +3040,7 @@
+--- scribus/scribus.cpp.orig	2003-07-11 21:58:11.000000000 +0200
++++ scribus/scribus.cpp	2003-07-15 10:59:33.000000000 +0200
+@@ -3051,7 +3051,7 @@
  void ScribusApp::slotHelpAbout()
  {
  	void *mo;
@@ -15,10 +15,10 @@
  	void *mo;
 -	char *error;
 +	const char *error;
+ 	bool zChange = false;
  	typedef Preferences* (*sdem)(QWidget *d, preV *Vor);
  	sdem demo;
- 	QString pfad = PREL;
-@@ -5153,7 +5153,7 @@
+@@ -5156,7 +5156,7 @@
  
  PSLib* ScribusApp::getPSDriver(bool psart, SCFonts &AllFonts, QMap<QString,QFont> DocFonts, CListe DocColors, bool pdf)
  {
@@ -27,7 +27,7 @@
  	typedef PSLib* (*sdem)(bool psart, SCFonts &AllFonts, QMap<QString,QFont> DocFonts, CListe DocColors, bool pdf);
  	sdem demo;
  	QString pfad = PREL;
-@@ -5188,7 +5188,7 @@
+@@ -5191,7 +5191,7 @@
  bool ScribusApp::getPDFDriver(QString fn, QString nam, int Components, int frPa, int toPa, QMap<int,QPixmap> thumbs)
  {
  	bool ret = false;
@@ -36,7 +36,7 @@
  	void *PDFDriver;
  	typedef bool (*sdem)(ScribusApp *plug, QString fn, QString nam, int Components, int frPa, int toPa, QMap<int,QPixmap> thumbs);
  	sdem demo;
-@@ -5734,7 +5734,7 @@
+@@ -5738,7 +5738,7 @@
  
  void ScribusApp::FinalizePlugs()
  {
@@ -45,7 +45,7 @@
  	QMap<QString, PlugData>::Iterator it;
  	struct PlugData pda;
  	typedef void (*sdem2)();
-@@ -5804,7 +5804,7 @@
+@@ -5808,7 +5808,7 @@
  void ScribusApp::CallDLL(QString name)
  {
  	void *mo;
@@ -54,7 +54,7 @@
  	struct PlugData pda;
  	pda = PluginMap[name];
  	typedef void (*sdem)(QWidget *d, ScribusApp *plug);
-@@ -5838,7 +5838,7 @@
+@@ -5842,7 +5842,7 @@
  bool ScribusApp::DLLName(QString name, QString *PName, int *typ, void **Zeig)
  {
  	void *mo;
@@ -63,36 +63,8 @@
  	typedef QString (*sdem0)();
  	typedef int (*sdem1)();
  	typedef void (*sdem2)(QWidget *d, ScribusApp *plug);
-diff -Naur scribus-0.9.10.orig/scribus/icc34.h scribus-0.9.10/scribus/icc34.h
---- scribus-0.9.10.orig/scribus/icc34.h	Sun Mar  2 13:41:48 2003
-+++ scribus-0.9.10/scribus/icc34.h	Wed May 14 10:26:21 2003
-@@ -180,10 +180,10 @@
- typedef int32_t       icSignature; 
- 
- /* Unsigned integer numbers */
--typedef u_int8_t   icUInt8Number;
--typedef u_int16_t  icUInt16Number;
--typedef u_int32_t  icUInt32Number;
--typedef u_int32_t  icUInt64Number[2];
-+typedef uint8_t   icUInt8Number;
-+typedef uint16_t  icUInt16Number;
-+typedef uint32_t  icUInt32Number;
-+typedef uint32_t  icUInt64Number[2];
- 
- /* Signed numbers */
- typedef int8_t	   icInt8Number;
-@@ -193,7 +193,7 @@
- 
- /* Fixed numbers */
- typedef int32_t    icS15Fixed16Number;
--typedef u_int32_t   icU16Fixed16Number;
-+typedef uint32_t   icU16Fixed16Number;
- 
- #else /* default definitions */
- 
-diff -Naur scribus-0.9.10.orig/scribus/scfonts_ttf.cpp scribus-0.9.10/scribus/scfonts_ttf.cpp
---- scribus-0.9.10.orig/scribus/scfonts_ttf.cpp	Fri Apr 11 23:11:08 2003
-+++ scribus-0.9.10/scribus/scfonts_ttf.cpp	Wed May 14 10:25:46 2003
+--- scribus/scfonts_ttf.cpp	Fri Apr 11 23:11:08 2003
++++ scribus/scfonts_ttf.cpp	Wed May 14 10:25:46 2003
 @@ -22,7 +22,7 @@
  #endif
  // #define doPost
@@ -195,9 +167,8 @@ diff -Naur scribus-0.9.10.orig/scribus/scfonts_ttf.cpp scribus-0.9.10/scribus/sc
  		for(int i=0;i<idarraylength;++i)
  			idarray[i]=readBEUInt16();
  		if(error)
-diff -Naur scribus-0.9.10.orig/scribus/scfonts_ttftypes.h scribus-0.9.10/scribus/scfonts_ttftypes.h
---- scribus-0.9.10.orig/scribus/scfonts_ttftypes.h	Sun Mar  2 13:40:52 2003
-+++ scribus-0.9.10/scribus/scfonts_ttftypes.h	Wed May 14 10:26:41 2003
+--- scribus/scfonts_ttftypes.h	Sun Mar  2 13:40:52 2003
++++ scribus/scfonts_ttftypes.h	Wed May 14 10:26:41 2003
 @@ -10,7 +10,7 @@
  struct fxp16_16_t
  {

scribus/scribus.spec

@@ -26,8 +26,8 @@
 #   FIXME: ms: Has JUNK status, because it locks up during a fcntl(2) on FreeBSD.
 
 #   package version
-%define       V_dist 1.0RC1
-%define       V_opkg 1.0rc1
+%define       V_dist 1.0
+%define       V_opkg 1.0
 
 #   package information
 Name:         scribus
@@ -39,10 +39,10 @@ Distribution: OpenPKG [JUNK]
 Group:        Misc
 License:      GPL
 Version:      %{V_opkg}
-Release:      20030712
+Release:      20030715
 
 #   list of sources
-Source0:      http://web2.altmuehlnet.de/fschmid/scribus-%{V_dist}.tar.gz
+Source0:      http://scribus.planetmirror.com/scribus-%{V_dist}.tar.gz
 Patch0:       scribus.patch
 
 #   build information
@@ -67,7 +67,7 @@ AutoReqProv:  no
 
 %prep
     %setup -q -n scribus-%{V_dist}
-    %patch -p1
+    %patch -p0
     %{l_shtool} subst \
         -e 's; ! -f $libstdcpp;;g' \
         configure