Hello community,
here is the log from the commit of package xfig
checked in at Mon Jul 31 23:27:54 CEST 2006.
--------
--- xfig/xfig.changes 2006-07-28 19:23:09.000000000 +0200
+++ xfig/xfig.changes 2006-07-31 19:17:45.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Jul 31 19:17:02 CEST 2006 - werner@suse.de
+
+- Use Imake defines for LIBDIR/SHAREDIR switch
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xfig.spec ++++++
--- /var/tmp/diff_new_pack.vK28PU/_old 2006-07-31 23:27:50.000000000 +0200
+++ /var/tmp/diff_new_pack.vK28PU/_new 2006-07-31 23:27:50.000000000 +0200
@@ -18,10 +18,9 @@
Requires: transfig netpbm ghostscript-fonts-std
Autoreqprov: on
Version: 3.2.4
-Release: 85
+Release: 86
Summary: Facility for Interactive Generation of Figures under the X Window System
Url: http://www.xfig.org/
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: xfig.%{version}.tar.bz2
Source1: font-test.fig
Source2: browser
@@ -36,16 +35,17 @@
Patch6: xfig.%{version}-null.dif
Patch7: xfig.%{version}-quiet.dif
Patch8: xfig.%{version}-gcc4.dif
+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
-
-%global _includedir %{_exec_prefix}/include
%define _x11data %{_exec_prefix}/lib/X11
+%define _data $(LIBDIR)
%define _appdefdir %{_x11data}/app-defaults
%else
%define _x11data %{_datadir}/X11
+%define _data $(SHAREDIR)
%define _appdefdir %{_x11data}/app-defaults
%endif
@@ -82,11 +82,10 @@
%patch7 -p0 -b .quiet
%patch8 -p0 -b .gcc4
cp $RPM_SOURCE_DIR/font-test.fig .
-xmkmf -a
+xmkmf -a -D_DATA='%{_data}'
%build
-make SHAREDIR=%{_x11data} \
- CCOPTIONS="-fno-strict-aliasing $RPM_OPT_FLAGS -w"
+make CCOPTIONS="-fno-strict-aliasing $RPM_OPT_FLAGS -w"
%install
mkdir -p %{buildroot}%{_bindir}
@@ -105,8 +104,8 @@
ln -sf %{_defaultdocdir}/%{name}/xfig-howto.pdf \
%{buildroot}%{_x11data}/xfig/
install -m 0755 %{SOURCE2} %{buildroot}%{_x11data}/xfig/
-make DESTDIR=%{buildroot} SHAREDIR=%{_x11data} install
-make DESTDIR=%{buildroot} SHAREDIR=%{_x11data} install.man
+make DESTDIR=%{buildroot} install
+make DESTDIR=%{buildroot} install.man
mkdir -p %{buildroot}/%{_docdir}/%{name}
cp -pr README FIGAPPS Libraries font-test.fig %{buildroot}/%{_docdir}/%{name}
cp -pr Doc/FORMAT* Doc/TODO Doc/html Doc/*.pdf Doc/*.html %{buildroot}/%{_docdir}/%{name}
@@ -133,6 +132,8 @@
%doc %{_mandir}/man1/xfig.1x.gz
%changelog -n xfig
+* Mon Jul 31 2006 - werner@suse.de
+- Use Imake defines for LIBDIR/SHAREDIR switch
* Fri Jul 28 2006 - werner@suse.de
- Make it build with X11R7
* Wed Feb 15 2006 - stbinner@suse.de
++++++ xfig.3.2.4.dif ++++++
--- /var/tmp/diff_new_pack.vK28PU/_old 2006-07-31 23:27:51.000000000 +0200
+++ /var/tmp/diff_new_pack.vK28PU/_new 2006-07-31 23:27:51.000000000 +0200
@@ -1,6 +1,6 @@
--- Fig-color.ad
-+++ Fig-color.ad Thu Mar 11 14:57:12 2004
-@@ -76,6 +76,12 @@
++++ Fig-color.ad 2006-07-31 17:56:25.000000000 +0200
+@@ -76,6 +76,12 @@ Fig*MenuButton*background: gray83
! in the color editor popup
Fig*mixedEdit.background: gray83
@@ -13,7 +13,7 @@
Fig*cancel.background: gray88
Fig*dismiss.background: gray88
Fig*commands*background: gray88
-@@ -85,12 +91,35 @@
+@@ -85,12 +91,35 @@ Fig*horizontal.background: gray88
Fig*topruler.background: gray95
Fig*sideruler.background: gray95
@@ -51,8 +51,8 @@
Fig*Label.background: gray80
Fig*ind_box.background: gray80
--- Fig.ad
-+++ Fig.ad Thu Mar 11 15:52:41 2004
-@@ -10,6 +10,8 @@
++++ Fig.ad 2006-07-31 17:56:25.000000000 +0200
+@@ -10,6 +10,8 @@ Fig.version: 3.2.4
Fig*AllowShellResize: false
@@ -61,7 +61,7 @@
! Image editor - can edit imported image
Fig.image_editor: xv
-@@ -20,7 +22,7 @@
+@@ -20,7 +22,7 @@ Fig.ghostscript: gs
! This is for viewing the xfig html reference.
! For netscape, this command will open the help pages in a running netscape,
! or start a new netscape if one isn't already running
@@ -70,7 +70,7 @@
! pdfviewer - put your favorite pdf viewer here.
! This is for viewing the xfig how-to guide and man pages
-@@ -99,60 +101,62 @@
+@@ -99,60 +101,62 @@ Fig.internalborderwidth: 1
! I include both for compatibility. Be sure to change both values when
! modifying them.
@@ -160,8 +160,8 @@
! Specify a private Compose key database file. If this resource contains a "/"
! then the wired-in name of the xfig global directory won't be prefixed to it.
--- Imakefile
-+++ Imakefile Thu Mar 11 16:49:26 2004
-@@ -49,7 +49,7 @@
++++ Imakefile 2006-07-31 18:20:06.000000000 +0200
+@@ -49,7 +49,7 @@ XCOMM Redefine the following if your PNG
XCOMM are in different places
PNGLIBDIR = $(USRLIBDIR)
@@ -170,7 +170,7 @@
XCOMM If don't want JPEG support, comment out the #define USEJPEG line
XCOMM Uncomment the #define for USEJPEG if you want to be able to import
-@@ -68,8 +68,8 @@
+@@ -68,8 +68,8 @@ XCOMM You must have version 5b or newer
#ifdef USEJPEG
#ifdef USEINSTALLEDJPEG
@@ -181,7 +181,7 @@
#else
JPEGLIBDIR = ../jpeg
JPEGINC = -I$(JPEGLIBDIR)
-@@ -87,8 +87,8 @@
+@@ -87,8 +87,8 @@ XCOMM in /contrib/libraries.
XCOMM Change XPMLIBDIR if necessary to point to the xpm library (libXpm)
XCOMM Change XPMINC if necessary to point to the include file for xpm (xpm.h)
@@ -192,7 +192,7 @@
#ifdef USEXPM
XPMLIBDIR = $(USRLIBDIR)
-@@ -105,17 +105,20 @@
+@@ -105,17 +105,20 @@ XCOMM the 3d Athena Widget Set (highly r
XCOMM Then be sure to change the XAW3DINC to point to the directory where your
XCOMM 3D Athena widget headers are located
@@ -215,7 +215,7 @@
#ifdef WHEELMOUSE
DUSEWHEELMOUSE = -DWHEELMOUSE
-@@ -154,7 +157,7 @@
+@@ -154,7 +157,7 @@ XCOMM uncomment the following line if yo
XCOMM inline functions. With the "INLINE" keyword, you should notice that
XCOMM the display will be a bit faster in complex figures
@@ -224,12 +224,12 @@
XCOMM use (and change) the following if you want the multi-key data base file
XCOMM somewhere other than the standard X11 library directory
-@@ -162,11 +165,11 @@
+@@ -162,11 +165,11 @@ XCOMM be sure to comment out the second
XCOMM XFIGLIBDIR = /usr/local/lib/xfig
XCOMM use this if you want the multi-key data base file in the standard X11 tree
-XFIGLIBDIR = $(LIBDIR)/xfig
-+XFIGLIBDIR = $(SHAREDIR)/xfig
++XFIGLIBDIR = _DATA/xfig
XCOMM XFIGDOCDIR tells where the html and pdf documentation should go
XCOMM XFIGDOCDIR = $(DOCDIR)/xfig
@@ -238,7 +238,7 @@
XCOMM MANDIR tells where the standard man pages should go (no need to change it
XCOMM if you want the man pages installed in the standard place on your system
-@@ -200,7 +203,7 @@
+@@ -200,7 +203,7 @@ XCOMM instead.
XCOMM Add `-DCACHE_SIZE_LIMIT=xxxx' where xxxx is the cache size in kilobytes.
XCOMM A cache size of zero turns caching off.
@@ -247,7 +247,7 @@
XCOMM For SYSV systems with BSD-style printer command which use lpr instead of
XCOMM lp (SGI is one such machine), add -DBSDLPR to the DEFINES variable
-@@ -214,6 +217,7 @@
+@@ -214,6 +217,7 @@ XCOMM number of vertices.
XCOMM If you want a compiler other than "cc", define it here
XCOMM CC = /opt/SUNWspro/bin/cc
@@ -255,7 +255,7 @@
XCOMM *****************************************************
XCOMM *****************************************************
-@@ -234,7 +238,7 @@
+@@ -234,7 +238,7 @@ DEPLIBJPEG = $(JPEGLIBDIR)/libjpeg.a
#endif /* USEJPEG */
#ifdef I18N
@@ -264,7 +264,7 @@
I18N_SRC = w_i18n.c
I18N_OBJ = w_i18n.o
#endif
-@@ -304,7 +308,7 @@
+@@ -304,7 +308,7 @@ XFIGSRC = d_arc.c d_arcbox.c d_box.c d_e
w_export.c w_file.c w_fontbits.c w_fontpanel.c w_grid.c w_icons.c \
w_indpanel.c w_library.c w_modepanel.c w_mousefun.c w_msgpanel.c \
w_print.c w_rottext.c w_rulers.c w_setup.c w_style.c w_util.c w_zoom.c \
@@ -273,7 +273,7 @@
XFIGOBJ = d_arc.o d_arcbox.o d_box.o d_ellipse.o d_picobj.o \
d_subspline.o d_line.o d_regpoly.o d_spline.o d_text.o \
-@@ -326,7 +330,7 @@
+@@ -326,7 +330,7 @@ XFIGOBJ = d_arc.o d_arcbox.o d_box.o d_e
w_export.o w_file.o w_fontbits.o w_fontpanel.o w_grid.o w_icons.o \
w_indpanel.o w_library.o w_modepanel.o w_mousefun.o w_msgpanel.o \
w_print.o w_rottext.o w_rulers.o w_setup.o w_style.o w_util.o w_zoom.o \
@@ -283,8 +283,8 @@
XCOMM Other dependencies should be handled by "make depend"
--- e_addpt.c
-+++ e_addpt.c Thu Mar 11 14:57:12 2004
-@@ -52,6 +52,7 @@
++++ e_addpt.c 2006-07-31 17:56:25.000000000 +0200
+@@ -52,6 +52,7 @@ point_adding_selected()
force_nopositioning();
force_anglegeom();
constrained = MOVE_ARB;
@@ -293,8 +293,8 @@
static void
--- e_align.c
-+++ e_align.c Thu Mar 11 14:57:12 2004
-@@ -63,6 +63,7 @@
++++ e_align.c 2006-07-31 17:56:25.000000000 +0200
+@@ -63,6 +63,7 @@ align_selected()
canvas_middlebut_proc = init_align_canvas;
canvas_rightbut_proc = null_proc;
set_cursor(pick15_cursor);
@@ -303,8 +303,8 @@
/* align objects to the whole canvas */
--- e_arrow.c
-+++ e_arrow.c Thu Mar 11 14:57:12 2004
-@@ -47,6 +47,7 @@
++++ e_arrow.c 2006-07-31 17:56:25.000000000 +0200
+@@ -47,6 +47,7 @@ arrow_head_selected()
canvas_middlebut_proc = point_search_middle;
canvas_rightbut_proc = null_proc;
set_cursor(pick9_cursor);
@@ -313,8 +313,8 @@
static void
--- e_break.c
-+++ e_break.c Thu Mar 11 14:57:12 2004
-@@ -43,6 +43,7 @@
++++ e_break.c 2006-07-31 17:56:25.000000000 +0200
+@@ -43,6 +43,7 @@ break_selected()
canvas_middlebut_proc = object_search_middle;
canvas_rightbut_proc = null_proc;
set_cursor(pick15_cursor);
@@ -322,7 +322,7 @@
}
static void
-@@ -82,8 +83,10 @@
+@@ -82,8 +83,10 @@ init_break(p, type, x, y, px, py, loc_ta
list_delete_compound(&objects.compounds, cur_c);
tail(&objects, &object_tails);
append_objects(&objects, cur_c, &object_tails);
@@ -334,8 +334,8 @@
set_tags(cur_c, loc_tag);
set_action(F_BREAK);
--- e_convert.c
-+++ e_convert.c Thu Mar 11 14:57:12 2004
-@@ -47,6 +47,7 @@
++++ e_convert.c 2006-07-31 17:56:25.000000000 +0200
+@@ -47,6 +47,7 @@ convert_selected()
canvas_middlebut_proc = null_proc;
canvas_rightbut_proc = point_search_right;
set_cursor(pick15_cursor);
@@ -344,8 +344,8 @@
static void
--- e_deletept.c
-+++ e_deletept.c Thu Mar 11 14:57:12 2004
-@@ -43,6 +43,7 @@
++++ e_deletept.c 2006-07-31 17:56:25.000000000 +0200
+@@ -43,6 +43,7 @@ delete_point_selected()
canvas_middlebut_proc = null_proc;
canvas_rightbut_proc = null_proc;
set_cursor(pick9_cursor);
@@ -354,8 +354,8 @@
static void
--- e_flip.c
-+++ e_flip.c Thu Mar 11 14:57:12 2004
-@@ -61,6 +61,7 @@
++++ e_flip.c 2006-07-31 17:56:25.000000000 +0200
+@@ -61,6 +61,7 @@ flip_ud_selected()
setcenter = 0;
setanchor = 0;
flip_selected();
@@ -363,7 +363,7 @@
}
void
-@@ -76,6 +77,7 @@
+@@ -76,6 +77,7 @@ flip_lr_selected()
setcenter = 0;
setanchor = 0;
flip_selected();
@@ -372,8 +372,8 @@
static void
--- e_movept.c
-+++ e_movept.c Thu Mar 11 14:57:12 2004
-@@ -80,6 +80,7 @@
++++ e_movept.c 2006-07-31 17:56:25.000000000 +0200
+@@ -80,6 +80,7 @@ move_point_selected()
canvas_rightbut_proc = null_proc;
set_cursor(pick9_cursor);
force_anglegeom();
@@ -382,8 +382,8 @@
static void
--- e_rotate.c
-+++ e_rotate.c Thu Mar 11 14:57:12 2004
-@@ -94,6 +94,7 @@
++++ e_rotate.c 2006-07-31 17:56:25.000000000 +0200
+@@ -94,6 +94,7 @@ rotate_selected()
canvas_middlebut_proc = object_search_middle;
canvas_rightbut_proc = set_unset_center;
set_cursor(pick15_cursor);
@@ -392,8 +392,8 @@
static void
--- e_update.c
-+++ e_update.c Thu Mar 11 14:57:12 2004
-@@ -64,6 +64,7 @@
++++ e_update.c 2006-07-31 17:56:25.000000000 +0200
+@@ -64,6 +64,7 @@ update_selected()
set_cursor(pick9_cursor);
/* manage on the update buttons */
manage_update_buts();
@@ -402,8 +402,8 @@
static int
--- fig.h
-+++ fig.h Thu Mar 11 14:57:12 2004
-@@ -26,6 +26,7 @@
++++ fig.h 2006-07-31 17:56:25.000000000 +0200
+@@ -26,6 +26,7 @@ extern char *my_strdup();
#if defined(ultrix) || defined(__bsdi__) || defined(Mips) || defined(apollo)
#include
participants (1)
-
root@suse.de