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: 06-Jul-2005 15:28:35
Branch: HEAD Handle: 2005070614283500
Modified files:
openpkg-src/scribus scribus.patch scribus.spec
Log:
upgrading package: scribus 1.2 -> 1.2.2.1
Summary:
Revision Changes Path
1.17 +11 -73 openpkg-src/scribus/scribus.patch
1.43 +10 -11 openpkg-src/scribus/scribus.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/scribus/scribus.patch
============================================================================
$ cvs diff -u -r1.16 -r1.17 scribus.patch
--- openpkg-src/scribus/scribus.patch 30 Aug 2004 12:10:20 -0000 1.16
+++ openpkg-src/scribus/scribus.patch 6 Jul 2005 13:28:35 -0000 1.17
@@ -1,8 +1,7 @@
Index: admin/ltmain.sh
-diff -Nau admin/ltmain.sh.orig admin/ltmain.sh
---- admin/ltmain.sh.orig Mon Jun 7 02:20:19 2004
-+++ admin/ltmain.sh Mon Jun 7 02:24:08 2004
-@@ -1123,6 +1123,7 @@
+--- admin/ltmain.sh.orig 2004-11-14 14:14:52 +0100
++++ admin/ltmain.sh 2005-07-06 13:49:28 +0200
+@@ -1175,6 +1175,7 @@
;;
-avoid-version)
@@ -10,16 +9,7 @@
avoid_version=yes
continue
;;
-@@ -1202,7 +1203,7 @@
- -l*)
- if test "$arg" = "-lc"; then
- case $host in
-- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
-+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* |
*-*-freebsd*)
- # These systems don't actually have c library (as such)
- continue
- ;;
-@@ -2744,7 +2745,7 @@
+@@ -3125,7 +3126,7 @@
if test "$build_libtool_libs" = yes; then
if test -n "$rpath"; then
case $host in
@@ -28,7 +18,7 @@
# these systems don't actually have a c library (as such)!
;;
*-*-rhapsody* | *-*-darwin1.[012])
-@@ -4622,10 +4623,12 @@
+@@ -5485,10 +5486,12 @@
fi
# Install the pseudo-library for information purposes.
@@ -41,24 +31,10 @@
# Maybe install the static library, too.
test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
-Index: scribus/plugins/pixmapexport/export.cpp
-diff -Nau scribus/plugins/pixmapexport/export.cpp.orig
scribus/plugins/pixmapexport/export.cpp
---- scribus/plugins/pixmapexport/export.cpp.orig Mon Jun 7 01:15:14 2004
-+++ scribus/plugins/pixmapexport/export.cpp Mon Jun 7 01:18:23 2004
-@@ -116,7 +116,7 @@
- QObject::tr("No"),
- QObject::tr("Yes"),
- // hack for multiple overwritting (petr)
-- (single==TRUE) ? 0 : QObject::tr("Yes all"),
-+ (single==TRUE) ? QString::null :
QObject::tr("Yes all"),
- 0, 0);
- QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
- if (over == 1)
Index: scribus/scribus.cpp
-diff -Nau scribus/scribus.cpp.orig scribus/scribus.cpp
---- scribus/scribus.cpp.orig 2004-05-31 12:38:49 +0200
-+++ scribus/scribus.cpp 2004-06-16 18:00:01 +0200
-@@ -565,10 +565,10 @@
+--- scribus/scribus.cpp.orig 2005-07-02 23:38:36 +0200
++++ scribus/scribus.cpp 2005-07-06 13:49:35 +0200
+@@ -605,10 +605,10 @@
handler = SIG_DFL;
sigset_t mask;
sigemptyset(&mask);
@@ -73,33 +49,9 @@
#ifdef SIGFPE
signal (SIGFPE, handler);
sigaddset(&mask, SIGFPE);
-@@ -3259,18 +3259,18 @@
- form2 =
QString(QImageIO::inputFormats().at(i)).upper();
- if (form1 == "jpeg")
- {
-- form1 = "jpg";
-- form2 = "JPG";
-+ formats += "JPEG (*.jpg *.jpeg *.JPG
*.JPEG);;";
-+ formatD += "*.jpg *.jpeg *.JPG *.JPEG ";
- }
-- if ((form1 == "jpg") || (form1 == "png") ||
(form1 == "xpm") || (form1 == "gif"))
-+ if ((form1 == "png") || (form1 == "xpm") ||
(form1 == "gif"))
- {
- formats += form2 + " (*."+form1+"
*."+form2+");;";
- formatD += "*."+form1+" *."+form2+" ";
- }
- }
- #ifdef HAVE_TIFF
-- formats += "TIFF (*.tif *.TIF);;";
-- formatD += "*.tif *.TIF";
-+ formats += "TIFF (*.tif *.tiff *.TIF *.TIFF);;";
-+ formatD += "*.tif *.tiff *.TIF *.TIFF";
- #endif
- formats += "EPS (*.eps *.EPS);;PDF (*.pdf *.PDF);;" +
tr("All Files (*)");
- formatD += " *.eps *.EPS *.pdf *.PDF";
-@@ -7371,7 +7371,8 @@
- *typ = (*demo1)();
- *Zeig = mo;
+@@ -8157,7 +8157,8 @@
+ }
+ *idNr = (*demo1)();
if (*typ < 4)
- dlclose(mo);
+// dlclose(mo);
@@ -107,17 +59,3 @@
else
{
dlerror();
-Index: scribus/templates/Makefile.in
---- scribus/templates/Makefile.in.orig 2004-08-30 13:08:07 +0200
-+++ scribus/templates/Makefile.in 2004-08-30 13:36:02 +0200
-@@ -383,8 +383,8 @@
-
-
- install-data-local:
-- $(mkinstalldirs) $(prefix)/share/scribus/templates/
-- $(INSTALL_DATA) $(srcdir)/Readme
$(prefix)/share/scribus/templates/Readme
-+ $(mkinstalldirs) $(DESTDIR)$(prefix)/share/scribus/templates/
-+ $(INSTALL_DATA) $(srcdir)/Readme
$(DESTDIR)$(prefix)/share/scribus/templates/Readme
-
- uninstall-local:
- -rm -f $(prefix)/share/scribus/templates/Readme
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/scribus/scribus.spec
============================================================================
$ cvs diff -u -r1.42 -r1.43 scribus.spec
--- openpkg-src/scribus/scribus.spec 24 Mar 2005 11:20:15 -0000 1.42
+++ openpkg-src/scribus/scribus.spec 6 Jul 2005 13:28:35 -0000 1.43
@@ -25,19 +25,18 @@
# package information
Name: scribus
Summary: Desktop Publishing Application
-URL: http://www.scribus.net/
+URL: http://www.scribus.org.uk/
Vendor: Franz Schmid
Packager: OpenPKG
Distribution: OpenPKG
Class: EVAL
Group: Editor
License: GPL
-Version: 1.2
-Release: 20041001
+Version: 1.2.2.1
+Release: 20050706
# list of sources
-Source0: http://web2.altmuehlnet.de/fschmid/scribus-%{version}.tar.gz
-Source1: http://web2.altmuehlnet.de/fschmid/scribus-i18n-en.tar.gz
+Source0:
http://www.scribus.org.uk/downloads/%{version}/scribus-%{version}.tar.bz2
Patch0: scribus.patch
# build information
@@ -63,13 +62,12 @@
%track
prog scribus = {
version = %{version}
- url = http://web2.altmuehlnet.de/fschmid/download.html
- regex = scribus-(\d+\.\d+(\.\d+)*)\.tar\.gz
+ url =
http://www.scribus.org.uk/modules.php?op=modload&name=Downloads&file=index
+ regex = (\d+\.\d+(\.\d+)*).Release
}
%prep
%setup -q
- %setup -q -T -D -a 1
%patch -p0
%{l_shtool} subst \
-e 's;$(prefix);$(DESTDIR)$(prefix);' \
@@ -168,9 +166,10 @@
%{l_shtool} install -c -m 755 \
plugdyn/*.s[ol] \
$RPM_BUILD_ROOT%{l_prefix}/lib/scribus/plugins
- %{l_shtool} mkdir -f -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix}/share/scribus/doc
- mv -f scribus-i18n-en/docs/en
$RPM_BUILD_ROOT%{l_prefix}/share/scribus/doc
+ 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
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/man/pl
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%files -f files
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
