X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=scribus.spec;h=88c7db797edefb093d054fc4e7d66d2ddcd1894d;hb=63d44f2398782c57b5435d1d7923770ef920522e;hp=f1e73dca850ef4e00f8749bd7c8670dc0818307c;hpb=a403755dacdeb8f5122516748495b0ae80d81fe6;p=packages%2Fscribus.git

diff --git a/scribus.spec b/scribus.spec
index f1e73dc..88c7db7 100644
--- a/scribus.spec
+++ b/scribus.spec
@@ -1,7 +1,7 @@
 #
 # TODO:
-#   - seperate scripts subpackage
-#   - check dirs
+# - seperate scripts subpackage
+# - seperate templates add proper obsoletes for it
 #
 # Conditional build:
 %bcond_without	cups	# build without CUPS support
@@ -9,16 +9,16 @@
 Summary:	Scribus - Desktop Publishing for Linux
 Summary(pl):	Scribus - DTP dla Linuksa
 Name:		scribus
-Version:	1.1.7
-Release:	0.1
+Version:	1.2.1
+%define	_snap	20041117
+Release:	0.%{_snap}.1
 License:	GPL v2
 Group:		X11/Applications/Publishing
-Source0:	http://ahnews.music.salford.ac.uk/scribus/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5:	1786f2ee59d1c80af4b52f287d449bbe
-Source1:	http://ahnews.music.salford.ac.uk/scribus/%{name}-i18n-en.tar.gz
-# Source1-md5:	cccfe4ddd9c646813cd9c5b12cf79138
-Source2:	ftp://ftp.ntua.gr/pub/gnu/scribus/%{name}-samples-0.1.tar.gz
-# Source2-md5:	799976e2191582faf0443a671374a67f
+#Source0:	http://ahnews.music.salford.ac.uk/scribus/downloads/1.2/%{name}-%{version}.tar.bz2
+Source0:	%{name}-%{version}-%{_snap}.tar.bz2
+# Source0-md5:	bf141c4c63ac26ff22bd403fffa227af
+Source1:	ftp://ftp.ntua.gr/pub/gnu/scribus/%{name}-samples-0.1.tar.gz
+# Source1-md5:	799976e2191582faf0443a671374a67f
 Source5:	%{name}.desktop
 Source6:	%{name}icon.png
 Patch0:		%{name}-python.patch
@@ -47,7 +47,7 @@ Obsoletes:	scribus-svg
 Obsoletes:	scribus-scripting
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		specflags_ia32	"-fomit-frame-pointer"
+%define		specflags_ia32	-fomit-frame-pointer
 %define		_ulibdir	%{_prefix}/lib
 
 %description
@@ -73,13 +73,28 @@ Header files for Scribus plugins development.
 %description devel -l pl
 Pliki nag³ówkowe do tworzenia wtyczek Scribusa.
 
+%package docs
+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.
+
+%description docs -l pl
+Dokumentacja u¿ytkownika dla Scribusa.
+
 %prep
-%setup -q -a1 -a2
+%setup -q -a1
 %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}
@@ -91,25 +106,19 @@ export QTDIR KDEDIR
 %{__automake}
 %{__perl} admin/am_edit
 %configure \
-	--with-qt-libraries=%{_libdir}
+	--with-qt-libraries=%{_libdir} \
+	--libdir=%{_ulibdir}
 %{__make}
-cd scribus-i18n-en
-cp ../admin/config.sub admin
-%configure
-%{__make}
-cd ../scribus-samples-*
+cd scribus-samples-*
 cp ../admin/config.sub admin
 %configure2_13
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_ulibdir}/%{name}/doc
 install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
 
-ln -sf $RPM_BUILD_ROOT%{_ulibdir} $RPM_BUILD_ROOT%{_datadir}
-
-for dir in . scribus-*; do
+for dir in . scribus-samples; do
 	[ ! -d "$dir" ] && continue
 	olddir=$(pwd)
 	cd $dir
@@ -122,6 +131,8 @@ done
 install %{SOURCE5} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE6} $RPM_BUILD_ROOT%{_pixmapsdir}
 
