rpms/scribus/FC-4 .cvsignore, 1.5, 1.6 scribus.spec, 1.11, 1.12 sources, 1.5, 1.6

[Tom Callaway (spot)]

Author: spot

Update of /cvs/extras/rpms/scribus/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5795/FC-4

Modified Files:
	.cvsignore scribus.spec sources 
Log Message:

Scribus update for Phil.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scribus/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Jan 2005 19:29:45 -0000	1.5
+++ .cvsignore	6 Jul 2005 22:41:31 -0000	1.6
@@ -1 +1,2 @@
 scribus-1.2.1.tar.bz2
+scribus-1.2.2.1.tar.bz2


Index: scribus.spec
===================================================================
RCS file: /cvs/extras/rpms/scribus/FC-4/scribus.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- scribus.spec	22 May 2005 23:16:50 -0000	1.11
+++ scribus.spec	6 Jul 2005 22:41:31 -0000	1.12
@@ -1,15 +1,16 @@
 Name:           scribus
-Version:        1.2.1
-Release: 5
+Version:        1.2.2.1
+Release: 1
 
 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
+Source0:        http://www.scribus.org.uk/downloads/1.2.2.1/scribus-1.2.2.1.tar.bz2
 Source1:        scribus.xml
-Patch0:         scribus-x86_64.patch
+Source2:	scribus.desktop
+#Patch0:         scribus-x86_64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cups-devel
@@ -22,24 +23,42 @@
 BuildRequires:  libtool
 BuildRequires:  libxml2-devel
 BuildRequires:  openssl-devel
-BuildRequires:  python-devel >= 2.2
+BuildRequires:  python-devel >= 2.3
 BuildRequires:  qt-devel >= 1:3.3
 BuildRequires:  zlib-devel
+BuildRequires:  freetype-devel
 Requires:       ghostscript >= 7.07
-Requires:       python >= 2.2
+Requires:       python >= 2.3
 Requires:       tkinter
 Requires(post): shared-mime-info
 Requires(post): desktop-file-utils
 Requires(postun): shared-mime-info
 Requires(postun): desktop-file-utils
 
-Obsoletes:      scribus-i18n-en
-
+Obsoletes:     scribus-i18n-en
+Obsoletes:     scribus-svg
+Obsoletes:     scribus-scripting
+Obsoletes:     scribus-short-words
+Obsoletes:     scribus-vnla
+Obsoletes:     scribus-i18en
+Obsoletes:     scribus-i18de
+Obsoletes:     scribus-i18fr
+Obsoletes:     scribus-templates
+
+Provides:      scribus-i18n-en
+Provides:      scribus-svg
+Provides:      scribus-scripting
+Provides:      scribus-short-words
+Provides:      scribus-vnla
+Provides:      scribus-i18en
+Provides:      scribus-i18de
+Provides:      scribus-i18fr
+Provides:      scribus-templates
 
 %description
-Scribus is a Layout program for GNU/Linux®, similar to Adobe® PageMaker™,
-QuarkXPress™ or Adobe® InDesign™, except that it is published under the
-GNU GPL.
+Scribus is an desktop open source page layout program with
+the aim of producing commercial grade output in PDF and
+Postscript, primarily, though not exclusively for Linux.
 
 While the goals of the program are for ease of use and simple easy to
 understand tools, Scribus offers support for professional publishing
@@ -58,7 +77,7 @@
 
 %prep
 %setup -q
-%patch -p1 -b .x86_64
+#%patch -p1 -b .x86_64
 
 
 %build
@@ -117,6 +136,20 @@
 
 
 %changelog
+* Tue Jul 5 2005 P Linnell <mrdocs AT scribus.info> - 1.2.2.1-1
+- 1.2.2.1 released to fix crash on open with certain 1.2.1 docs
+
+* Sun Jul 3 2005 P Linnell <mrdocs AT scribus.info> - 1.2.2-0.fc4
+- 1.2.2 final
+
+* Tue Jun 28 2005 P Linnell <mrdocs AT scribus.info>- 1.2.2cvs-0
+- test build for 1.2.2cvs
+- Add freetype2 explicit build requirement
+- Add obsoletes. See PACKAGING in the source tarball
+- Change the description per PACKAGING
+- Bump required python. 2.2 is no longer supported.
+
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.2.1-5
 - rebuild on all arches
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scribus/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Jan 2005 19:29:45 -0000	1.5
+++ sources	6 Jul 2005 22:41:31 -0000	1.6
@@ -1 +1,2 @@
 002cb629e817722f4123df7a41fc824b  scribus-1.2.1.tar.bz2
+8c2eac0a358b04c39252586d9d85ab24  scribus-1.2.2.1.tar.bz2