X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=scribus.spec;h=87b237867831b337b65c1b6014aa84bd87d27340;hb=b49fb9944f3e644167de3a853f6058f955a9b56c;hp=32d0442139562aa3119e4d440a52aa620046b934;hpb=80c5b9f1ec70be8830b31abbeb1a1d68ba68b276;p=packages%2Fscribus.git

diff --git a/scribus.spec b/scribus.spec
index 32d0442..87b2378 100644
--- a/scribus.spec
+++ b/scribus.spec
@@ -5,39 +5,42 @@
 Summary:	Scribus - Desktop Publishing for Linux
 Summary(pl):	Scribus - DTP dla Linuksa
 Name:		scribus
-Version:	1.1.0
-Release:	0.9
+Version:	1.1.4
+Release:	2
 License:	GPL v2
 Group:		X11/Applications/Publishing
-Source0:	http://scribus.planetmirror.com/%{name}-%{version}.tar.gz
-# Source0-md5:	29c5cbdd1c7de56d569a61a8b986d8ae
-Source1:	http://web2.altmuehlnet.de/fschmid/%{name}-i18n-en.tar.gz
+Source0:	http://ahnews.music.salford.ac.uk:82/%{name}-%{version}.tar.gz
+# Source0-md5:	7e9577ce56b0a5955ed9b37bb2a8c7a1
+Source1:	http://ahnews.music.salford.ac.uk:82/%{name}-i18n-en.tar.gz
 # Source1-md5:	cccfe4ddd9c646813cd9c5b12cf79138
-Source2:	http://web2.altmuehlnet.de/fschmid/%{name}-i18n-de.tar.gz
-# Source2-md5:	e142431cee352abd2e5278ea4b748264
-Source3:	http://web2.altmuehlnet.de/fschmid/%{name}-i18n-fr.tar.gz
-# Source3-md5:	688db072ffbf3bb1fceee3e763e4fc48
-#Source4:	http://web2.altmuehlnet.de/fschmid/%{name}-samples-0.1.tar.gz
-# Source4-md5:	799976e2191582faf0443a671374a67f
+Source2:	ftp://ftp.ntua.gr/pub/gnu/scribus/%{name}-samples-0.1.tar.gz
+# Source2-md5:	799976e2191582faf0443a671374a67f
+Source5:	%{name}.desktop
+Source6:	%{name}icon.png
 Patch0:		%{name}-standard-font-paths.patch
 Patch1:		%{name}-module-fixes.patch
 Patch2:		%{name}-nolibs.patch
-URL:		http://web2.altmuehlnet.de/fschmid/
+Patch3:		%{name}-gcc2.patch
+URL:		http://www.scribus.org.uk/
+BuildRequires:	autoconf
+BuildRequires:	automake
 %{!?_without_cups:BuildRequires:	cups-devel}
 %{?_without_cups:BuildConflicts:	cups-devel}
-BuildRequires:	lcms-devel >= 1.08-2
-BuildRequires:	libart_lgpl-devel
+BuildRequires:	freetype-devel >= 2.1.0
+BuildRequires:	lcms-devel >= 1.09
+BuildRequires:	libart_lgpl-devel >= 2.3.14
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel
 BuildRequires:	libtiff-devel
+BuildRequires:	python-devel
 BuildRequires:	qt-devel >= 3.0.5
 BuildRequires:	zlib-devel
-# fonts are required locally!
-Requires:	XFree86-fonts
 Obsoletes:	scribus-svg
-Buildroot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Obsoletes:	scribus-scripting
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		specflags_ia32	"-fomit-frame-pointer"
+%define		_ulibdir	%{_prefix}/lib
 
 %description
 Scribus is a Layout program for Linux(R), similar to Adobe(R)
@@ -63,10 +66,11 @@ Header files for Scribus plugins development.
 Pliki nag³ówkowe do tworzenia wtyczek Scribusa.
 
 %prep
-%setup -q -a1 -a2 -a3
+%setup -q -a1 -a2
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 QTDIR=%{_prefix}
@@ -78,28 +82,27 @@ export QTDIR KDEDIR
 %{__autoheader}
 %{__automake}
 %{__perl} admin/am_edit
-%configure
+%configure \
+	--with-qt-libraries=%{_libdir}
 %{__make}
 cd scribus-i18n-en
+cp ../admin/config.sub admin
 %configure
 %{__make}
-cd ../scribus-i18n-de
-%configure2_13
-%{__make}
-cd ../scribus-i18n-fr
+cd ../scribus-samples-*
+cp ../admin/config.sub admin
 %configure2_13
 %{__make}
-#cd ../scribus-samples-0.1
-#%configure2_13
-#%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/doc
+install -d $RPM_BUILD_ROOT%{_ulibdir}/%{name}/doc
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
 
-ln -sf $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_datadir}
+ln -sf $RPM_BUILD_ROOT%{_ulibdir} $RPM_BUILD_ROOT%{_datadir}
 
 for dir in . scribus-*; do
