SPECS: scribus.spec - add qt epoch - add kde-common-LD_quote.patch...

glen glen at pld-linux.org
Sun Oct 29 23:38:05 CET 2006 

Author: glen                         Date: Sun Oct 29 22:38:05 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add qt epoch
- add kde-common-LD_quote.patch
- add plain docs (-docs dir is now unversioned due rpm %doc handling)

---- Files affected:
SPECS:
   scribus.spec (1.111 -> 1.112) 

---- Diffs:

================================================================
Index: SPECS/scribus.spec
diff -u SPECS/scribus.spec:1.111 SPECS/scribus.spec:1.112
--- SPECS/scribus.spec:1.111	Sun Oct 29 16:08:53 2006
+++ SPECS/scribus.spec	Sun Oct 29 23:37:57 2006
@@ -1,13 +1,11 @@
 # $Revision$, $Date$
+# TODO:
+#	- get the docs right, I just don't know of any better way
 #
 # Conditional build:
 %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
@@ -22,6 +20,7 @@
 Patch1:		%{name}-standard-font-paths.patch
 Patch2:		%{name}-module-fixes.patch
 Patch3:		%{name}-nolibs.patch
+Patch4:		kde-common-LD_quote.patch
 URL:		http://www.scribus.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -39,16 +38,18 @@
 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:	sed >= 4.0
 BuildRequires:	zlib-devel
 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
@@ -98,12 +99,11 @@
 Requires:	scribus >= 1.2.3
 
 %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
@@ -126,13 +126,13 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
-%{__perl} -pi -e 's@(ac_python_dir/lib /usr/)lib@$1%{_lib}@' acinclude.m4
+%{__sed} -i -e 's@\(ac_python_dir/lib /usr/\)lib@\1%{_lib}@' acinclude.m4
 
 %build
-QTDIR=%{_prefix}
-KDEDIR=%{_prefix}
-export QTDIR KDEDIR
+export QTDIR=%{_prefix}
+export KDEDIR=%{_prefix}
 
 %{__aclocal}
 %{__autoconf}
@@ -152,11 +152,15 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-#Install .desktop
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 
 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}
+
+# can't use %{_docdir} and %doc in same specfile
+mv $RPM_BUILD_ROOT%{_docdir}/%{name}{-%{version},}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -170,6 +174,7 @@
 
 %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
@@ -246,23 +251,23 @@
 
 %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) %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)
@@ -289,9 +294,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.112  2006/10/29 22:37:57  glen
+- add qt epoch
+- add kde-common-LD_quote.patch
+- add plain docs (-docs dir is now unversioned due rpm %doc handling)
+
 Revision 1.111  2006/10/29 15:08:53  deejay1
 - up to 1.3.3.4
-- cleanup post/un and %%files
+- cleanup post/un and %files
 
 Revision 1.110  2006/09/01 14:51:05  cieciwa
 - release 3,
@@ -360,7 +370,7 @@
 - updated to 1.2.2.1
 
 Revision 1.91  2005/05/28 08:26:28  deejay1
-- renumbered sources, changed some translations and %%descriptions
+- renumbered sources, changed some translations and %descriptions
 
 Revision 1.90  2005/05/26 10:30:11  deejay1
 - use dropin for source
@@ -385,7 +395,7 @@
 - O: scribus-templates for clean upgrade, rel. 4
 
 Revision 1.75.2.8  2005/01/09 17:01:04  deejay1
-- ugh, missing %%defattr
+- ugh, missing %defattr
 
 Revision 1.75.2.7  2005/01/08 21:52:53  deejay1
 - added patch5, helpbrowser works now without docs subpackage, rel 3 STBR
@@ -666,7 +676,7 @@
 - updated to version 0.9.3.
 
 Revision 1.8  2002/10/24 11:30:24  qboosh
-- updated to 0.8, cleanups, updated %%files
+- updated to 0.8, cleanups, updated %files
 - always look for Type1 and TTF in standard paths (patch)
 - install binary modules in libdir not datadir, use -avoid-version (patch)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/scribus.spec?r1=1.111&r2=1.112&f=u

More information about the pld-cvs-commit mailing list