commit gv

2 Aug 2006

Hello community,

here is the log from the commit of package gv
checked in at Wed Aug 2 16:03:22 CEST 2006.

--------

--- gv/gv.changes	2006-02-28 15:51:10.000000000 +0100
+++ gv/gv.changes	2006-08-02 15:02:19.000000000 +0200
@@ -1,0 +2,5 @@
+Wed Aug  2 15:01:57 CEST 2006 - werner@suse.de
+
+- Make it build with X11R7
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gv.spec ++++++
--- /var/tmp/diff_new_pack.CzjzjA/_old	2006-08-02 15:58:59.000000000 +0200
+++ /var/tmp/diff_new_pack.CzjzjA/_new	2006-08-02 15:58:59.000000000 +0200
@@ -23,7 +23,7 @@
 URL:            http://wwwthep.physik.uni-mainz.de/~plass/gv/
 Summary:        A Program to View PostScript Files
 Version:        3.5.8
-Release:        1146
+Release:        1156
 Source0:        gv-3.5.8.tar.bz2
 Patch0:         gv-3.5.8-deb.patch
 Patch1:         gv-3.5.8.dif
@@ -38,6 +38,16 @@
 Patch6:         settitle.patch
 Patch7:         gv-3.5.8-gcc4.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)}
+%if "%_exec_prefix" == "/usr/X11R6"
+
+%global _mandir     %{_exec_prefix}/man
+%define _x11data    %{_exec_prefix}/lib/X11
+%define _appdefdir  %{_x11data}/app-defaults
+%else
+%define _x11data    %{_datadir}/X11
+%define _appdefdir  %{_x11data}/app-defaults
+%endif
 
 %description
 GV offers you an X Window System GUI for viewing PostScript files. This
@@ -66,41 +76,41 @@
 make CCOPTIONS="$RPM_OPT_FLAGS"
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
-make DESTDIR=$RPM_BUILD_ROOT install.man
-make DESTDIR=$RPM_BUILD_ROOT install.doc
-install -m 0444 NOTE $RPM_BUILD_ROOT/%{_defaultdocdir}/gv/Copyright
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install
+make DESTDIR=%{buildroot} install.man
+make DESTDIR=%{buildroot} install.doc
+install -m 0444 NOTE %{buildroot}/%{_defaultdocdir}/gv/Copyright
 # add font settings to app-defaults:
-for i in $(find $RPM_BUILD_ROOT/usr/X11R6/lib/X11/ -type f -name "GV")
+for i in $(find %{buildroot}%{_x11data} -type f -name "GV")
 do
     cat source/gv_font_res-I18N_mb.dat >> ${i}
 done
 # japanese app-defaults:
-mkdir -p $RPM_BUILD_ROOT/usr/X11R6/lib/X11/{ja,ja_JP.SJIS,ja_JP.UTF-8}/app-defaults
-mv $RPM_BUILD_ROOT/usr/X11R6/lib/X11/ja_JP.eucJP/app-defaults/GV \
-   $RPM_BUILD_ROOT/usr/X11R6/lib/X11/ja/app-defaults/GV
-iconv -f EUC-JP -t SJIS < $RPM_BUILD_ROOT/usr/X11R6/lib/X11/ja/app-defaults/GV \
-   > $RPM_BUILD_ROOT/usr/X11R6/lib/X11/ja_JP.SJIS/app-defaults/GV 
-iconv -f EUC-JP -t UTF-8 < $RPM_BUILD_ROOT/usr/X11R6/lib/X11/ja/app-defaults/GV \
-   > $RPM_BUILD_ROOT/usr/X11R6/lib/X11/ja_JP.UTF-8/app-defaults/GV 
+mkdir -p %{buildroot}%{_x11data}/{ja,ja_JP.SJIS,ja_JP.UTF-8}/app-defaults
+mv %{buildroot}%{_x11data}/ja_JP.eucJP/app-defaults/GV \
+   %{buildroot}%{_x11data}/ja/app-defaults/GV
+iconv -f EUC-JP -t SJIS < %{buildroot}%{_x11data}/ja/app-defaults/GV \
+   > %{buildroot}%{_x11data}/ja_JP.SJIS/app-defaults/GV 
+iconv -f EUC-JP -t UTF-8 < %{buildroot}%{_x11data}/ja/app-defaults/GV \
+   > %{buildroot}%{_x11data}/ja_JP.UTF-8/app-defaults/GV 
 %suse_update_desktop_file -i gv Office Viewer
-rm $RPM_BUILD_ROOT/usr/share/pixmaps/gv.png
+rm %{buildroot}/usr/share/pixmaps/gv.png
 
 %files
 %defattr(-,root,root)
 /usr/share/applications/gv.desktop