+rm -f $RPM_BUILD_ROOT%{_ulibdir}/scribus/*.no.qm
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -129,56 +140,79 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/scribus
 %dir %{_ulibdir}/%{name}
+%{_ulibdir}/%{name}/import.prolog
 # don't mark dictionaries with lang() --misiek
 %{_ulibdir}/%{name}/dicts
-%dir %{_ulibdir}/%{name}/doc
-%{_ulibdir}/%{name}/doc/en
-%dir %{_datadir}/%{name}/doc/en
-%{_datadir}/%{name}/doc/en/Scripter/*
-%{_ulibdir}/%{name}/icons
 %dir %{_ulibdir}/%{name}/libs
 %attr(755,root,root) %{_ulibdir}/%{name}/libs/*.so*
 %{_ulibdir}/%{name}/libs/*.la
 %dir %{_ulibdir}/%{name}/plugins
-#%%lang(da) %{_libdir}/%{name}/plugins/*.da.qm
-%lang(nb) %{_ulibdir}/%{name}/plugins/*.no.qm
-%lang(sk) %{_ulibdir}/%{name}/plugins/*.sk.qm
+#%lang(da) %{_ulibdir}/%{name}/plugins/*.da.qm
+#%lang(nb) %{_ulibdir}/%{name}/plugins/*.no.qm
+#%lang(sk) %{_ulibdir}/%{name}/plugins/*.sk.qm
 %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
 %{_ulibdir}/scribus/profiles
 %{_ulibdir}/scribus/rgb*
-%dir %{_datadir}/%{name}/samples
-%{_datadir}/%{name}/samples/*
-%dir %{_ulibdir}/%{name}/samples
-%{_ulibdir}/scribus/samples/*
-%dir %{_datadir}/%{name}/scripts
-%{_datadir}/%{name}/scripts/*
 %lang(bg) %{_ulibdir}/scribus/scribus.bg.qm
 %lang(br) %{_ulibdir}/scribus/scribus.br.qm
-#%lang(ca) %{_ulibdir}/scribus/scribus.ca.qm
+%lang(ca) %{_ulibdir}/scribus/scribus.ca.qm
 %lang(cs) %{_ulibdir}/scribus/scribus.cs.qm
 %lang(cy) %{_ulibdir}/scribus/scribus.cy.qm
 %lang(da) %{_ulibdir}/scribus/scribus.da.qm
 %lang(de) %{_ulibdir}/scribus/scribus.de.qm
 %lang(en_GB) %{_ulibdir}/scribus/scribus.en_GB.qm
+%lang(eo) %{_ulibdir}/scribus/scribus.eo.qm
 %lang(es) %{_ulibdir}/scribus/scribus.es.qm
+%lang(eu) %{_ulibdir}/scribus/scribus.eu.qm
 %lang(fi) %{_ulibdir}/scribus/scribus.fi.qm
 %lang(fr) %{_ulibdir}/scribus/scribus.fr.qm
 %lang(gl) %{_ulibdir}/scribus/scribus.gl.qm
 %lang(hu) %{_ulibdir}/scribus/scribus.hu.qm
 %lang(id) %{_ulibdir}/scribus/scribus.id.qm
 %lang(it) %{_ulibdir}/scribus/scribus.it.qm
-#%lang(lt) %{_ulibdir}/scribus/scribus.lt.qm
+%lang(ko) %{_ulibdir}/scribus/scribus.ko.qm
+%lang(lt) %{_ulibdir}/scribus/scribus.lt.qm
 %lang(nl) %{_ulibdir}/scribus/scribus.nl.qm
-%lang(nb) %{_ulibdir}/scribus/scribus.no.qm
+%lang(nb) %{_ulibdir}/scribus/scribus.nb.qm
 %lang(pl) %{_ulibdir}/scribus/scribus.pl.qm
 %lang(ru) %{_ulibdir}/scribus/scribus.ru.qm
+%lang(se) %{_ulibdir}/scribus/scribus.se.qm
 %lang(sk) %{_ulibdir}/scribus/scribus.sk.qm
+%lang(sl) %{_ulibdir}/scribus/scribus.sl.qm
+%lang(sr) %{_ulibdir}/scribus/scribus.sr.qm
 %lang(tr) %{_ulibdir}/scribus/scribus.tr.qm
 %lang(uk) %{_ulibdir}/scribus/scribus.uk.qm
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/doc
+%{_datadir}/%{name}/icons
+%dir %{_datadir}/%{name}/samples
+%{_datadir}/%{name}/samples/*
+%dir %{_datadir}/%{name}/scripts
+%{_datadir}/%{name}/scripts/*
+%dir %{_datadir}/%{name}/templates
+%{_datadir}/%{name}/templates/*.xml
+%dir %{_datadir}/%{name}/templates/br1
+%{_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
+%{_datadir}/%{name}/templates/textbased/*
 %{_desktopdir}/%{name}.desktop
+%{_mandir}/man1/%{name}.*
 %{_pixmapsdir}/%{name}icon.png
 
 %files devel
 %defattr(644,root,root,755)
 %{_includedir}/scribus
+
+%files docs
+%dir %{_datadir}/%{name}/doc/en
+%{_datadir}/%{name}/doc/en/*