OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 10-Mar-2006 21:03:21
Branch: HEAD Handle: 2006031020032001
Modified files:
openpkg-src/scribus scribus.patch scribus.spec
Log:
fully cleanup packaging by kicking out things we do no longer
understand or which do not longer apply. Let's see whether the package
still works are needs fixing from scratch
Summary:
Revision Changes Path
1.19 +2 -20 openpkg-src/scribus/scribus.patch
1.46 +12 -78 openpkg-src/scribus/scribus.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/scribus/scribus.patch
============================================================================
$ cvs diff -u -r1.18 -r1.19 scribus.patch
--- openpkg-src/scribus/scribus.patch 21 Nov 2005 08:42:58 -0000 1.18
+++ openpkg-src/scribus/scribus.patch 10 Mar 2006 20:03:20 -0000 1.19
@@ -1,6 +1,6 @@
Index: admin/ltmain.sh
---- admin/ltmain.sh.orig 2004-11-14 14:14:52 +0100
-+++ admin/ltmain.sh 2005-07-06 13:49:28 +0200
+--- admin/ltmain.sh.orig 2004-11-14 14:12:17 +0100
++++ admin/ltmain.sh 2006-03-10 19:48:46 +0100
@@ -1175,6 +1175,7 @@
;;
@@ -31,21 +31,3 @@
# Maybe install the static library, too.
test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
-Index: scribus/main.cpp
---- scribus/main.cpp.orig 2005-07-05 08:36:03 +0200
-+++ scribus/main.cpp 2005-08-01 13:17:02 +0200
-@@ -80,10 +80,10 @@
- handler = SIG_DFL;
- sigset_t mask;
- sigemptyset(&mask);
--#ifdef SIGSEGV
-- signal (SIGSEGV, handler);
-- sigaddset(&mask, SIGSEGV);
--#endif
-+//#ifdef SIGSEGV
-+// signal (SIGSEGV, handler);
-+// sigaddset(&mask, SIGSEGV);
-+//#endif
- #ifdef SIGFPE
- signal (SIGFPE, handler);
- sigaddset(&mask, SIGFPE);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/scribus/scribus.spec
============================================================================
$ cvs diff -u -r1.45 -r1.46 scribus.spec
--- openpkg-src/scribus/scribus.spec 1 Jan 2006 13:21:54 -0000 1.45
+++ openpkg-src/scribus/scribus.spec 10 Mar 2006 20:03:21 -0000 1.46
@@ -32,8 +32,8 @@
Class: EVAL
Group: Editor
License: GPL
-Version: 1.3.1
-Release: 20051121
+Version: 1.3.2
+Release: 20060310
# list of sources
Source0:
http://www.scribus.org.uk/downloads/%{version}/scribus-%{version}.tar.bz2
@@ -50,92 +50,32 @@
AutoReqProv: no
%description
- Scribus is a Layout program similar to QuarkXPress, Adobe® PageMaker,
- or Adobe® InDesign. It has the ability to layout newsletters, create
- corporate stationery, small posters and other documents which need
- flexible layout and/or the ability to output to professional quality
- imagesetting equipment. Graphic formats which can be placed include
- EPS, JPEG, PNG, and XPM. Scribus also offers more advanced professional
- publishing features, such as CMYK color, easy PDF creation, Encapsulated
- Postscript import/export and creation of color separations.
+ Scribus is a Layout program similar to QuarkXPress, Adobe®
+ PageMaker, or Adobe® InDesign. It has the ability to layout
+ newsletters, create corporate stationery, small posters and other
+ documents which need flexible layout and/or the ability to output
+ to professional quality imagesetting equipment. Graphic formats
+ which can be placed include EPS, JPEG, PNG, and XPM. Scribus also
+ offers more advanced professional publishing features, such as CMYK
+ color, easy PDF creation, Encapsulated Postscript import/export and
+ creation of color separations.
%track
prog scribus = {
- comment = "thl/1.3.1: scribus/libpostscript: No such file or
directory"
version = %{version}
url =
http://www.scribus.org.uk/modules.php?op=modload&name=Downloads&file=index
- regex = (\d+\.\d+(\.\d+)*).Release
+ regex = (1\.\d+(\.\d+)*).Release
}
%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/plugins/psimport/Makefile.in \
- scribus/plugins/fontpreview/Makefile.in \
- scribus/plugins/scriptplugin/doc/en/Makefile.in
- %{l_shtool} subst \
- -e 's;\(pluginsdir = \)$(DESTDIR)\($(prefix)\);\1\2;' \
- scribus/plugins/fontpreview/Makefile.in \
- scribus/plugins/psimport/Makefile.in \
- scribus/libpostscript/Makefile.in \
- %{l_shtool} subst \
- -e 's;\([^=] *\)$(prefix);\1$(DESTDIR)$(prefix);' \
- scribus/libpostscript/Makefile.in \
- %{l_shtool} subst \
- -e 's;\(LIBFREETYPE_LIBS =\).*;\1;' \
- `find . -name Makefile.in -print`
- %{l_shtool} subst \
-e 's; ! -f $libstdcpp;;g' \
-e 's;^\(jpeg_incdirs="\)[^"]*\("\);\1%{l_prefix}/include\2;' \
configure
%build
- # make dynamic plugins, but build statically again later
- mkdir libsdyn plugdyn
- CC="%{l_cc}" \
- CXX="%{l_cxx}" \
- CFLAGS="%{l_cflags -O} `%{l_prefix}/bin/pkg-config --cflags-only-other
qt`" \
- CXXFLAGS="%{l_cxxflags -O} `%{l_prefix}/bin/pkg-config
--cflags-only-other qt`" \
- CPPFLAGS="%{l_cppflags tiff} `%{l_prefix}/bin/pkg-config --cflags-only-I
qt`" \
- LDFLAGS="%{l_ldflags} `%{l_prefix}/bin/pkg-config --libs-only-L qt`" \
- LIBS="$LIBS `%{l_prefix}/bin/pkg-config --libs-only-l --libs-only-other
qt`" \
- ./configure \
- --prefix=%{l_prefix} \
- --disable-threading \
- --enable-shared \
- --disable-static \
- --with-x \
- --x-includes=`%{l_rc} --query x11_incdir` \
- --x-libraries=`%{l_rc} --query x11_libdir`\
- --with-qt-dir=%{l_prefix} \
- --with-qt-includes=%{l_prefix}/include/qt/ \
- --with-qt-libraries=%{l_prefix}/lib/
- for buildir in libabout libpostscript libprefs
- do
- ( cd scribus/$buildir
- %{l_make} %{l_mflags -O} AM_LDFLAGS=""
- cp -f .libs/*.s[ol] ../../libsdyn
- %{l_make} %{l_mflags} distclean
- ) || exit $?
- done
- for buildir in fontpreview libchar pixmapexport \
- printpreview psimport svgexplugin svgimplugin
- do
- ( cd scribus/plugins/$buildir
- %{l_make} %{l_mflags -O} AM_LDFLAGS=""
- cp -f .libs/*.s[ol] ../../../plugdyn
- %{l_make} %{l_mflags} distclean
- ) || exit $?
- done
-
- # now make everything statically as we normally do
CC="%{l_cc}" \
CXX="%{l_cxx}" \
CFLAGS="%{l_cflags -O} `%{l_prefix}/bin/pkg-config --cflags-only-other
qt`" \
@@ -159,12 +99,6 @@
%install
rm -rf $RPM_BUILD_ROOT
%{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
- %{l_shtool} install -c -m 755 \
- libsdyn/*.s[ol] \
- $RPM_BUILD_ROOT%{l_prefix}/lib/scribus/libs
- %{l_shtool} install -c -m 755 \
- plugdyn/*.s[ol] \
- $RPM_BUILD_ROOT%{l_prefix}/lib/scribus/plugins
rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/scribus/doc/cr
rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/scribus/doc/fr
rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/scribus/doc/pl
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
