Changeset from: mschwendt
Update of /cvs/extras/rpms/gsview/FC-1
In directory cvs.fedora.redhat.com:/tmp/cvs-serv9171/FC-1
Modified Files:
gsview.desktop gsview.spec
Added Files:
gsview-4.6-libgs.patch
Log Message:
auto-import gsview-4.6-0.fdr.8.1 on branch FC-1 from gsview-4.6-0.fdr.8.1.src.rpm
gsview-4.6-libgs.patch:
--- NEW FILE gsview-4.6-libgs.patch ---
--- gsview-4.6/src/gvcver.h.libgs 2003-10-17 17:12:38.000000000 -0500
+++ gsview-4.6/src/gvcver.h 2004-08-06 11:22:07.811201931 -0500
@@ -61,7 +61,7 @@
/* Ghostscript */
#define GS_PRODUCT "AFPL Ghostscript"
#define GS_REVISION_MIN 704
-#define GS_REVISION 704
+#define GS_REVISION 707
#define GS_REVISION_MAX 919
#ifdef _Windows
@@ -77,7 +77,7 @@
#if X11
#define INIFILE "gsview.ini"
#define GS_EXENAME "gs"
-#define GS_DLLNAME "libgs.so"
+#define GS_DLLNAME "libgs.so.7"
#else
#define GS_EXENAME "gsos2.exe"
#define GS_DLLNAME "gsdll2.dll"
Index: gsview.desktop
===================================================================
RCS file: /cvs/extras/rpms/gsview/FC-1/gsview.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gsview.desktop 8 Nov 2004 04:30:19 -0000 1.1
+++ gsview.desktop 4 Dec 2004 12:22:55 -0000 1.2
@@ -2,6 +2,7 @@
[Desktop Entry]
Encoding=UTF-8
Name=GSview
+GenericName=PS/PDF Viewer
Comment=EPS,PDF,PS Viewer
Exec=gsview
Icon=gsview.png
Index: gsview.spec
===================================================================
RCS file: /cvs/extras/rpms/gsview/FC-1/gsview.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gsview.spec 8 Nov 2004 04:30:19 -0000 1.1
+++ gsview.spec 4 Dec 2004 12:22:55 -0000 1.2
@@ -4,7 +4,7 @@
Name: gsview
Epoch: 0
Version: 4.6
-Release: 0.fdr.5%{?dist_tag}.1
+Release: 0.fdr.8%{?dist_tag}.1
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
@@ -16,16 +16,16 @@
BuildRequires: gtk+-devel
BuildRequires: desktop-file-utils
-# These are a teeny bit redundant, but some versions of ghostscript7 do not
-# include the shared-lib.
-Requires: ghostscript >= 7.04
+# 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
Requires: libgs.so.7
-%{!?_applnkdir: %define _applnkdir %{_sysconfdir}/X11/applnk}
-%{!?_icondir: %define _icondir %{_datadir}/pixmaps}
-
## 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. (-:
+Patch2: gsview-4.6-libgs.patch
%description
@@ -40,6 +40,7 @@
%setup -q
%patch1 -p1 -b .htmlview
+%patch2 -p1 -b .libgs7
%build
@@ -64,17 +65,12 @@
GSVIEW_ETCPATH=$RPM_BUILD_ROOT%{_sysconfdir}
# desktop/icon files
-install -D -p -m644 binary/gsview48.png $RPM_BUILD_ROOT%{_icondir}/gsview.png
-#install -D -p -m644 srcunx/gvxdesk.txt
$RPM_BUILD_ROOT%{_applnkdir}/Graphics/gsview.desktop
-install -D -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Graphics/gsview.desktop
+install -D -p -m644 binary/gsview48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/gsview.png
-%if "%{?desktop_file}" != "0"
desktop-file-install --vendor fedora \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--add-category X-Fedora \
- --delete-original \
- $RPM_BUILD_ROOT%{_applnkdir}/*/*.desktop
-%endif
+ %{SOURCE1}
## Unpackaged files
# nuke depcrecated epstool
@@ -87,19 +83,31 @@
%dir %{_sysconfdir}/gsview
%config(noreplace) %{_sysconfdir}/gsview/printer.ini
%{_mandir}/man*/*
-%if "%{?desktop_file}" != "0"
%{_datadir}/applications/*.desktop
-%else
-%{_applnkdir}/*/*.desktop
-%endif
-%{_icondir}/gsview.png
+%{_datadir}/pixmaps/*.png
%doc %{_docdir}/*
+
%clean
rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Aug 06 2004 Rex Dieter <rexdieter at sf.net> 0:4.6-0.fdr.8
+- Patch to load libgs.so.7 by default (instead of libgs.so)
+- Req: libgs.so.7, dropping Req: ghostscript, allowing for users
+ with older/custom ghostscript builds (will have to rework when/if
+ ghostscript >= 8.0 comes)
+- .desktop: GenericName: PS/PDF Viewer
+
+* Thu Aug 05 2004 Rex Dieter <rexdieter at sf.net> 0:4.6-0.fdr.7
+- remove Req: libgs.so
+- Req: ghostscript >= 7.07-15.3
+ (
http://www.redhat.com/archives/fedora-devel-list/2004-August/msg00068.html)
+
+* Tue Aug 03 2004 Rex Dieter <rexdieter at sf.net> 0:4.6-0.fdr.6
+- Requires: ghostscript >= 7.07-18
+
* Thu Apr 29 2004 Rex Dieter <rexdieter at sf.net> 0:4.6-0.fdr.5
- Group: Applications/Publishing
- remove Vendor tag