rpms/gsview/devel gsview-4.7-dllversion.patch, NONE, 1.1 gsview-4.7-letterpaper.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 gsview-4.6-libgs.patch, 1.1, 1.2 gsview.spec, 1.7, 1.8 sources, 1.2, 1.3
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Wed Aug 3 18:17:30 UTC 2005
Author: rdieter
Update of /cvs/extras/rpms/gsview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16390/devel
Modified Files:
.cvsignore gsview-4.6-libgs.patch gsview.spec sources
Added Files:
gsview-4.7-dllversion.patch gsview-4.7-letterpaper.patch
Log Message:
auto-import gsview-4.7-3 on branch devel from gsview-4.7-3.src.rpm
gsview-4.7-dllversion.patch:
--- NEW FILE gsview-4.7-dllversion.patch ---
--- gsview-4.7/src/cdll.c.dllversion 2002-02-09 21:46:38.000000000 -0600
+++ gsview-4.7/src/cdll.c 2005-06-23 09:05:39.000000000 -0500
@@ -106,6 +106,10 @@
}
dll->revision_number = rv.revision;
+ /* Hack because FC5's ghostscript-8.15 reports 81500 instead of 815 -- Rex */
+ if ( dll->revision_number > (GS_REVISION_MIN*100) )
+ dll->revision_number = (long)(dll->revision_number / 100);
+
if ( (dll->revision_number < GS_REVISION_MIN) ||
(dll->revision_number > GS_REVISION_MAX) ) {
gs_addmessf("\nWrong version of DLL found.\n\
gsview-4.7-letterpaper.patch:
--- NEW FILE gsview-4.7-letterpaper.patch ---
--- gsview-4.7/src/gvcinit.c.letterpaper 2005-03-01 03:51:38.000000000 -0600
+++ gsview-4.7/src/gvcinit.c 2005-06-23 10:41:42.000000000 -0500
@@ -319,13 +319,13 @@
option.button_show = TRUE;
option.fit_page = FALSE; /* Changed after 2.1 */
option.safer = TRUE;
- option.media = IDM_A4;
- strcpy(option.medianame, "A4");
+ option.media = IDM_LETTER;
+ strcpy(option.medianame, "Letter");
option.media_rotate = FALSE;
option.user_width_warn = 5669; /* 2 metres */
option.user_height_warn = 5669;
- option.user_width = 595; /* A4 width 210mm */
- option.user_height = 842; /* A4 height 297mm */
+ option.user_width = 612; /* Letter width 8.5in */
+ option.user_height = 792; /* Letter height 11in */
option.epsf_clip = FALSE;
option.epsf_warn = FALSE;
option.ignore_dsc = FALSE;
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gsview/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 8 Nov 2004 04:30:19 -0000 1.2
+++ .cvsignore 3 Aug 2005 18:17:28 -0000 1.3
@@ -1 +1 @@
-gsview-4.6.tar.gz
+gsview-4.7.tar.gz
gsview-4.6-libgs.patch:
Index: gsview-4.6-libgs.patch
===================================================================
RCS file: /cvs/extras/rpms/gsview/devel/gsview-4.6-libgs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gsview-4.6-libgs.patch 4 Dec 2004 12:25:30 -0000 1.1
+++ gsview-4.6-libgs.patch 3 Aug 2005 18:17:28 -0000 1.2
@@ -5,7 +5,7 @@
#define GS_PRODUCT "AFPL Ghostscript"
#define GS_REVISION_MIN 704
-#define GS_REVISION 704
-+#define GS_REVISION 707
++#define GS_REVISION @@GS_REVISION@@
#define GS_REVISION_MAX 919
#ifdef _Windows
@@ -14,7 +14,7 @@
#define INIFILE "gsview.ini"
#define GS_EXENAME "gs"
-#define GS_DLLNAME "libgs.so"
-+#define GS_DLLNAME "libgs.so.7"
++#define GS_DLLNAME "libgs.so.@@SOMAJOR@@"
#else
#define GS_EXENAME "gsos2.exe"
#define GS_DLLNAME "gsdll2.dll"
Index: gsview.spec
===================================================================
RCS file: /cvs/extras/rpms/gsview/devel/gsview.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gsview.spec 6 Apr 2005 22:11:39 -0000 1.7
+++ gsview.spec 3 Aug 2005 18:17:28 -0000 1.8
@@ -1,47 +1,67 @@
# $Id$
Summary: PostScript and PDF previewer
-Name: gsview
-Version: 4.6
-Release: 10
+Name: gsview
+Version: 4.7
+Release: 3
License: Aladdin Free Public License, Ghostgum Software Pty Ltd
-Group: Applications/Publishing
-Source: ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/ghostgum/gsview-4.6.tar.gz
-URL: http://www.cs.wisc.edu/~ghost/gsview/
+Group: Applications/Publishing
+Source: ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/ghostgum/gsview-4.7.tar.gz
+URL: http://www.cs.wisc.edu/~ghost/gsview/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Source1: gsview.desktop
BuildRequires: gtk+-devel
BuildRequires: desktop-file-utils
-
+BuildRequires: sed >= 4.0
+BuildRequires: ghostscript-devel >= 7.07-15.3
+%define gs_ver %{expand:%%(rpm -q --qf '%%{VERSION}' ghostscript-devel | cut -d. -f-2 )}
+%define gs_ver1 %{expand:%%(echo %{gs_ver} | cut -d. -f1)}
+%if "%{?gs_ver1}" == "7"
# See http://www.redhat.com/archives/fedora-devel-list/2004-August/msg00068.html
Requires: ghostscript >= 7.07-15.3
-# Stick with this one for now, allowing for users with custom/older builds to provide libgs
-# doesn't work on x86_64 (see http://bugzilla.redhat.com/bugzilla/146223 )
-#Requires: libgs.so.7
+%endif
## Use htmlview instead of hard-coded mozilla
Patch1: gsview-4.4-htmlview.patch
-# default to libgs.so.7 instead of libgs.so
-# will need to rework when/if ghostscript >= 8.0 comes around. (-:
+# default to libgs.so.@@SOMAJOR@@ instead of libgs.so
Patch2: gsview-4.6-libgs.patch
+# attempt to allow/use ghostscript-8.15 reported value of 81500.
+# http://bugs.erdhat.com/159912
+Patch3: gsview-4.7-dllversion.patch
+# Change Paper default A4 -> Letter
+Patch4: gsview-4.7-letterpaper.patch
%description
GSview is a graphical interface for Ghostscript.
-Ghostscript is an interpreter for the PostScript page
+Ghostscript is an interpreter for the PostScript page
description language used by laser printers.
-For documents following the Adobe PostScript Document Structuring
+For documents following the Adobe PostScript Document Structuring
Conventions, GSview allows selected pages to be viewed or printed.
%prep
-%setup -q
+%setup -q
+
+echo "gs_ver %{gs_ver}, gs_ver1 %{gs_ver1}"
%patch1 -p1 -b .htmlview
-%patch2 -p1 -b .libgs7
+%patch2 -p1 -b .libgs
+%patch3 -p1 -b .dllversion
+%patch4 -p1 -b .letterpaper
+
+# Determine GS_REVISION/SOMAJOR and substitute values (see patch2)
+GS_REVISION=%(echo %{gs_ver} | tr -d '.' )
+sed -i -e "s|@@GS_REVISION@@|${GS_REVISION}|g" src/gvcver.h
+# Sanity check to make sure file exists
+if [ ! -f "%(ls %{_libdir}/libgs.so.?)" ]; then
+ echo "Error: %{_libdir}/libgs.so.? doesn't exist"; exit 1
+fi
+SOMAJOR=$(basename %{_libdir}/libgs.so.? | sed -e 's at libgs.so.@@' )
+sed -i -e "s|@@SOMAJOR@@|${SOMAJOR}|g" src/gvcver.h
%build
@@ -71,10 +91,10 @@
desktop-file-install --vendor fedora \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--add-category X-Fedora \
- %{SOURCE1}
+ %{SOURCE1}
## Unpackaged files
-# nuke depcrecated epstool
+# nuke depcrecated epstool, to be (hopefully) packaged separately... someday.
rm -f $RPM_BUILD_ROOT{%{_bindir}/epstool,%{_docdir}/*/epstool*}
@@ -86,7 +106,7 @@
%{_mandir}/man*/*
%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/*.png
-%doc %{_docdir}/*
+%doc %{_docdir}/*
%clean
@@ -94,6 +114,16 @@
%changelog
+* Thu Jul 28 2005 Rex Dieter <rexdieter[AT]users.sf.net> 4.7-3
+- add file:// to help URL.
+
+* Thu Jun 23 2005 Rex Dieter <rexdieter[AT]users.sf.net> 4.7-2
+- fixes for ghostscript-8.15 (#159912)
+- Change paper default A4->Letter
+
+* Wed Apr 20 2005 Rex Dieter <rexdieter[AT]users.sf.net> 4.7-1
+- 4.7
+
* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
- rebuilt
@@ -124,8 +154,8 @@
* Sat Apr 24 2004 Rex Dieter <rexdieter at sf.net> 0:4.6-0.fdr.3
- don't include old epstool (to be packaged separately)
-- gsview.desktop:
- MimeType=image/x-eps;application/postscript;application/pdf;
+- gsview.desktop:
+ MimeType=image/x-eps;application/postscript;application/pdf;
Categories=Application;GTK;Graphics;Viewer;Publishing;
* Thu Apr 01 2004 Rex Dieter <rexdieter at sf.net> 0:4.6-0.fdr.2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gsview/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 8 Nov 2004 04:30:19 -0000 1.2
+++ sources 3 Aug 2005 18:17:28 -0000 1.3
@@ -1 +1 @@
-35cb5e421faca49eb70c426354e41ba8 gsview-4.6.tar.gz
+ce6288cc8597d6b918498d6d02654bb7 gsview-4.7.tar.gz
More information about the fedora-extras-commits
mailing list