+	[ ! -d "$dir" ] && continue
 	olddir=$(pwd)
 	cd $dir
 	%{__make} install \
@@ -107,53 +110,57 @@ for dir in . scribus-*; do
 	cd $olddir
 done
 
+#Install .desktop and .icon (temporary)
+install %{SOURCE5} $RPM_BUILD_ROOT%{_desktopdir}
+install %{SOURCE6} $RPM_BUILD_ROOT%{_pixmapsdir}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/scribus
-%dir %{_libdir}/%{name}
+%dir %{_ulibdir}/%{name}
 # don't mark dictionaries with lang() --misiek
-%{_libdir}/%{name}/dicts
-%dir %{_libdir}/%{name}/doc
-%{_libdir}/%{name}/doc/en
-%lang(de) %{_libdir}/%{name}/doc/de
-%lang(fr) %{_libdir}/%{name}/doc/fr
-%{_libdir}/%{name}/icons
-%dir %{_libdir}/%{name}/libs
-%attr(755,root,root) %{_libdir}/%{name}/libs/*.so*
-%{_libdir}/%{name}/libs/*.la
-%dir %{_libdir}/%{name}/plugins
-%lang(da) %{_libdir}/%{name}/plugins/*.da.qm
-%lang(no) %{_libdir}/%{name}/plugins/*.no.qm
-%lang(sk) %{_libdir}/%{name}/plugins/*.sk.qm
-%attr(755,root,root) %{_libdir}/%{name}/plugins/*.so*
-%{_libdir}/%{name}/plugins/*.la
-%{_libdir}/scribus/profiles
-#%{_libdir}/scribus/samples
-%{_libdir}/scribus/*.enc
-%{_libdir}/scribus/*enc.txt
-%lang(bg) %{_libdir}/scribus/scribus.bg.qm
-#%lang(ca) %{_libdir}/scribus/scribus.ca.qm
-%lang(cs) %{_libdir}/scribus/scribus.cs.qm
-%lang(da) %{_libdir}/scribus/scribus.da.qm
-%lang(de) %{_libdir}/scribus/scribus.de.qm
-%lang(en_GB) %{_libdir}/scribus/scribus.en_GB.qm
-%lang(es) %{_libdir}/scribus/scribus.es.qm
-%lang(fr) %{_libdir}/scribus/scribus.fr.qm
-%lang(gl) %{_libdir}/scribus/scribus.gl.qm
-%lang(hu) %{_libdir}/scribus/scribus.hu.qm
-%lang(id) %{_libdir}/scribus/scribus.id.qm
-%lang(it) %{_libdir}/scribus/scribus.it.qm
-#%lang(lt) %{_libdir}/scribus/scribus.lt.qm
-%lang(nl) %{_libdir}/scribus/scribus.nl.qm
-%lang(no) %{_libdir}/scribus/scribus.no.qm
-%lang(pl) %{_libdir}/scribus/scribus.pl.qm
-%lang(ru) %{_libdir}/scribus/scribus.ru.qm
-%lang(sk) %{_libdir}/scribus/scribus.sk.qm
-%lang(tr) %{_libdir}/scribus/scribus.tr.qm
-%lang(uk) %{_libdir}/scribus/scribus.uk.qm
+%{_ulibdir}/%{name}/dicts
+%dir %{_ulibdir}/%{name}/doc
+%{_ulibdir}/%{name}/doc/en
+%{_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(no) %{_ulibdir}/%{name}/plugins/*.no.qm
+%lang(sk) %{_ulibdir}/%{name}/plugins/*.sk.qm
+%attr(755,root,root) %{_ulibdir}/%{name}/plugins/*.so*
+%{_ulibdir}/%{name}/plugins/*.la
+%{_ulibdir}/scribus/profiles
+%{_ulibdir}/scribus/samples
+%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
+%lang(da) %{_ulibdir}/scribus/scribus.da.qm
+%lang(de) %{_ulibdir}/scribus/scribus.de.qm
+%lang(en_GB) %{_ulibdir}/scribus/scribus.en_GB.qm
+%lang(es) %{_ulibdir}/scribus/scribus.es.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(nl) %{_ulibdir}/scribus/scribus.nl.qm
+%lang(no) %{_ulibdir}/scribus/scribus.no.qm
+%lang(pl) %{_ulibdir}/scribus/scribus.pl.qm
+%lang(ru) %{_ulibdir}/scribus/scribus.ru.qm
+%lang(sk) %{_ulibdir}/scribus/scribus.sk.qm
+%lang(tr) %{_ulibdir}/scribus/scribus.tr.qm
+%lang(uk) %{_ulibdir}/scribus/scribus.uk.qm
+%{_desktopdir}/%{name}.desktop
+%{_pixmapsdir}/%{name}icon.png
 
 %files devel
 %defattr(644,root,root,755)