devel/scribus scribus-x86_64.patch,NONE,1.1 scribus.spec,1.7,1.8

[Phillip Compton (pcompton)]

Author: pcompton

Update of /cvs/extras/devel/scribus
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3682

Modified Files:
	scribus.spec 
Added Files:
	scribus-x86_64.patch 
Log Message:
Fix for x86_64 build, and qt-devel BR bump.


scribus-x86_64.patch:

--- NEW FILE scribus-x86_64.patch ---
diff -Nur scribus-1.2.1-orig/scribus/plugins/gettext/htmlim/Makefile.in scribus-1.2.1/scribus/plugins/gettext/htmlim/Makefile.in
--- scribus-1.2.1-orig/scribus/plugins/gettext/htmlim/Makefile.in	2005-01-08 10:10:04.000000000 +0100
+++ scribus-1.2.1/scribus/plugins/gettext/htmlim/Makefile.in	2005-02-03 01:04:48.654806024 +0100
@@ -287,7 +287,7 @@
 target_vendor = @target_vendor@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
-pluginsdir = $(prefix)/lib/scribus/plugins/gettext
+pluginsdir = $(libdir)/scribus/plugins/gettext
 SUBDIRS = 
 plugins_LTLIBRARIES = libhtmlim.la
 INCLUDES = $(LIBFREETYPE_CFLAGS) $(XML_CFLAGS) $(all_includes)
diff -Nur scribus-1.2.1-orig/scribus/plugins/gettext/sxwim/Makefile.in scribus-1.2.1/scribus/plugins/gettext/sxwim/Makefile.in
--- scribus-1.2.1-orig/scribus/plugins/gettext/sxwim/Makefile.in	2005-01-08 10:10:04.000000000 +0100
+++ scribus-1.2.1/scribus/plugins/gettext/sxwim/Makefile.in	2005-02-03 01:04:28.093931752 +0100
@@ -303,7 +303,7 @@
 target_vendor = @target_vendor@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
-pluginsdir = $(prefix)/lib/scribus/plugins/gettext
+pluginsdir = $(libdir)/scribus/plugins/gettext
 SUBDIRS = 
 plugins_LTLIBRARIES = libsxwimplugin.la
 INCLUDES = $(LIBFREETYPE_CFLAGS) $(XML_CFLAGS) $(all_includes)


Index: scribus.spec
===================================================================
RCS file: /cvs/extras/devel/scribus/scribus.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- scribus.spec	9 Jan 2005 19:29:45 -0000	1.7
+++ scribus.spec	9 Feb 2005 01:54:43 -0000	1.8
@@ -1,13 +1,14 @@
 Name:           scribus
 Version:        1.2.1
-Release:        1
-Summary:        DeskTop Publishing app in QT.
+Release:        3
+Summary:        DeskTop Publishing application written in Qt
 
 Group:          Applications/Productivity
 License:        GPL
 URL:            http://www.scribus.net/
 Source0:        http://www.scribus.org.uk/downloads/1.2.1/scribus-1.2.1.tar.bz2
 Source1:        scribus.xml
+Patch0:         scribus-x86_64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cups-devel
@@ -21,7 +22,7 @@
 BuildRequires:  libxml2-devel
 BuildRequires:  openssl-devel
 BuildRequires:  python-devel >= 2.2
-BuildRequires:  qt-devel >= 1:3.0.5
+BuildRequires:  qt-devel >= 1:3.3
 BuildRequires:  zlib-devel
 Requires:       ghostscript >= 7.07
 Requires:       python >= 2.2
@@ -55,7 +56,8 @@
 
 
 %prep
-%setup -q 
+%setup -q
+%patch -p1 -b .x86_64
 
 
 %build
@@ -114,6 +116,12 @@
 
 
 %changelog
+* Sun Feb 06 2005 Phillip Compton <pcompton[AT]proteinmedia.com> - 1.2.1-3
+- Bumped BR on qt-devel to 3.3.
+
+* Thu Feb  3 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.2.1-2
+- Fix x86_64 build and summary.
+
 * Sun Jan 09 2005 Phillip Compton <pcompton[AT]proteinmedia.com> - 1.2.1-1
 - 1.2.1.