diff --git a/.cvsignore b/.cvsignore index 74e935b..4b913df 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -scribus-svn-12516.tar.bz2 +scribus-1.3.5.beta.tar.bz2 diff --git a/scribus-x86_64.patch b/scribus-x86_64.patch deleted file mode 100644 index 6ba72aa..0000000 --- a/scribus-x86_64.patch +++ /dev/null @@ -1,24 +0,0 @@ -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) diff --git a/scribus.spec b/scribus.spec index 6e7e0bc..a46d335 100644 --- a/scribus.spec +++ b/scribus.spec @@ -1,15 +1,13 @@ Name: scribus Version: 1.3.5 -Release: 0.5.12516svn%{?dist} +Release: 0.12.beta%{?dist} Summary: DeskTop Publishing application written in Qt Group: Applications/Productivity License: GPLv2+ URL: http://www.scribus.net/ -# obtained via svn co -r 12516 svn://scribus.info/Scribus/trunk/Scribus -Source0: scribus-svn-12516.tar.bz2 -Source1: scribus.xml +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.beta.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake @@ -30,31 +28,14 @@ BuildRequires: zlib-devel BuildRequires: freetype-devel BuildRequires: gnutls-devel BuildRequires: cairo-devel +BuildRequires: aspell-devel +BuildRequires: boost-devel Requires: ghostscript >= 7.07 Requires: python >= 2.3 Requires: python-imaging Requires: tkinter Requires: shared-mime-info -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 an desktop open source page layout program with @@ -79,12 +60,16 @@ Header files for Scribus. Summary: Documentation files for Scribus Group: Development/Tools Requires: %{name} = %{version}-%{release} +%if 0%{?fedora} > 9 +BuildArch: noarch +%endif + %description doc %{summary} %prep -%setup -q -n Scribus +%setup -q -n %{name}-%{version}.beta # recode man page to UTF-8 pushd scribus/manpages @@ -96,9 +81,6 @@ popd # fix permissions chmod a-x scribus/pageitem_latexframe.h -# remove zero-length source files -rm -f scribus/canvasgesture_pan.* - %build mkdir build @@ -115,7 +97,7 @@ pushd build make install DESTDIR=$RPM_BUILD_ROOT popd -install -p -D -m0644 ${RPM_BUILD_ROOT}%{_datadir}/scribus/icons/scribusicon.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/scribusicon.png +install -p -D -m0644 ${RPM_BUILD_ROOT}%{_datadir}/scribus/icons/scribus.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/scribus.png install -p -D -m0644 ${RPM_BUILD_ROOT}%{_datadir}/scribus/icons/scribusdoc.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/x-scribus.png find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';' @@ -145,7 +127,6 @@ update-mime-database %{_datadir}/mime > /dev/null 2>&1 || : %{_bindir}/scribus %{_datadir}/applications/fedora-scribus.desktop %{_datadir}/mime/packages/scribus.xml -#%{_datadir}/mimelnk/application/*scribus.desktop %{_datadir}/pixmaps/* %{_datadir}/scribus/ %{_libdir}/scribus/ @@ -160,24 +141,52 @@ update-mime-database %{_datadir}/mime > /dev/null 2>&1 || : %files doc %defattr(-,root,root,-) -%lang(cd) %{_datadir}/doc/%{name}-1.3.5svn/cs/* -%lang(de) %{_datadir}/doc/%{name}-1.3.5svn/de/* -%lang(en) %{_datadir}/doc/%{name}-1.3.5svn/en/* -%lang(fr) %{_datadir}/doc/%{name}-1.3.5svn/fr/* -%lang(pl) %{_datadir}/doc/%{name}-1.3.5svn/pl/* -%{_datadir}/doc/%{name}-1.3.5svn/AUTHORS -%{_datadir}/doc/%{name}-1.3.5svn/BUILDING -%{_datadir}/doc/%{name}-1.3.5svn/ChangeLog -%{_datadir}/doc/%{name}-1.3.5svn/ChangeLogSVN -%{_datadir}/doc/%{name}-1.3.5svn/COPYING -%{_datadir}/doc/%{name}-1.3.5svn/NEWS -%{_datadir}/doc/%{name}-1.3.5svn/README* -%{_datadir}/doc/%{name}-1.3.5svn/TODO -%{_datadir}/doc/%{name}-1.3.5svn/PACKAGING +%dir %{_datadir}/doc/%{name}-1.3.5.beta +%lang(cd) %{_datadir}/doc/%{name}-1.3.5.beta/cs +%lang(de) %{_datadir}/doc/%{name}-1.3.5.beta/de +%lang(en) %{_datadir}/doc/%{name}-1.3.5.beta/en +%lang(fr) %{_datadir}/doc/%{name}-1.3.5.beta/fr +%lang(pl) %{_datadir}/doc/%{name}-1.3.5.beta/pl +%{_datadir}/doc/%{name}-1.3.5.beta/AUTHORS +%{_datadir}/doc/%{name}-1.3.5.beta/BUILDING +%{_datadir}/doc/%{name}-1.3.5.beta/ChangeLog +%{_datadir}/doc/%{name}-1.3.5.beta/ChangeLogSVN +%{_datadir}/doc/%{name}-1.3.5.beta/COPYING +%{_datadir}/doc/%{name}-1.3.5.beta/NEWS +%{_datadir}/doc/%{name}-1.3.5.beta/README* +%{_datadir}/doc/%{name}-1.3.5.beta/TODO +%{_datadir}/doc/%{name}-1.3.5.beta/PACKAGING +%{_datadir}/doc/%{name}-1.3.5.beta/LINKS +%{_datadir}/doc/%{name}-1.3.5.beta/TRANSLATION %changelog +* Wed Apr 22 2009 Dan Horák - 1.3.5-0.12.beta +- update to 1.3.5.beta +- make docs subpackage noarch +- drop outdated Obsoletes/Provides + +* Sun Mar 29 2009 Dan Horák - 1.3.5-0.11.20090329svn13359 +- update to revision 13359 +- add aspell-devel and boost-devel as BR +- update release tag to conform to the pre-release versioning guideline + +* Wed Feb 25 2009 Fedora Release Engineering - 1.3.5-0.10.12516svn +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sat Jan 17 2009 Tomas Mraz - 1.3.4-0.9.12516svn +- rebuild with new openssl + +* Thu Dec 04 2008 Ignacio Vazquez-Abrams - 1.3.5-0.8.12516svn +- Rebuild for Python 2.6 + +* Tue Dec 2 2008 Dan Horák - 1.3.5-0.7.12516svn +- fix directory ownership in doc subpackage (#474041) + +* Sun Nov 30 2008 Ignacio Vazquez-Abrams - 1.3.5-0.6.12516svn +- Rebuild for Python 2.6 + * Mon Oct 13 2008 Dan Horák 1.3.5-0.5.12516svn - install global desktop file instead of KDE-only one (#461124) - little cleanup diff --git a/scribus.xml b/scribus.xml deleted file mode 100644 index 37a9856..0000000 --- a/scribus.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - Scribus Document - Dokument Scribusa - Scribus Dokument - Dogfen Scribus - Scribus-dokument - Scribus-dokument - - - - - - diff --git a/sources b/sources index 65ecfe3..81b3cad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -521c659bee0d94b334180572ab1f9e8d scribus-svn-12516.tar.bz2 +ee097c2203ee86aac16cf820d3d698ce scribus-1.3.5.beta.tar.bz2