OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ghostview?expand=0&rev=4

ghostview.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Apr  8 11:06:40 CEST 2008 - werner@suse.de
+
+- Resolve file conflict by renaming gv.png to ghostview.png
+
 -------------------------------------------------------------------
 Sun Jan 13 17:53:14 CET 2008 - coolo@suse.de
 

ghostview.desktop

@@ -4,7 +4,7 @@ Name=GhostView
 MimeType=application/pdf;application/postscript;image/x-eps;
 GenericName=PostScript Viewer
 Exec=ghostview
-Icon=gv
+Icon=ghostview
 Type=Application
 Terminal=false
 X-KDE-StartupNotify=false

ghostview.spec

@@ -10,6 +10,7 @@
 
 # norootforbuild
 
+
 Name:           ghostview
 BuildRequires:  update-desktop-files xorg-x11 xorg-x11-devel
 License:        GPL v2 or later
@@ -20,11 +21,11 @@ Requires:       ghostscript_x11
 Conflicts:      gs_serv gs_vga
 AutoReqProv:    on
 Version:        1.5
-Release:        343
+Release:        371
 Summary:        Ghostview
 Source:         ghostview-1.5.tar.bz2
 Source1:        ghostview.desktop
-Source2:        gv.png
+Source2:        ghostview.png
 Patch:          ghostview-1.5.dif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)}
@@ -67,47 +68,49 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root)
 /usr/share/applications/ghostview.desktop
-/usr/share/pixmaps/gv.png
+/usr/share/pixmaps/ghostview.png
 %{_bindir}/ghostview
 %config %{_appdefdir}/Ghostview
 %doc %{_mandir}/man1/ghostview.1x.gz
 
 %changelog
-* Sun Jan 13 2008 - coolo@suse.de
+* Tue Apr 08 2008 werner@suse.de
+- Resolve file conflict by renaming gv.png to ghostview.png
+* Sun Jan 13 2008 coolo@suse.de
 - remove desktop-data from buildrequires
-* Thu Jul 05 2007 - coolo@suse.de
+* Thu Jul 05 2007 coolo@suse.de
 - put desktop file and icon into package
-* Thu Nov 09 2006 - werner@suse.de
+* Thu Nov 09 2006 werner@suse.de
 - Get file stat before using it (bug #216970)
-* Thu Aug 24 2006 - werner@suse.de
+* Thu Aug 24 2006 werner@suse.de
 - Don't package icon already present in desktop-data-SuSE
-* Wed Aug 02 2006 - werner@suse.de
+* Wed Aug 02 2006 werner@suse.de
 - Make it build with X11R7
-* Wed Jan 25 2006 - mls@suse.de
+* Wed Jan 25 2006 mls@suse.de
 - converted neededforbuild to BuildRequires
-* Wed Oct 05 2005 - dmueller@suse.de
+* Wed Oct 05 2005 dmueller@suse.de
 - add norootforbuild
-* Thu May 12 2005 - meissner@suse.de
+* Thu May 12 2005 meissner@suse.de
 - use RPM_OPT_FLAGS
-* Wed Nov 17 2004 - werner@suse.de
+* Wed Nov 17 2004 werner@suse.de
 - Add gv.png pixmap to file list
-* Wed Apr 28 2004 - werner@suse.de
+* Wed Apr 28 2004 werner@suse.de
 - Avoid compiler warnings
-* Sat Aug 16 2003 - adrian@suse.de
+* Sat Aug 16 2003 adrian@suse.de
 - install desktop file from kappfinder
-* Fri Jun 13 2003 - kukuk@suse.de
+* Fri Jun 13 2003 kukuk@suse.de
 - Rename to ghostview [Bug #27088]
 - Add BuildRoot
 - Fix filelist
-* Fri Nov 08 2002 - werner@suse.de
+* Fri Nov 08 2002 werner@suse.de
 - Remove XCOMM definition to make new cpp happy
-* Sat Dec 09 2000 - nashif@suse.de
+* Sat Dec 09 2000 nashif@suse.de
 - sorted
-* Mon Sep 20 1999 - ro@suse.de
+* Mon Sep 20 1999 ro@suse.de
 - added Requires ghostscript_x11
-* Mon Sep 13 1999 - bs@suse.de
+* Mon Sep 13 1999 bs@suse.de
 - ran old prepare_spec on spec file to switch to new prepare_spec.
-* Sun Sep 20 1998 - ro@suse.de
+* Sun Sep 20 1998 ro@suse.de
 - dont redeclare sys_errlist for glibc
-* Thu Feb 13 1997 - werner@suse.de
+* Thu Feb 13 1997 werner@suse.de
 - Compiled and packed under X11R6.1