rpms/scribus/devel .cvsignore, 1.4, 1.5 scribus.spec, 1.6, 1.7 sources, 1.4, 1.5

[Phillip Compton (pcompton)]

Author: pcompton

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scribus/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Nov 2004 05:20:05 -0000	1.4
+++ .cvsignore	9 Jan 2005 19:29:45 -0000	1.5
@@ -1 +1 @@
-scribus-1.2.tar.bz2
+scribus-1.2.1.tar.bz2


Index: scribus.spec
===================================================================
RCS file: /cvs/extras/rpms/scribus/devel/scribus.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- scribus.spec	10 Dec 2004 22:03:11 -0000	1.6
+++ scribus.spec	9 Jan 2005 19:29:45 -0000	1.7
@@ -1,14 +1,13 @@
 Name:           scribus
-Version:        1.2
-Release:        3
+Version:        1.2.1
+Release:        1
 Summary:        DeskTop Publishing app in QT.
 
 Group:          Applications/Productivity
 License:        GPL
 URL:            http://www.scribus.net/
-Source0:        http://www.scribus.org.uk/downloads/1.2/scribus-1.2.tar.bz2
+Source0:        http://www.scribus.org.uk/downloads/1.2.1/scribus-1.2.1.tar.bz2
 Source1:        scribus.xml
-Source2:        scribus.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cups-devel
@@ -19,6 +18,7 @@
 BuildRequires:  libpng-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  libtool
+BuildRequires:  libxml2-devel
 BuildRequires:  openssl-devel
 BuildRequires:  python-devel >= 2.2
 BuildRequires:  qt-devel >= 1:3.0.5
@@ -31,6 +31,8 @@
 Requires(postun): shared-mime-info
 Requires(postun): desktop-file-utils
 
+Obsoletes:      scribus-i18n-en
+
 
 %description
 Scribus is a Layout program for GNU/Linux®, similar to Adobe® PageMaker™,
@@ -71,10 +73,10 @@
 install -p -D -m0644 scribus/icons/scribusdoc.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/x-scribus.png
 install -p -D -m0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/mime/packages/scribus.xml
 
-desktop-file-install --vendor fedora                   \
-  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications      \
-  --add-category X-Fedora                              \
-  %{SOURCE2}
+desktop-file-install --vendor fedora                \
+  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications   \
+  --add-category X-Fedora                           \
+ scribus.desktop
 
 find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
 
@@ -102,6 +104,8 @@
 %{_datadir}/pixmaps/*
 %{_datadir}/scribus/
 %{_libdir}/scribus/
+%{_mandir}/man1/*
+%{_mandir}/pl/man1/*
 
 %files devel
 %defattr(-,root,root,-)
@@ -110,6 +114,12 @@
 
 
 %changelog
+* Sun Jan 09 2005 Phillip Compton <pcompton[AT]proteinmedia.com> - 1.2.1-1
+- 1.2.1.
+
+* Sat Dec 04 2004 Phillip Compton <pcompton[AT]proteinmedia.com> - 1.2.1-0.1.cvs20041118
+- cvs snapshot.
+
 * Wed Nov 11 2004 Phillip Compton <pcompton[AT]proteinmedia.com> - 1.2-0.fdr.3
 - Redirect output in post/postun, to avoid failure.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scribus/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Nov 2004 05:20:05 -0000	1.4
+++ sources	9 Jan 2005 19:29:45 -0000	1.5
@@ -1 +1 @@
-7d2c2b228f9a6ff82c9401fd54bdbe16  scribus-1.2.tar.bz2
+002cb629e817722f4123df7a41fc824b  scribus-1.2.1.tar.bz2