X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=scribus.spec;h=a8a55c74991b1269fd019b86aee9d4975e5bd0be;hb=46d83971352937de0f642df8fec4f58a83567361;hp=7e9355a3fb511a80db862bddcb5a14073267678e;hpb=ea668bad020175a382807c917e160d2fc2248df4;p=packages%2Fscribus.git

diff --git a/scribus.spec b/scribus.spec
index 7e9355a..a8a55c7 100644
--- a/scribus.spec
+++ b/scribus.spec
@@ -3,29 +3,21 @@
 %bcond_with	cairo	# build with cairo support
 %bcond_without	cups	# build without CUPS support
 #
-# TODO:
-#	- get the docs right, I just don't know of any better way
-#
-
 Summary:	Scribus - Open Source Desktop Publishing
 Summary(pl):	Scribus - DTP dla Wolnego Oprogramowania
 Name:		scribus
-Version:	1.3.3.2
-Release:	1
+Version:	1.3.3.7
+Release:	2
 License:	GPL v2
 Group:		X11/Applications/Publishing
 Source0:	http://dl.sourceforge.net/scribus/%{name}-%{version}.tar.bz2
-# Source0-md5:	fa5d0dbb675b41f3d56823943b06c84c
+# Source0-md5:	9d20ef9010d94b504f6c8cd6acd215ca
 Source1:	%{name}.desktop
-Source2:	%{name}icon.png
-Patch0:		%{name}-python.patch
 Patch1:		%{name}-standard-font-paths.patch
-Patch2:		%{name}-module-fixes.patch
-Patch3:		%{name}-nolibs.patch
+Patch2:		%{name}-version.patch
 URL:		http://www.scribus.net/
-BuildRequires:	autoconf
-BuildRequires:	automake
-%{?with_cairo:BuildRequires:	cairo-devel}
+%{?with_cairo:BuildRequires:	cairo-devel >= 1.2.0}
+BuildRequires:	cmake >= 2.4.5
 %if %{with cups}
 BuildRequires:	cups-devel
 %else
@@ -39,17 +31,19 @@ BuildRequires:	libpng-devel
 BuildRequires:	libtiff-devel
 BuildRequires:	libxml2-devel
 BuildRequires:	openssl-devel
+BuildRequires:	perl-base
 BuildRequires:	python-devel
 BuildRequires:	python-modules
+BuildRequires:	qt-devel >= 6:3.0.5
 BuildRequires:	rpm-pythonprov
-#BuildRequires:	qt-devel >= 3.0.5
-BuildRequires:	QtCore-devel
+BuildRequires:	rpmbuild(macros) >= 1.293
+BuildRequires:	sed >= 4.0
 BuildRequires:	zlib-devel
-Requires:	python-Imaging
+Requires:	python-PIL
 Requires:	python-tkinter
-Obsoletes:	scribus-svg
 Obsoletes:	scribus-scripting
 Obsoletes:	scribus-short-words
+Obsoletes:	scribus-svg
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		specflags_ia32	-fomit-frame-pointer
@@ -83,10 +77,9 @@ Summary:	Documentation for Scribus
 Summary(pl):	Dokumentacja dla Scribusa
 License:	custom OPL (see License),FDL
 Group:		X11/Applications/Publishing
-Requires:	scribus
 
 %description docs
-On-line user documentation for Scribus.
+User documentation for Scribus.
 
 %description docs -l pl
 Dokumentacja u¿ytkownika dla Scribusa.
@@ -96,15 +89,14 @@ Summary:	ICC profiles for Scribus
 Summary(pl):	Profile ICC dla Scribusa
 License:	freely distributable
 Group:		X11/Applications/Publishing
-Requires:	scribus >= 1.2.3
+Requires:	%{name} = %{version}-%{release}
 
 %description icc
-Some standard ICM CMYK and RGB profiles for use with Scribus.
-You should take care to use custom ones!
+Some standard ICM CMYK and RGB profiles for use with Scribus. You
+should take care to use custom ones!
 
 %description icc -l pl
-Standardowe profile ICM w formacie CMYK i RGB do u¿ycia
-w Scribusie.
+Standardowe profile ICM w formacie CMYK i RGB do u¿ycia w Scribusie.
 Zalecane jest u¿ywanie w³asnych profili zamiast nich!
 
 %package templates-base
@@ -112,7 +104,7 @@ Summary:	Default document templates
 Summary(pl):	Domy¶lne szablony dokumentów
 License:	GPL v2
 Group:		X11/Applications/Publishing
