OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 06-Jun-2004 13:35:16
Branch: HEAD Handle: 2004060612351400
Modified files:
openpkg-src/scribus scribus.spec
Removed files:
openpkg-src/scribus scribus.patch
Log:
upgrading package: scribus 1.1.6 -> 1.1.7
Summary:
Revision Changes Path
1.14 +0 -21 openpkg-src/scribus/scribus.patch
1.33 +6 -13 openpkg-src/scribus/scribus.spec
____________________________________________________________________________
rm -f openpkg-src/scribus/scribus.patch <<'@@ .'
Index: openpkg-src/scribus/scribus.patch
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/scribus/scribus.spec
============================================================================
$ cvs diff -u -r1.32 -r1.33 scribus.spec
--- openpkg-src/scribus/scribus.spec 30 Mar 2004 10:43:20 -0000 1.32
+++ openpkg-src/scribus/scribus.spec 6 Jun 2004 11:35:14 -0000 1.33
@@ -33,15 +33,14 @@
Class: EVAL
Group: Editor
License: GPL
-Version: 1.1.6
-Release: 20040330
+Version: 1.1.7
+Release: 20040606
# package options
%option with_python no
# list of sources
Source0: http://web2.altmuehlnet.de/fschmid/scribus-%{version}.tar.gz
-Patch0: scribus.patch
# build information
Prefix: %{l_prefix}
@@ -76,29 +75,23 @@
%prep
%setup -q
- %patch -p0
%{l_shtool} subst \
-e 's;$(prefix);$(DESTDIR)$(prefix);' \
scribus/Makefile.in \
scribus/dicts/Makefile.in \
scribus/icons/Makefile.in \
scribus/profiles/Makefile.in \
- scribus/qm/Makefile.in
-
+ scribus/qm/Makefile.in \
+ scribus/plugins/psimport/Makefile.in \
+ scribus/plugins/fontpreview/Makefile.in
%{l_shtool} subst \
-e 's;\([^=] *\)$(prefix);\1$(DESTDIR)$(prefix);' \
scribus/libpostscript/Makefile.in \
scribus/libpdf/Makefile.in
-
%{l_shtool} subst \
-e 's; ! -f $libstdcpp;;g' \
+ -e 's;^\(jpeg_incdirs="\)[^"]*\("\);\1%{l_prefix}/include\2;' \
configure
-%if "%{with_python}" == "yes"
-%else
- %{l_shtool} subst \
- -e 's;^\(SUBDIRS =.*\) scriptplugin\(.*\)$;\1\2;' \
- scribus/plugins/Makefile.in
-%endif
%build
CC="%{l_cc}" \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