-%config /usr/X11R6/lib/X11/gv/gv_system.ad
-%config /usr/X11R6/lib/X11/gv/gv_user.ad
-%config /usr/X11R6/lib/X11/gv/gv_class.ad
-%dir /usr/X11R6/lib/X11/gv/
-%config /usr/X11R6/lib/X11/app-defaults/GV
-%dir /usr/X11R6/lib/X11/??
-%dir /usr/X11R6/lib/X11/??_*
-%dir /usr/X11R6/lib/X11/*/app-defaults
-%config /usr/X11R6/lib/X11/ja*/app-defaults/GV
-/usr/X11R6/bin/gv
-%doc /usr/X11R6/man/man1/gv.1x.gz
+%dir %{_x11data}/gv/
+%config %{_x11data}/gv/gv_system.ad
+%config %{_x11data}/gv/gv_user.ad
+%config %{_x11data}/gv/gv_class.ad
+%config %{_appdefdir}/GV
+%dir %{_x11data}/??
+%dir %{_x11data}/??_*
+%dir %{_x11data}/*/app-defaults
+%config %{_x11data}/ja*/app-defaults/GV
+%{_bindir}/gv
+%doc %{_mandir}/man1/gv.1x.gz
 %docdir %{_defaultdocdir}/gv/
 %{_defaultdocdir}/gv/Copyright
 %doc %{_defaultdocdir}/gv/gs.interface.gz
@@ -126,6 +136,8 @@
 %dir %{_defaultdocdir}/gv/
 
 %changelog -n gv
+* Wed Aug 02 2006 - werner@suse.de
+- Make it build with X11R7
 * Tue Feb 28 2006 - werner@suse.de
 - Fix range of array subscript (bug #154109)
 * Wed Jan 25 2006 - mls@suse.de

++++++ gv-3.5.8-I18N-mb.patch ++++++
--- /var/tmp/diff_new_pack.CzjzjA/_old	2006-08-02 15:58:59.000000000 +0200
+++ /var/tmp/diff_new_pack.CzjzjA/_new	2006-08-02 15:58:59.000000000 +0200
@@ -94,10 +94,10 @@
 +		[ -f gv_nls_$$LNG.dat ] || continue; \
 +		cat $(GV_SYSTEM_AD)		>  GV_$$LNG.ad; \
 +		cat gv_nls_$$LNG.dat		>> GV_$$LNG.ad; \
-+		[ -d $(DESTDIR)$(LIBDIR)/$$LNG/app-defaults ] || \
-+			$(MKDIRHIER) $(DESTDIR)$(LIBDIR)/$$LNG/app-defaults; \
++		[ -d $(DESTDIR)$(SHAREDIR)/$$LNG/app-defaults ] || \
++			$(MKDIRHIER) $(DESTDIR)$(SHAREDIR)/$$LNG/app-defaults; \
 +		$(INSTALL) $(INSTALLFLAGS) \
-+			GV_$$LNG.ad $(DESTDIR)$(LIBDIR)/$$LNG/app-defaults/GV; \
++			GV_$$LNG.ad $(DESTDIR)$(SHAREDIR)/$$LNG/app-defaults/GV; \
 +	done
 +
 +clean::

++++++ gv-3.5.8.dif ++++++
--- /var/tmp/diff_new_pack.CzjzjA/_old	2006-08-02 15:58:59.000000000 +0200
+++ /var/tmp/diff_new_pack.CzjzjA/_new	2006-08-02 15:58:59.000000000 +0200
@@ -66,7 +66,7 @@
 + *      FAX: (608)262-9777         Madison, WI   53706
 --- config.Unix
 +++ config.Unix	2006-02-28 15:49:27.000000000 +0100
-@@ -32,16 +32,21 @@
+@@ -32,16 +32,22 @@
  XCOMM --------------------------------------------------------------------
  XCOMM  Destination directories.
  XCOMM --------------------------------------------------------------------
@@ -74,10 +74,11 @@
 -      GV_DOCDIR    = /usr/local/doc/gv/
 -      GV_LIBDIR    = /usr/local/lib/gv/
 -      GV_MANDIR    = /usr/local/man/man1/
-+      GV_BINDIR    = /usr/X11R6/bin/
++      SHAREDIR    ?= $(LIBDIR)
++      GV_BINDIR    = $(BINDIR)/
 +      GV_DOCDIR    = /usr/share/doc/packages/gv/
-+      GV_LIBDIR    = /usr/X11R6/lib/X11/gv/
-+      GV_MANDIR    = /usr/X11R6/man/man1/
++      GV_LIBDIR    = $(SHAREDIR)/gv/
++      GV_MANDIR    = $(MANPATH)/man1/
 +
 +XCOMM --------------------------------------------------------------------
 +XCOMM --- Don not use private functions of Xaw or Xaw3d
@@ -93,7 +94,7 @@
  
  XCOMM --------------------------------------------------------------------
  XCOMM  As far as the Xaw3d header files are concerned it is by
-@@ -57,6 +62,7 @@
+@@ -57,6 +63,7 @@
  XCOMM     ln -s /home/aaa/Xaw3d Xaw3d
  XCOMM --------------------------------------------------------------------
  XCOMM XAW3D_HEADERS = -I/home/aaa/Xaw3d
@@ -101,7 +102,7 @@
  
  XCOMM --------------------------------------------------------------------
  XCOMM  Print Command
-@@ -100,7 +106,7 @@
+@@ -100,7 +107,7 @@
  XCOMM --------------------------------------------------------------------
  XCOMM --- Use gv's own Motif like scrollbar.
  XCOMM --------------------------------------------------------------------
@@ -110,7 +111,7 @@
  
  XCOMM --------------------------------------------------------------------
  XCOMM --- Compile style files into the executable.
-@@ -121,6 +127,7 @@
+@@ -121,6 +128,7 @@
  XCOMM CCOPTIONS   = -ansi -pedantic -Wall
  XCOMM CDEBUGFLAGS =
  XCOMM LDPOSTLIB   =



++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

    

root＠suse.de

tags

participants (1)