-Requires:	scribus
+Requires:	%{name} = %{version}-%{release}
 Obsoletes:	scribus-templates < 1.2.1
 
 %description templates-base
@@ -123,58 +115,53 @@ Domy
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-
-%{__perl} -pi -e 's@(ac_python_dir/lib /usr/)lib@$1%{_lib}@' acinclude.m4
 
 %build
-QTDIR=%{_prefix}
-KDEDIR=%{_prefix}
-export QTDIR KDEDIR
-
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%{__perl} admin/am_edit
-%configure \
-	%{?with_cairo:--enable-cairo} \
-	--with-qt-libraries=%{_libdir} \
-	--libdir=%{_ulibdir}
+export QTDIR=%{_prefix}
+export KDEDIR=%{_prefix}
+
+%cmake . \
+	-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
+%if %{with cairo}
+	-DWANT_CAIRO=1
+%else
+	-DWANT_LIBART=1
+%endif
+
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_datadir}/mime/packages/}
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-#Install .desktop, .icon and .xml
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
-install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
-install scribus.xml $RPM_BUILD_ROOT%{_datadir}/mime/packages/scribus.xml
+install $RPM_BUILD_ROOT%{_datadir}/%{name}/icons/scribusicon.png $RPM_BUILD_ROOT%{_pixmapsdir}
+
+mv $RPM_BUILD_ROOT%{_ulibdir}/scribus/%{name}.lt_LT.qm $RPM_BUILD_ROOT%{_ulibdir}/scribus/%{name}.lt.qm
 
 rm -f $RPM_BUILD_ROOT%{_ulibdir}/scribus/*.no.qm
 
+rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/{AUTHORS,BUILDING,COPYING,ChangeLog,ChangeLogCVS,INSTALL,NEWS,PACKAGING,README,README.MacOSX,TODO}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-umask 022
-[ ! -x /usr/bin/update-desktop-database ] || /usr/bin/update-desktop-database >/dev/null 2>&1 ||:
-[ ! -x /usr/bin/update-mime-database ] || /usr/bin/update-mime-database %{_datadir}/mime >/dev/null 2>&1 ||:
+%update_desktop_database_post
+%update_mime_database
 
 %postun
-umask 022
-[ ! -x /usr/bin/update-desktop-database ] || /usr/bin/update-desktop-database >/dev/null 2>&1 ||:
-[ ! -x /usr/bin/update-mime-database ] || /usr/bin/update-mime-database %{_datadir}/mime >/dev/null 2>&1 ||:
+%update_desktop_database_postun
+%update_mime_database
 
 %files
 %defattr(644,root,root,755)
+%doc AUTHORS BUILDING ChangeLog ChangeLogCVS INSTALL NEWS README TODO
 %attr(755,root,root) %{_bindir}/scribus
 %dir %{_ulibdir}/%{name}
 %{_ulibdir}/%{name}/import.prolog
@@ -183,13 +170,12 @@ umask 022
 %{_ulibdir}/%{name}/keysets
 %dir %{_ulibdir}/%{name}/plugins
 %attr(755,root,root) %{_ulibdir}/%{name}/plugins/*.so*
-%{_ulibdir}/%{name}/plugins/*.la
 %dir %{_ulibdir}/%{name}/plugins/gettext
 %attr(755,root,root) %{_ulibdir}/%{name}/plugins/gettext/*.so*
-%{_ulibdir}/%{name}/plugins/gettext/*.la
 %dir %{_ulibdir}/scribus/profiles
 %lang(af) %{_ulibdir}/scribus/scribus.af.qm
 %lang(bg) %{_ulibdir}/scribus/scribus.bg.qm
+%lang(br) %{_ulibdir}/scribus/scribus.br.qm
 %lang(ca) %{_ulibdir}/scribus/scribus.ca.qm
 %lang(cs) %{_ulibdir}/scribus/scribus.cs.qm
 %lang(cy) %{_ulibdir}/scribus/scribus.cy.qm
@@ -198,7 +184,9 @@ umask 022
 %lang(de_OL) %{_ulibdir}/scribus/scribus.de_ol.qm
 %lang(dz) %{_ulibdir}/scribus/scribus.dz.qm
 %lang(el) %{_ulibdir}/scribus/scribus.el.qm
+#%lang(en_AU) %{_ulibdir}/scribus/scribus.en_AU.qm
 %lang(en_GB) %{_ulibdir}/scribus/scribus.en_GB.qm
+#%lang(en_US) %{_ulibdir}/scribus/scribus.en_US.qm
 %lang(eo) %{_ulibdir}/scribus/scribus.eo.qm
 %lang(es) %{_ulibdir}/scribus/scribus.es.qm
 %lang(es_LA) %{_ulibdir}/scribus/scribus.es_LA.qm
@@ -237,37 +225,38 @@ umask 022
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/*
 %dir %{_datadir}/%{name}/samples
-%{_datadir}/%{name}/samples/*
+%{_datadir}/%{name}/samples/*.py
 %dir %{_datadir}/%{name}/scripts
-%{_datadir}/%{name}/scripts/*
+%{_datadir}/%{name}/scripts/*.py
 %{_desktopdir}/%{name}.desktop
 %{_mandir}/man1/%{name}.*
 %lang(pl) %{_mandir}/pl/man1/%{name}.*
 %{_pixmapsdir}/%{name}icon.png
 
-%files devel
-%defattr(644,root,root,755)
-%{_includedir}/scribus
+#%files devel
+#%defattr(644,root,root,755)
+#%{_includedir}/scribus
 
 %files docs
 %defattr(644,root,root,755)
-%dir %{_docdir}/%{name}-%{version}
-%dir %{_docdir}/%{name}-%{version}/en
-%{_docdir}/%{name}-%{version}/en/*
-%lang(cs) %dir %{_docdir}/%{name}-%{version}/cs
-%lang(cs) %dir %{_docdir}/%{name}-%{version}/cs/tutorials
-%lang(cs) %dir %{_docdir}/%{name}-%{version}/cs/tutorials/scribus-short-words
-%lang(cs) %{_docdir}/%{name}-%{version}/cs/tutorials/scribus-short-words/*
-%lang(de) %dir %{_docdir}/%{name}-%{version}/de
-%lang(de) %{_docdir}/%{name}-%{version}/de/*
-%lang(fr) %dir %{_docdir}/%{name}-%{version}/fr
-%lang(fr) %dir %{_docdir}/%{name}-%{version}/fr/tutorials
-%lang(fr) %dir %{_docdir}/%{name}-%{version}/fr/tutorials/scribus-short-words
-%lang(fr) %{_docdir}/%{name}-%{version}/fr/tutorials/scribus-short-words/*
-%lang(pl) %dir %{_docdir}/%{name}-%{version}/pl
-%lang(pl) %dir %{_docdir}/%{name}-%{version}/pl/tutorials
-%lang(pl) %dir %{_docdir}/%{name}-%{version}/pl/tutorials/scribus-short-words
-%lang(pl) %{_docdir}/%{name}-%{version}/pl/tutorials/scribus-short-words/*
+%dir %{_docdir}/%{name}
+%dir %{_docdir}/%{name}/en
+%{_docdir}/%{name}/en/*
+%lang(cs) %dir %{_docdir}/%{name}/cs
+%lang(cs) %dir %{_docdir}/%{name}/cs/tutorials
+%lang(cs) %dir %{_docdir}/%{name}/cs/tutorials/scribus-short-words
+%lang(cs) %{_docdir}/%{name}/cs/tutorials/scribus-short-words/*
+%lang(de) %dir %{_docdir}/%{name}/de
+%lang(de) %{_docdir}/%{name}/de/*
+%lang(fr) %dir %{_docdir}/%{name}/fr
+%lang(fr) %{_docdir}/%{name}/fr/*.html
+%lang(fr) %dir %{_docdir}/%{name}/fr/tutorials
+%lang(fr) %dir %{_docdir}/%{name}/fr/tutorials/scribus-short-words
+%lang(fr) %{_docdir}/%{name}/fr/tutorials/scribus-short-words/*
+%lang(pl) %dir %{_docdir}/%{name}/pl
+%lang(pl) %dir %{_docdir}/%{name}/pl/tutorials
+%lang(pl) %dir %{_docdir}/%{name}/pl/tutorials/scribus-short-words
+%lang(pl) %{_docdir}/%{name}/pl/tutorials/scribus-short-words/*
 
 %files icc
 %defattr(644,root,root,755)
@@ -281,8 +270,6 @@ umask 022
 %{_datadir}/%{name}/templates/br1/*
 %dir %{_datadir}/%{name}/templates/nl1
 %{_datadir}/%{name}/templates/nl1/*
-%dir %{_datadir}/%{name}/templates/nl2
-%{_datadir}/%{name}/templates/nl2/*
 %dir %{_datadir}/%{name}/templates/sc_presentation
 %{_datadir}/%{name}/templates/sc_presentation/*
 %dir %{_datadir}/%{name}/templates/textbased